diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md index 387f19672e77d..a66ef7e08b9a8 100644 --- a/railties/CHANGELOG.md +++ b/railties/CHANGELOG.md @@ -1,3 +1,32 @@ +* Allow Actionable Errors encountered when running tests to be retried. + + ```txt + Migrations are pending. To resolve this issue, run: + + bin/rails db:migrate + + You have 1 pending migration: + + db/migrate/20240201213806_add_a_to_b.rb + Run pending migrations? [Yn] Y + == 20240201213806 AddAToB: migrating ========================================= + == 20240201213806 AddAToB: migrated (0.0000s) ================================ + + Running 7 tests in a single process (parallelization threshold is 50) + Run options: --seed 22200 + + # Running: + + ....... + + Finished in 0.243394s, 28.7600 runs/s, 45.1942 assertions/s. + 7 runs, 11 assertions, 0 failures, 0 errors, 0 skips + ``` + + This feature will only be present on interactive terminals. + + *Andrew Novoselac & Gannon McGibbon* + * Fix sanitizer vendor configuration in 7.1 defaults. In apps where rails-html-sanitizer was not eagerly loaded, the sanitizer default could end up diff --git a/railties/lib/rails/command/base.rb b/railties/lib/rails/command/base.rb index ee6e04998733e..67950cde7b9cc 100644 --- a/railties/lib/rails/command/base.rb +++ b/railties/lib/rails/command/base.rb @@ -179,6 +179,26 @@ def invoke_command(command, *) # :nodoc: ensure @current_subcommand = original_subcommand end + + protected + def with_actionable_errors_retried(&block) + block.call + rescue ActiveSupport::ActionableError => e + puts e.to_s.strip + exit 1 unless tty? + + ActiveSupport::ActionableError.actions(e).each_key do |action_name| + if yes? "#{action_name}? [Yn]" + ActiveSupport::ActionableError.dispatch(e, action_name) + return with_actionable_errors_retried(&block) + end + end + exit 1 + end + + def tty? + STDOUT.tty? + end end end end diff --git a/railties/lib/rails/commands/test/test_command.rb b/railties/lib/rails/commands/test/test_command.rb index e183ddf0f3406..0e592963adc0b 100644 --- a/railties/lib/rails/commands/test/test_command.rb +++ b/railties/lib/rails/commands/test/test_command.rb @@ -30,7 +30,9 @@ def perform(*args) Rails::TestUnit::Runner.parse_options(args) run_prepare_task if self.args.none?(EXACT_TEST_ARGUMENT_PATTERN) - Rails::TestUnit::Runner.run(args) + with_actionable_errors_retried do + Rails::TestUnit::Runner.run(args) + end rescue Rails::TestUnit::InvalidTestError => error say error.message end diff --git a/railties/lib/rails/testing/maintain_test_schema.rb b/railties/lib/rails/testing/maintain_test_schema.rb index 3197b77d10928..34991c64032f4 100644 --- a/railties/lib/rails/testing/maintain_test_schema.rb +++ b/railties/lib/rails/testing/maintain_test_schema.rb @@ -1,12 +1,8 @@ # frozen_string_literal: true if defined?(ActiveRecord::Base) - begin - ActiveRecord::Migration.maintain_test_schema! - rescue ActiveRecord::PendingMigrationError => e - puts e.to_s.strip - exit 1 - end + + ActiveRecord::Migration.maintain_test_schema! if Rails.configuration.eager_load ActiveRecord::Base.descendants.each do |model| diff --git a/railties/test/application/test_test.rb b/railties/test/application/test_test.rb index 30f92fbe98106..ec187adb24d21 100644 --- a/railties/test/application/test_test.rb +++ b/railties/test/application/test_test.rb @@ -1,6 +1,7 @@ # frozen_string_literal: true require "isolation/abstract_unit" +require "thor" module ApplicationTests class TestTest < ActiveSupport::TestCase @@ -110,6 +111,11 @@ def test_failure output = rails("generate", "model", "user", "name:string") version = output.match(/(\d+)_create_users\.rb/)[1] + app_file "config/environments/test.rb", <<-RUBY + Rails.application.configure do + config.actionable_command_line_errors = false + end + RUBY app_file "test/models/user_test.rb", <<-RUBY require "test_helper" @@ -147,6 +153,11 @@ class UserTest < ActiveSupport::TestCase output = rails("generate", "model", "user", "name:string") version = output.match(/(\d+)_create_users\.rb/)[1] + app_file "config/environments/test.rb", <<-RUBY + Rails.application.configure do + config.actionable_command_line_errors = false + end + RUBY app_file "test/models/user_test.rb", <<-RUBY require "test_helper" @@ -345,6 +356,45 @@ def self.load_schema! assert_unsuccessful_run "models/user_test.rb", "SCHEMA LOADED!" end + def test_actionable_command_line_error_with_tty + rails "generate", "scaffold", "user", "name:string" + app_file "config/initializers/thor_yes.rb", <<-RUBY + Rails::Command::Base.class_eval <<-INITIALIZER + def yes?(statement, color = nil) + raise ArgumentError unless statement == "Run pending migrations? [Yn]" + true + end + + def tty? + true + end + INITIALIZER + RUBY + + run_test_file("models/user_test.rb").tap do |output| + assert_match "Migrations are pending. To resolve this issue, run:", output + assert_match "CreateUsers: migrating", output + assert_match "0 runs, 0 assertions, 0 failures, 0 errors, 0 skips", output + end + end + + def test_actionable_command_line_without_tty + rails "generate", "scaffold", "user", "name:string" + app_file "config/initializers/thor_yes.rb", <<-RUBY + Rails::Command::Base.class_eval <<-INITIALIZER + def tty? + false + end + INITIALIZER + RUBY + + run_test_file("models/user_test.rb").tap do |output| + assert_match "Migrations are pending. To resolve this issue, run:", output + assert_no_match "CreateUsers: migrating", output + assert_no_match "0 runs, 0 assertions, 0 failures, 0 errors, 0 skips", output + end + end + private def assert_unsuccessful_run(name, message) result = run_test_file(name)