Merge pull request #25231 from prathamesh-sonpatki/collapse-new-initializers

Collapse all new default initializers into a single file

2 files changed, 19 insertions, 93 deletions

diff --git a/railties/test/generators/api_app_generator_test.rb b/railties/test/generators/api_app_generator_test.rb
index 505c1be9fc..92779452e1 100644
--- a/railties/test/generators/api_app_generator_test.rb
+++ b/railties/test/generators/api_app_generator_test.rb
@@ -62,6 +62,15 @@ class ApiAppGeneratorTest < Rails::Generators::TestCase
     end
   end
 
+  def test_generator_skips_per_form_csrf_token_and_origin_check_configs_for_api_apps
+    run_generator
+
+    assert_file "config/initializers/new_framework_defaults.rb" do |initializer_content|
+      assert_no_match(/per_form_csrf_tokens/, initializer_content)
+      assert_no_match(/forgery_protection_origin_check/, initializer_content)
+    end
+  end
+
   private
 
   def default_files
@@ -100,8 +109,6 @@ class ApiAppGeneratorTest < Rails::Generators::TestCase
        config/initializers/assets.rb
        config/initializers/cookies_serializer.rb
        config/initializers/session_store.rb
-       config/initializers/new_framework_defaults/request_forgery_protection.rb
-       config/initializers/new_framework_defaults/per_form_csrf_tokens.rb
        lib/assets
        vendor/assets
        test/helpers
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index cb656cc94c..bea8db087f 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -172,34 +172,6 @@ class AppGeneratorTest < Rails::Generators::TestCase
     end
   end
 
-  def test_rails_update_does_not_create_callback_terminator_initializer
-    app_root = File.join(destination_root, 'myapp')
-    run_generator [app_root]
-
-    FileUtils.rm("#{app_root}/config/initializers/new_framework_defaults/callback_terminator.rb")
-
-    stub_rails_application(app_root) do
-      generator = Rails::Generators::AppGenerator.new ["rails"], [], destination_root: app_root, shell: @shell
-      generator.send(:app_const)
-      quietly { generator.send(:update_config_files) }
-      assert_no_file "#{app_root}/config/initializers/new_framework_defaults/callback_terminator.rb"
-    end
-  end
-
-  def test_rails_update_does_not_remove_callback_terminator_initializer_if_already_present
-    app_root = File.join(destination_root, 'myapp')
-    run_generator [app_root]
-
-    FileUtils.touch("#{app_root}/config/initializers/new_framework_defaults/callback_terminator.rb")
-
-    stub_rails_application(app_root) do
-      generator = Rails::Generators::AppGenerator.new ["rails"], [], destination_root: app_root, shell: @shell
-      generator.send(:app_const)
-      quietly { generator.send(:update_config_files) }
-      assert_file "#{app_root}/config/initializers/new_framework_defaults/callback_terminator.rb"
-    end
-  end
-
   def test_rails_update_set_the_cookie_serializer_to_marshal_if_it_is_not_already_configured
     app_root = File.join(destination_root, 'myapp')
     run_generator [app_root]
@@ -229,87 +201,31 @@ class AppGeneratorTest < Rails::Generators::TestCase
     end
   end
 
-  def test_rails_update_does_not_create_active_record_belongs_to_required_by_default
-    app_root = File.join(destination_root, 'myapp')
-    run_generator [app_root]
-
-    FileUtils.rm("#{app_root}/config/initializers/new_framework_defaults/active_record_belongs_to_required_by_default.rb")
-
-    stub_rails_application(app_root) do
-      generator = Rails::Generators::AppGenerator.new ["rails"], [], destination_root: app_root, shell: @shell
-      generator.send(:app_const)
-      quietly { generator.send(:update_config_files) }
-      assert_no_file "#{app_root}/config/initializers/new_framework_defaults/active_record_belongs_to_required_by_default.rb"
-    end
-  end
-
-  def test_rails_update_does_not_remove_active_record_belongs_to_required_by_default_if_already_present
-    app_root = File.join(destination_root, 'myapp')
-    run_generator [app_root]
-
-    FileUtils.touch("#{app_root}/config/initializers/new_framework_defaults/active_record_belongs_to_required_by_default.rb")
-
-    stub_rails_application(app_root) do
-      generator = Rails::Generators::AppGenerator.new ["rails"], [], destination_root: app_root, shell: @shell
-      generator.send(:app_const)
-      quietly { generator.send(:update_config_files) }
-      assert_file "#{app_root}/config/initializers/new_framework_defaults/active_record_belongs_to_required_by_default.rb"
-    end
-  end
-
-  def test_rails_update_does_not_create_to_time_preserves_timezone
-    app_root = File.join(destination_root, 'myapp')
-    run_generator [app_root]
-
-    FileUtils.rm("#{app_root}/config/initializers/new_framework_defaults/to_time_preserves_timezone.rb")
-
-    stub_rails_application(app_root) do
-      generator = Rails::Generators::AppGenerator.new ["rails"], [], destination_root: app_root, shell: @shell
-      generator.send(:app_const)
-      quietly { generator.send(:update_config_files) }
-      assert_no_file "#{app_root}/config/initializers/new_framework_defaults/to_time_preserves_timezone.rb"
-    end
-  end
-
-  def test_rails_update_does_not_remove_to_time_preserves_timezone_if_already_present
+  def test_rails_update_does_not_create_new_framework_defaults_by_default
     app_root = File.join(destination_root, 'myapp')
     run_generator [app_root]
 
-    FileUtils.touch("#{app_root}/config/initializers/new_framework_defaults/to_time_preserves_timezone.rb")
+    FileUtils.rm("#{app_root}/config/initializers/new_framework_defaults.rb")
 
     stub_rails_application(app_root) do
       generator = Rails::Generators::AppGenerator.new ["rails"], [], destination_root: app_root, shell: @shell
       generator.send(:app_const)
       quietly { generator.send(:update_config_files) }
-      assert_file "#{app_root}/config/initializers/new_framework_defaults/to_time_preserves_timezone.rb"
+      assert_no_file "#{app_root}/config/initializers/new_framework_defaults.rb"
     end
   end
 
-  def test_rails_update_does_not_create_ssl_options_by_default
+  def test_rails_update_does_not_new_framework_defaults_if_already_present
     app_root = File.join(destination_root, 'myapp')
     run_generator [app_root]
 
-    FileUtils.rm("#{app_root}/config/initializers/new_framework_defaults/ssl_options.rb")
+    FileUtils.touch("#{app_root}/config/initializers/new_framework_defaults.rb")
 
     stub_rails_application(app_root) do
       generator = Rails::Generators::AppGenerator.new ["rails"], [], destination_root: app_root, shell: @shell
       generator.send(:app_const)
       quietly { generator.send(:update_config_files) }
-      assert_no_file "#{app_root}/config/initializers/new_framework_defaults/ssl_options.rb"
-    end
-  end
-
-  def test_rails_update_does_not_remove_ssl_options_if_already_present
-    app_root = File.join(destination_root, 'myapp')
-    run_generator [app_root]
-
-    FileUtils.touch("#{app_root}/config/initializers/new_framework_defaults/ssl_options.rb")
-
-    stub_rails_application(app_root) do
-      generator = Rails::Generators::AppGenerator.new ["rails"], [], destination_root: app_root, shell: @shell
-      generator.send(:app_const)
-      quietly { generator.send(:update_config_files) }
-      assert_file "#{app_root}/config/initializers/new_framework_defaults/ssl_options.rb"
+      assert_file "#{app_root}/config/initializers/new_framework_defaults.rb"
     end
   end
 
@@ -452,12 +368,15 @@ class AppGeneratorTest < Rails::Generators::TestCase
   def test_generator_if_skip_active_record_is_given
     run_generator [destination_root, "--skip-active-record"]
     assert_no_file "config/database.yml"
-    assert_no_file "config/initializers/new_framework_defaults/active_record_belongs_to_required_by_default.rb"
     assert_no_file "app/models/application_record.rb"
     assert_file "config/application.rb", /#\s+require\s+["']active_record\/railtie["']/
     assert_file "test/test_helper.rb" do |helper_content|
       assert_no_match(/fixtures :all/, helper_content)
     end
+
+    assert_file "config/initializers/new_framework_defaults.rb" do |initializer_content|
+      assert_no_match(/belongs_to_required_by_default/, initializer_content)
+    end
   end
 
   def test_generator_if_skip_action_mailer_is_given