Move new default initializers into separate directory

- These initializers are new defaults for Rails 5 and newly generated
  apps do not need to change them.
- Fixes #25181

railties/lib/rails/generators/rails/app/app_generator.rb

@@ -90,11 +90,11 @@ def config
 
     def config_when_updating
       cookie_serializer_config_exist = File.exist?('config/initializers/cookies_serializer.rb')
-      callback_terminator_config_exist = File.exist?('config/initializers/callback_terminator.rb')
-      active_record_belongs_to_required_by_default_config_exist = File.exist?('config/initializers/active_record_belongs_to_required_by_default.rb')
-      to_time_preserves_timezone_config_exist = File.exist?('config/initializers/to_time_preserves_timezone.rb')
+      callback_terminator_config_exist = File.exist?('config/initializers/new_framework_defaults/callback_terminator.rb')
+      active_record_belongs_to_required_by_default_config_exist = File.exist?('config/initializers/new_framework_defaults/active_record_belongs_to_required_by_default.rb')
+      to_time_preserves_timezone_config_exist = File.exist?('config/initializers/new_framework_defaults/to_time_preserves_timezone.rb')
       action_cable_config_exist = File.exist?('config/cable.yml')
-      ssl_options_exist = File.exist?('config/initializers/ssl_options.rb')
+      ssl_options_exist = File.exist?('config/initializers/new_framework_defaults/ssl_options.rb')
       rack_cors_config_exist = File.exist?('config/initializers/cors.rb')
 
       config
@@ -102,7 +102,7 @@ def config_when_updating
       gsub_file 'config/environments/development.rb', /^(\s+)config\.file_watcher/, '\1# config.file_watcher'
 
       unless callback_terminator_config_exist
-        remove_file 'config/initializers/callback_terminator.rb'
+        remove_file 'config/initializers/new_framework_defaults/callback_terminator.rb'
       end
 
       unless cookie_serializer_config_exist
@@ -110,11 +110,11 @@ def config_when_updating
       end
 
       unless active_record_belongs_to_required_by_default_config_exist
-        remove_file 'config/initializers/active_record_belongs_to_required_by_default.rb'
+        remove_file 'config/initializers/new_framework_defaults/active_record_belongs_to_required_by_default.rb'
       end
 
       unless to_time_preserves_timezone_config_exist
-        remove_file 'config/initializers/to_time_preserves_timezone.rb'
+        remove_file 'config/initializers/new_framework_defaults/to_time_preserves_timezone.rb'
       end
 
       unless action_cable_config_exist
@@ -122,7 +122,7 @@ def config_when_updating
       end
 
       unless ssl_options_exist
-        remove_file 'config/initializers/ssl_options.rb'
+        remove_file 'config/initializers/new_framework_defaults/ssl_options.rb'
       end
 
       unless rack_cors_config_exist
@@ -344,7 +344,7 @@ def delete_action_mailer_files_skipping_action_mailer
 
       def delete_active_record_initializers_skipping_active_record
         if options[:skip_active_record]
-          remove_file 'config/initializers/active_record_belongs_to_required_by_default.rb'
+          remove_file 'config/initializers/new_framework_defaults/active_record_belongs_to_required_by_default.rb'
         end
       end
 
@@ -360,8 +360,8 @@ def delete_non_api_initializers_if_api_option
         if options[:api]
           remove_file 'config/initializers/session_store.rb'
           remove_file 'config/initializers/cookies_serializer.rb'
-          remove_file 'config/initializers/request_forgery_protection.rb'
-          remove_file 'config/initializers/per_form_csrf_tokens.rb'
+          remove_file 'config/initializers/new_framework_defaults/request_forgery_protection.rb'
+          remove_file 'config/initializers/new_framework_defaults/per_form_csrf_tokens.rb'
         end
       end
 

railties/lib/rails/generators/rails/app/templates/config/initializers/ssl_options.rb → railties/lib/rails/generators/rails/app/templates/config/initializers/new_framework_defaults/ssl_options.rb

 # Be sure to restart your server when you modify this file.
 
-# Configure SSL options to enable HSTS with subdomains.
+# Configure SSL options to enable HSTS with subdomains. This is a new
+# Rails 5.0 default, so it is introduced as a configuration option to ensure
+# that apps made on earlier versions of Rails are not affected when upgrading.
 Rails.application.config.ssl_options = { hsts: { subdomains: true } }

railties/test/generators/api_app_generator_test.rb

@@ -100,8 +100,8 @@ def skipped_files
        config/initializers/assets.rb
        config/initializers/cookies_serializer.rb
        config/initializers/session_store.rb
-       config/initializers/request_forgery_protection.rb
-       config/initializers/per_form_csrf_tokens.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

railties/test/generators/app_generator_test.rb

@@ -176,13 +176,13 @@ 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/callback_terminator.rb")
+    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/callback_terminator.rb"
+      assert_no_file "#{app_root}/config/initializers/new_framework_defaults/callback_terminator.rb"
     end
   end
 
@@ -190,13 +190,13 @@ def test_rails_update_does_not_remove_callback_terminator_initializer_if_already
     app_root = File.join(destination_root, 'myapp')
     run_generator [app_root]
 
-    FileUtils.touch("#{app_root}/config/initializers/callback_terminator.rb")
+    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/callback_terminator.rb"
+      assert_file "#{app_root}/config/initializers/new_framework_defaults/callback_terminator.rb"
     end
   end
 
@@ -233,13 +233,13 @@ def test_rails_update_does_not_create_active_record_belongs_to_required_by_defau
     app_root = File.join(destination_root, 'myapp')
     run_generator [app_root]
 
-    FileUtils.rm("#{app_root}/config/initializers/active_record_belongs_to_required_by_default.rb")
+    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/active_record_belongs_to_required_by_default.rb"
+      assert_no_file "#{app_root}/config/initializers/new_framework_defaults/active_record_belongs_to_required_by_default.rb"
     end
   end
 
@@ -247,13 +247,13 @@ def test_rails_update_does_not_remove_active_record_belongs_to_required_by_defau
     app_root = File.join(destination_root, 'myapp')
     run_generator [app_root]
 
-    FileUtils.touch("#{app_root}/config/initializers/active_record_belongs_to_required_by_default.rb")
+    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/active_record_belongs_to_required_by_default.rb"
+      assert_file "#{app_root}/config/initializers/new_framework_defaults/active_record_belongs_to_required_by_default.rb"
     end
   end
 
@@ -261,13 +261,13 @@ 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/to_time_preserves_timezone.rb")
+    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/to_time_preserves_timezone.rb"
+      assert_no_file "#{app_root}/config/initializers/new_framework_defaults/to_time_preserves_timezone.rb"
     end
   end
 
@@ -275,13 +275,13 @@ def test_rails_update_does_not_remove_to_time_preserves_timezone_if_already_pres
     app_root = File.join(destination_root, 'myapp')
     run_generator [app_root]
 
-    FileUtils.touch("#{app_root}/config/initializers/to_time_preserves_timezone.rb")
+    FileUtils.touch("#{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_file "#{app_root}/config/initializers/to_time_preserves_timezone.rb"
+      assert_file "#{app_root}/config/initializers/new_framework_defaults/to_time_preserves_timezone.rb"
     end
   end
 
@@ -289,13 +289,13 @@ def test_rails_update_does_not_create_ssl_options_by_default
     app_root = File.join(destination_root, 'myapp')
     run_generator [app_root]
 
-    FileUtils.rm("#{app_root}/config/initializers/ssl_options.rb")
+    FileUtils.rm("#{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_no_file "#{app_root}/config/initializers/ssl_options.rb"
+      assert_no_file "#{app_root}/config/initializers/new_framework_defaults/ssl_options.rb"
     end
   end
 
@@ -303,13 +303,13 @@ 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/ssl_options.rb")
+    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/ssl_options.rb"
+      assert_file "#{app_root}/config/initializers/new_framework_defaults/ssl_options.rb"
     end
   end
 
@@ -452,7 +452,7 @@ def test_generator_if_skip_puma_is_given
   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/active_record_belongs_to_required_by_default.rb"
+    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|

railties/test/isolation/abstract_unit.rb

@@ -111,7 +111,7 @@ def build_app(options = {})
 
       # Delete the initializers unless requested
       unless options[:initializers]
-        Dir["#{app_path}/config/initializers/*.rb"].each do |initializer|
+        Dir["#{app_path}/config/initializers/**/*.rb"].each do |initializer|
           File.delete(initializer)
         end
       end