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.
---
 activemodel/test/cases/attribute_assignment_test.rb                      | 1 -
 activemodel/test/cases/attribute_methods_test.rb                         | 1 -
 activemodel/test/cases/callbacks_test.rb                                 | 1 -
 activemodel/test/cases/conversion_test.rb                                | 1 -
 activemodel/test/cases/dirty_test.rb                                     | 1 -
 activemodel/test/cases/errors_test.rb                                    | 1 -
 activemodel/test/cases/forbidden_attributes_protection_test.rb           | 1 -
 activemodel/test/cases/helper.rb                                         | 1 -
 activemodel/test/cases/lint_test.rb                                      | 1 -
 activemodel/test/cases/model_test.rb                                     | 1 -
 activemodel/test/cases/naming_test.rb                                    | 1 -
 activemodel/test/cases/railtie_test.rb                                   | 1 -
 activemodel/test/cases/secure_password_test.rb                           | 1 -
 activemodel/test/cases/serialization_test.rb                             | 1 -
 activemodel/test/cases/serializers/json_serialization_test.rb            | 1 -
 activemodel/test/cases/translation_test.rb                               | 1 -
 activemodel/test/cases/type/big_integer_test.rb                          | 1 -
 activemodel/test/cases/type/binary_test.rb                               | 1 -
 activemodel/test/cases/type/boolean_test.rb                              | 1 -
 activemodel/test/cases/type/date_test.rb                                 | 1 -
 activemodel/test/cases/type/date_time_test.rb                            | 1 -
 activemodel/test/cases/type/decimal_test.rb                              | 1 -
 activemodel/test/cases/type/float_test.rb                                | 1 -
 activemodel/test/cases/type/immutable_string_test.rb                     | 1 -
 activemodel/test/cases/type/integer_test.rb                              | 1 -
 activemodel/test/cases/type/registry_test.rb                             | 1 -
 activemodel/test/cases/type/string_test.rb                               | 1 -
 activemodel/test/cases/type/time_test.rb                                 | 1 -
 activemodel/test/cases/type/value_test.rb                                | 1 -
 activemodel/test/cases/validations/absence_validation_test.rb            | 1 -
 activemodel/test/cases/validations/acceptance_validation_test.rb         | 1 -
 activemodel/test/cases/validations/callbacks_test.rb                     | 1 -
 activemodel/test/cases/validations/conditional_validation_test.rb        | 1 -
 activemodel/test/cases/validations/confirmation_validation_test.rb       | 1 -
 activemodel/test/cases/validations/exclusion_validation_test.rb          | 1 -
 activemodel/test/cases/validations/format_validation_test.rb             | 1 -
 .../test/cases/validations/i18n_generate_message_validation_test.rb      | 1 -
 activemodel/test/cases/validations/i18n_validation_test.rb               | 1 -
 activemodel/test/cases/validations/inclusion_validation_test.rb          | 1 -
 activemodel/test/cases/validations/length_validation_test.rb             | 1 -
 activemodel/test/cases/validations/numericality_validation_test.rb       | 1 -
 activemodel/test/cases/validations/presence_validation_test.rb           | 1 -
 activemodel/test/cases/validations/validates_test.rb                     | 1 -
 activemodel/test/cases/validations/validations_context_test.rb           | 1 -
 activemodel/test/cases/validations/with_validation_test.rb               | 1 -
 activemodel/test/cases/validations_test.rb                               | 1 -
 activemodel/test/models/account.rb                                       | 1 -
 activemodel/test/models/blog_post.rb                                     | 1 -
 activemodel/test/models/contact.rb                                       | 1 -
 activemodel/test/models/custom_reader.rb                                 | 1 -
 activemodel/test/models/helicopter.rb                                    | 1 -
 activemodel/test/models/person.rb                                        | 1 -
 activemodel/test/models/person_with_validator.rb                         | 1 -
 activemodel/test/models/reply.rb                                         | 1 -
 activemodel/test/models/sheep.rb                                         | 1 -
 activemodel/test/models/topic.rb                                         | 1 -
 activemodel/test/models/track_back.rb                                    | 1 -
 activemodel/test/models/user.rb                                          | 1 -
 activemodel/test/models/visitor.rb                                       | 1 -
 activemodel/test/validators/email_validator.rb                           | 1 -
 activemodel/test/validators/namespace/email_validator.rb                 | 1 -
 61 files changed, 61 deletions(-)

(limited to 'activemodel/test')

diff --git a/activemodel/test/cases/attribute_assignment_test.rb b/activemodel/test/cases/attribute_assignment_test.rb
index 5ec55676da..fa41d1b95f 100644
--- a/activemodel/test/cases/attribute_assignment_test.rb
+++ b/activemodel/test/cases/attribute_assignment_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "cases/helper"
 require "active_support/core_ext/hash/indifferent_access"
 require "active_support/hash_with_indifferent_access"
diff --git a/activemodel/test/cases/attribute_methods_test.rb b/activemodel/test/cases/attribute_methods_test.rb
index 4b03c581e9..4767accb7c 100644
--- a/activemodel/test/cases/attribute_methods_test.rb
+++ b/activemodel/test/cases/attribute_methods_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "cases/helper"
 
 class ModelWithAttributes
diff --git a/activemodel/test/cases/callbacks_test.rb b/activemodel/test/cases/callbacks_test.rb
index f236cb3997..f85cd7dec4 100644
--- a/activemodel/test/cases/callbacks_test.rb
+++ b/activemodel/test/cases/callbacks_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "cases/helper"
 
 class CallbacksTest < ActiveModel::TestCase
diff --git a/activemodel/test/cases/conversion_test.rb b/activemodel/test/cases/conversion_test.rb
index 145a7b4e7f..4a93347abc 100644
--- a/activemodel/test/cases/conversion_test.rb
+++ b/activemodel/test/cases/conversion_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "cases/helper"
 require "models/contact"
 require "models/helicopter"
diff --git a/activemodel/test/cases/dirty_test.rb b/activemodel/test/cases/dirty_test.rb
index 18d2db7edf..0242b96083 100644
--- a/activemodel/test/cases/dirty_test.rb
+++ b/activemodel/test/cases/dirty_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "cases/helper"
 
 class DirtyTest < ActiveModel::TestCase
diff --git a/activemodel/test/cases/errors_test.rb b/activemodel/test/cases/errors_test.rb
index 790113331d..43aee5a814 100644
--- a/activemodel/test/cases/errors_test.rb
+++ b/activemodel/test/cases/errors_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "cases/helper"
 require "active_support/core_ext/string/strip"
 require "yaml"
diff --git a/activemodel/test/cases/forbidden_attributes_protection_test.rb b/activemodel/test/cases/forbidden_attributes_protection_test.rb
index b2211b069c..d8cc72e662 100644
--- a/activemodel/test/cases/forbidden_attributes_protection_test.rb
+++ b/activemodel/test/cases/forbidden_attributes_protection_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "cases/helper"
 require "active_support/core_ext/hash/indifferent_access"
 require "models/account"
diff --git a/activemodel/test/cases/helper.rb b/activemodel/test/cases/helper.rb
index be0817624c..eeb5c85a48 100644
--- a/activemodel/test/cases/helper.rb
+++ b/activemodel/test/cases/helper.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "active_model"
 
 # Show backtraces for deprecated behavior for quicker cleanup.
diff --git a/activemodel/test/cases/lint_test.rb b/activemodel/test/cases/lint_test.rb
index 29443f212f..7a817d7c01 100644
--- a/activemodel/test/cases/lint_test.rb
+++ b/activemodel/test/cases/lint_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "cases/helper"
 
 class LintTest < ActiveModel::TestCase
diff --git a/activemodel/test/cases/model_test.rb b/activemodel/test/cases/model_test.rb
index 593077a768..ba87cd1506 100644
--- a/activemodel/test/cases/model_test.rb
+++ b/activemodel/test/cases/model_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "cases/helper"
 
 class ModelTest < ActiveModel::TestCase
diff --git a/activemodel/test/cases/naming_test.rb b/activemodel/test/cases/naming_test.rb
index 068cb93762..d5cb1a62bc 100644
--- a/activemodel/test/cases/naming_test.rb
+++ b/activemodel/test/cases/naming_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "cases/helper"
 require "models/contact"
 require "models/sheep"
diff --git a/activemodel/test/cases/railtie_test.rb b/activemodel/test/cases/railtie_test.rb
index faace1be85..a56b26b5ee 100644
--- a/activemodel/test/cases/railtie_test.rb
+++ b/activemodel/test/cases/railtie_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "cases/helper"
 require "active_support/testing/isolation"
 
diff --git a/activemodel/test/cases/secure_password_test.rb b/activemodel/test/cases/secure_password_test.rb
index 92368a5512..77ce86f392 100644
--- a/activemodel/test/cases/secure_password_test.rb
+++ b/activemodel/test/cases/secure_password_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "cases/helper"
 require "models/user"
 require "models/visitor"
diff --git a/activemodel/test/cases/serialization_test.rb b/activemodel/test/cases/serialization_test.rb
index 8611dcbf0b..f78efd2f0c 100644
--- a/activemodel/test/cases/serialization_test.rb
+++ b/activemodel/test/cases/serialization_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "cases/helper"
 require "active_support/core_ext/object/instance_variables"
 
diff --git a/activemodel/test/cases/serializers/json_serialization_test.rb b/activemodel/test/cases/serializers/json_serialization_test.rb
index c6981e86e1..d15ba64eb0 100644
--- a/activemodel/test/cases/serializers/json_serialization_test.rb
+++ b/activemodel/test/cases/serializers/json_serialization_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "cases/helper"
 require "models/contact"
 require "active_support/core_ext/object/instance_variables"
diff --git a/activemodel/test/cases/translation_test.rb b/activemodel/test/cases/translation_test.rb
index aa2c41849d..9972f9daea 100644
--- a/activemodel/test/cases/translation_test.rb
+++ b/activemodel/test/cases/translation_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "cases/helper"
 require "models/person"
 
diff --git a/activemodel/test/cases/type/big_integer_test.rb b/activemodel/test/cases/type/big_integer_test.rb
index fba019c01f..56002b7cc6 100644
--- a/activemodel/test/cases/type/big_integer_test.rb
+++ b/activemodel/test/cases/type/big_integer_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "cases/helper"
 require "active_model/type"
 
diff --git a/activemodel/test/cases/type/binary_test.rb b/activemodel/test/cases/type/binary_test.rb
index b0ae5c3423..e9c2ccfca4 100644
--- a/activemodel/test/cases/type/binary_test.rb
+++ b/activemodel/test/cases/type/binary_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "cases/helper"
 require "active_model/type"
 
diff --git a/activemodel/test/cases/type/boolean_test.rb b/activemodel/test/cases/type/boolean_test.rb
index e8ed904c75..92e5aebfb7 100644
--- a/activemodel/test/cases/type/boolean_test.rb
+++ b/activemodel/test/cases/type/boolean_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "cases/helper"
 require "active_model/type"
 
diff --git a/activemodel/test/cases/type/date_test.rb b/activemodel/test/cases/type/date_test.rb
index ef21e52361..0cc90e99d3 100644
--- a/activemodel/test/cases/type/date_test.rb
+++ b/activemodel/test/cases/type/date_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "cases/helper"
 require "active_model/type"
 
diff --git a/activemodel/test/cases/type/date_time_test.rb b/activemodel/test/cases/type/date_time_test.rb
index fd717d8793..75a7fc686e 100644
--- a/activemodel/test/cases/type/date_time_test.rb
+++ b/activemodel/test/cases/type/date_time_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "cases/helper"
 require "active_model/type"
 
diff --git a/activemodel/test/cases/type/decimal_test.rb b/activemodel/test/cases/type/decimal_test.rb
index 18b1e60127..c3b43725cc 100644
--- a/activemodel/test/cases/type/decimal_test.rb
+++ b/activemodel/test/cases/type/decimal_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "cases/helper"
 require "active_model/type"
 
diff --git a/activemodel/test/cases/type/float_test.rb b/activemodel/test/cases/type/float_test.rb
index 594a7fc668..8026d63ad5 100644
--- a/activemodel/test/cases/type/float_test.rb
+++ b/activemodel/test/cases/type/float_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "cases/helper"
 require "active_model/type"
 
diff --git a/activemodel/test/cases/type/immutable_string_test.rb b/activemodel/test/cases/type/immutable_string_test.rb
index 5b2830d4a4..23e58974fb 100644
--- a/activemodel/test/cases/type/immutable_string_test.rb
+++ b/activemodel/test/cases/type/immutable_string_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "cases/helper"
 require "active_model/type"
 
diff --git a/activemodel/test/cases/type/integer_test.rb b/activemodel/test/cases/type/integer_test.rb
index 67ee6307ea..a91144036b 100644
--- a/activemodel/test/cases/type/integer_test.rb
+++ b/activemodel/test/cases/type/integer_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "cases/helper"
 require "active_model/type"
 require "active_support/core_ext/numeric/time"
diff --git a/activemodel/test/cases/type/registry_test.rb b/activemodel/test/cases/type/registry_test.rb
index b2901253a5..927b6d0307 100644
--- a/activemodel/test/cases/type/registry_test.rb
+++ b/activemodel/test/cases/type/registry_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "cases/helper"
 require "active_model/type"
 
diff --git a/activemodel/test/cases/type/string_test.rb b/activemodel/test/cases/type/string_test.rb
index 9c604bcec2..5bf9fc3527 100644
--- a/activemodel/test/cases/type/string_test.rb
+++ b/activemodel/test/cases/type/string_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "cases/helper"
 require "active_model/type"
 
diff --git a/activemodel/test/cases/type/time_test.rb b/activemodel/test/cases/type/time_test.rb
index aa114fc911..0cc4d33caa 100644
--- a/activemodel/test/cases/type/time_test.rb
+++ b/activemodel/test/cases/type/time_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "cases/helper"
 require "active_model/type"
 
diff --git a/activemodel/test/cases/type/value_test.rb b/activemodel/test/cases/type/value_test.rb
index d294e86ef9..d8b3e7f164 100644
--- a/activemodel/test/cases/type/value_test.rb
+++ b/activemodel/test/cases/type/value_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "cases/helper"
 require "active_model/type"
 
diff --git a/activemodel/test/cases/validations/absence_validation_test.rb b/activemodel/test/cases/validations/absence_validation_test.rb
index 10a42fba59..833f694c5a 100644
--- a/activemodel/test/cases/validations/absence_validation_test.rb
+++ b/activemodel/test/cases/validations/absence_validation_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "cases/helper"
 require "models/topic"
 require "models/person"
diff --git a/activemodel/test/cases/validations/acceptance_validation_test.rb b/activemodel/test/cases/validations/acceptance_validation_test.rb
index 78619abdb8..fbd994e914 100644
--- a/activemodel/test/cases/validations/acceptance_validation_test.rb
+++ b/activemodel/test/cases/validations/acceptance_validation_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "cases/helper"
 
 require "models/topic"
diff --git a/activemodel/test/cases/validations/callbacks_test.rb b/activemodel/test/cases/validations/callbacks_test.rb
index 9ef59b917a..f2e4a5946d 100644
--- a/activemodel/test/cases/validations/callbacks_test.rb
+++ b/activemodel/test/cases/validations/callbacks_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "cases/helper"
 
 class Dog
diff --git a/activemodel/test/cases/validations/conditional_validation_test.rb b/activemodel/test/cases/validations/conditional_validation_test.rb
index c86124c8ea..048d27446e 100644
--- a/activemodel/test/cases/validations/conditional_validation_test.rb
+++ b/activemodel/test/cases/validations/conditional_validation_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "cases/helper"
 
 require "models/topic"
diff --git a/activemodel/test/cases/validations/confirmation_validation_test.rb b/activemodel/test/cases/validations/confirmation_validation_test.rb
index 1d3e2390e6..7ddf3ad273 100644
--- a/activemodel/test/cases/validations/confirmation_validation_test.rb
+++ b/activemodel/test/cases/validations/confirmation_validation_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "cases/helper"
 
 require "models/topic"
diff --git a/activemodel/test/cases/validations/exclusion_validation_test.rb b/activemodel/test/cases/validations/exclusion_validation_test.rb
index 2bef74fd6c..06ae4fbecd 100644
--- a/activemodel/test/cases/validations/exclusion_validation_test.rb
+++ b/activemodel/test/cases/validations/exclusion_validation_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "cases/helper"
 require "active_support/core_ext/numeric/time"
 
diff --git a/activemodel/test/cases/validations/format_validation_test.rb b/activemodel/test/cases/validations/format_validation_test.rb
index 3bde650d37..f5b1ad721c 100644
--- a/activemodel/test/cases/validations/format_validation_test.rb
+++ b/activemodel/test/cases/validations/format_validation_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "cases/helper"
 
 require "models/topic"
diff --git a/activemodel/test/cases/validations/i18n_generate_message_validation_test.rb b/activemodel/test/cases/validations/i18n_generate_message_validation_test.rb
index 462a2254d2..f049ee26e8 100644
--- a/activemodel/test/cases/validations/i18n_generate_message_validation_test.rb
+++ b/activemodel/test/cases/validations/i18n_generate_message_validation_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "cases/helper"
 
 require "models/person"
diff --git a/activemodel/test/cases/validations/i18n_validation_test.rb b/activemodel/test/cases/validations/i18n_validation_test.rb
index d6a00a6630..f28cfc0ef5 100644
--- a/activemodel/test/cases/validations/i18n_validation_test.rb
+++ b/activemodel/test/cases/validations/i18n_validation_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "cases/helper"
 require "models/person"
 
diff --git a/activemodel/test/cases/validations/inclusion_validation_test.rb b/activemodel/test/cases/validations/inclusion_validation_test.rb
index 537ff45626..5aa43ea4a9 100644
--- a/activemodel/test/cases/validations/inclusion_validation_test.rb
+++ b/activemodel/test/cases/validations/inclusion_validation_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "cases/helper"
 require "active_support/all"
 
diff --git a/activemodel/test/cases/validations/length_validation_test.rb b/activemodel/test/cases/validations/length_validation_test.rb
index 03e73546da..95ee87b401 100644
--- a/activemodel/test/cases/validations/length_validation_test.rb
+++ b/activemodel/test/cases/validations/length_validation_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "cases/helper"
 
 require "models/topic"
diff --git a/activemodel/test/cases/validations/numericality_validation_test.rb b/activemodel/test/cases/validations/numericality_validation_test.rb
index aadc825b52..c0158e075f 100644
--- a/activemodel/test/cases/validations/numericality_validation_test.rb
+++ b/activemodel/test/cases/validations/numericality_validation_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "cases/helper"
 
 require "models/topic"
diff --git a/activemodel/test/cases/validations/presence_validation_test.rb b/activemodel/test/cases/validations/presence_validation_test.rb
index af3d7401ed..642dd0f144 100644
--- a/activemodel/test/cases/validations/presence_validation_test.rb
+++ b/activemodel/test/cases/validations/presence_validation_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "cases/helper"
 
 require "models/topic"
diff --git a/activemodel/test/cases/validations/validates_test.rb b/activemodel/test/cases/validations/validates_test.rb
index fe602a2316..011033606e 100644
--- a/activemodel/test/cases/validations/validates_test.rb
+++ b/activemodel/test/cases/validations/validates_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "cases/helper"
 require "models/person"
 require "models/topic"
diff --git a/activemodel/test/cases/validations/validations_context_test.rb b/activemodel/test/cases/validations/validations_context_test.rb
index 04108eb2a0..25c37a572f 100644
--- a/activemodel/test/cases/validations/validations_context_test.rb
+++ b/activemodel/test/cases/validations/validations_context_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "cases/helper"
 
 require "models/topic"
diff --git a/activemodel/test/cases/validations/with_validation_test.rb b/activemodel/test/cases/validations/with_validation_test.rb
index 70f1337035..5ce86738cd 100644
--- a/activemodel/test/cases/validations/with_validation_test.rb
+++ b/activemodel/test/cases/validations/with_validation_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "cases/helper"
 
 require "models/topic"
diff --git a/activemodel/test/cases/validations_test.rb b/activemodel/test/cases/validations_test.rb
index 83be8b26da..6647191205 100644
--- a/activemodel/test/cases/validations_test.rb
+++ b/activemodel/test/cases/validations_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "cases/helper"
 
 require "models/topic"
diff --git a/activemodel/test/models/account.rb b/activemodel/test/models/account.rb
index c25d12e138..eed668d38f 100644
--- a/activemodel/test/models/account.rb
+++ b/activemodel/test/models/account.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 class Account
   include ActiveModel::ForbiddenAttributesProtection
 
diff --git a/activemodel/test/models/blog_post.rb b/activemodel/test/models/blog_post.rb
index 2a6240fb04..46eba857df 100644
--- a/activemodel/test/models/blog_post.rb
+++ b/activemodel/test/models/blog_post.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 module Blog
   def self.use_relative_model_naming?
     true
diff --git a/activemodel/test/models/contact.rb b/activemodel/test/models/contact.rb
index 9853bc6234..113ab0bc1f 100644
--- a/activemodel/test/models/contact.rb
+++ b/activemodel/test/models/contact.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 class Contact
   extend ActiveModel::Naming
   include ActiveModel::Conversion
diff --git a/activemodel/test/models/custom_reader.rb b/activemodel/test/models/custom_reader.rb
index a6f983e3ca..dc26bb10ff 100644
--- a/activemodel/test/models/custom_reader.rb
+++ b/activemodel/test/models/custom_reader.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 class CustomReader
   include ActiveModel::Validations
 
diff --git a/activemodel/test/models/helicopter.rb b/activemodel/test/models/helicopter.rb
index 33877e1fba..933f3c463a 100644
--- a/activemodel/test/models/helicopter.rb
+++ b/activemodel/test/models/helicopter.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 class Helicopter
   include ActiveModel::Conversion
 end
diff --git a/activemodel/test/models/person.rb b/activemodel/test/models/person.rb
index 94a3275514..e896e90f98 100644
--- a/activemodel/test/models/person.rb
+++ b/activemodel/test/models/person.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 class Person
   include ActiveModel::Validations
   extend  ActiveModel::Translation
diff --git a/activemodel/test/models/person_with_validator.rb b/activemodel/test/models/person_with_validator.rb
index b32730abc1..505ed880c1 100644
--- a/activemodel/test/models/person_with_validator.rb
+++ b/activemodel/test/models/person_with_validator.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 class PersonWithValidator
   include ActiveModel::Validations
 
diff --git a/activemodel/test/models/reply.rb b/activemodel/test/models/reply.rb
index 9a6b4864f1..3fe11043d2 100644
--- a/activemodel/test/models/reply.rb
+++ b/activemodel/test/models/reply.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "models/topic"
 
 class Reply < Topic
diff --git a/activemodel/test/models/sheep.rb b/activemodel/test/models/sheep.rb
index f62a98777a..7aba055c4f 100644
--- a/activemodel/test/models/sheep.rb
+++ b/activemodel/test/models/sheep.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 class Sheep
   extend ActiveModel::Naming
 end
diff --git a/activemodel/test/models/topic.rb b/activemodel/test/models/topic.rb
index 37dc437e81..192786c096 100644
--- a/activemodel/test/models/topic.rb
+++ b/activemodel/test/models/topic.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 class Topic
   include ActiveModel::Validations
   include ActiveModel::Validations::Callbacks
diff --git a/activemodel/test/models/track_back.rb b/activemodel/test/models/track_back.rb
index 80c4075b00..357ee37d6d 100644
--- a/activemodel/test/models/track_back.rb
+++ b/activemodel/test/models/track_back.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 class Post
   class TrackBack
     def to_model
diff --git a/activemodel/test/models/user.rb b/activemodel/test/models/user.rb
index 106b487cbc..6556b1a7d9 100644
--- a/activemodel/test/models/user.rb
+++ b/activemodel/test/models/user.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 class User
   extend ActiveModel::Callbacks
   include ActiveModel::SecurePassword
diff --git a/activemodel/test/models/visitor.rb b/activemodel/test/models/visitor.rb
index 5bcd5d6458..22ad1a3c3d 100644
--- a/activemodel/test/models/visitor.rb
+++ b/activemodel/test/models/visitor.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 class Visitor
   extend ActiveModel::Callbacks
   include ActiveModel::SecurePassword
diff --git a/activemodel/test/validators/email_validator.rb b/activemodel/test/validators/email_validator.rb
index 206c3d319c..f733c45cf0 100644
--- a/activemodel/test/validators/email_validator.rb
+++ b/activemodel/test/validators/email_validator.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 class EmailValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, value)
     record.errors[attribute] << (options[:message] || "is not an email") unless
diff --git a/activemodel/test/validators/namespace/email_validator.rb b/activemodel/test/validators/namespace/email_validator.rb
index 4c37f6f3a2..8639045b0d 100644
--- a/activemodel/test/validators/namespace/email_validator.rb
+++ b/activemodel/test/validators/namespace/email_validator.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "validators/email_validator"
 
 module Namespace
-- 
cgit v1.2.3