From 6fbd405a2eb585591bb57de5adae71f890a24af3 Mon Sep 17 00:00:00 2001
From: "yuuji.yaginuma" <yuuji.yaginuma@gmail.com>
Date: Thu, 22 Jun 2017 22:17:18 +0900
Subject: Clear screenshots files in `tmp:clear` task

If system test fails, it creates screenshot under `tmp/screenshots`.
https://github.com/rails/rails/blob/34fe2a4fc778d18b7fe6bdf3629c1481bee789b9/actionpack/lib/action_dispatch/system_testing/test_helpers/screenshot_helper.rb#L45

But currently, screenshot files is not cleared by `tmp:clear` task.
This patch make clears screenshot files with `tmp:clear` task as well
as other tmp files.
---
 railties/test/application/rake/tmp_test.rb | 36 ++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 railties/test/application/rake/tmp_test.rb

(limited to 'railties/test')

diff --git a/railties/test/application/rake/tmp_test.rb b/railties/test/application/rake/tmp_test.rb
new file mode 100644
index 0000000000..bc9865b0de
--- /dev/null
+++ b/railties/test/application/rake/tmp_test.rb
@@ -0,0 +1,36 @@
+require "isolation/abstract_unit"
+
+module ApplicationTests
+  module RakeTests
+    class TmpTest < ActiveSupport::TestCase
+      include ActiveSupport::Testing::Isolation
+
+      def setup
+        build_app
+      end
+
+      def teardown
+        teardown_app
+      end
+
+      test "tmp:clear clear cache, socket and screenshot files" do
+        Dir.chdir(app_path) do
+          FileUtils.mkdir_p("tmp/cache")
+          FileUtils.touch("tmp/cache/cache_file")
+
+          FileUtils.mkdir_p("tmp/sockets")
+          FileUtils.touch("tmp/sockets/socket_file")
+
+          FileUtils.mkdir_p("tmp/screenshots")
+          FileUtils.touch("tmp/screenshots/fail.png")
+
+          `rails tmp:clear`
+
+          assert_not File.exist?("tmp/cache/cache_file")
+          assert_not File.exist?("tmp/sockets/socket_file")
+          assert_not File.exist?("tmp/screenshots/fail.png")
+        end
+      end
+    end
+  end
+end
-- 
cgit v1.2.3


From cfade1ec7ee7b5b51f3c1578e3474f9c156f2971 Mon Sep 17 00:00:00 2001
From: Kir Shatrov <shatrov@me.com>
Date: Thu, 22 Jun 2017 22:59:18 -0400
Subject: Enforce frozen string in Rubocop

---
 railties/test/abstract_unit.rb                                           | 1 +
 railties/test/app_loader_test.rb                                         | 1 +
 railties/test/application/asset_debugging_test.rb                        | 1 +
 railties/test/application/assets_test.rb                                 | 1 +
 railties/test/application/bin_setup_test.rb                              | 1 +
 railties/test/application/configuration/custom_test.rb                   | 1 +
 railties/test/application/configuration_test.rb                          | 1 +
 railties/test/application/console_test.rb                                | 1 +
 railties/test/application/current_attributes_integration_test.rb         | 1 +
 railties/test/application/generators_test.rb                             | 1 +
 railties/test/application/help_test.rb                                   | 1 +
 railties/test/application/initializers/frameworks_test.rb                | 1 +
 railties/test/application/initializers/hooks_test.rb                     | 1 +
 railties/test/application/initializers/i18n_test.rb                      | 1 +
 railties/test/application/initializers/load_path_test.rb                 | 1 +
 railties/test/application/initializers/notifications_test.rb             | 1 +
 railties/test/application/integration_test_case_test.rb                  | 1 +
 railties/test/application/loading_test.rb                                | 1 +
 railties/test/application/mailer_previews_test.rb                        | 1 +
 railties/test/application/middleware/cache_test.rb                       | 1 +
 railties/test/application/middleware/cookies_test.rb                     | 1 +
 railties/test/application/middleware/exceptions_test.rb                  | 1 +
 railties/test/application/middleware/remote_ip_test.rb                   | 1 +
 railties/test/application/middleware/sendfile_test.rb                    | 1 +
 railties/test/application/middleware/session_test.rb                     | 1 +
 railties/test/application/middleware/static_test.rb                      | 1 +
 railties/test/application/middleware_test.rb                             | 1 +
 railties/test/application/multiple_applications_test.rb                  | 1 +
 railties/test/application/paths_test.rb                                  | 1 +
 railties/test/application/per_request_digest_cache_test.rb               | 1 +
 railties/test/application/rack/logger_test.rb                            | 1 +
 railties/test/application/rackup_test.rb                                 | 1 +
 railties/test/application/rake/dbs_test.rb                               | 1 +
 railties/test/application/rake/dev_test.rb                               | 1 +
 railties/test/application/rake/framework_test.rb                         | 1 +
 railties/test/application/rake/log_test.rb                               | 1 +
 railties/test/application/rake/migrations_test.rb                        | 1 +
 railties/test/application/rake/notes_test.rb                             | 1 +
 railties/test/application/rake/restart_test.rb                           | 1 +
 railties/test/application/rake_test.rb                                   | 1 +
 railties/test/application/rendering_test.rb                              | 1 +
 railties/test/application/routing_test.rb                                | 1 +
 railties/test/application/runner_test.rb                                 | 1 +
 railties/test/application/test_runner_test.rb                            | 1 +
 railties/test/application/test_test.rb                                   | 1 +
 railties/test/application/url_generation_test.rb                         | 1 +
 railties/test/application/version_test.rb                                | 1 +
 railties/test/backtrace_cleaner_test.rb                                  | 1 +
 railties/test/code_statistics_calculator_test.rb                         | 1 +
 railties/test/code_statistics_test.rb                                    | 1 +
 railties/test/command/base_test.rb                                       | 1 +
 railties/test/commands/console_test.rb                                   | 1 +
 railties/test/commands/dbconsole_test.rb                                 | 1 +
 railties/test/commands/secrets_test.rb                                   | 1 +
 railties/test/commands/server_test.rb                                    | 1 +
 railties/test/configuration/middleware_stack_proxy_test.rb               | 1 +
 railties/test/engine/commands_test.rb                                    | 1 +
 railties/test/engine_test.rb                                             | 1 +
 railties/test/env_helpers.rb                                             | 1 +
 railties/test/fixtures/about_yml_plugins/bad_about_yml/init.rb           | 1 +
 .../test/fixtures/about_yml_plugins/plugin_without_about_yml/init.rb     | 1 +
 railties/test/fixtures/lib/create_test_dummy_template.rb                 | 1 +
 railties/test/fixtures/lib/generators/active_record/fixjour_generator.rb | 1 +
 railties/test/fixtures/lib/generators/fixjour_generator.rb               | 1 +
 railties/test/fixtures/lib/generators/model_generator.rb                 | 1 +
 .../fixtures/lib/generators/usage_template/usage_template_generator.rb   | 1 +
 railties/test/fixtures/lib/rails/generators/foobar/foobar_generator.rb   | 1 +
 railties/test/fixtures/lib/template.rb                                   | 1 +
 railties/test/generators/actions_test.rb                                 | 1 +
 railties/test/generators/api_app_generator_test.rb                       | 1 +
 railties/test/generators/app_generator_test.rb                           | 1 +
 railties/test/generators/argv_scrubber_test.rb                           | 1 +
 railties/test/generators/assets_generator_test.rb                        | 1 +
 railties/test/generators/channel_generator_test.rb                       | 1 +
 railties/test/generators/controller_generator_test.rb                    | 1 +
 railties/test/generators/create_migration_test.rb                        | 1 +
 railties/test/generators/encrypted_secrets_generator_test.rb             | 1 +
 railties/test/generators/generated_attribute_test.rb                     | 1 +
 railties/test/generators/generator_generator_test.rb                     | 1 +
 railties/test/generators/generator_test.rb                               | 1 +
 railties/test/generators/generators_test_helper.rb                       | 1 +
 railties/test/generators/helper_generator_test.rb                        | 1 +
 railties/test/generators/integration_test_generator_test.rb              | 1 +
 railties/test/generators/job_generator_test.rb                           | 1 +
 railties/test/generators/mailer_generator_test.rb                        | 1 +
 railties/test/generators/migration_generator_test.rb                     | 1 +
 railties/test/generators/model_generator_test.rb                         | 1 +
 railties/test/generators/named_base_test.rb                              | 1 +
 railties/test/generators/namespaced_generators_test.rb                   | 1 +
 railties/test/generators/orm_test.rb                                     | 1 +
 railties/test/generators/plugin_generator_test.rb                        | 1 +
 railties/test/generators/plugin_test_helper.rb                           | 1 +
 railties/test/generators/plugin_test_runner_test.rb                      | 1 +
 railties/test/generators/resource_generator_test.rb                      | 1 +
 railties/test/generators/scaffold_controller_generator_test.rb           | 1 +
 railties/test/generators/scaffold_generator_test.rb                      | 1 +
 railties/test/generators/shared_generator_tests.rb                       | 1 +
 railties/test/generators/system_test_generator_test.rb                   | 1 +
 railties/test/generators/task_generator_test.rb                          | 1 +
 railties/test/generators/test_runner_in_engine_test.rb                   | 1 +
 railties/test/generators_test.rb                                         | 1 +
 railties/test/initializable_test.rb                                      | 1 +
 railties/test/isolation/abstract_unit.rb                                 | 1 +
 railties/test/json_params_parsing_test.rb                                | 1 +
 railties/test/path_generation_test.rb                                    | 1 +
 railties/test/paths_test.rb                                              | 1 +
 railties/test/rack_logger_test.rb                                        | 1 +
 railties/test/rails_info_controller_test.rb                              | 1 +
 railties/test/rails_info_test.rb                                         | 1 +
 railties/test/railties/engine_test.rb                                    | 1 +
 railties/test/railties/generators_test.rb                                | 1 +
 railties/test/railties/mounted_engine_test.rb                            | 1 +
 railties/test/railties/railtie_test.rb                                   | 1 +
 railties/test/secrets_test.rb                                            | 1 +
 railties/test/test_unit/reporter_test.rb                                 | 1 +
 railties/test/version_test.rb                                            | 1 +
 116 files changed, 116 insertions(+)

(limited to 'railties/test')

diff --git a/railties/test/abstract_unit.rb b/railties/test/abstract_unit.rb
index 2d4c7a0f0b..e04bce24cb 100644
--- a/railties/test/abstract_unit.rb
+++ b/railties/test/abstract_unit.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 ENV["RAILS_ENV"] ||= "test"
 
 require "stringio"
diff --git a/railties/test/app_loader_test.rb b/railties/test/app_loader_test.rb
index 85f5502b4d..6210215dc8 100644
--- a/railties/test/app_loader_test.rb
+++ b/railties/test/app_loader_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "tmpdir"
 require "abstract_unit"
 require "rails/app_loader"
diff --git a/railties/test/application/asset_debugging_test.rb b/railties/test/application/asset_debugging_test.rb
index 3e17a1efa5..1ce77fba9f 100644
--- a/railties/test/application/asset_debugging_test.rb
+++ b/railties/test/application/asset_debugging_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "isolation/abstract_unit"
 require "rack/test"
 
diff --git a/railties/test/application/assets_test.rb b/railties/test/application/assets_test.rb
index f38cacd6da..8e7f50b8de 100644
--- a/railties/test/application/assets_test.rb
+++ b/railties/test/application/assets_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "isolation/abstract_unit"
 require "rack/test"
 require "active_support/json"
diff --git a/railties/test/application/bin_setup_test.rb b/railties/test/application/bin_setup_test.rb
index 0fb995900f..a9009531aa 100644
--- a/railties/test/application/bin_setup_test.rb
+++ b/railties/test/application/bin_setup_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "isolation/abstract_unit"
 
 module ApplicationTests
diff --git a/railties/test/application/configuration/custom_test.rb b/railties/test/application/configuration/custom_test.rb
index 8360b7bf4b..71b33c15a4 100644
--- a/railties/test/application/configuration/custom_test.rb
+++ b/railties/test/application/configuration/custom_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "isolation/abstract_unit"
 
 module ApplicationTests
diff --git a/railties/test/application/configuration_test.rb b/railties/test/application/configuration_test.rb
index 06767167a9..e73c2a992c 100644
--- a/railties/test/application/configuration_test.rb
+++ b/railties/test/application/configuration_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "isolation/abstract_unit"
 require "rack/test"
 require "env_helpers"
diff --git a/railties/test/application/console_test.rb b/railties/test/application/console_test.rb
index 057d473870..7dc9d0083f 100644
--- a/railties/test/application/console_test.rb
+++ b/railties/test/application/console_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "isolation/abstract_unit"
 
 class ConsoleTest < ActiveSupport::TestCase
diff --git a/railties/test/application/current_attributes_integration_test.rb b/railties/test/application/current_attributes_integration_test.rb
index 5653ec0be1..a10eb51851 100644
--- a/railties/test/application/current_attributes_integration_test.rb
+++ b/railties/test/application/current_attributes_integration_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "isolation/abstract_unit"
 require "rack/test"
 
diff --git a/railties/test/application/generators_test.rb b/railties/test/application/generators_test.rb
index fe581db286..9732216b92 100644
--- a/railties/test/application/generators_test.rb
+++ b/railties/test/application/generators_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "isolation/abstract_unit"
 
 module ApplicationTests
diff --git a/railties/test/application/help_test.rb b/railties/test/application/help_test.rb
index 0c3fe8bfa3..f92dd60a7c 100644
--- a/railties/test/application/help_test.rb
+++ b/railties/test/application/help_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "isolation/abstract_unit"
 
 class HelpTest < ActiveSupport::TestCase
diff --git a/railties/test/application/initializers/frameworks_test.rb b/railties/test/application/initializers/frameworks_test.rb
index eb2c578f91..c15e057b19 100644
--- a/railties/test/application/initializers/frameworks_test.rb
+++ b/railties/test/application/initializers/frameworks_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "isolation/abstract_unit"
 
 module ApplicationTests
diff --git a/railties/test/application/initializers/hooks_test.rb b/railties/test/application/initializers/hooks_test.rb
index 36926c50ff..6acaea07dd 100644
--- a/railties/test/application/initializers/hooks_test.rb
+++ b/railties/test/application/initializers/hooks_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "isolation/abstract_unit"
 
 module ApplicationTests
diff --git a/railties/test/application/initializers/i18n_test.rb b/railties/test/application/initializers/i18n_test.rb
index cee198bd01..4bf01c6f9e 100644
--- a/railties/test/application/initializers/i18n_test.rb
+++ b/railties/test/application/initializers/i18n_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "isolation/abstract_unit"
 
 module ApplicationTests
diff --git a/railties/test/application/initializers/load_path_test.rb b/railties/test/application/initializers/load_path_test.rb
index dbefb22837..29f6bab256 100644
--- a/railties/test/application/initializers/load_path_test.rb
+++ b/railties/test/application/initializers/load_path_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "isolation/abstract_unit"
 
 module ApplicationTests
diff --git a/railties/test/application/initializers/notifications_test.rb b/railties/test/application/initializers/notifications_test.rb
index b847ac6b36..0be4280f38 100644
--- a/railties/test/application/initializers/notifications_test.rb
+++ b/railties/test/application/initializers/notifications_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "isolation/abstract_unit"
 
 module ApplicationTests
diff --git a/railties/test/application/integration_test_case_test.rb b/railties/test/application/integration_test_case_test.rb
index 1118e5037a..73fc9f63c0 100644
--- a/railties/test/application/integration_test_case_test.rb
+++ b/railties/test/application/integration_test_case_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "isolation/abstract_unit"
 
 module ApplicationTests
diff --git a/railties/test/application/loading_test.rb b/railties/test/application/loading_test.rb
index c75a25bc6f..3572fd68eb 100644
--- a/railties/test/application/loading_test.rb
+++ b/railties/test/application/loading_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "isolation/abstract_unit"
 
 class LoadingTest < ActiveSupport::TestCase
diff --git a/railties/test/application/mailer_previews_test.rb b/railties/test/application/mailer_previews_test.rb
index f5c013dab6..7fc5adddaa 100644
--- a/railties/test/application/mailer_previews_test.rb
+++ b/railties/test/application/mailer_previews_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "isolation/abstract_unit"
 require "rack/test"
 require "base64"
diff --git a/railties/test/application/middleware/cache_test.rb b/railties/test/application/middleware/cache_test.rb
index 93b5263bf7..cbb265bb7c 100644
--- a/railties/test/application/middleware/cache_test.rb
+++ b/railties/test/application/middleware/cache_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "isolation/abstract_unit"
 
 module ApplicationTests
diff --git a/railties/test/application/middleware/cookies_test.rb b/railties/test/application/middleware/cookies_test.rb
index 1e4b5d086c..725a35aac1 100644
--- a/railties/test/application/middleware/cookies_test.rb
+++ b/railties/test/application/middleware/cookies_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "isolation/abstract_unit"
 
 module ApplicationTests
diff --git a/railties/test/application/middleware/exceptions_test.rb b/railties/test/application/middleware/exceptions_test.rb
index fe07ad3cbe..af91720943 100644
--- a/railties/test/application/middleware/exceptions_test.rb
+++ b/railties/test/application/middleware/exceptions_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "isolation/abstract_unit"
 require "rack/test"
 
diff --git a/railties/test/application/middleware/remote_ip_test.rb b/railties/test/application/middleware/remote_ip_test.rb
index c34d9d6ee7..68d97e9a96 100644
--- a/railties/test/application/middleware/remote_ip_test.rb
+++ b/railties/test/application/middleware/remote_ip_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "ipaddr"
 require "isolation/abstract_unit"
 require "active_support/key_generator"
diff --git a/railties/test/application/middleware/sendfile_test.rb b/railties/test/application/middleware/sendfile_test.rb
index 4938402fdc..d1bad10fdc 100644
--- a/railties/test/application/middleware/sendfile_test.rb
+++ b/railties/test/application/middleware/sendfile_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "isolation/abstract_unit"
 
 module ApplicationTests
diff --git a/railties/test/application/middleware/session_test.rb b/railties/test/application/middleware/session_test.rb
index a14ea589ed..028309d8e4 100644
--- a/railties/test/application/middleware/session_test.rb
+++ b/railties/test/application/middleware/session_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "isolation/abstract_unit"
 require "rack/test"
 
diff --git a/railties/test/application/middleware/static_test.rb b/railties/test/application/middleware/static_test.rb
index 5cd3e4325e..9a0a5f7265 100644
--- a/railties/test/application/middleware/static_test.rb
+++ b/railties/test/application/middleware/static_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "isolation/abstract_unit"
 require "rack/test"
 
diff --git a/railties/test/application/middleware_test.rb b/railties/test/application/middleware_test.rb
index 0a6e5b52e9..64a3cbbfa1 100644
--- a/railties/test/application/middleware_test.rb
+++ b/railties/test/application/middleware_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "isolation/abstract_unit"
 
 module ApplicationTests
diff --git a/railties/test/application/multiple_applications_test.rb b/railties/test/application/multiple_applications_test.rb
index 26b810af73..9e832b6892 100644
--- a/railties/test/application/multiple_applications_test.rb
+++ b/railties/test/application/multiple_applications_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "isolation/abstract_unit"
 
 module ApplicationTests
diff --git a/railties/test/application/paths_test.rb b/railties/test/application/paths_test.rb
index 515205296c..1c7db1bb9d 100644
--- a/railties/test/application/paths_test.rb
+++ b/railties/test/application/paths_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "isolation/abstract_unit"
 
 module ApplicationTests
diff --git a/railties/test/application/per_request_digest_cache_test.rb b/railties/test/application/per_request_digest_cache_test.rb
index 6e6996a6ba..148043d5cb 100644
--- a/railties/test/application/per_request_digest_cache_test.rb
+++ b/railties/test/application/per_request_digest_cache_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "isolation/abstract_unit"
 require "rack/test"
 require "minitest/mock"
diff --git a/railties/test/application/rack/logger_test.rb b/railties/test/application/rack/logger_test.rb
index e71bcbc536..cb4d1d22af 100644
--- a/railties/test/application/rack/logger_test.rb
+++ b/railties/test/application/rack/logger_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "isolation/abstract_unit"
 require "active_support/log_subscriber/test_helper"
 require "rack/test"
diff --git a/railties/test/application/rackup_test.rb b/railties/test/application/rackup_test.rb
index 2943e9ee5d..bf9e96cf45 100644
--- a/railties/test/application/rackup_test.rb
+++ b/railties/test/application/rackup_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "isolation/abstract_unit"
 
 module ApplicationTests
diff --git a/railties/test/application/rake/dbs_test.rb b/railties/test/application/rake/dbs_test.rb
index c63f23fa0a..d5e5566635 100644
--- a/railties/test/application/rake/dbs_test.rb
+++ b/railties/test/application/rake/dbs_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "isolation/abstract_unit"
 
 module ApplicationTests
diff --git a/railties/test/application/rake/dev_test.rb b/railties/test/application/rake/dev_test.rb
index 4f992d9c8d..1556e5d5db 100644
--- a/railties/test/application/rake/dev_test.rb
+++ b/railties/test/application/rake/dev_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "isolation/abstract_unit"
 
 module ApplicationTests
diff --git a/railties/test/application/rake/framework_test.rb b/railties/test/application/rake/framework_test.rb
index 40488a6aab..ec476addf4 100644
--- a/railties/test/application/rake/framework_test.rb
+++ b/railties/test/application/rake/framework_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "isolation/abstract_unit"
 
 module ApplicationTests
diff --git a/railties/test/application/rake/log_test.rb b/railties/test/application/rake/log_test.rb
index fdd3c71fe8..431492fb64 100644
--- a/railties/test/application/rake/log_test.rb
+++ b/railties/test/application/rake/log_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "isolation/abstract_unit"
 
 module ApplicationTests
diff --git a/railties/test/application/rake/migrations_test.rb b/railties/test/application/rake/migrations_test.rb
index 51dfe2ef98..1cf780178f 100644
--- a/railties/test/application/rake/migrations_test.rb
+++ b/railties/test/application/rake/migrations_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "isolation/abstract_unit"
 
 module ApplicationTests
diff --git a/railties/test/application/rake/notes_test.rb b/railties/test/application/rake/notes_test.rb
index e7ffea2e71..a500c55104 100644
--- a/railties/test/application/rake/notes_test.rb
+++ b/railties/test/application/rake/notes_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "isolation/abstract_unit"
 require "rails/source_annotation_extractor"
 
diff --git a/railties/test/application/rake/restart_test.rb b/railties/test/application/rake/restart_test.rb
index 6ebd2d5461..640a0008e7 100644
--- a/railties/test/application/rake/restart_test.rb
+++ b/railties/test/application/rake/restart_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "isolation/abstract_unit"
 
 module ApplicationTests
diff --git a/railties/test/application/rake_test.rb b/railties/test/application/rake_test.rb
index 1b64a0a1ca..a3508a4a12 100644
--- a/railties/test/application/rake_test.rb
+++ b/railties/test/application/rake_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "isolation/abstract_unit"
 require "active_support/core_ext/string/strip"
 
diff --git a/railties/test/application/rendering_test.rb b/railties/test/application/rendering_test.rb
index ccafc5b6f1..67843a09fa 100644
--- a/railties/test/application/rendering_test.rb
+++ b/railties/test/application/rendering_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "isolation/abstract_unit"
 require "rack/test"
 
diff --git a/railties/test/application/routing_test.rb b/railties/test/application/routing_test.rb
index 6742da20cc..28a5ecb7ac 100644
--- a/railties/test/application/routing_test.rb
+++ b/railties/test/application/routing_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "isolation/abstract_unit"
 require "rack/test"
 
diff --git a/railties/test/application/runner_test.rb b/railties/test/application/runner_test.rb
index 0c45bc398a..9611797765 100644
--- a/railties/test/application/runner_test.rb
+++ b/railties/test/application/runner_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "isolation/abstract_unit"
 require "env_helpers"
 
diff --git a/railties/test/application/test_runner_test.rb b/railties/test/application/test_runner_test.rb
index 8e0712fca2..91a6229cc4 100644
--- a/railties/test/application/test_runner_test.rb
+++ b/railties/test/application/test_runner_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "isolation/abstract_unit"
 require "active_support/core_ext/string/strip"
 require "env_helpers"
diff --git a/railties/test/application/test_test.rb b/railties/test/application/test_test.rb
index 32d2a6857c..c57cf548f7 100644
--- a/railties/test/application/test_test.rb
+++ b/railties/test/application/test_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "isolation/abstract_unit"
 
 module ApplicationTests
diff --git a/railties/test/application/url_generation_test.rb b/railties/test/application/url_generation_test.rb
index 37f129475c..c7d7db8a75 100644
--- a/railties/test/application/url_generation_test.rb
+++ b/railties/test/application/url_generation_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "isolation/abstract_unit"
 
 module ApplicationTests
diff --git a/railties/test/application/version_test.rb b/railties/test/application/version_test.rb
index 6b419ae7ae..ff3751446c 100644
--- a/railties/test/application/version_test.rb
+++ b/railties/test/application/version_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "isolation/abstract_unit"
 require "rails/gem_version"
 
diff --git a/railties/test/backtrace_cleaner_test.rb b/railties/test/backtrace_cleaner_test.rb
index f71e56f323..e72963ee91 100644
--- a/railties/test/backtrace_cleaner_test.rb
+++ b/railties/test/backtrace_cleaner_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "abstract_unit"
 require "rails/backtrace_cleaner"
 
diff --git a/railties/test/code_statistics_calculator_test.rb b/railties/test/code_statistics_calculator_test.rb
index 25a8a40d27..3e7be58e9c 100644
--- a/railties/test/code_statistics_calculator_test.rb
+++ b/railties/test/code_statistics_calculator_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "abstract_unit"
 require "rails/code_statistics_calculator"
 
diff --git a/railties/test/code_statistics_test.rb b/railties/test/code_statistics_test.rb
index e6e3943117..8cc59f1154 100644
--- a/railties/test/code_statistics_test.rb
+++ b/railties/test/code_statistics_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "abstract_unit"
 require "rails/code_statistics"
 
diff --git a/railties/test/command/base_test.rb b/railties/test/command/base_test.rb
index ebfc4d0ba9..02a508fea7 100644
--- a/railties/test/command/base_test.rb
+++ b/railties/test/command/base_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "abstract_unit"
 require "rails/command"
 require "rails/commands/generate/generate_command"
diff --git a/railties/test/commands/console_test.rb b/railties/test/commands/console_test.rb
index 4fc082e4ca..6fca08ad79 100644
--- a/railties/test/commands/console_test.rb
+++ b/railties/test/commands/console_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "abstract_unit"
 require "env_helpers"
 require "rails/command"
diff --git a/railties/test/commands/dbconsole_test.rb b/railties/test/commands/dbconsole_test.rb
index 0f8c5dbb79..3041f9233d 100644
--- a/railties/test/commands/dbconsole_test.rb
+++ b/railties/test/commands/dbconsole_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "abstract_unit"
 require "minitest/mock"
 require "rails/command"
diff --git a/railties/test/commands/secrets_test.rb b/railties/test/commands/secrets_test.rb
index be610f3b47..c06100cde2 100644
--- a/railties/test/commands/secrets_test.rb
+++ b/railties/test/commands/secrets_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "isolation/abstract_unit"
 require "rails/command"
 require "rails/commands/secrets/secrets_command"
diff --git a/railties/test/commands/server_test.rb b/railties/test/commands/server_test.rb
index 722323efdc..a0d2535c77 100644
--- a/railties/test/commands/server_test.rb
+++ b/railties/test/commands/server_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "abstract_unit"
 require "env_helpers"
 require "rails/command"
diff --git a/railties/test/configuration/middleware_stack_proxy_test.rb b/railties/test/configuration/middleware_stack_proxy_test.rb
index 559ce72693..ca2293d65f 100644
--- a/railties/test/configuration/middleware_stack_proxy_test.rb
+++ b/railties/test/configuration/middleware_stack_proxy_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "active_support"
 require "active_support/testing/autorun"
 require "rails/configuration"
diff --git a/railties/test/engine/commands_test.rb b/railties/test/engine/commands_test.rb
index b1c937143f..e3811f0ea4 100644
--- a/railties/test/engine/commands_test.rb
+++ b/railties/test/engine/commands_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "abstract_unit"
 begin
   require "pty"
diff --git a/railties/test/engine_test.rb b/railties/test/engine_test.rb
index 248afa2d2c..9a2629a9f2 100644
--- a/railties/test/engine_test.rb
+++ b/railties/test/engine_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "abstract_unit"
 
 class EngineTest < ActiveSupport::TestCase
diff --git a/railties/test/env_helpers.rb b/railties/test/env_helpers.rb
index 1f64d5fda3..72f3008877 100644
--- a/railties/test/env_helpers.rb
+++ b/railties/test/env_helpers.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "rails"
 
 module EnvHelpers
diff --git a/railties/test/fixtures/about_yml_plugins/bad_about_yml/init.rb b/railties/test/fixtures/about_yml_plugins/bad_about_yml/init.rb
index 636bc1a8ab..23b1b41541 100644
--- a/railties/test/fixtures/about_yml_plugins/bad_about_yml/init.rb
+++ b/railties/test/fixtures/about_yml_plugins/bad_about_yml/init.rb
@@ -1 +1,2 @@
+# frozen_string_literal: true
 # intentionally empty
diff --git a/railties/test/fixtures/about_yml_plugins/plugin_without_about_yml/init.rb b/railties/test/fixtures/about_yml_plugins/plugin_without_about_yml/init.rb
index 636bc1a8ab..23b1b41541 100644
--- a/railties/test/fixtures/about_yml_plugins/plugin_without_about_yml/init.rb
+++ b/railties/test/fixtures/about_yml_plugins/plugin_without_about_yml/init.rb
@@ -1 +1,2 @@
+# frozen_string_literal: true
 # intentionally empty
diff --git a/railties/test/fixtures/lib/create_test_dummy_template.rb b/railties/test/fixtures/lib/create_test_dummy_template.rb
index e4378bbd1a..934f1b9bca 100644
--- a/railties/test/fixtures/lib/create_test_dummy_template.rb
+++ b/railties/test/fixtures/lib/create_test_dummy_template.rb
@@ -1 +1,2 @@
+# frozen_string_literal: true
 create_dummy_app("spec/dummy")
diff --git a/railties/test/fixtures/lib/generators/active_record/fixjour_generator.rb b/railties/test/fixtures/lib/generators/active_record/fixjour_generator.rb
index 1139350b94..5f29d43851 100644
--- a/railties/test/fixtures/lib/generators/active_record/fixjour_generator.rb
+++ b/railties/test/fixtures/lib/generators/active_record/fixjour_generator.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "rails/generators/active_record"
 
 module ActiveRecord
diff --git a/railties/test/fixtures/lib/generators/fixjour_generator.rb b/railties/test/fixtures/lib/generators/fixjour_generator.rb
index ef3e9edbed..587cbf3e30 100644
--- a/railties/test/fixtures/lib/generators/fixjour_generator.rb
+++ b/railties/test/fixtures/lib/generators/fixjour_generator.rb
@@ -1,2 +1,3 @@
+# frozen_string_literal: true
 class FixjourGenerator < Rails::Generators::NamedBase
 end
diff --git a/railties/test/fixtures/lib/generators/model_generator.rb b/railties/test/fixtures/lib/generators/model_generator.rb
index 0905fa9631..422e19e388 100644
--- a/railties/test/fixtures/lib/generators/model_generator.rb
+++ b/railties/test/fixtures/lib/generators/model_generator.rb
@@ -1 +1,2 @@
+# frozen_string_literal: true
 raise "I should never be loaded"
diff --git a/railties/test/fixtures/lib/generators/usage_template/usage_template_generator.rb b/railties/test/fixtures/lib/generators/usage_template/usage_template_generator.rb
index 701515440a..df2cdadaea 100644
--- a/railties/test/fixtures/lib/generators/usage_template/usage_template_generator.rb
+++ b/railties/test/fixtures/lib/generators/usage_template/usage_template_generator.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "rails/generators"
 
 class UsageTemplateGenerator < Rails::Generators::Base
diff --git a/railties/test/fixtures/lib/rails/generators/foobar/foobar_generator.rb b/railties/test/fixtures/lib/rails/generators/foobar/foobar_generator.rb
index d1de8c56fa..d7e4a8fdca 100644
--- a/railties/test/fixtures/lib/rails/generators/foobar/foobar_generator.rb
+++ b/railties/test/fixtures/lib/rails/generators/foobar/foobar_generator.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Foobar
   class FoobarGenerator < Rails::Generators::Base
   end
diff --git a/railties/test/fixtures/lib/template.rb b/railties/test/fixtures/lib/template.rb
index c14a1a8784..eccba91236 100644
--- a/railties/test/fixtures/lib/template.rb
+++ b/railties/test/fixtures/lib/template.rb
@@ -1 +1,2 @@
+# frozen_string_literal: true
 say "It works from file!"
diff --git a/railties/test/generators/actions_test.rb b/railties/test/generators/actions_test.rb
index 03b29be907..2e212b0e71 100644
--- a/railties/test/generators/actions_test.rb
+++ b/railties/test/generators/actions_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "generators/generators_test_helper"
 require "rails/generators/rails/app/app_generator"
 require "env_helpers"
diff --git a/railties/test/generators/api_app_generator_test.rb b/railties/test/generators/api_app_generator_test.rb
index a19e0f0dd8..86b99ec6f1 100644
--- a/railties/test/generators/api_app_generator_test.rb
+++ b/railties/test/generators/api_app_generator_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "generators/generators_test_helper"
 require "rails/generators/rails/app/app_generator"
 
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index 8a8c9a35ce..2f4ea8ed28 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "generators/generators_test_helper"
 require "rails/generators/rails/app/app_generator"
 require "generators/shared_generator_tests"
diff --git a/railties/test/generators/argv_scrubber_test.rb b/railties/test/generators/argv_scrubber_test.rb
index 7f4295a20f..61f28c0731 100644
--- a/railties/test/generators/argv_scrubber_test.rb
+++ b/railties/test/generators/argv_scrubber_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "active_support/test_case"
 require "active_support/testing/autorun"
 require "rails/generators/rails/app/app_generator"
diff --git a/railties/test/generators/assets_generator_test.rb b/railties/test/generators/assets_generator_test.rb
index 1c02c67e42..55b910b2dd 100644
--- a/railties/test/generators/assets_generator_test.rb
+++ b/railties/test/generators/assets_generator_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "generators/generators_test_helper"
 require "rails/generators/rails/assets/assets_generator"
 
diff --git a/railties/test/generators/channel_generator_test.rb b/railties/test/generators/channel_generator_test.rb
index af68a9c49f..ef09b172ff 100644
--- a/railties/test/generators/channel_generator_test.rb
+++ b/railties/test/generators/channel_generator_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "generators/generators_test_helper"
 require "rails/generators/channel/channel_generator"
 
diff --git a/railties/test/generators/controller_generator_test.rb b/railties/test/generators/controller_generator_test.rb
index af86a0136f..d573b3b803 100644
--- a/railties/test/generators/controller_generator_test.rb
+++ b/railties/test/generators/controller_generator_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "generators/generators_test_helper"
 require "rails/generators/rails/controller/controller_generator"
 
diff --git a/railties/test/generators/create_migration_test.rb b/railties/test/generators/create_migration_test.rb
index c7b0237f02..3d2d39bba5 100644
--- a/railties/test/generators/create_migration_test.rb
+++ b/railties/test/generators/create_migration_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "generators/generators_test_helper"
 require "rails/generators/rails/migration/migration_generator"
 
diff --git a/railties/test/generators/encrypted_secrets_generator_test.rb b/railties/test/generators/encrypted_secrets_generator_test.rb
index 21fdcab19f..32651d81ae 100644
--- a/railties/test/generators/encrypted_secrets_generator_test.rb
+++ b/railties/test/generators/encrypted_secrets_generator_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "generators/generators_test_helper"
 require "rails/generators/rails/encrypted_secrets/encrypted_secrets_generator"
 
diff --git a/railties/test/generators/generated_attribute_test.rb b/railties/test/generators/generated_attribute_test.rb
index 97847c8624..29d6c0f4fc 100644
--- a/railties/test/generators/generated_attribute_test.rb
+++ b/railties/test/generators/generated_attribute_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "generators/generators_test_helper"
 require "rails/generators/generated_attribute"
 
diff --git a/railties/test/generators/generator_generator_test.rb b/railties/test/generators/generator_generator_test.rb
index 5ff8bb0357..c5d8412307 100644
--- a/railties/test/generators/generator_generator_test.rb
+++ b/railties/test/generators/generator_generator_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "generators/generators_test_helper"
 require "rails/generators/rails/generator/generator_generator"
 
diff --git a/railties/test/generators/generator_test.rb b/railties/test/generators/generator_test.rb
index 4444b3a56e..f9bfee2fa1 100644
--- a/railties/test/generators/generator_test.rb
+++ b/railties/test/generators/generator_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "active_support/test_case"
 require "active_support/testing/autorun"
 require "rails/generators/app_base"
diff --git a/railties/test/generators/generators_test_helper.rb b/railties/test/generators/generators_test_helper.rb
index 5fb331e197..73fb2a86c8 100644
--- a/railties/test/generators/generators_test_helper.rb
+++ b/railties/test/generators/generators_test_helper.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/core_ext/module/remove_method"
 require "active_support/testing/stream"
diff --git a/railties/test/generators/helper_generator_test.rb b/railties/test/generators/helper_generator_test.rb
index d9e6e0a85a..683cd13cfb 100644
--- a/railties/test/generators/helper_generator_test.rb
+++ b/railties/test/generators/helper_generator_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "generators/generators_test_helper"
 require "rails/generators/rails/helper/helper_generator"
 
diff --git a/railties/test/generators/integration_test_generator_test.rb b/railties/test/generators/integration_test_generator_test.rb
index 9358b63bd4..dc586f60b4 100644
--- a/railties/test/generators/integration_test_generator_test.rb
+++ b/railties/test/generators/integration_test_generator_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "generators/generators_test_helper"
 require "rails/generators/rails/integration_test/integration_test_generator"
 
diff --git a/railties/test/generators/job_generator_test.rb b/railties/test/generators/job_generator_test.rb
index 68d158eb39..4981ee999e 100644
--- a/railties/test/generators/job_generator_test.rb
+++ b/railties/test/generators/job_generator_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "generators/generators_test_helper"
 require "rails/generators/job/job_generator"
 
diff --git a/railties/test/generators/mailer_generator_test.rb b/railties/test/generators/mailer_generator_test.rb
index 2ff03ea65e..13c3956ae8 100644
--- a/railties/test/generators/mailer_generator_test.rb
+++ b/railties/test/generators/mailer_generator_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "generators/generators_test_helper"
 require "rails/generators/mailer/mailer_generator"
 
diff --git a/railties/test/generators/migration_generator_test.rb b/railties/test/generators/migration_generator_test.rb
index 6fe6e4ca07..0a70be0677 100644
--- a/railties/test/generators/migration_generator_test.rb
+++ b/railties/test/generators/migration_generator_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "generators/generators_test_helper"
 require "rails/generators/rails/migration/migration_generator"
 
diff --git a/railties/test/generators/model_generator_test.rb b/railties/test/generators/model_generator_test.rb
index f41969fc46..2a85f985ee 100644
--- a/railties/test/generators/model_generator_test.rb
+++ b/railties/test/generators/model_generator_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "generators/generators_test_helper"
 require "rails/generators/rails/model/model_generator"
 require "active_support/core_ext/string/strip"
diff --git a/railties/test/generators/named_base_test.rb b/railties/test/generators/named_base_test.rb
index 3015b5363b..d775faad36 100644
--- a/railties/test/generators/named_base_test.rb
+++ b/railties/test/generators/named_base_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "generators/generators_test_helper"
 require "rails/generators/rails/scaffold_controller/scaffold_controller_generator"
 
diff --git a/railties/test/generators/namespaced_generators_test.rb b/railties/test/generators/namespaced_generators_test.rb
index 1caabbe6b1..7d63431436 100644
--- a/railties/test/generators/namespaced_generators_test.rb
+++ b/railties/test/generators/namespaced_generators_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "generators/generators_test_helper"
 require "rails/generators/rails/controller/controller_generator"
 require "rails/generators/rails/model/model_generator"
diff --git a/railties/test/generators/orm_test.rb b/railties/test/generators/orm_test.rb
index 88ae930554..35cfeeabf6 100644
--- a/railties/test/generators/orm_test.rb
+++ b/railties/test/generators/orm_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "generators/generators_test_helper"
 require "rails/generators/rails/scaffold_controller/scaffold_controller_generator"
 
diff --git a/railties/test/generators/plugin_generator_test.rb b/railties/test/generators/plugin_generator_test.rb
index f8512f9157..2aef4e6584 100644
--- a/railties/test/generators/plugin_generator_test.rb
+++ b/railties/test/generators/plugin_generator_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "generators/generators_test_helper"
 require "rails/generators/rails/plugin/plugin_generator"
 require "generators/shared_generator_tests"
diff --git a/railties/test/generators/plugin_test_helper.rb b/railties/test/generators/plugin_test_helper.rb
index 8ac90e3484..81768b890f 100644
--- a/railties/test/generators/plugin_test_helper.rb
+++ b/railties/test/generators/plugin_test_helper.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "abstract_unit"
 require "tmpdir"
 
diff --git a/railties/test/generators/plugin_test_runner_test.rb b/railties/test/generators/plugin_test_runner_test.rb
index 0bdd2a77d2..58f60404c4 100644
--- a/railties/test/generators/plugin_test_runner_test.rb
+++ b/railties/test/generators/plugin_test_runner_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "generators/plugin_test_helper"
 
 class PluginTestRunnerTest < ActiveSupport::TestCase
diff --git a/railties/test/generators/resource_generator_test.rb b/railties/test/generators/resource_generator_test.rb
index e976e58180..45b02e663d 100644
--- a/railties/test/generators/resource_generator_test.rb
+++ b/railties/test/generators/resource_generator_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "generators/generators_test_helper"
 require "rails/generators/rails/resource/resource_generator"
 
diff --git a/railties/test/generators/scaffold_controller_generator_test.rb b/railties/test/generators/scaffold_controller_generator_test.rb
index 9971626f9f..ff510e9312 100644
--- a/railties/test/generators/scaffold_controller_generator_test.rb
+++ b/railties/test/generators/scaffold_controller_generator_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "generators/generators_test_helper"
 require "rails/generators/rails/scaffold_controller/scaffold_controller_generator"
 
diff --git a/railties/test/generators/scaffold_generator_test.rb b/railties/test/generators/scaffold_generator_test.rb
index bc76cead18..0141701b52 100644
--- a/railties/test/generators/scaffold_generator_test.rb
+++ b/railties/test/generators/scaffold_generator_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "generators/generators_test_helper"
 require "rails/generators/rails/scaffold/scaffold_generator"
 
diff --git a/railties/test/generators/shared_generator_tests.rb b/railties/test/generators/shared_generator_tests.rb
index 5e75879964..5fd0a6c7d1 100644
--- a/railties/test/generators/shared_generator_tests.rb
+++ b/railties/test/generators/shared_generator_tests.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Tests, setup, and teardown common to the application and plugin generator suites.
 #
diff --git a/railties/test/generators/system_test_generator_test.rb b/railties/test/generators/system_test_generator_test.rb
index 4622360244..03c1c78ef4 100644
--- a/railties/test/generators/system_test_generator_test.rb
+++ b/railties/test/generators/system_test_generator_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "generators/generators_test_helper"
 require "rails/generators/rails/system_test/system_test_generator"
 
diff --git a/railties/test/generators/task_generator_test.rb b/railties/test/generators/task_generator_test.rb
index 2285534bb9..1896dc5c87 100644
--- a/railties/test/generators/task_generator_test.rb
+++ b/railties/test/generators/task_generator_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "generators/generators_test_helper"
 require "rails/generators/rails/task/task_generator"
 
diff --git a/railties/test/generators/test_runner_in_engine_test.rb b/railties/test/generators/test_runner_in_engine_test.rb
index 680dc2608e..0a330ea4e9 100644
--- a/railties/test/generators/test_runner_in_engine_test.rb
+++ b/railties/test/generators/test_runner_in_engine_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "generators/plugin_test_helper"
 
 class TestRunnerInEngineTest < ActiveSupport::TestCase
diff --git a/railties/test/generators_test.rb b/railties/test/generators_test.rb
index e07627f36d..766a50f6a0 100644
--- a/railties/test/generators_test.rb
+++ b/railties/test/generators_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "generators/generators_test_helper"
 require "rails/generators/rails/model/model_generator"
 require "rails/generators/test_unit/model/model_generator"
diff --git a/railties/test/initializable_test.rb b/railties/test/initializable_test.rb
index 4b67c91cc5..e942a983b6 100644
--- a/railties/test/initializable_test.rb
+++ b/railties/test/initializable_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "abstract_unit"
 require "rails/initializable"
 
diff --git a/railties/test/isolation/abstract_unit.rb b/railties/test/isolation/abstract_unit.rb
index 7496b5f84a..2e910d1d17 100644
--- a/railties/test/isolation/abstract_unit.rb
+++ b/railties/test/isolation/abstract_unit.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Note:
 # It is important to keep this file as light as possible
 # the goal for tests that require this is to test booting up
diff --git a/railties/test/json_params_parsing_test.rb b/railties/test/json_params_parsing_test.rb
index 7fff3bb465..e2bd4a8230 100644
--- a/railties/test/json_params_parsing_test.rb
+++ b/railties/test/json_params_parsing_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "abstract_unit"
 require "action_dispatch"
 require "active_record"
diff --git a/railties/test/path_generation_test.rb b/railties/test/path_generation_test.rb
index c0b03d0c15..1f82ec3bbb 100644
--- a/railties/test/path_generation_test.rb
+++ b/railties/test/path_generation_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/core_ext/object/with_options"
 require "active_support/core_ext/object/json"
diff --git a/railties/test/paths_test.rb b/railties/test/paths_test.rb
index f3db0a51d2..0ec21fc90e 100644
--- a/railties/test/paths_test.rb
+++ b/railties/test/paths_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "abstract_unit"
 require "rails/paths"
 require "minitest/mock"
diff --git a/railties/test/rack_logger_test.rb b/railties/test/rack_logger_test.rb
index 33b4bc6a3a..cd14cbe7a6 100644
--- a/railties/test/rack_logger_test.rb
+++ b/railties/test/rack_logger_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/testing/autorun"
 require "active_support/test_case"
diff --git a/railties/test/rails_info_controller_test.rb b/railties/test/rails_info_controller_test.rb
index d795629ccd..bae87e6a1c 100644
--- a/railties/test/rails_info_controller_test.rb
+++ b/railties/test/rails_info_controller_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "abstract_unit"
 
 module ActionController
diff --git a/railties/test/rails_info_test.rb b/railties/test/rails_info_test.rb
index 383adcc55d..e29e3c828e 100644
--- a/railties/test/rails_info_test.rb
+++ b/railties/test/rails_info_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "abstract_unit"
 
 unless defined?(Rails) && defined?(Rails::Info)
diff --git a/railties/test/railties/engine_test.rb b/railties/test/railties/engine_test.rb
index e382a7a873..19d2a2e4f6 100644
--- a/railties/test/railties/engine_test.rb
+++ b/railties/test/railties/engine_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "isolation/abstract_unit"
 require "stringio"
 require "rack/test"
diff --git a/railties/test/railties/generators_test.rb b/railties/test/railties/generators_test.rb
index 5c691b9ec4..22c2697577 100644
--- a/railties/test/railties/generators_test.rb
+++ b/railties/test/railties/generators_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 RAILS_ISOLATED_ENGINE = true
 require "isolation/abstract_unit"
 
diff --git a/railties/test/railties/mounted_engine_test.rb b/railties/test/railties/mounted_engine_test.rb
index 6639e55382..b4efe50038 100644
--- a/railties/test/railties/mounted_engine_test.rb
+++ b/railties/test/railties/mounted_engine_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "isolation/abstract_unit"
 
 module ApplicationTests
diff --git a/railties/test/railties/railtie_test.rb b/railties/test/railties/railtie_test.rb
index 30cd525266..be77af8134 100644
--- a/railties/test/railties/railtie_test.rb
+++ b/railties/test/railties/railtie_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "isolation/abstract_unit"
 
 module RailtiesTest
diff --git a/railties/test/secrets_test.rb b/railties/test/secrets_test.rb
index 36c8ef1fd9..030303525b 100644
--- a/railties/test/secrets_test.rb
+++ b/railties/test/secrets_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "abstract_unit"
 require "isolation/abstract_unit"
 require "rails/generators"
diff --git a/railties/test/test_unit/reporter_test.rb b/railties/test/test_unit/reporter_test.rb
index 98201394cd..dc462fe0f4 100644
--- a/railties/test/test_unit/reporter_test.rb
+++ b/railties/test/test_unit/reporter_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "abstract_unit"
 require "rails/test_unit/reporter"
 require "minitest/mock"
diff --git a/railties/test/version_test.rb b/railties/test/version_test.rb
index 86a482e091..393da344a1 100644
--- a/railties/test/version_test.rb
+++ b/railties/test/version_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "abstract_unit"
 
 class VersionTest < ActiveSupport::TestCase
-- 
cgit v1.2.3


From 87b3e226d65ac1ed371620bfdcd2f950c87cfece Mon Sep 17 00:00:00 2001
From: Matthew Draper <matthew@trebex.net>
Date: Sun, 2 Jul 2017 02:15:17 +0930
Subject: Revert "Merge pull request #29540 from kirs/rubocop-frozen-string"

This reverts commit 3420a14590c0e6915d8b6c242887f74adb4120f9, reversing
changes made to afb66a5a598ce4ac74ad84b125a5abf046dcf5aa.
---
 railties/test/abstract_unit.rb                                           | 1 -
 railties/test/app_loader_test.rb                                         | 1 -
 railties/test/application/asset_debugging_test.rb                        | 1 -
 railties/test/application/assets_test.rb                                 | 1 -
 railties/test/application/bin_setup_test.rb                              | 1 -
 railties/test/application/configuration/custom_test.rb                   | 1 -
 railties/test/application/configuration_test.rb                          | 1 -
 railties/test/application/console_test.rb                                | 1 -
 railties/test/application/current_attributes_integration_test.rb         | 1 -
 railties/test/application/generators_test.rb                             | 1 -
 railties/test/application/help_test.rb                                   | 1 -
 railties/test/application/initializers/frameworks_test.rb                | 1 -
 railties/test/application/initializers/hooks_test.rb                     | 1 -
 railties/test/application/initializers/i18n_test.rb                      | 1 -
 railties/test/application/initializers/load_path_test.rb                 | 1 -
 railties/test/application/initializers/notifications_test.rb             | 1 -
 railties/test/application/integration_test_case_test.rb                  | 1 -
 railties/test/application/loading_test.rb                                | 1 -
 railties/test/application/mailer_previews_test.rb                        | 1 -
 railties/test/application/middleware/cache_test.rb                       | 1 -
 railties/test/application/middleware/cookies_test.rb                     | 1 -
 railties/test/application/middleware/exceptions_test.rb                  | 1 -
 railties/test/application/middleware/remote_ip_test.rb                   | 1 -
 railties/test/application/middleware/sendfile_test.rb                    | 1 -
 railties/test/application/middleware/session_test.rb                     | 1 -
 railties/test/application/middleware/static_test.rb                      | 1 -
 railties/test/application/middleware_test.rb                             | 1 -
 railties/test/application/multiple_applications_test.rb                  | 1 -
 railties/test/application/paths_test.rb                                  | 1 -
 railties/test/application/per_request_digest_cache_test.rb               | 1 -
 railties/test/application/rack/logger_test.rb                            | 1 -
 railties/test/application/rackup_test.rb                                 | 1 -
 railties/test/application/rake/dbs_test.rb                               | 1 -
 railties/test/application/rake/dev_test.rb                               | 1 -
 railties/test/application/rake/framework_test.rb                         | 1 -
 railties/test/application/rake/log_test.rb                               | 1 -
 railties/test/application/rake/migrations_test.rb                        | 1 -
 railties/test/application/rake/notes_test.rb                             | 1 -
 railties/test/application/rake/restart_test.rb                           | 1 -
 railties/test/application/rake/tmp_test.rb                               | 1 -
 railties/test/application/rake_test.rb                                   | 1 -
 railties/test/application/rendering_test.rb                              | 1 -
 railties/test/application/routing_test.rb                                | 1 -
 railties/test/application/runner_test.rb                                 | 1 -
 railties/test/application/test_runner_test.rb                            | 1 -
 railties/test/application/test_test.rb                                   | 1 -
 railties/test/application/url_generation_test.rb                         | 1 -
 railties/test/application/version_test.rb                                | 1 -
 railties/test/backtrace_cleaner_test.rb                                  | 1 -
 railties/test/code_statistics_calculator_test.rb                         | 1 -
 railties/test/code_statistics_test.rb                                    | 1 -
 railties/test/command/base_test.rb                                       | 1 -
 railties/test/commands/console_test.rb                                   | 1 -
 railties/test/commands/dbconsole_test.rb                                 | 1 -
 railties/test/commands/secrets_test.rb                                   | 1 -
 railties/test/commands/server_test.rb                                    | 1 -
 railties/test/configuration/middleware_stack_proxy_test.rb               | 1 -
 railties/test/engine/commands_test.rb                                    | 1 -
 railties/test/engine_test.rb                                             | 1 -
 railties/test/env_helpers.rb                                             | 1 -
 railties/test/fixtures/about_yml_plugins/bad_about_yml/init.rb           | 1 -
 .../test/fixtures/about_yml_plugins/plugin_without_about_yml/init.rb     | 1 -
 railties/test/fixtures/lib/create_test_dummy_template.rb                 | 1 -
 railties/test/fixtures/lib/generators/active_record/fixjour_generator.rb | 1 -
 railties/test/fixtures/lib/generators/fixjour_generator.rb               | 1 -
 railties/test/fixtures/lib/generators/model_generator.rb                 | 1 -
 .../fixtures/lib/generators/usage_template/usage_template_generator.rb   | 1 -
 railties/test/fixtures/lib/rails/generators/foobar/foobar_generator.rb   | 1 -
 railties/test/fixtures/lib/template.rb                                   | 1 -
 railties/test/generators/actions_test.rb                                 | 1 -
 railties/test/generators/api_app_generator_test.rb                       | 1 -
 railties/test/generators/app_generator_test.rb                           | 1 -
 railties/test/generators/argv_scrubber_test.rb                           | 1 -
 railties/test/generators/assets_generator_test.rb                        | 1 -
 railties/test/generators/channel_generator_test.rb                       | 1 -
 railties/test/generators/controller_generator_test.rb                    | 1 -
 railties/test/generators/create_migration_test.rb                        | 1 -
 railties/test/generators/encrypted_secrets_generator_test.rb             | 1 -
 railties/test/generators/generated_attribute_test.rb                     | 1 -
 railties/test/generators/generator_generator_test.rb                     | 1 -
 railties/test/generators/generator_test.rb                               | 1 -
 railties/test/generators/generators_test_helper.rb                       | 1 -
 railties/test/generators/helper_generator_test.rb                        | 1 -
 railties/test/generators/integration_test_generator_test.rb              | 1 -
 railties/test/generators/job_generator_test.rb                           | 1 -
 railties/test/generators/mailer_generator_test.rb                        | 1 -
 railties/test/generators/migration_generator_test.rb                     | 1 -
 railties/test/generators/model_generator_test.rb                         | 1 -
 railties/test/generators/named_base_test.rb                              | 1 -
 railties/test/generators/namespaced_generators_test.rb                   | 1 -
 railties/test/generators/orm_test.rb                                     | 1 -
 railties/test/generators/plugin_generator_test.rb                        | 1 -
 railties/test/generators/plugin_test_helper.rb                           | 1 -
 railties/test/generators/plugin_test_runner_test.rb                      | 1 -
 railties/test/generators/resource_generator_test.rb                      | 1 -
 railties/test/generators/scaffold_controller_generator_test.rb           | 1 -
 railties/test/generators/scaffold_generator_test.rb                      | 1 -
 railties/test/generators/shared_generator_tests.rb                       | 1 -
 railties/test/generators/system_test_generator_test.rb                   | 1 -
 railties/test/generators/task_generator_test.rb                          | 1 -
 railties/test/generators/test_runner_in_engine_test.rb                   | 1 -
 railties/test/generators_test.rb                                         | 1 -
 railties/test/initializable_test.rb                                      | 1 -
 railties/test/isolation/abstract_unit.rb                                 | 1 -
 railties/test/json_params_parsing_test.rb                                | 1 -
 railties/test/path_generation_test.rb                                    | 1 -
 railties/test/paths_test.rb                                              | 1 -
 railties/test/rack_logger_test.rb                                        | 1 -
 railties/test/rails_info_controller_test.rb                              | 1 -
 railties/test/rails_info_test.rb                                         | 1 -
 railties/test/railties/engine_test.rb                                    | 1 -
 railties/test/railties/generators_test.rb                                | 1 -
 railties/test/railties/mounted_engine_test.rb                            | 1 -
 railties/test/railties/railtie_test.rb                                   | 1 -
 railties/test/secrets_test.rb                                            | 1 -
 railties/test/test_unit/reporter_test.rb                                 | 1 -
 railties/test/version_test.rb                                            | 1 -
 117 files changed, 117 deletions(-)

(limited to 'railties/test')

diff --git a/railties/test/abstract_unit.rb b/railties/test/abstract_unit.rb
index e04bce24cb..2d4c7a0f0b 100644
--- a/railties/test/abstract_unit.rb
+++ b/railties/test/abstract_unit.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 ENV["RAILS_ENV"] ||= "test"
 
 require "stringio"
diff --git a/railties/test/app_loader_test.rb b/railties/test/app_loader_test.rb
index 6210215dc8..85f5502b4d 100644
--- a/railties/test/app_loader_test.rb
+++ b/railties/test/app_loader_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "tmpdir"
 require "abstract_unit"
 require "rails/app_loader"
diff --git a/railties/test/application/asset_debugging_test.rb b/railties/test/application/asset_debugging_test.rb
index 1ce77fba9f..3e17a1efa5 100644
--- a/railties/test/application/asset_debugging_test.rb
+++ b/railties/test/application/asset_debugging_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "isolation/abstract_unit"
 require "rack/test"
 
diff --git a/railties/test/application/assets_test.rb b/railties/test/application/assets_test.rb
index 8e7f50b8de..f38cacd6da 100644
--- a/railties/test/application/assets_test.rb
+++ b/railties/test/application/assets_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "isolation/abstract_unit"
 require "rack/test"
 require "active_support/json"
diff --git a/railties/test/application/bin_setup_test.rb b/railties/test/application/bin_setup_test.rb
index a9009531aa..0fb995900f 100644
--- a/railties/test/application/bin_setup_test.rb
+++ b/railties/test/application/bin_setup_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "isolation/abstract_unit"
 
 module ApplicationTests
diff --git a/railties/test/application/configuration/custom_test.rb b/railties/test/application/configuration/custom_test.rb
index 71b33c15a4..8360b7bf4b 100644
--- a/railties/test/application/configuration/custom_test.rb
+++ b/railties/test/application/configuration/custom_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "isolation/abstract_unit"
 
 module ApplicationTests
diff --git a/railties/test/application/configuration_test.rb b/railties/test/application/configuration_test.rb
index e73c2a992c..06767167a9 100644
--- a/railties/test/application/configuration_test.rb
+++ b/railties/test/application/configuration_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "isolation/abstract_unit"
 require "rack/test"
 require "env_helpers"
diff --git a/railties/test/application/console_test.rb b/railties/test/application/console_test.rb
index 7dc9d0083f..057d473870 100644
--- a/railties/test/application/console_test.rb
+++ b/railties/test/application/console_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "isolation/abstract_unit"
 
 class ConsoleTest < ActiveSupport::TestCase
diff --git a/railties/test/application/current_attributes_integration_test.rb b/railties/test/application/current_attributes_integration_test.rb
index a10eb51851..5653ec0be1 100644
--- a/railties/test/application/current_attributes_integration_test.rb
+++ b/railties/test/application/current_attributes_integration_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "isolation/abstract_unit"
 require "rack/test"
 
diff --git a/railties/test/application/generators_test.rb b/railties/test/application/generators_test.rb
index 9732216b92..fe581db286 100644
--- a/railties/test/application/generators_test.rb
+++ b/railties/test/application/generators_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "isolation/abstract_unit"
 
 module ApplicationTests
diff --git a/railties/test/application/help_test.rb b/railties/test/application/help_test.rb
index f92dd60a7c..0c3fe8bfa3 100644
--- a/railties/test/application/help_test.rb
+++ b/railties/test/application/help_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "isolation/abstract_unit"
 
 class HelpTest < ActiveSupport::TestCase
diff --git a/railties/test/application/initializers/frameworks_test.rb b/railties/test/application/initializers/frameworks_test.rb
index c15e057b19..eb2c578f91 100644
--- a/railties/test/application/initializers/frameworks_test.rb
+++ b/railties/test/application/initializers/frameworks_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "isolation/abstract_unit"
 
 module ApplicationTests
diff --git a/railties/test/application/initializers/hooks_test.rb b/railties/test/application/initializers/hooks_test.rb
index 6acaea07dd..36926c50ff 100644
--- a/railties/test/application/initializers/hooks_test.rb
+++ b/railties/test/application/initializers/hooks_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "isolation/abstract_unit"
 
 module ApplicationTests
diff --git a/railties/test/application/initializers/i18n_test.rb b/railties/test/application/initializers/i18n_test.rb
index 4bf01c6f9e..cee198bd01 100644
--- a/railties/test/application/initializers/i18n_test.rb
+++ b/railties/test/application/initializers/i18n_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "isolation/abstract_unit"
 
 module ApplicationTests
diff --git a/railties/test/application/initializers/load_path_test.rb b/railties/test/application/initializers/load_path_test.rb
index 29f6bab256..dbefb22837 100644
--- a/railties/test/application/initializers/load_path_test.rb
+++ b/railties/test/application/initializers/load_path_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "isolation/abstract_unit"
 
 module ApplicationTests
diff --git a/railties/test/application/initializers/notifications_test.rb b/railties/test/application/initializers/notifications_test.rb
index 0be4280f38..b847ac6b36 100644
--- a/railties/test/application/initializers/notifications_test.rb
+++ b/railties/test/application/initializers/notifications_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "isolation/abstract_unit"
 
 module ApplicationTests
diff --git a/railties/test/application/integration_test_case_test.rb b/railties/test/application/integration_test_case_test.rb
index 73fc9f63c0..1118e5037a 100644
--- a/railties/test/application/integration_test_case_test.rb
+++ b/railties/test/application/integration_test_case_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "isolation/abstract_unit"
 
 module ApplicationTests
diff --git a/railties/test/application/loading_test.rb b/railties/test/application/loading_test.rb
index 3572fd68eb..c75a25bc6f 100644
--- a/railties/test/application/loading_test.rb
+++ b/railties/test/application/loading_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "isolation/abstract_unit"
 
 class LoadingTest < ActiveSupport::TestCase
diff --git a/railties/test/application/mailer_previews_test.rb b/railties/test/application/mailer_previews_test.rb
index 7fc5adddaa..f5c013dab6 100644
--- a/railties/test/application/mailer_previews_test.rb
+++ b/railties/test/application/mailer_previews_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "isolation/abstract_unit"
 require "rack/test"
 require "base64"
diff --git a/railties/test/application/middleware/cache_test.rb b/railties/test/application/middleware/cache_test.rb
index cbb265bb7c..93b5263bf7 100644
--- a/railties/test/application/middleware/cache_test.rb
+++ b/railties/test/application/middleware/cache_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "isolation/abstract_unit"
 
 module ApplicationTests
diff --git a/railties/test/application/middleware/cookies_test.rb b/railties/test/application/middleware/cookies_test.rb
index 725a35aac1..1e4b5d086c 100644
--- a/railties/test/application/middleware/cookies_test.rb
+++ b/railties/test/application/middleware/cookies_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "isolation/abstract_unit"
 
 module ApplicationTests
diff --git a/railties/test/application/middleware/exceptions_test.rb b/railties/test/application/middleware/exceptions_test.rb
index af91720943..fe07ad3cbe 100644
--- a/railties/test/application/middleware/exceptions_test.rb
+++ b/railties/test/application/middleware/exceptions_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "isolation/abstract_unit"
 require "rack/test"
 
diff --git a/railties/test/application/middleware/remote_ip_test.rb b/railties/test/application/middleware/remote_ip_test.rb
index 68d97e9a96..c34d9d6ee7 100644
--- a/railties/test/application/middleware/remote_ip_test.rb
+++ b/railties/test/application/middleware/remote_ip_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "ipaddr"
 require "isolation/abstract_unit"
 require "active_support/key_generator"
diff --git a/railties/test/application/middleware/sendfile_test.rb b/railties/test/application/middleware/sendfile_test.rb
index d1bad10fdc..4938402fdc 100644
--- a/railties/test/application/middleware/sendfile_test.rb
+++ b/railties/test/application/middleware/sendfile_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "isolation/abstract_unit"
 
 module ApplicationTests
diff --git a/railties/test/application/middleware/session_test.rb b/railties/test/application/middleware/session_test.rb
index 028309d8e4..a14ea589ed 100644
--- a/railties/test/application/middleware/session_test.rb
+++ b/railties/test/application/middleware/session_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "isolation/abstract_unit"
 require "rack/test"
 
diff --git a/railties/test/application/middleware/static_test.rb b/railties/test/application/middleware/static_test.rb
index 9a0a5f7265..5cd3e4325e 100644
--- a/railties/test/application/middleware/static_test.rb
+++ b/railties/test/application/middleware/static_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "isolation/abstract_unit"
 require "rack/test"
 
diff --git a/railties/test/application/middleware_test.rb b/railties/test/application/middleware_test.rb
index 64a3cbbfa1..0a6e5b52e9 100644
--- a/railties/test/application/middleware_test.rb
+++ b/railties/test/application/middleware_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "isolation/abstract_unit"
 
 module ApplicationTests
diff --git a/railties/test/application/multiple_applications_test.rb b/railties/test/application/multiple_applications_test.rb
index 9e832b6892..26b810af73 100644
--- a/railties/test/application/multiple_applications_test.rb
+++ b/railties/test/application/multiple_applications_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "isolation/abstract_unit"
 
 module ApplicationTests
diff --git a/railties/test/application/paths_test.rb b/railties/test/application/paths_test.rb
index 1c7db1bb9d..515205296c 100644
--- a/railties/test/application/paths_test.rb
+++ b/railties/test/application/paths_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "isolation/abstract_unit"
 
 module ApplicationTests
diff --git a/railties/test/application/per_request_digest_cache_test.rb b/railties/test/application/per_request_digest_cache_test.rb
index 148043d5cb..6e6996a6ba 100644
--- a/railties/test/application/per_request_digest_cache_test.rb
+++ b/railties/test/application/per_request_digest_cache_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "isolation/abstract_unit"
 require "rack/test"
 require "minitest/mock"
diff --git a/railties/test/application/rack/logger_test.rb b/railties/test/application/rack/logger_test.rb
index cb4d1d22af..e71bcbc536 100644
--- a/railties/test/application/rack/logger_test.rb
+++ b/railties/test/application/rack/logger_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "isolation/abstract_unit"
 require "active_support/log_subscriber/test_helper"
 require "rack/test"
diff --git a/railties/test/application/rackup_test.rb b/railties/test/application/rackup_test.rb
index bf9e96cf45..2943e9ee5d 100644
--- a/railties/test/application/rackup_test.rb
+++ b/railties/test/application/rackup_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "isolation/abstract_unit"
 
 module ApplicationTests
diff --git a/railties/test/application/rake/dbs_test.rb b/railties/test/application/rake/dbs_test.rb
index d5e5566635..c63f23fa0a 100644
--- a/railties/test/application/rake/dbs_test.rb
+++ b/railties/test/application/rake/dbs_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "isolation/abstract_unit"
 
 module ApplicationTests
diff --git a/railties/test/application/rake/dev_test.rb b/railties/test/application/rake/dev_test.rb
index 1556e5d5db..4f992d9c8d 100644
--- a/railties/test/application/rake/dev_test.rb
+++ b/railties/test/application/rake/dev_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "isolation/abstract_unit"
 
 module ApplicationTests
diff --git a/railties/test/application/rake/framework_test.rb b/railties/test/application/rake/framework_test.rb
index ec476addf4..40488a6aab 100644
--- a/railties/test/application/rake/framework_test.rb
+++ b/railties/test/application/rake/framework_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "isolation/abstract_unit"
 
 module ApplicationTests
diff --git a/railties/test/application/rake/log_test.rb b/railties/test/application/rake/log_test.rb
index 431492fb64..fdd3c71fe8 100644
--- a/railties/test/application/rake/log_test.rb
+++ b/railties/test/application/rake/log_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "isolation/abstract_unit"
 
 module ApplicationTests
diff --git a/railties/test/application/rake/migrations_test.rb b/railties/test/application/rake/migrations_test.rb
index 1cf780178f..51dfe2ef98 100644
--- a/railties/test/application/rake/migrations_test.rb
+++ b/railties/test/application/rake/migrations_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "isolation/abstract_unit"
 
 module ApplicationTests
diff --git a/railties/test/application/rake/notes_test.rb b/railties/test/application/rake/notes_test.rb
index a500c55104..e7ffea2e71 100644
--- a/railties/test/application/rake/notes_test.rb
+++ b/railties/test/application/rake/notes_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "isolation/abstract_unit"
 require "rails/source_annotation_extractor"
 
diff --git a/railties/test/application/rake/restart_test.rb b/railties/test/application/rake/restart_test.rb
index 640a0008e7..6ebd2d5461 100644
--- a/railties/test/application/rake/restart_test.rb
+++ b/railties/test/application/rake/restart_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "isolation/abstract_unit"
 
 module ApplicationTests
diff --git a/railties/test/application/rake/tmp_test.rb b/railties/test/application/rake/tmp_test.rb
index d8f684dbe9..bc9865b0de 100644
--- a/railties/test/application/rake/tmp_test.rb
+++ b/railties/test/application/rake/tmp_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "isolation/abstract_unit"
 
 module ApplicationTests
diff --git a/railties/test/application/rake_test.rb b/railties/test/application/rake_test.rb
index a3508a4a12..1b64a0a1ca 100644
--- a/railties/test/application/rake_test.rb
+++ b/railties/test/application/rake_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "isolation/abstract_unit"
 require "active_support/core_ext/string/strip"
 
diff --git a/railties/test/application/rendering_test.rb b/railties/test/application/rendering_test.rb
index 67843a09fa..ccafc5b6f1 100644
--- a/railties/test/application/rendering_test.rb
+++ b/railties/test/application/rendering_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "isolation/abstract_unit"
 require "rack/test"
 
diff --git a/railties/test/application/routing_test.rb b/railties/test/application/routing_test.rb
index 28a5ecb7ac..6742da20cc 100644
--- a/railties/test/application/routing_test.rb
+++ b/railties/test/application/routing_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "isolation/abstract_unit"
 require "rack/test"
 
diff --git a/railties/test/application/runner_test.rb b/railties/test/application/runner_test.rb
index 9611797765..0c45bc398a 100644
--- a/railties/test/application/runner_test.rb
+++ b/railties/test/application/runner_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "isolation/abstract_unit"
 require "env_helpers"
 
diff --git a/railties/test/application/test_runner_test.rb b/railties/test/application/test_runner_test.rb
index 91a6229cc4..8e0712fca2 100644
--- a/railties/test/application/test_runner_test.rb
+++ b/railties/test/application/test_runner_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "isolation/abstract_unit"
 require "active_support/core_ext/string/strip"
 require "env_helpers"
diff --git a/railties/test/application/test_test.rb b/railties/test/application/test_test.rb
index c57cf548f7..32d2a6857c 100644
--- a/railties/test/application/test_test.rb
+++ b/railties/test/application/test_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "isolation/abstract_unit"
 
 module ApplicationTests
diff --git a/railties/test/application/url_generation_test.rb b/railties/test/application/url_generation_test.rb
index c7d7db8a75..37f129475c 100644
--- a/railties/test/application/url_generation_test.rb
+++ b/railties/test/application/url_generation_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "isolation/abstract_unit"
 
 module ApplicationTests
diff --git a/railties/test/application/version_test.rb b/railties/test/application/version_test.rb
index ff3751446c..6b419ae7ae 100644
--- a/railties/test/application/version_test.rb
+++ b/railties/test/application/version_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "isolation/abstract_unit"
 require "rails/gem_version"
 
diff --git a/railties/test/backtrace_cleaner_test.rb b/railties/test/backtrace_cleaner_test.rb
index e72963ee91..f71e56f323 100644
--- a/railties/test/backtrace_cleaner_test.rb
+++ b/railties/test/backtrace_cleaner_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 require "rails/backtrace_cleaner"
 
diff --git a/railties/test/code_statistics_calculator_test.rb b/railties/test/code_statistics_calculator_test.rb
index 3e7be58e9c..25a8a40d27 100644
--- a/railties/test/code_statistics_calculator_test.rb
+++ b/railties/test/code_statistics_calculator_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 require "rails/code_statistics_calculator"
 
diff --git a/railties/test/code_statistics_test.rb b/railties/test/code_statistics_test.rb
index 8cc59f1154..e6e3943117 100644
--- a/railties/test/code_statistics_test.rb
+++ b/railties/test/code_statistics_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 require "rails/code_statistics"
 
diff --git a/railties/test/command/base_test.rb b/railties/test/command/base_test.rb
index 02a508fea7..ebfc4d0ba9 100644
--- a/railties/test/command/base_test.rb
+++ b/railties/test/command/base_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 require "rails/command"
 require "rails/commands/generate/generate_command"
diff --git a/railties/test/commands/console_test.rb b/railties/test/commands/console_test.rb
index 6fca08ad79..4fc082e4ca 100644
--- a/railties/test/commands/console_test.rb
+++ b/railties/test/commands/console_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 require "env_helpers"
 require "rails/command"
diff --git a/railties/test/commands/dbconsole_test.rb b/railties/test/commands/dbconsole_test.rb
index 3041f9233d..0f8c5dbb79 100644
--- a/railties/test/commands/dbconsole_test.rb
+++ b/railties/test/commands/dbconsole_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 require "minitest/mock"
 require "rails/command"
diff --git a/railties/test/commands/secrets_test.rb b/railties/test/commands/secrets_test.rb
index c06100cde2..be610f3b47 100644
--- a/railties/test/commands/secrets_test.rb
+++ b/railties/test/commands/secrets_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "isolation/abstract_unit"
 require "rails/command"
 require "rails/commands/secrets/secrets_command"
diff --git a/railties/test/commands/server_test.rb b/railties/test/commands/server_test.rb
index a0d2535c77..722323efdc 100644
--- a/railties/test/commands/server_test.rb
+++ b/railties/test/commands/server_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 require "env_helpers"
 require "rails/command"
diff --git a/railties/test/configuration/middleware_stack_proxy_test.rb b/railties/test/configuration/middleware_stack_proxy_test.rb
index ca2293d65f..559ce72693 100644
--- a/railties/test/configuration/middleware_stack_proxy_test.rb
+++ b/railties/test/configuration/middleware_stack_proxy_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "active_support"
 require "active_support/testing/autorun"
 require "rails/configuration"
diff --git a/railties/test/engine/commands_test.rb b/railties/test/engine/commands_test.rb
index e3811f0ea4..b1c937143f 100644
--- a/railties/test/engine/commands_test.rb
+++ b/railties/test/engine/commands_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 begin
   require "pty"
diff --git a/railties/test/engine_test.rb b/railties/test/engine_test.rb
index 9a2629a9f2..248afa2d2c 100644
--- a/railties/test/engine_test.rb
+++ b/railties/test/engine_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 
 class EngineTest < ActiveSupport::TestCase
diff --git a/railties/test/env_helpers.rb b/railties/test/env_helpers.rb
index 72f3008877..1f64d5fda3 100644
--- a/railties/test/env_helpers.rb
+++ b/railties/test/env_helpers.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "rails"
 
 module EnvHelpers
diff --git a/railties/test/fixtures/about_yml_plugins/bad_about_yml/init.rb b/railties/test/fixtures/about_yml_plugins/bad_about_yml/init.rb
index 23b1b41541..636bc1a8ab 100644
--- a/railties/test/fixtures/about_yml_plugins/bad_about_yml/init.rb
+++ b/railties/test/fixtures/about_yml_plugins/bad_about_yml/init.rb
@@ -1,2 +1 @@
-# frozen_string_literal: true
 # intentionally empty
diff --git a/railties/test/fixtures/about_yml_plugins/plugin_without_about_yml/init.rb b/railties/test/fixtures/about_yml_plugins/plugin_without_about_yml/init.rb
index 23b1b41541..636bc1a8ab 100644
--- a/railties/test/fixtures/about_yml_plugins/plugin_without_about_yml/init.rb
+++ b/railties/test/fixtures/about_yml_plugins/plugin_without_about_yml/init.rb
@@ -1,2 +1 @@
-# frozen_string_literal: true
 # intentionally empty
diff --git a/railties/test/fixtures/lib/create_test_dummy_template.rb b/railties/test/fixtures/lib/create_test_dummy_template.rb
index 934f1b9bca..e4378bbd1a 100644
--- a/railties/test/fixtures/lib/create_test_dummy_template.rb
+++ b/railties/test/fixtures/lib/create_test_dummy_template.rb
@@ -1,2 +1 @@
-# frozen_string_literal: true
 create_dummy_app("spec/dummy")
diff --git a/railties/test/fixtures/lib/generators/active_record/fixjour_generator.rb b/railties/test/fixtures/lib/generators/active_record/fixjour_generator.rb
index 5f29d43851..1139350b94 100644
--- a/railties/test/fixtures/lib/generators/active_record/fixjour_generator.rb
+++ b/railties/test/fixtures/lib/generators/active_record/fixjour_generator.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "rails/generators/active_record"
 
 module ActiveRecord
diff --git a/railties/test/fixtures/lib/generators/fixjour_generator.rb b/railties/test/fixtures/lib/generators/fixjour_generator.rb
index 587cbf3e30..ef3e9edbed 100644
--- a/railties/test/fixtures/lib/generators/fixjour_generator.rb
+++ b/railties/test/fixtures/lib/generators/fixjour_generator.rb
@@ -1,3 +1,2 @@
-# frozen_string_literal: true
 class FixjourGenerator < Rails::Generators::NamedBase
 end
diff --git a/railties/test/fixtures/lib/generators/model_generator.rb b/railties/test/fixtures/lib/generators/model_generator.rb
index 422e19e388..0905fa9631 100644
--- a/railties/test/fixtures/lib/generators/model_generator.rb
+++ b/railties/test/fixtures/lib/generators/model_generator.rb
@@ -1,2 +1 @@
-# frozen_string_literal: true
 raise "I should never be loaded"
diff --git a/railties/test/fixtures/lib/generators/usage_template/usage_template_generator.rb b/railties/test/fixtures/lib/generators/usage_template/usage_template_generator.rb
index df2cdadaea..701515440a 100644
--- a/railties/test/fixtures/lib/generators/usage_template/usage_template_generator.rb
+++ b/railties/test/fixtures/lib/generators/usage_template/usage_template_generator.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "rails/generators"
 
 class UsageTemplateGenerator < Rails::Generators::Base
diff --git a/railties/test/fixtures/lib/rails/generators/foobar/foobar_generator.rb b/railties/test/fixtures/lib/rails/generators/foobar/foobar_generator.rb
index d7e4a8fdca..d1de8c56fa 100644
--- a/railties/test/fixtures/lib/rails/generators/foobar/foobar_generator.rb
+++ b/railties/test/fixtures/lib/rails/generators/foobar/foobar_generator.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 module Foobar
   class FoobarGenerator < Rails::Generators::Base
   end
diff --git a/railties/test/fixtures/lib/template.rb b/railties/test/fixtures/lib/template.rb
index eccba91236..c14a1a8784 100644
--- a/railties/test/fixtures/lib/template.rb
+++ b/railties/test/fixtures/lib/template.rb
@@ -1,2 +1 @@
-# frozen_string_literal: true
 say "It works from file!"
diff --git a/railties/test/generators/actions_test.rb b/railties/test/generators/actions_test.rb
index 2e212b0e71..03b29be907 100644
--- a/railties/test/generators/actions_test.rb
+++ b/railties/test/generators/actions_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "generators/generators_test_helper"
 require "rails/generators/rails/app/app_generator"
 require "env_helpers"
diff --git a/railties/test/generators/api_app_generator_test.rb b/railties/test/generators/api_app_generator_test.rb
index 86b99ec6f1..a19e0f0dd8 100644
--- a/railties/test/generators/api_app_generator_test.rb
+++ b/railties/test/generators/api_app_generator_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "generators/generators_test_helper"
 require "rails/generators/rails/app/app_generator"
 
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index 554c57d670..9364f11a98 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "generators/generators_test_helper"
 require "rails/generators/rails/app/app_generator"
 require "generators/shared_generator_tests"
diff --git a/railties/test/generators/argv_scrubber_test.rb b/railties/test/generators/argv_scrubber_test.rb
index 61f28c0731..7f4295a20f 100644
--- a/railties/test/generators/argv_scrubber_test.rb
+++ b/railties/test/generators/argv_scrubber_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "active_support/test_case"
 require "active_support/testing/autorun"
 require "rails/generators/rails/app/app_generator"
diff --git a/railties/test/generators/assets_generator_test.rb b/railties/test/generators/assets_generator_test.rb
index 55b910b2dd..1c02c67e42 100644
--- a/railties/test/generators/assets_generator_test.rb
+++ b/railties/test/generators/assets_generator_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "generators/generators_test_helper"
 require "rails/generators/rails/assets/assets_generator"
 
diff --git a/railties/test/generators/channel_generator_test.rb b/railties/test/generators/channel_generator_test.rb
index ef09b172ff..af68a9c49f 100644
--- a/railties/test/generators/channel_generator_test.rb
+++ b/railties/test/generators/channel_generator_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "generators/generators_test_helper"
 require "rails/generators/channel/channel_generator"
 
diff --git a/railties/test/generators/controller_generator_test.rb b/railties/test/generators/controller_generator_test.rb
index d573b3b803..af86a0136f 100644
--- a/railties/test/generators/controller_generator_test.rb
+++ b/railties/test/generators/controller_generator_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "generators/generators_test_helper"
 require "rails/generators/rails/controller/controller_generator"
 
diff --git a/railties/test/generators/create_migration_test.rb b/railties/test/generators/create_migration_test.rb
index 3d2d39bba5..c7b0237f02 100644
--- a/railties/test/generators/create_migration_test.rb
+++ b/railties/test/generators/create_migration_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "generators/generators_test_helper"
 require "rails/generators/rails/migration/migration_generator"
 
diff --git a/railties/test/generators/encrypted_secrets_generator_test.rb b/railties/test/generators/encrypted_secrets_generator_test.rb
index 32651d81ae..21fdcab19f 100644
--- a/railties/test/generators/encrypted_secrets_generator_test.rb
+++ b/railties/test/generators/encrypted_secrets_generator_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "generators/generators_test_helper"
 require "rails/generators/rails/encrypted_secrets/encrypted_secrets_generator"
 
diff --git a/railties/test/generators/generated_attribute_test.rb b/railties/test/generators/generated_attribute_test.rb
index 29d6c0f4fc..97847c8624 100644
--- a/railties/test/generators/generated_attribute_test.rb
+++ b/railties/test/generators/generated_attribute_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "generators/generators_test_helper"
 require "rails/generators/generated_attribute"
 
diff --git a/railties/test/generators/generator_generator_test.rb b/railties/test/generators/generator_generator_test.rb
index c5d8412307..5ff8bb0357 100644
--- a/railties/test/generators/generator_generator_test.rb
+++ b/railties/test/generators/generator_generator_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "generators/generators_test_helper"
 require "rails/generators/rails/generator/generator_generator"
 
diff --git a/railties/test/generators/generator_test.rb b/railties/test/generators/generator_test.rb
index f9bfee2fa1..4444b3a56e 100644
--- a/railties/test/generators/generator_test.rb
+++ b/railties/test/generators/generator_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "active_support/test_case"
 require "active_support/testing/autorun"
 require "rails/generators/app_base"
diff --git a/railties/test/generators/generators_test_helper.rb b/railties/test/generators/generators_test_helper.rb
index 73fb2a86c8..5fb331e197 100644
--- a/railties/test/generators/generators_test_helper.rb
+++ b/railties/test/generators/generators_test_helper.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/core_ext/module/remove_method"
 require "active_support/testing/stream"
diff --git a/railties/test/generators/helper_generator_test.rb b/railties/test/generators/helper_generator_test.rb
index 683cd13cfb..d9e6e0a85a 100644
--- a/railties/test/generators/helper_generator_test.rb
+++ b/railties/test/generators/helper_generator_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "generators/generators_test_helper"
 require "rails/generators/rails/helper/helper_generator"
 
diff --git a/railties/test/generators/integration_test_generator_test.rb b/railties/test/generators/integration_test_generator_test.rb
index dc586f60b4..9358b63bd4 100644
--- a/railties/test/generators/integration_test_generator_test.rb
+++ b/railties/test/generators/integration_test_generator_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "generators/generators_test_helper"
 require "rails/generators/rails/integration_test/integration_test_generator"
 
diff --git a/railties/test/generators/job_generator_test.rb b/railties/test/generators/job_generator_test.rb
index 4981ee999e..68d158eb39 100644
--- a/railties/test/generators/job_generator_test.rb
+++ b/railties/test/generators/job_generator_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "generators/generators_test_helper"
 require "rails/generators/job/job_generator"
 
diff --git a/railties/test/generators/mailer_generator_test.rb b/railties/test/generators/mailer_generator_test.rb
index 13c3956ae8..2ff03ea65e 100644
--- a/railties/test/generators/mailer_generator_test.rb
+++ b/railties/test/generators/mailer_generator_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "generators/generators_test_helper"
 require "rails/generators/mailer/mailer_generator"
 
diff --git a/railties/test/generators/migration_generator_test.rb b/railties/test/generators/migration_generator_test.rb
index 0a70be0677..6fe6e4ca07 100644
--- a/railties/test/generators/migration_generator_test.rb
+++ b/railties/test/generators/migration_generator_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "generators/generators_test_helper"
 require "rails/generators/rails/migration/migration_generator"
 
diff --git a/railties/test/generators/model_generator_test.rb b/railties/test/generators/model_generator_test.rb
index 2a85f985ee..f41969fc46 100644
--- a/railties/test/generators/model_generator_test.rb
+++ b/railties/test/generators/model_generator_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "generators/generators_test_helper"
 require "rails/generators/rails/model/model_generator"
 require "active_support/core_ext/string/strip"
diff --git a/railties/test/generators/named_base_test.rb b/railties/test/generators/named_base_test.rb
index d775faad36..3015b5363b 100644
--- a/railties/test/generators/named_base_test.rb
+++ b/railties/test/generators/named_base_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "generators/generators_test_helper"
 require "rails/generators/rails/scaffold_controller/scaffold_controller_generator"
 
diff --git a/railties/test/generators/namespaced_generators_test.rb b/railties/test/generators/namespaced_generators_test.rb
index 7d63431436..1caabbe6b1 100644
--- a/railties/test/generators/namespaced_generators_test.rb
+++ b/railties/test/generators/namespaced_generators_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "generators/generators_test_helper"
 require "rails/generators/rails/controller/controller_generator"
 require "rails/generators/rails/model/model_generator"
diff --git a/railties/test/generators/orm_test.rb b/railties/test/generators/orm_test.rb
index 35cfeeabf6..88ae930554 100644
--- a/railties/test/generators/orm_test.rb
+++ b/railties/test/generators/orm_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "generators/generators_test_helper"
 require "rails/generators/rails/scaffold_controller/scaffold_controller_generator"
 
diff --git a/railties/test/generators/plugin_generator_test.rb b/railties/test/generators/plugin_generator_test.rb
index 2aef4e6584..f8512f9157 100644
--- a/railties/test/generators/plugin_generator_test.rb
+++ b/railties/test/generators/plugin_generator_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "generators/generators_test_helper"
 require "rails/generators/rails/plugin/plugin_generator"
 require "generators/shared_generator_tests"
diff --git a/railties/test/generators/plugin_test_helper.rb b/railties/test/generators/plugin_test_helper.rb
index 81768b890f..8ac90e3484 100644
--- a/railties/test/generators/plugin_test_helper.rb
+++ b/railties/test/generators/plugin_test_helper.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 require "tmpdir"
 
diff --git a/railties/test/generators/plugin_test_runner_test.rb b/railties/test/generators/plugin_test_runner_test.rb
index 58f60404c4..0bdd2a77d2 100644
--- a/railties/test/generators/plugin_test_runner_test.rb
+++ b/railties/test/generators/plugin_test_runner_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "generators/plugin_test_helper"
 
 class PluginTestRunnerTest < ActiveSupport::TestCase
diff --git a/railties/test/generators/resource_generator_test.rb b/railties/test/generators/resource_generator_test.rb
index 45b02e663d..e976e58180 100644
--- a/railties/test/generators/resource_generator_test.rb
+++ b/railties/test/generators/resource_generator_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "generators/generators_test_helper"
 require "rails/generators/rails/resource/resource_generator"
 
diff --git a/railties/test/generators/scaffold_controller_generator_test.rb b/railties/test/generators/scaffold_controller_generator_test.rb
index ff510e9312..9971626f9f 100644
--- a/railties/test/generators/scaffold_controller_generator_test.rb
+++ b/railties/test/generators/scaffold_controller_generator_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "generators/generators_test_helper"
 require "rails/generators/rails/scaffold_controller/scaffold_controller_generator"
 
diff --git a/railties/test/generators/scaffold_generator_test.rb b/railties/test/generators/scaffold_generator_test.rb
index 4956ca21b0..9926d58d16 100644
--- a/railties/test/generators/scaffold_generator_test.rb
+++ b/railties/test/generators/scaffold_generator_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "generators/generators_test_helper"
 require "rails/generators/rails/scaffold/scaffold_generator"
 
diff --git a/railties/test/generators/shared_generator_tests.rb b/railties/test/generators/shared_generator_tests.rb
index 5fd0a6c7d1..5e75879964 100644
--- a/railties/test/generators/shared_generator_tests.rb
+++ b/railties/test/generators/shared_generator_tests.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 #
 # Tests, setup, and teardown common to the application and plugin generator suites.
 #
diff --git a/railties/test/generators/system_test_generator_test.rb b/railties/test/generators/system_test_generator_test.rb
index 03c1c78ef4..4622360244 100644
--- a/railties/test/generators/system_test_generator_test.rb
+++ b/railties/test/generators/system_test_generator_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "generators/generators_test_helper"
 require "rails/generators/rails/system_test/system_test_generator"
 
diff --git a/railties/test/generators/task_generator_test.rb b/railties/test/generators/task_generator_test.rb
index 1896dc5c87..2285534bb9 100644
--- a/railties/test/generators/task_generator_test.rb
+++ b/railties/test/generators/task_generator_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "generators/generators_test_helper"
 require "rails/generators/rails/task/task_generator"
 
diff --git a/railties/test/generators/test_runner_in_engine_test.rb b/railties/test/generators/test_runner_in_engine_test.rb
index 0a330ea4e9..680dc2608e 100644
--- a/railties/test/generators/test_runner_in_engine_test.rb
+++ b/railties/test/generators/test_runner_in_engine_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "generators/plugin_test_helper"
 
 class TestRunnerInEngineTest < ActiveSupport::TestCase
diff --git a/railties/test/generators_test.rb b/railties/test/generators_test.rb
index 766a50f6a0..e07627f36d 100644
--- a/railties/test/generators_test.rb
+++ b/railties/test/generators_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "generators/generators_test_helper"
 require "rails/generators/rails/model/model_generator"
 require "rails/generators/test_unit/model/model_generator"
diff --git a/railties/test/initializable_test.rb b/railties/test/initializable_test.rb
index e942a983b6..4b67c91cc5 100644
--- a/railties/test/initializable_test.rb
+++ b/railties/test/initializable_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 require "rails/initializable"
 
diff --git a/railties/test/isolation/abstract_unit.rb b/railties/test/isolation/abstract_unit.rb
index 2e910d1d17..7496b5f84a 100644
--- a/railties/test/isolation/abstract_unit.rb
+++ b/railties/test/isolation/abstract_unit.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 # Note:
 # It is important to keep this file as light as possible
 # the goal for tests that require this is to test booting up
diff --git a/railties/test/json_params_parsing_test.rb b/railties/test/json_params_parsing_test.rb
index e2bd4a8230..7fff3bb465 100644
--- a/railties/test/json_params_parsing_test.rb
+++ b/railties/test/json_params_parsing_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 require "action_dispatch"
 require "active_record"
diff --git a/railties/test/path_generation_test.rb b/railties/test/path_generation_test.rb
index 1f82ec3bbb..c0b03d0c15 100644
--- a/railties/test/path_generation_test.rb
+++ b/railties/test/path_generation_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/core_ext/object/with_options"
 require "active_support/core_ext/object/json"
diff --git a/railties/test/paths_test.rb b/railties/test/paths_test.rb
index 0ec21fc90e..f3db0a51d2 100644
--- a/railties/test/paths_test.rb
+++ b/railties/test/paths_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 require "rails/paths"
 require "minitest/mock"
diff --git a/railties/test/rack_logger_test.rb b/railties/test/rack_logger_test.rb
index cd14cbe7a6..33b4bc6a3a 100644
--- a/railties/test/rack_logger_test.rb
+++ b/railties/test/rack_logger_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/testing/autorun"
 require "active_support/test_case"
diff --git a/railties/test/rails_info_controller_test.rb b/railties/test/rails_info_controller_test.rb
index bae87e6a1c..d795629ccd 100644
--- a/railties/test/rails_info_controller_test.rb
+++ b/railties/test/rails_info_controller_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 
 module ActionController
diff --git a/railties/test/rails_info_test.rb b/railties/test/rails_info_test.rb
index e29e3c828e..383adcc55d 100644
--- a/railties/test/rails_info_test.rb
+++ b/railties/test/rails_info_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 
 unless defined?(Rails) && defined?(Rails::Info)
diff --git a/railties/test/railties/engine_test.rb b/railties/test/railties/engine_test.rb
index 19d2a2e4f6..e382a7a873 100644
--- a/railties/test/railties/engine_test.rb
+++ b/railties/test/railties/engine_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "isolation/abstract_unit"
 require "stringio"
 require "rack/test"
diff --git a/railties/test/railties/generators_test.rb b/railties/test/railties/generators_test.rb
index 22c2697577..5c691b9ec4 100644
--- a/railties/test/railties/generators_test.rb
+++ b/railties/test/railties/generators_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 RAILS_ISOLATED_ENGINE = true
 require "isolation/abstract_unit"
 
diff --git a/railties/test/railties/mounted_engine_test.rb b/railties/test/railties/mounted_engine_test.rb
index b4efe50038..6639e55382 100644
--- a/railties/test/railties/mounted_engine_test.rb
+++ b/railties/test/railties/mounted_engine_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "isolation/abstract_unit"
 
 module ApplicationTests
diff --git a/railties/test/railties/railtie_test.rb b/railties/test/railties/railtie_test.rb
index be77af8134..30cd525266 100644
--- a/railties/test/railties/railtie_test.rb
+++ b/railties/test/railties/railtie_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "isolation/abstract_unit"
 
 module RailtiesTest
diff --git a/railties/test/secrets_test.rb b/railties/test/secrets_test.rb
index 030303525b..36c8ef1fd9 100644
--- a/railties/test/secrets_test.rb
+++ b/railties/test/secrets_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 require "isolation/abstract_unit"
 require "rails/generators"
diff --git a/railties/test/test_unit/reporter_test.rb b/railties/test/test_unit/reporter_test.rb
index dc462fe0f4..98201394cd 100644
--- a/railties/test/test_unit/reporter_test.rb
+++ b/railties/test/test_unit/reporter_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 require "rails/test_unit/reporter"
 require "minitest/mock"
diff --git a/railties/test/version_test.rb b/railties/test/version_test.rb
index 393da344a1..86a482e091 100644
--- a/railties/test/version_test.rb
+++ b/railties/test/version_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 
 class VersionTest < ActiveSupport::TestCase
-- 
cgit v1.2.3


From 06b1e5f5076961a85e354714490528d6b342c725 Mon Sep 17 00:00:00 2001
From: "yuuji.yaginuma" <yuuji.yaginuma@gmail.com>
Date: Sun, 2 Jul 2017 09:13:55 +0900
Subject: Move test related to `tmp:clear` task to `tmp_test.rb`

---
 railties/test/application/rake/tmp_test.rb | 7 +++++++
 railties/test/application/rake_test.rb     | 7 -------
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'railties/test')

diff --git a/railties/test/application/rake/tmp_test.rb b/railties/test/application/rake/tmp_test.rb
index bc9865b0de..8423a98f84 100644
--- a/railties/test/application/rake/tmp_test.rb
+++ b/railties/test/application/rake/tmp_test.rb
@@ -31,6 +31,13 @@ module ApplicationTests
           assert_not File.exist?("tmp/screenshots/fail.png")
         end
       end
+
+      test "tmp:clear should work if folder missing" do
+        FileUtils.remove_dir("#{app_path}/tmp")
+        errormsg = Dir.chdir(app_path) { `bin/rails tmp:clear` }
+        assert_predicate $?, :success?
+        assert_empty errormsg
+      end
     end
   end
 end
diff --git a/railties/test/application/rake_test.rb b/railties/test/application/rake_test.rb
index 1b64a0a1ca..5ae6ea925f 100644
--- a/railties/test/application/rake_test.rb
+++ b/railties/test/application/rake_test.rb
@@ -391,12 +391,5 @@ module ApplicationTests
 
       assert_match(/Hello, World!/, output)
     end
-
-    def test_tmp_clear_should_work_if_folder_missing
-      FileUtils.remove_dir("#{app_path}/tmp")
-      errormsg = Dir.chdir(app_path) { `bin/rails tmp:clear` }
-      assert_predicate $?, :success?
-      assert_empty errormsg
-    end
   end
 end
-- 
cgit v1.2.3


From 6aa658e329e54f94519268a02b29dc102b415c07 Mon Sep 17 00:00:00 2001
From: Ryuta Kamizono <kamipo@gmail.com>
Date: Mon, 3 Jul 2017 00:16:53 +0900
Subject: Remove redundant `assert_respond_to`

It is covered by following assertion.
---
 railties/test/application/configuration_test.rb | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'railties/test')

diff --git a/railties/test/application/configuration_test.rb b/railties/test/application/configuration_test.rb
index 06767167a9..95a2cc2d31 100644
--- a/railties/test/application/configuration_test.rb
+++ b/railties/test/application/configuration_test.rb
@@ -176,13 +176,11 @@ module ApplicationTests
 
     test "Rails.application responds to all instance methods" do
       app "development"
-      assert_respond_to Rails.application, :routes_reloader
       assert_equal Rails.application.routes_reloader, AppTemplate::Application.routes_reloader
     end
 
     test "Rails::Application responds to paths" do
       app "development"
-      assert_respond_to AppTemplate::Application, :paths
       assert_equal ["#{app_path}/app/views"], AppTemplate::Application.paths["app/views"].expanded
     end
 
@@ -1220,7 +1218,6 @@ module ApplicationTests
     test "Rails.application#env_config exists and include some existing parameters" do
       make_basic_app
 
-      assert_respond_to app, :env_config
       assert_equal      app.env_config["action_dispatch.parameter_filter"],  app.config.filter_parameters
       assert_equal      app.env_config["action_dispatch.show_exceptions"],   app.config.action_dispatch.show_exceptions
       assert_equal      app.env_config["action_dispatch.logger"],            Rails.logger
-- 
cgit v1.2.3