Collapse all new default initializers into a single file

- Adjusted tests also for this new behavior.
- Based on the discussion in
  https://github.com/rails/rails/pull/25184#issuecomment-222454583.

1 files changed, 9 insertions, 2 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