From 036bdee4d5bdad3b3fa1d57ca292214afe746a09 Mon Sep 17 00:00:00 2001
From: Pat Allan <pat@freelancing-gods.com>
Date: Mon, 19 Jun 2017 19:03:10 +1000
Subject: Make ActiveSupport frozen string literal friendly.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The ActiveSupport test suite only passes currently if it uses the latest unreleased commits for dalli, and a patch for Builder:
https://github.com/tenderlove/builder/pull/6

Beyond that, all external dependencies (at least, to the extent they’re used by ActiveSupport) are happy, including Nokogiri as of 1.8.0.
---
 activesupport/test/core_ext/string_ext_test.rb | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

(limited to 'activesupport/test/core_ext')

diff --git a/activesupport/test/core_ext/string_ext_test.rb b/activesupport/test/core_ext/string_ext_test.rb
index a98951e889..daa8c3f2ef 100644
--- a/activesupport/test/core_ext/string_ext_test.rb
+++ b/activesupport/test/core_ext/string_ext_test.rb
@@ -233,7 +233,7 @@ class StringInflectionsTest < ActiveSupport::TestCase
 
   def test_string_squish
     original = %{\u205f\u3000 A string surrounded by various unicode spaces,
-      with tabs(\t\t), newlines(\n\n), unicode nextlines(\u0085\u0085) and many spaces(  ). \u00a0\u2007}
+      with tabs(\t\t), newlines(\n\n), unicode nextlines(\u0085\u0085) and many spaces(  ). \u00a0\u2007}.dup
 
     expected = "A string surrounded by various unicode spaces, " \
       "with tabs( ), newlines( ), unicode nextlines( ) and many spaces( )."
@@ -303,8 +303,8 @@ class StringInflectionsTest < ActiveSupport::TestCase
   end
 
   def test_truncate_multibyte
-    assert_equal "\354\225\204\353\246\254\353\236\221 \354\225\204\353\246\254 ...".force_encoding(Encoding::UTF_8),
-      "\354\225\204\353\246\254\353\236\221 \354\225\204\353\246\254 \354\225\204\353\235\274\353\246\254\354\230\244".force_encoding(Encoding::UTF_8).truncate(10)
+    assert_equal "\354\225\204\353\246\254\353\236\221 \354\225\204\353\246\254 ...".dup.force_encoding(Encoding::UTF_8),
+      "\354\225\204\353\246\254\353\236\221 \354\225\204\353\246\254 \354\225\204\353\235\274\353\246\254\354\230\244".dup.force_encoding(Encoding::UTF_8).truncate(10)
   end
 
   def test_truncate_should_not_be_html_safe
@@ -325,7 +325,7 @@ class StringInflectionsTest < ActiveSupport::TestCase
   end
 
   def test_remove!
-    original = "This is a very good day to die"
+    original = "This is a very good day to die".dup
     assert_equal "This is a good day to die", original.remove!(" very")
     assert_equal "This is a good day to die", original
     assert_equal "This is a good day", original.remove!(" to ", /die/)
@@ -658,7 +658,7 @@ end
 
 class OutputSafetyTest < ActiveSupport::TestCase
   def setup
-    @string = "hello"
+    @string = "hello".dup
     @object = Class.new(Object) do
       def to_s
         "other"
@@ -734,7 +734,7 @@ class OutputSafetyTest < ActiveSupport::TestCase
   end
 
   test "Concatting safe onto unsafe yields unsafe" do
-    @other_string = "other"
+    @other_string = "other".dup
 
     string = @string.html_safe
     @other_string.concat(string)
@@ -757,7 +757,7 @@ class OutputSafetyTest < ActiveSupport::TestCase
   end
 
   test "Concatting safe onto unsafe with << yields unsafe" do
-    @other_string = "other"
+    @other_string = "other".dup
     string = @string.html_safe
 
     @other_string << string
@@ -813,7 +813,7 @@ class OutputSafetyTest < ActiveSupport::TestCase
   test "Concatting an integer to safe always yields safe" do
     string = @string.html_safe
     string = string.concat(13)
-    assert_equal "hello".concat(13), string
+    assert_equal "hello".dup.concat(13), string
     assert string.html_safe?
   end
 
@@ -868,7 +868,8 @@ end
 
 class StringIndentTest < ActiveSupport::TestCase
   test "does not indent strings that only contain newlines (edge cases)" do
-    ["", "\n", "\n" * 7].each do |str|
+    ["", "\n", "\n" * 7].each do |string|
+      str = string.dup
       assert_nil str.indent!(8)
       assert_equal str, str.indent(8)
       assert_equal str, str.indent(1, "\t")
-- 
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

---
 activesupport/test/core_ext/array/access_test.rb                         | 1 +
 activesupport/test/core_ext/array/conversions_test.rb                    | 1 +
 activesupport/test/core_ext/array/extract_options_test.rb                | 1 +
 activesupport/test/core_ext/array/grouping_test.rb                       | 1 +
 activesupport/test/core_ext/array/prepend_append_test.rb                 | 1 +
 activesupport/test/core_ext/array/wrap_test.rb                           | 1 +
 activesupport/test/core_ext/bigdecimal_test.rb                           | 1 +
 activesupport/test/core_ext/class/attribute_test.rb                      | 1 +
 activesupport/test/core_ext/class_test.rb                                | 1 +
 activesupport/test/core_ext/date_and_time_behavior.rb                    | 1 +
 activesupport/test/core_ext/date_and_time_compatibility_test.rb          | 1 +
 activesupport/test/core_ext/date_ext_test.rb                             | 1 +
 activesupport/test/core_ext/date_time_ext_test.rb                        | 1 +
 activesupport/test/core_ext/digest/uuid_test.rb                          | 1 +
 activesupport/test/core_ext/duration_test.rb                             | 1 +
 activesupport/test/core_ext/enumerable_test.rb                           | 1 +
 activesupport/test/core_ext/file_test.rb                                 | 1 +
 activesupport/test/core_ext/hash/transform_keys_test.rb                  | 1 +
 activesupport/test/core_ext/hash/transform_values_test.rb                | 1 +
 activesupport/test/core_ext/hash_ext_test.rb                             | 1 +
 activesupport/test/core_ext/integer_ext_test.rb                          | 1 +
 activesupport/test/core_ext/kernel/concern_test.rb                       | 1 +
 activesupport/test/core_ext/kernel_test.rb                               | 1 +
 activesupport/test/core_ext/load_error_test.rb                           | 1 +
 activesupport/test/core_ext/marshal_test.rb                              | 1 +
 activesupport/test/core_ext/module/anonymous_test.rb                     | 1 +
 activesupport/test/core_ext/module/attr_internal_test.rb                 | 1 +
 activesupport/test/core_ext/module/attribute_accessor_per_thread_test.rb | 1 +
 activesupport/test/core_ext/module/attribute_accessor_test.rb            | 1 +
 activesupport/test/core_ext/module/attribute_aliasing_test.rb            | 1 +
 activesupport/test/core_ext/module/concerning_test.rb                    | 1 +
 activesupport/test/core_ext/module/introspection_test.rb                 | 1 +
 activesupport/test/core_ext/module/reachable_test.rb                     | 1 +
 activesupport/test/core_ext/module/remove_method_test.rb                 | 1 +
 activesupport/test/core_ext/module_test.rb                               | 1 +
 activesupport/test/core_ext/name_error_test.rb                           | 1 +
 activesupport/test/core_ext/numeric_ext_test.rb                          | 1 +
 activesupport/test/core_ext/object/acts_like_test.rb                     | 1 +
 activesupport/test/core_ext/object/blank_test.rb                         | 1 +
 activesupport/test/core_ext/object/deep_dup_test.rb                      | 1 +
 activesupport/test/core_ext/object/duplicable_test.rb                    | 1 +
 activesupport/test/core_ext/object/inclusion_test.rb                     | 1 +
 activesupport/test/core_ext/object/instance_variables_test.rb            | 1 +
 activesupport/test/core_ext/object/json_cherry_pick_test.rb              | 1 +
 activesupport/test/core_ext/object/json_gem_encoding_test.rb             | 1 +
 activesupport/test/core_ext/object/to_param_test.rb                      | 1 +
 activesupport/test/core_ext/object/to_query_test.rb                      | 1 +
 activesupport/test/core_ext/object/try_test.rb                           | 1 +
 activesupport/test/core_ext/range_ext_test.rb                            | 1 +
 activesupport/test/core_ext/regexp_ext_test.rb                           | 1 +
 activesupport/test/core_ext/secure_random_test.rb                        | 1 +
 activesupport/test/core_ext/string_ext_test.rb                           | 1 +
 activesupport/test/core_ext/time_ext_test.rb                             | 1 +
 activesupport/test/core_ext/time_with_zone_test.rb                       | 1 +
 activesupport/test/core_ext/uri_ext_test.rb                              | 1 +
 55 files changed, 55 insertions(+)

(limited to 'activesupport/test/core_ext')

diff --git a/activesupport/test/core_ext/array/access_test.rb b/activesupport/test/core_ext/array/access_test.rb
index a38ea36d00..08af9e1b55 100644
--- a/activesupport/test/core_ext/array/access_test.rb
+++ b/activesupport/test/core_ext/array/access_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/core_ext/array"
 
diff --git a/activesupport/test/core_ext/array/conversions_test.rb b/activesupport/test/core_ext/array/conversions_test.rb
index 29e661a99b..33d051c514 100644
--- a/activesupport/test/core_ext/array/conversions_test.rb
+++ b/activesupport/test/core_ext/array/conversions_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/core_ext/array"
 require "active_support/core_ext/big_decimal"
diff --git a/activesupport/test/core_ext/array/extract_options_test.rb b/activesupport/test/core_ext/array/extract_options_test.rb
index 1651bee0f6..09bf97ae6c 100644
--- a/activesupport/test/core_ext/array/extract_options_test.rb
+++ b/activesupport/test/core_ext/array/extract_options_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/core_ext/array"
 require "active_support/core_ext/hash"
diff --git a/activesupport/test/core_ext/array/grouping_test.rb b/activesupport/test/core_ext/array/grouping_test.rb
index 4c6aadba8c..daf47e9a9f 100644
--- a/activesupport/test/core_ext/array/grouping_test.rb
+++ b/activesupport/test/core_ext/array/grouping_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/core_ext/array"
 
diff --git a/activesupport/test/core_ext/array/prepend_append_test.rb b/activesupport/test/core_ext/array/prepend_append_test.rb
index 763e26191d..3b38acf56c 100644
--- a/activesupport/test/core_ext/array/prepend_append_test.rb
+++ b/activesupport/test/core_ext/array/prepend_append_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/core_ext/array"
 
diff --git a/activesupport/test/core_ext/array/wrap_test.rb b/activesupport/test/core_ext/array/wrap_test.rb
index ae846cb3f2..451f9db2ed 100644
--- a/activesupport/test/core_ext/array/wrap_test.rb
+++ b/activesupport/test/core_ext/array/wrap_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/core_ext/array"
 
diff --git a/activesupport/test/core_ext/bigdecimal_test.rb b/activesupport/test/core_ext/bigdecimal_test.rb
index 43b659546f..dbd0762574 100644
--- a/activesupport/test/core_ext/bigdecimal_test.rb
+++ b/activesupport/test/core_ext/bigdecimal_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/core_ext/big_decimal"
 
diff --git a/activesupport/test/core_ext/class/attribute_test.rb b/activesupport/test/core_ext/class/attribute_test.rb
index f16043c612..2933b62c58 100644
--- a/activesupport/test/core_ext/class/attribute_test.rb
+++ b/activesupport/test/core_ext/class/attribute_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/core_ext/class/attribute"
 
diff --git a/activesupport/test/core_ext/class_test.rb b/activesupport/test/core_ext/class_test.rb
index a7905196ae..c0cabea8fd 100644
--- a/activesupport/test/core_ext/class_test.rb
+++ b/activesupport/test/core_ext/class_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/core_ext/class"
 require "set"
diff --git a/activesupport/test/core_ext/date_and_time_behavior.rb b/activesupport/test/core_ext/date_and_time_behavior.rb
index 6c77e8f313..8d908968ef 100644
--- a/activesupport/test/core_ext/date_and_time_behavior.rb
+++ b/activesupport/test/core_ext/date_and_time_behavior.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "abstract_unit"
 
 module DateAndTimeBehavior
diff --git a/activesupport/test/core_ext/date_and_time_compatibility_test.rb b/activesupport/test/core_ext/date_and_time_compatibility_test.rb
index 6c6205a4d2..04b93105d5 100644
--- a/activesupport/test/core_ext/date_and_time_compatibility_test.rb
+++ b/activesupport/test/core_ext/date_and_time_compatibility_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/time"
 require "time_zone_test_helpers"
diff --git a/activesupport/test/core_ext/date_ext_test.rb b/activesupport/test/core_ext/date_ext_test.rb
index 50bb1004f7..7c6e705936 100644
--- a/activesupport/test/core_ext/date_ext_test.rb
+++ b/activesupport/test/core_ext/date_ext_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/time"
 require "core_ext/date_and_time_behavior"
diff --git a/activesupport/test/core_ext/date_time_ext_test.rb b/activesupport/test/core_ext/date_time_ext_test.rb
index 276fa2bfd3..beddfe4584 100644
--- a/activesupport/test/core_ext/date_time_ext_test.rb
+++ b/activesupport/test/core_ext/date_time_ext_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/time"
 require "core_ext/date_and_time_behavior"
diff --git a/activesupport/test/core_ext/digest/uuid_test.rb b/activesupport/test/core_ext/digest/uuid_test.rb
index 866a03259a..ea3605bf9c 100644
--- a/activesupport/test/core_ext/digest/uuid_test.rb
+++ b/activesupport/test/core_ext/digest/uuid_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/core_ext/digest/uuid"
 
diff --git a/activesupport/test/core_ext/duration_test.rb b/activesupport/test/core_ext/duration_test.rb
index cd1b505c34..32c0ce4317 100644
--- a/activesupport/test/core_ext/duration_test.rb
+++ b/activesupport/test/core_ext/duration_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/inflector"
 require "active_support/time"
diff --git a/activesupport/test/core_ext/enumerable_test.rb b/activesupport/test/core_ext/enumerable_test.rb
index 0b345ecf0f..3259109b0e 100644
--- a/activesupport/test/core_ext/enumerable_test.rb
+++ b/activesupport/test/core_ext/enumerable_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/core_ext/array"
 require "active_support/core_ext/enumerable"
diff --git a/activesupport/test/core_ext/file_test.rb b/activesupport/test/core_ext/file_test.rb
index df5d09acd0..67b1a04429 100644
--- a/activesupport/test/core_ext/file_test.rb
+++ b/activesupport/test/core_ext/file_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/core_ext/file"
 
diff --git a/activesupport/test/core_ext/hash/transform_keys_test.rb b/activesupport/test/core_ext/hash/transform_keys_test.rb
index 7a11d827f8..f329246bdd 100644
--- a/activesupport/test/core_ext/hash/transform_keys_test.rb
+++ b/activesupport/test/core_ext/hash/transform_keys_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/core_ext/hash/keys"
 
diff --git a/activesupport/test/core_ext/hash/transform_values_test.rb b/activesupport/test/core_ext/hash/transform_values_test.rb
index f2ac4ce6ce..4eb6999510 100644
--- a/activesupport/test/core_ext/hash/transform_values_test.rb
+++ b/activesupport/test/core_ext/hash/transform_values_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/core_ext/hash/indifferent_access"
 require "active_support/core_ext/hash/transform_values"
diff --git a/activesupport/test/core_ext/hash_ext_test.rb b/activesupport/test/core_ext/hash_ext_test.rb
index 18da5fcf5f..c533c002a4 100644
--- a/activesupport/test/core_ext/hash_ext_test.rb
+++ b/activesupport/test/core_ext/hash_ext_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/core_ext/hash"
 require "bigdecimal"
diff --git a/activesupport/test/core_ext/integer_ext_test.rb b/activesupport/test/core_ext/integer_ext_test.rb
index 137e8ce85f..a7ea084e7f 100644
--- a/activesupport/test/core_ext/integer_ext_test.rb
+++ b/activesupport/test/core_ext/integer_ext_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/core_ext/integer"
 
diff --git a/activesupport/test/core_ext/kernel/concern_test.rb b/activesupport/test/core_ext/kernel/concern_test.rb
index e7e4f99d7e..1f4fb8029c 100644
--- a/activesupport/test/core_ext/kernel/concern_test.rb
+++ b/activesupport/test/core_ext/kernel/concern_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/core_ext/kernel/concern"
 
diff --git a/activesupport/test/core_ext/kernel_test.rb b/activesupport/test/core_ext/kernel_test.rb
index 26f5088ede..875598f611 100644
--- a/activesupport/test/core_ext/kernel_test.rb
+++ b/activesupport/test/core_ext/kernel_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/core_ext/kernel"
 
diff --git a/activesupport/test/core_ext/load_error_test.rb b/activesupport/test/core_ext/load_error_test.rb
index 44ff6bb051..3d003fd1d5 100644
--- a/activesupport/test/core_ext/load_error_test.rb
+++ b/activesupport/test/core_ext/load_error_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/core_ext/load_error"
 
diff --git a/activesupport/test/core_ext/marshal_test.rb b/activesupport/test/core_ext/marshal_test.rb
index cabeed2fae..d17a6fe7f1 100644
--- a/activesupport/test/core_ext/marshal_test.rb
+++ b/activesupport/test/core_ext/marshal_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/core_ext/marshal"
 require "dependencies_test_helpers"
diff --git a/activesupport/test/core_ext/module/anonymous_test.rb b/activesupport/test/core_ext/module/anonymous_test.rb
index f885444284..d667bc0a34 100644
--- a/activesupport/test/core_ext/module/anonymous_test.rb
+++ b/activesupport/test/core_ext/module/anonymous_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/core_ext/module/anonymous"
 
diff --git a/activesupport/test/core_ext/module/attr_internal_test.rb b/activesupport/test/core_ext/module/attr_internal_test.rb
index 8458e278ee..12dc2f101a 100644
--- a/activesupport/test/core_ext/module/attr_internal_test.rb
+++ b/activesupport/test/core_ext/module/attr_internal_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/core_ext/module/attr_internal"
 
diff --git a/activesupport/test/core_ext/module/attribute_accessor_per_thread_test.rb b/activesupport/test/core_ext/module/attribute_accessor_per_thread_test.rb
index af240bc38d..e8587e3424 100644
--- a/activesupport/test/core_ext/module/attribute_accessor_per_thread_test.rb
+++ b/activesupport/test/core_ext/module/attribute_accessor_per_thread_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/core_ext/module/attribute_accessors_per_thread"
 
diff --git a/activesupport/test/core_ext/module/attribute_accessor_test.rb b/activesupport/test/core_ext/module/attribute_accessor_test.rb
index 9b185e9381..2cf33fcc12 100644
--- a/activesupport/test/core_ext/module/attribute_accessor_test.rb
+++ b/activesupport/test/core_ext/module/attribute_accessor_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/core_ext/module/attribute_accessors"
 
diff --git a/activesupport/test/core_ext/module/attribute_aliasing_test.rb b/activesupport/test/core_ext/module/attribute_aliasing_test.rb
index fdfa868851..9e5edda77a 100644
--- a/activesupport/test/core_ext/module/attribute_aliasing_test.rb
+++ b/activesupport/test/core_ext/module/attribute_aliasing_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/core_ext/module/aliasing"
 
diff --git a/activesupport/test/core_ext/module/concerning_test.rb b/activesupport/test/core_ext/module/concerning_test.rb
index 098036828a..64accc06fc 100644
--- a/activesupport/test/core_ext/module/concerning_test.rb
+++ b/activesupport/test/core_ext/module/concerning_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/core_ext/module/concerning"
 
diff --git a/activesupport/test/core_ext/module/introspection_test.rb b/activesupport/test/core_ext/module/introspection_test.rb
index db383850cd..589c9455ed 100644
--- a/activesupport/test/core_ext/module/introspection_test.rb
+++ b/activesupport/test/core_ext/module/introspection_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/core_ext/module/introspection"
 
diff --git a/activesupport/test/core_ext/module/reachable_test.rb b/activesupport/test/core_ext/module/reachable_test.rb
index 487c7dee16..f8970bc9f4 100644
--- a/activesupport/test/core_ext/module/reachable_test.rb
+++ b/activesupport/test/core_ext/module/reachable_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/core_ext/module/reachable"
 
diff --git a/activesupport/test/core_ext/module/remove_method_test.rb b/activesupport/test/core_ext/module/remove_method_test.rb
index 0c627f1e74..327c66e3ec 100644
--- a/activesupport/test/core_ext/module/remove_method_test.rb
+++ b/activesupport/test/core_ext/module/remove_method_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/core_ext/module/remove_method"
 
diff --git a/activesupport/test/core_ext/module_test.rb b/activesupport/test/core_ext/module_test.rb
index a4d4444d69..b683c4e110 100644
--- a/activesupport/test/core_ext/module_test.rb
+++ b/activesupport/test/core_ext/module_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/core_ext/module"
 
diff --git a/activesupport/test/core_ext/name_error_test.rb b/activesupport/test/core_ext/name_error_test.rb
index fdb9493d3c..a99b20602d 100644
--- a/activesupport/test/core_ext/name_error_test.rb
+++ b/activesupport/test/core_ext/name_error_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/core_ext/name_error"
 
diff --git a/activesupport/test/core_ext/numeric_ext_test.rb b/activesupport/test/core_ext/numeric_ext_test.rb
index 3cfbe6e7e6..d4e03a90a4 100644
--- a/activesupport/test/core_ext/numeric_ext_test.rb
+++ b/activesupport/test/core_ext/numeric_ext_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/time"
 require "active_support/core_ext/numeric"
diff --git a/activesupport/test/core_ext/object/acts_like_test.rb b/activesupport/test/core_ext/object/acts_like_test.rb
index 631f4e63a8..1f1b71f748 100644
--- a/activesupport/test/core_ext/object/acts_like_test.rb
+++ b/activesupport/test/core_ext/object/acts_like_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/core_ext/object"
 
diff --git a/activesupport/test/core_ext/object/blank_test.rb b/activesupport/test/core_ext/object/blank_test.rb
index 7fd3fed042..fbd96893f6 100644
--- a/activesupport/test/core_ext/object/blank_test.rb
+++ b/activesupport/test/core_ext/object/blank_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/core_ext/object/blank"
 
diff --git a/activesupport/test/core_ext/object/deep_dup_test.rb b/activesupport/test/core_ext/object/deep_dup_test.rb
index f247ee16de..d6f0a71c5b 100644
--- a/activesupport/test/core_ext/object/deep_dup_test.rb
+++ b/activesupport/test/core_ext/object/deep_dup_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/core_ext/object"
 
diff --git a/activesupport/test/core_ext/object/duplicable_test.rb b/activesupport/test/core_ext/object/duplicable_test.rb
index 68b0129980..7607e98b0c 100644
--- a/activesupport/test/core_ext/object/duplicable_test.rb
+++ b/activesupport/test/core_ext/object/duplicable_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "abstract_unit"
 require "bigdecimal"
 require "active_support/core_ext/object/duplicable"
diff --git a/activesupport/test/core_ext/object/inclusion_test.rb b/activesupport/test/core_ext/object/inclusion_test.rb
index 955686d6aa..b706e6b90f 100644
--- a/activesupport/test/core_ext/object/inclusion_test.rb
+++ b/activesupport/test/core_ext/object/inclusion_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/core_ext/object/inclusion"
 
diff --git a/activesupport/test/core_ext/object/instance_variables_test.rb b/activesupport/test/core_ext/object/instance_variables_test.rb
index 5bdb2fbc35..df38282fb0 100644
--- a/activesupport/test/core_ext/object/instance_variables_test.rb
+++ b/activesupport/test/core_ext/object/instance_variables_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/core_ext/object"
 
diff --git a/activesupport/test/core_ext/object/json_cherry_pick_test.rb b/activesupport/test/core_ext/object/json_cherry_pick_test.rb
index dd4e90918e..9f3f92a74b 100644
--- a/activesupport/test/core_ext/object/json_cherry_pick_test.rb
+++ b/activesupport/test/core_ext/object/json_cherry_pick_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "abstract_unit"
 
 # These test cases were added to test that cherry-picking the json extensions
diff --git a/activesupport/test/core_ext/object/json_gem_encoding_test.rb b/activesupport/test/core_ext/object/json_gem_encoding_test.rb
index f5016d0c2a..3ff34e448e 100644
--- a/activesupport/test/core_ext/object/json_gem_encoding_test.rb
+++ b/activesupport/test/core_ext/object/json_gem_encoding_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "abstract_unit"
 require "json"
 require "json/encoding_test_cases"
diff --git a/activesupport/test/core_ext/object/to_param_test.rb b/activesupport/test/core_ext/object/to_param_test.rb
index 56246b24f3..e446092abe 100644
--- a/activesupport/test/core_ext/object/to_param_test.rb
+++ b/activesupport/test/core_ext/object/to_param_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/core_ext/object/to_param"
 
diff --git a/activesupport/test/core_ext/object/to_query_test.rb b/activesupport/test/core_ext/object/to_query_test.rb
index 298c8bf373..44147d47cf 100644
--- a/activesupport/test/core_ext/object/to_query_test.rb
+++ b/activesupport/test/core_ext/object/to_query_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/ordered_hash"
 require "active_support/core_ext/object/to_query"
diff --git a/activesupport/test/core_ext/object/try_test.rb b/activesupport/test/core_ext/object/try_test.rb
index 5c8bf59952..fe437f6260 100644
--- a/activesupport/test/core_ext/object/try_test.rb
+++ b/activesupport/test/core_ext/object/try_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/core_ext/object"
 
diff --git a/activesupport/test/core_ext/range_ext_test.rb b/activesupport/test/core_ext/range_ext_test.rb
index d166c7309c..693de2755d 100644
--- a/activesupport/test/core_ext/range_ext_test.rb
+++ b/activesupport/test/core_ext/range_ext_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/time"
 require "active_support/core_ext/numeric"
diff --git a/activesupport/test/core_ext/regexp_ext_test.rb b/activesupport/test/core_ext/regexp_ext_test.rb
index e569a9f234..c937dad1db 100644
--- a/activesupport/test/core_ext/regexp_ext_test.rb
+++ b/activesupport/test/core_ext/regexp_ext_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/core_ext/regexp"
 
diff --git a/activesupport/test/core_ext/secure_random_test.rb b/activesupport/test/core_ext/secure_random_test.rb
index fc25f6ab41..b2ac4640ab 100644
--- a/activesupport/test/core_ext/secure_random_test.rb
+++ b/activesupport/test/core_ext/secure_random_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/core_ext/securerandom"
 
diff --git a/activesupport/test/core_ext/string_ext_test.rb b/activesupport/test/core_ext/string_ext_test.rb
index a98951e889..ed5854b8ff 100644
--- a/activesupport/test/core_ext/string_ext_test.rb
+++ b/activesupport/test/core_ext/string_ext_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "date"
 require "abstract_unit"
 require "timeout"
diff --git a/activesupport/test/core_ext/time_ext_test.rb b/activesupport/test/core_ext/time_ext_test.rb
index 625a5bffb8..f1c6fa4f8c 100644
--- a/activesupport/test/core_ext/time_ext_test.rb
+++ b/activesupport/test/core_ext/time_ext_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/time"
 require "core_ext/date_and_time_behavior"
diff --git a/activesupport/test/core_ext/time_with_zone_test.rb b/activesupport/test/core_ext/time_with_zone_test.rb
index 70ae793cda..9401b9be07 100644
--- a/activesupport/test/core_ext/time_with_zone_test.rb
+++ b/activesupport/test/core_ext/time_with_zone_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/time"
 require "time_zone_test_helpers"
diff --git a/activesupport/test/core_ext/uri_ext_test.rb b/activesupport/test/core_ext/uri_ext_test.rb
index 0f13ca9c0e..555716d1c3 100644
--- a/activesupport/test/core_ext/uri_ext_test.rb
+++ b/activesupport/test/core_ext/uri_ext_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "abstract_unit"
 require "uri"
 require "active_support/core_ext/uri"
-- 
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.
---
 activesupport/test/core_ext/array/access_test.rb                         | 1 -
 activesupport/test/core_ext/array/conversions_test.rb                    | 1 -
 activesupport/test/core_ext/array/extract_options_test.rb                | 1 -
 activesupport/test/core_ext/array/grouping_test.rb                       | 1 -
 activesupport/test/core_ext/array/prepend_append_test.rb                 | 1 -
 activesupport/test/core_ext/array/wrap_test.rb                           | 1 -
 activesupport/test/core_ext/bigdecimal_test.rb                           | 1 -
 activesupport/test/core_ext/class/attribute_test.rb                      | 1 -
 activesupport/test/core_ext/class_test.rb                                | 1 -
 activesupport/test/core_ext/date_and_time_behavior.rb                    | 1 -
 activesupport/test/core_ext/date_and_time_compatibility_test.rb          | 1 -
 activesupport/test/core_ext/date_ext_test.rb                             | 1 -
 activesupport/test/core_ext/date_time_ext_test.rb                        | 1 -
 activesupport/test/core_ext/digest/uuid_test.rb                          | 1 -
 activesupport/test/core_ext/duration_test.rb                             | 1 -
 activesupport/test/core_ext/enumerable_test.rb                           | 1 -
 activesupport/test/core_ext/file_test.rb                                 | 1 -
 activesupport/test/core_ext/hash/transform_keys_test.rb                  | 1 -
 activesupport/test/core_ext/hash/transform_values_test.rb                | 1 -
 activesupport/test/core_ext/hash_ext_test.rb                             | 1 -
 activesupport/test/core_ext/integer_ext_test.rb                          | 1 -
 activesupport/test/core_ext/kernel/concern_test.rb                       | 1 -
 activesupport/test/core_ext/kernel_test.rb                               | 1 -
 activesupport/test/core_ext/load_error_test.rb                           | 1 -
 activesupport/test/core_ext/marshal_test.rb                              | 1 -
 activesupport/test/core_ext/module/anonymous_test.rb                     | 1 -
 activesupport/test/core_ext/module/attr_internal_test.rb                 | 1 -
 activesupport/test/core_ext/module/attribute_accessor_per_thread_test.rb | 1 -
 activesupport/test/core_ext/module/attribute_accessor_test.rb            | 1 -
 activesupport/test/core_ext/module/attribute_aliasing_test.rb            | 1 -
 activesupport/test/core_ext/module/concerning_test.rb                    | 1 -
 activesupport/test/core_ext/module/introspection_test.rb                 | 1 -
 activesupport/test/core_ext/module/reachable_test.rb                     | 1 -
 activesupport/test/core_ext/module/remove_method_test.rb                 | 1 -
 activesupport/test/core_ext/module_test.rb                               | 1 -
 activesupport/test/core_ext/name_error_test.rb                           | 1 -
 activesupport/test/core_ext/numeric_ext_test.rb                          | 1 -
 activesupport/test/core_ext/object/acts_like_test.rb                     | 1 -
 activesupport/test/core_ext/object/blank_test.rb                         | 1 -
 activesupport/test/core_ext/object/deep_dup_test.rb                      | 1 -
 activesupport/test/core_ext/object/duplicable_test.rb                    | 1 -
 activesupport/test/core_ext/object/inclusion_test.rb                     | 1 -
 activesupport/test/core_ext/object/instance_variables_test.rb            | 1 -
 activesupport/test/core_ext/object/json_cherry_pick_test.rb              | 1 -
 activesupport/test/core_ext/object/json_gem_encoding_test.rb             | 1 -
 activesupport/test/core_ext/object/to_param_test.rb                      | 1 -
 activesupport/test/core_ext/object/to_query_test.rb                      | 1 -
 activesupport/test/core_ext/object/try_test.rb                           | 1 -
 activesupport/test/core_ext/range_ext_test.rb                            | 1 -
 activesupport/test/core_ext/regexp_ext_test.rb                           | 1 -
 activesupport/test/core_ext/secure_random_test.rb                        | 1 -
 activesupport/test/core_ext/string_ext_test.rb                           | 1 -
 activesupport/test/core_ext/time_ext_test.rb                             | 1 -
 activesupport/test/core_ext/time_with_zone_test.rb                       | 1 -
 activesupport/test/core_ext/uri_ext_test.rb                              | 1 -
 55 files changed, 55 deletions(-)

(limited to 'activesupport/test/core_ext')

diff --git a/activesupport/test/core_ext/array/access_test.rb b/activesupport/test/core_ext/array/access_test.rb
index 08af9e1b55..a38ea36d00 100644
--- a/activesupport/test/core_ext/array/access_test.rb
+++ b/activesupport/test/core_ext/array/access_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/core_ext/array"
 
diff --git a/activesupport/test/core_ext/array/conversions_test.rb b/activesupport/test/core_ext/array/conversions_test.rb
index 33d051c514..29e661a99b 100644
--- a/activesupport/test/core_ext/array/conversions_test.rb
+++ b/activesupport/test/core_ext/array/conversions_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/core_ext/array"
 require "active_support/core_ext/big_decimal"
diff --git a/activesupport/test/core_ext/array/extract_options_test.rb b/activesupport/test/core_ext/array/extract_options_test.rb
index 09bf97ae6c..1651bee0f6 100644
--- a/activesupport/test/core_ext/array/extract_options_test.rb
+++ b/activesupport/test/core_ext/array/extract_options_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/core_ext/array"
 require "active_support/core_ext/hash"
diff --git a/activesupport/test/core_ext/array/grouping_test.rb b/activesupport/test/core_ext/array/grouping_test.rb
index daf47e9a9f..4c6aadba8c 100644
--- a/activesupport/test/core_ext/array/grouping_test.rb
+++ b/activesupport/test/core_ext/array/grouping_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/core_ext/array"
 
diff --git a/activesupport/test/core_ext/array/prepend_append_test.rb b/activesupport/test/core_ext/array/prepend_append_test.rb
index 3b38acf56c..763e26191d 100644
--- a/activesupport/test/core_ext/array/prepend_append_test.rb
+++ b/activesupport/test/core_ext/array/prepend_append_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/core_ext/array"
 
diff --git a/activesupport/test/core_ext/array/wrap_test.rb b/activesupport/test/core_ext/array/wrap_test.rb
index 451f9db2ed..ae846cb3f2 100644
--- a/activesupport/test/core_ext/array/wrap_test.rb
+++ b/activesupport/test/core_ext/array/wrap_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/core_ext/array"
 
diff --git a/activesupport/test/core_ext/bigdecimal_test.rb b/activesupport/test/core_ext/bigdecimal_test.rb
index dbd0762574..43b659546f 100644
--- a/activesupport/test/core_ext/bigdecimal_test.rb
+++ b/activesupport/test/core_ext/bigdecimal_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/core_ext/big_decimal"
 
diff --git a/activesupport/test/core_ext/class/attribute_test.rb b/activesupport/test/core_ext/class/attribute_test.rb
index 2933b62c58..f16043c612 100644
--- a/activesupport/test/core_ext/class/attribute_test.rb
+++ b/activesupport/test/core_ext/class/attribute_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/core_ext/class/attribute"
 
diff --git a/activesupport/test/core_ext/class_test.rb b/activesupport/test/core_ext/class_test.rb
index c0cabea8fd..a7905196ae 100644
--- a/activesupport/test/core_ext/class_test.rb
+++ b/activesupport/test/core_ext/class_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/core_ext/class"
 require "set"
diff --git a/activesupport/test/core_ext/date_and_time_behavior.rb b/activesupport/test/core_ext/date_and_time_behavior.rb
index 8d908968ef..6c77e8f313 100644
--- a/activesupport/test/core_ext/date_and_time_behavior.rb
+++ b/activesupport/test/core_ext/date_and_time_behavior.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 
 module DateAndTimeBehavior
diff --git a/activesupport/test/core_ext/date_and_time_compatibility_test.rb b/activesupport/test/core_ext/date_and_time_compatibility_test.rb
index 04b93105d5..6c6205a4d2 100644
--- a/activesupport/test/core_ext/date_and_time_compatibility_test.rb
+++ b/activesupport/test/core_ext/date_and_time_compatibility_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/time"
 require "time_zone_test_helpers"
diff --git a/activesupport/test/core_ext/date_ext_test.rb b/activesupport/test/core_ext/date_ext_test.rb
index 7c6e705936..50bb1004f7 100644
--- a/activesupport/test/core_ext/date_ext_test.rb
+++ b/activesupport/test/core_ext/date_ext_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/time"
 require "core_ext/date_and_time_behavior"
diff --git a/activesupport/test/core_ext/date_time_ext_test.rb b/activesupport/test/core_ext/date_time_ext_test.rb
index beddfe4584..276fa2bfd3 100644
--- a/activesupport/test/core_ext/date_time_ext_test.rb
+++ b/activesupport/test/core_ext/date_time_ext_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/time"
 require "core_ext/date_and_time_behavior"
diff --git a/activesupport/test/core_ext/digest/uuid_test.rb b/activesupport/test/core_ext/digest/uuid_test.rb
index ea3605bf9c..866a03259a 100644
--- a/activesupport/test/core_ext/digest/uuid_test.rb
+++ b/activesupport/test/core_ext/digest/uuid_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/core_ext/digest/uuid"
 
diff --git a/activesupport/test/core_ext/duration_test.rb b/activesupport/test/core_ext/duration_test.rb
index 32c0ce4317..cd1b505c34 100644
--- a/activesupport/test/core_ext/duration_test.rb
+++ b/activesupport/test/core_ext/duration_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/inflector"
 require "active_support/time"
diff --git a/activesupport/test/core_ext/enumerable_test.rb b/activesupport/test/core_ext/enumerable_test.rb
index 3259109b0e..0b345ecf0f 100644
--- a/activesupport/test/core_ext/enumerable_test.rb
+++ b/activesupport/test/core_ext/enumerable_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/core_ext/array"
 require "active_support/core_ext/enumerable"
diff --git a/activesupport/test/core_ext/file_test.rb b/activesupport/test/core_ext/file_test.rb
index 67b1a04429..df5d09acd0 100644
--- a/activesupport/test/core_ext/file_test.rb
+++ b/activesupport/test/core_ext/file_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/core_ext/file"
 
diff --git a/activesupport/test/core_ext/hash/transform_keys_test.rb b/activesupport/test/core_ext/hash/transform_keys_test.rb
index f329246bdd..7a11d827f8 100644
--- a/activesupport/test/core_ext/hash/transform_keys_test.rb
+++ b/activesupport/test/core_ext/hash/transform_keys_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/core_ext/hash/keys"
 
diff --git a/activesupport/test/core_ext/hash/transform_values_test.rb b/activesupport/test/core_ext/hash/transform_values_test.rb
index 4eb6999510..f2ac4ce6ce 100644
--- a/activesupport/test/core_ext/hash/transform_values_test.rb
+++ b/activesupport/test/core_ext/hash/transform_values_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/core_ext/hash/indifferent_access"
 require "active_support/core_ext/hash/transform_values"
diff --git a/activesupport/test/core_ext/hash_ext_test.rb b/activesupport/test/core_ext/hash_ext_test.rb
index c533c002a4..18da5fcf5f 100644
--- a/activesupport/test/core_ext/hash_ext_test.rb
+++ b/activesupport/test/core_ext/hash_ext_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/core_ext/hash"
 require "bigdecimal"
diff --git a/activesupport/test/core_ext/integer_ext_test.rb b/activesupport/test/core_ext/integer_ext_test.rb
index a7ea084e7f..137e8ce85f 100644
--- a/activesupport/test/core_ext/integer_ext_test.rb
+++ b/activesupport/test/core_ext/integer_ext_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/core_ext/integer"
 
diff --git a/activesupport/test/core_ext/kernel/concern_test.rb b/activesupport/test/core_ext/kernel/concern_test.rb
index 1f4fb8029c..e7e4f99d7e 100644
--- a/activesupport/test/core_ext/kernel/concern_test.rb
+++ b/activesupport/test/core_ext/kernel/concern_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/core_ext/kernel/concern"
 
diff --git a/activesupport/test/core_ext/kernel_test.rb b/activesupport/test/core_ext/kernel_test.rb
index 875598f611..26f5088ede 100644
--- a/activesupport/test/core_ext/kernel_test.rb
+++ b/activesupport/test/core_ext/kernel_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/core_ext/kernel"
 
diff --git a/activesupport/test/core_ext/load_error_test.rb b/activesupport/test/core_ext/load_error_test.rb
index 3d003fd1d5..44ff6bb051 100644
--- a/activesupport/test/core_ext/load_error_test.rb
+++ b/activesupport/test/core_ext/load_error_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/core_ext/load_error"
 
diff --git a/activesupport/test/core_ext/marshal_test.rb b/activesupport/test/core_ext/marshal_test.rb
index d17a6fe7f1..cabeed2fae 100644
--- a/activesupport/test/core_ext/marshal_test.rb
+++ b/activesupport/test/core_ext/marshal_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/core_ext/marshal"
 require "dependencies_test_helpers"
diff --git a/activesupport/test/core_ext/module/anonymous_test.rb b/activesupport/test/core_ext/module/anonymous_test.rb
index d667bc0a34..f885444284 100644
--- a/activesupport/test/core_ext/module/anonymous_test.rb
+++ b/activesupport/test/core_ext/module/anonymous_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/core_ext/module/anonymous"
 
diff --git a/activesupport/test/core_ext/module/attr_internal_test.rb b/activesupport/test/core_ext/module/attr_internal_test.rb
index 12dc2f101a..8458e278ee 100644
--- a/activesupport/test/core_ext/module/attr_internal_test.rb
+++ b/activesupport/test/core_ext/module/attr_internal_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/core_ext/module/attr_internal"
 
diff --git a/activesupport/test/core_ext/module/attribute_accessor_per_thread_test.rb b/activesupport/test/core_ext/module/attribute_accessor_per_thread_test.rb
index e8587e3424..af240bc38d 100644
--- a/activesupport/test/core_ext/module/attribute_accessor_per_thread_test.rb
+++ b/activesupport/test/core_ext/module/attribute_accessor_per_thread_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/core_ext/module/attribute_accessors_per_thread"
 
diff --git a/activesupport/test/core_ext/module/attribute_accessor_test.rb b/activesupport/test/core_ext/module/attribute_accessor_test.rb
index 2cf33fcc12..9b185e9381 100644
--- a/activesupport/test/core_ext/module/attribute_accessor_test.rb
+++ b/activesupport/test/core_ext/module/attribute_accessor_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/core_ext/module/attribute_accessors"
 
diff --git a/activesupport/test/core_ext/module/attribute_aliasing_test.rb b/activesupport/test/core_ext/module/attribute_aliasing_test.rb
index 9e5edda77a..fdfa868851 100644
--- a/activesupport/test/core_ext/module/attribute_aliasing_test.rb
+++ b/activesupport/test/core_ext/module/attribute_aliasing_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/core_ext/module/aliasing"
 
diff --git a/activesupport/test/core_ext/module/concerning_test.rb b/activesupport/test/core_ext/module/concerning_test.rb
index 64accc06fc..098036828a 100644
--- a/activesupport/test/core_ext/module/concerning_test.rb
+++ b/activesupport/test/core_ext/module/concerning_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/core_ext/module/concerning"
 
diff --git a/activesupport/test/core_ext/module/introspection_test.rb b/activesupport/test/core_ext/module/introspection_test.rb
index 589c9455ed..db383850cd 100644
--- a/activesupport/test/core_ext/module/introspection_test.rb
+++ b/activesupport/test/core_ext/module/introspection_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/core_ext/module/introspection"
 
diff --git a/activesupport/test/core_ext/module/reachable_test.rb b/activesupport/test/core_ext/module/reachable_test.rb
index f8970bc9f4..487c7dee16 100644
--- a/activesupport/test/core_ext/module/reachable_test.rb
+++ b/activesupport/test/core_ext/module/reachable_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/core_ext/module/reachable"
 
diff --git a/activesupport/test/core_ext/module/remove_method_test.rb b/activesupport/test/core_ext/module/remove_method_test.rb
index 327c66e3ec..0c627f1e74 100644
--- a/activesupport/test/core_ext/module/remove_method_test.rb
+++ b/activesupport/test/core_ext/module/remove_method_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/core_ext/module/remove_method"
 
diff --git a/activesupport/test/core_ext/module_test.rb b/activesupport/test/core_ext/module_test.rb
index b683c4e110..a4d4444d69 100644
--- a/activesupport/test/core_ext/module_test.rb
+++ b/activesupport/test/core_ext/module_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/core_ext/module"
 
diff --git a/activesupport/test/core_ext/name_error_test.rb b/activesupport/test/core_ext/name_error_test.rb
index a99b20602d..fdb9493d3c 100644
--- a/activesupport/test/core_ext/name_error_test.rb
+++ b/activesupport/test/core_ext/name_error_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/core_ext/name_error"
 
diff --git a/activesupport/test/core_ext/numeric_ext_test.rb b/activesupport/test/core_ext/numeric_ext_test.rb
index d4e03a90a4..3cfbe6e7e6 100644
--- a/activesupport/test/core_ext/numeric_ext_test.rb
+++ b/activesupport/test/core_ext/numeric_ext_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/time"
 require "active_support/core_ext/numeric"
diff --git a/activesupport/test/core_ext/object/acts_like_test.rb b/activesupport/test/core_ext/object/acts_like_test.rb
index 1f1b71f748..631f4e63a8 100644
--- a/activesupport/test/core_ext/object/acts_like_test.rb
+++ b/activesupport/test/core_ext/object/acts_like_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/core_ext/object"
 
diff --git a/activesupport/test/core_ext/object/blank_test.rb b/activesupport/test/core_ext/object/blank_test.rb
index fbd96893f6..7fd3fed042 100644
--- a/activesupport/test/core_ext/object/blank_test.rb
+++ b/activesupport/test/core_ext/object/blank_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/core_ext/object/blank"
 
diff --git a/activesupport/test/core_ext/object/deep_dup_test.rb b/activesupport/test/core_ext/object/deep_dup_test.rb
index d6f0a71c5b..f247ee16de 100644
--- a/activesupport/test/core_ext/object/deep_dup_test.rb
+++ b/activesupport/test/core_ext/object/deep_dup_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/core_ext/object"
 
diff --git a/activesupport/test/core_ext/object/duplicable_test.rb b/activesupport/test/core_ext/object/duplicable_test.rb
index 7607e98b0c..68b0129980 100644
--- a/activesupport/test/core_ext/object/duplicable_test.rb
+++ b/activesupport/test/core_ext/object/duplicable_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 require "bigdecimal"
 require "active_support/core_ext/object/duplicable"
diff --git a/activesupport/test/core_ext/object/inclusion_test.rb b/activesupport/test/core_ext/object/inclusion_test.rb
index b706e6b90f..955686d6aa 100644
--- a/activesupport/test/core_ext/object/inclusion_test.rb
+++ b/activesupport/test/core_ext/object/inclusion_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/core_ext/object/inclusion"
 
diff --git a/activesupport/test/core_ext/object/instance_variables_test.rb b/activesupport/test/core_ext/object/instance_variables_test.rb
index df38282fb0..5bdb2fbc35 100644
--- a/activesupport/test/core_ext/object/instance_variables_test.rb
+++ b/activesupport/test/core_ext/object/instance_variables_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/core_ext/object"
 
diff --git a/activesupport/test/core_ext/object/json_cherry_pick_test.rb b/activesupport/test/core_ext/object/json_cherry_pick_test.rb
index 9f3f92a74b..dd4e90918e 100644
--- a/activesupport/test/core_ext/object/json_cherry_pick_test.rb
+++ b/activesupport/test/core_ext/object/json_cherry_pick_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 
 # These test cases were added to test that cherry-picking the json extensions
diff --git a/activesupport/test/core_ext/object/json_gem_encoding_test.rb b/activesupport/test/core_ext/object/json_gem_encoding_test.rb
index 3ff34e448e..f5016d0c2a 100644
--- a/activesupport/test/core_ext/object/json_gem_encoding_test.rb
+++ b/activesupport/test/core_ext/object/json_gem_encoding_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 require "json"
 require "json/encoding_test_cases"
diff --git a/activesupport/test/core_ext/object/to_param_test.rb b/activesupport/test/core_ext/object/to_param_test.rb
index e446092abe..56246b24f3 100644
--- a/activesupport/test/core_ext/object/to_param_test.rb
+++ b/activesupport/test/core_ext/object/to_param_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/core_ext/object/to_param"
 
diff --git a/activesupport/test/core_ext/object/to_query_test.rb b/activesupport/test/core_ext/object/to_query_test.rb
index 44147d47cf..298c8bf373 100644
--- a/activesupport/test/core_ext/object/to_query_test.rb
+++ b/activesupport/test/core_ext/object/to_query_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/ordered_hash"
 require "active_support/core_ext/object/to_query"
diff --git a/activesupport/test/core_ext/object/try_test.rb b/activesupport/test/core_ext/object/try_test.rb
index fe437f6260..5c8bf59952 100644
--- a/activesupport/test/core_ext/object/try_test.rb
+++ b/activesupport/test/core_ext/object/try_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/core_ext/object"
 
diff --git a/activesupport/test/core_ext/range_ext_test.rb b/activesupport/test/core_ext/range_ext_test.rb
index 693de2755d..d166c7309c 100644
--- a/activesupport/test/core_ext/range_ext_test.rb
+++ b/activesupport/test/core_ext/range_ext_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/time"
 require "active_support/core_ext/numeric"
diff --git a/activesupport/test/core_ext/regexp_ext_test.rb b/activesupport/test/core_ext/regexp_ext_test.rb
index c937dad1db..e569a9f234 100644
--- a/activesupport/test/core_ext/regexp_ext_test.rb
+++ b/activesupport/test/core_ext/regexp_ext_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/core_ext/regexp"
 
diff --git a/activesupport/test/core_ext/secure_random_test.rb b/activesupport/test/core_ext/secure_random_test.rb
index b2ac4640ab..fc25f6ab41 100644
--- a/activesupport/test/core_ext/secure_random_test.rb
+++ b/activesupport/test/core_ext/secure_random_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/core_ext/securerandom"
 
diff --git a/activesupport/test/core_ext/string_ext_test.rb b/activesupport/test/core_ext/string_ext_test.rb
index defec8bba0..daa8c3f2ef 100644
--- a/activesupport/test/core_ext/string_ext_test.rb
+++ b/activesupport/test/core_ext/string_ext_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "date"
 require "abstract_unit"
 require "timeout"
diff --git a/activesupport/test/core_ext/time_ext_test.rb b/activesupport/test/core_ext/time_ext_test.rb
index f1c6fa4f8c..625a5bffb8 100644
--- a/activesupport/test/core_ext/time_ext_test.rb
+++ b/activesupport/test/core_ext/time_ext_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/time"
 require "core_ext/date_and_time_behavior"
diff --git a/activesupport/test/core_ext/time_with_zone_test.rb b/activesupport/test/core_ext/time_with_zone_test.rb
index 9401b9be07..70ae793cda 100644
--- a/activesupport/test/core_ext/time_with_zone_test.rb
+++ b/activesupport/test/core_ext/time_with_zone_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/time"
 require "time_zone_test_helpers"
diff --git a/activesupport/test/core_ext/uri_ext_test.rb b/activesupport/test/core_ext/uri_ext_test.rb
index 555716d1c3..0f13ca9c0e 100644
--- a/activesupport/test/core_ext/uri_ext_test.rb
+++ b/activesupport/test/core_ext/uri_ext_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 require "uri"
 require "active_support/core_ext/uri"
-- 
cgit v1.2.3


From 6642b112cd7cbff690a003db9e4fb0704e659b6d Mon Sep 17 00:00:00 2001
From: Akira Matsuda <ronnie@dio.jp>
Date: Sun, 2 Jul 2017 22:47:11 +0900
Subject: Expectation first

---
 activesupport/test/core_ext/array/conversions_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'activesupport/test/core_ext')

diff --git a/activesupport/test/core_ext/array/conversions_test.rb b/activesupport/test/core_ext/array/conversions_test.rb
index 29e661a99b..bbe81ae70c 100644
--- a/activesupport/test/core_ext/array/conversions_test.rb
+++ b/activesupport/test/core_ext/array/conversions_test.rb
@@ -58,7 +58,7 @@ class ToSentenceTest < ActiveSupport::TestCase
       ["one", "two"].to_sentence(passing: "invalid option")
     end
 
-    assert_equal exception.message, "Unknown key: :passing. Valid keys are: :words_connector, :two_words_connector, :last_word_connector, :locale"
+    assert_equal "Unknown key: :passing. Valid keys are: :words_connector, :two_words_connector, :last_word_connector, :locale", exception.message
   end
 
   def test_always_returns_string
-- 
cgit v1.2.3