From a6e1be71485d09bce493340078f98ed4f1b928ba Mon Sep 17 00:00:00 2001 From: Jonathan Hefner Date: Tue, 23 Jun 2020 23:30:53 -0500 Subject: [PATCH] Ensure principle tasks go before finish_template This fixes a regression of #13637, and adds a regression test. --- .../lib/rails/generators/rails/app/app_generator.rb | 12 ++++++------ railties/test/generators/app_generator_test.rb | 6 ++++++ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb index 8b08ca98ea..7c28277192 100644 --- a/railties/lib/rails/generators/rails/app/app_generator.rb +++ b/railties/lib/rails/generators/rails/app/app_generator.rb @@ -491,6 +491,12 @@ module Rails end end + def delete_active_job_folder_if_skipping_active_job + if options[:skip_active_job] + remove_dir "app/jobs" + end + end + def delete_action_mailer_files_skipping_action_mailer if options[:skip_action_mailer] remove_file "app/views/layouts/mailer.html.erb" @@ -536,12 +542,6 @@ module Rails build(:leftovers) end - def delete_active_job_folder_if_skipping_active_job - if options[:skip_active_job] - remove_dir "app/jobs" - end - end - public_task :apply_rails_template, :run_bundle public_task :generate_bundler_binstub, :generate_spring_binstub public_task :run_webpack diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb index 396741e78a..2240a8e1a4 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -1074,6 +1074,12 @@ class AppGeneratorTest < Rails::Generators::TestCase end end + def test_principle_tasks_go_before_finish_template + tasks = generator.class.tasks.keys + + assert_equal tasks.index("apply_rails_template") - 1, tasks.index("finish_template") + end + def test_after_bundle_callback path = "http://example.org/rails_template" template = +%{ after_bundle { run 'echo ran after_bundle' } }