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.
---
 actionview/test/template/active_model_helper_test.rb                  | 1 -
 actionview/test/template/asset_tag_helper_test.rb                     | 1 -
 actionview/test/template/atom_feed_helper_test.rb                     | 1 -
 actionview/test/template/capture_helper_test.rb                       | 1 -
 actionview/test/template/compiled_templates_test.rb                   | 1 -
 actionview/test/template/controller_helper_test.rb                    | 1 -
 actionview/test/template/date_helper_i18n_test.rb                     | 1 -
 actionview/test/template/date_helper_test.rb                          | 1 -
 actionview/test/template/dependency_tracker_test.rb                   | 1 -
 actionview/test/template/digestor_test.rb                             | 1 -
 actionview/test/template/erb/deprecated_erubis_implementation_test.rb | 1 -
 actionview/test/template/erb/form_for_test.rb                         | 1 -
 actionview/test/template/erb/helper.rb                                | 1 -
 actionview/test/template/erb/tag_helper_test.rb                       | 1 -
 actionview/test/template/erb_util_test.rb                             | 1 -
 actionview/test/template/form_collections_helper_test.rb              | 1 -
 actionview/test/template/form_helper/form_with_test.rb                | 1 -
 actionview/test/template/form_helper_test.rb                          | 1 -
 actionview/test/template/form_options_helper_i18n_test.rb             | 1 -
 actionview/test/template/form_options_helper_test.rb                  | 1 -
 actionview/test/template/form_tag_helper_test.rb                      | 1 -
 actionview/test/template/html_test.rb                                 | 1 -
 actionview/test/template/javascript_helper_test.rb                    | 1 -
 actionview/test/template/log_subscriber_test.rb                       | 1 -
 actionview/test/template/lookup_context_test.rb                       | 1 -
 actionview/test/template/number_helper_test.rb                        | 1 -
 actionview/test/template/output_safety_helper_test.rb                 | 1 -
 actionview/test/template/partial_iteration_test.rb                    | 1 -
 actionview/test/template/record_identifier_test.rb                    | 1 -
 actionview/test/template/record_tag_helper_test.rb                    | 1 -
 actionview/test/template/render_test.rb                               | 1 -
 actionview/test/template/resolver_cache_test.rb                       | 1 -
 actionview/test/template/resolver_patterns_test.rb                    | 1 -
 actionview/test/template/sanitize_helper_test.rb                      | 1 -
 actionview/test/template/streaming_render_test.rb                     | 1 -
 actionview/test/template/tag_helper_test.rb                           | 1 -
 actionview/test/template/template_error_test.rb                       | 1 -
 actionview/test/template/template_test.rb                             | 1 -
 actionview/test/template/test_case_test.rb                            | 1 -
 actionview/test/template/test_test.rb                                 | 1 -
 actionview/test/template/testing/fixture_resolver_test.rb             | 1 -
 actionview/test/template/testing/null_resolver_test.rb                | 1 -
 actionview/test/template/text_helper_test.rb                          | 1 -
 actionview/test/template/text_test.rb                                 | 1 -
 actionview/test/template/translation_helper_test.rb                   | 1 -
 actionview/test/template/url_helper_test.rb                           | 1 -
 46 files changed, 46 deletions(-)

(limited to 'actionview/test/template')

diff --git a/actionview/test/template/active_model_helper_test.rb b/actionview/test/template/active_model_helper_test.rb
index 030c36b1b2..6b63aa25a5 100644
--- a/actionview/test/template/active_model_helper_test.rb
+++ b/actionview/test/template/active_model_helper_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 
 class ActiveModelHelperTest < ActionView::TestCase
diff --git a/actionview/test/template/asset_tag_helper_test.rb b/actionview/test/template/asset_tag_helper_test.rb
index 3f837ffc33..d1190b1bd7 100644
--- a/actionview/test/template/asset_tag_helper_test.rb
+++ b/actionview/test/template/asset_tag_helper_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/ordered_options"
 
diff --git a/actionview/test/template/atom_feed_helper_test.rb b/actionview/test/template/atom_feed_helper_test.rb
index fd31dd09f8..7fa5e042fb 100644
--- a/actionview/test/template/atom_feed_helper_test.rb
+++ b/actionview/test/template/atom_feed_helper_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 
 Scroll = Struct.new(:id, :to_param, :title, :body, :updated_at, :created_at) do
diff --git a/actionview/test/template/capture_helper_test.rb b/actionview/test/template/capture_helper_test.rb
index 657fda405e..7f37523eeb 100644
--- a/actionview/test/template/capture_helper_test.rb
+++ b/actionview/test/template/capture_helper_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 
 class CaptureHelperTest < ActionView::TestCase
diff --git a/actionview/test/template/compiled_templates_test.rb b/actionview/test/template/compiled_templates_test.rb
index 5135b1e90b..adb2be9be4 100644
--- a/actionview/test/template/compiled_templates_test.rb
+++ b/actionview/test/template/compiled_templates_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 
 class CompiledTemplatesTest < ActiveSupport::TestCase
diff --git a/actionview/test/template/controller_helper_test.rb b/actionview/test/template/controller_helper_test.rb
index 1b6f1b95c2..8dd0cedb75 100644
--- a/actionview/test/template/controller_helper_test.rb
+++ b/actionview/test/template/controller_helper_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 
 class ControllerHelperTest < ActionView::TestCase
diff --git a/actionview/test/template/date_helper_i18n_test.rb b/actionview/test/template/date_helper_i18n_test.rb
index eee4340958..207c8a683e 100644
--- a/actionview/test/template/date_helper_i18n_test.rb
+++ b/actionview/test/template/date_helper_i18n_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 
 class DateHelperDistanceOfTimeInWordsI18nTests < ActiveSupport::TestCase
diff --git a/actionview/test/template/date_helper_test.rb b/actionview/test/template/date_helper_test.rb
index 235ac9f338..b9b8194e69 100644
--- a/actionview/test/template/date_helper_test.rb
+++ b/actionview/test/template/date_helper_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 
 class DateHelperTest < ActionView::TestCase
diff --git a/actionview/test/template/dependency_tracker_test.rb b/actionview/test/template/dependency_tracker_test.rb
index f3c1ab4fbf..89917035ff 100644
--- a/actionview/test/template/dependency_tracker_test.rb
+++ b/actionview/test/template/dependency_tracker_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 require "action_view/dependency_tracker"
 
diff --git a/actionview/test/template/digestor_test.rb b/actionview/test/template/digestor_test.rb
index b8cae0ab66..de04f3f25d 100644
--- a/actionview/test/template/digestor_test.rb
+++ b/actionview/test/template/digestor_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 require "fileutils"
 require "action_view/dependency_tracker"
diff --git a/actionview/test/template/erb/deprecated_erubis_implementation_test.rb b/actionview/test/template/erb/deprecated_erubis_implementation_test.rb
index 511dbf8008..aaf99f85c0 100644
--- a/actionview/test/template/erb/deprecated_erubis_implementation_test.rb
+++ b/actionview/test/template/erb/deprecated_erubis_implementation_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 
 module ERBTest
diff --git a/actionview/test/template/erb/form_for_test.rb b/actionview/test/template/erb/form_for_test.rb
index e251083fc8..e722b40a9a 100644
--- a/actionview/test/template/erb/form_for_test.rb
+++ b/actionview/test/template/erb/form_for_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 require "template/erb/helper"
 
diff --git a/actionview/test/template/erb/helper.rb b/actionview/test/template/erb/helper.rb
index 78fc0d4290..bc1eedc15f 100644
--- a/actionview/test/template/erb/helper.rb
+++ b/actionview/test/template/erb/helper.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 module ERBTest
   class ViewContext
     include ActionView::Helpers::UrlHelper
diff --git a/actionview/test/template/erb/tag_helper_test.rb b/actionview/test/template/erb/tag_helper_test.rb
index 65ded0aaf5..233f37c48a 100644
--- a/actionview/test/template/erb/tag_helper_test.rb
+++ b/actionview/test/template/erb/tag_helper_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 require "template/erb/helper"
 
diff --git a/actionview/test/template/erb_util_test.rb b/actionview/test/template/erb_util_test.rb
index 69d092b6c6..4412ea37fa 100644
--- a/actionview/test/template/erb_util_test.rb
+++ b/actionview/test/template/erb_util_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/json"
 
diff --git a/actionview/test/template/form_collections_helper_test.rb b/actionview/test/template/form_collections_helper_test.rb
index ddc2619e7a..6160524eb3 100644
--- a/actionview/test/template/form_collections_helper_test.rb
+++ b/actionview/test/template/form_collections_helper_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 
 Category = Struct.new(:id, :name)
diff --git a/actionview/test/template/form_helper/form_with_test.rb b/actionview/test/template/form_helper/form_with_test.rb
index cbfe97159d..df81315b9c 100644
--- a/actionview/test/template/form_helper/form_with_test.rb
+++ b/actionview/test/template/form_helper/form_with_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 require "controller/fake_models"
 
diff --git a/actionview/test/template/form_helper_test.rb b/actionview/test/template/form_helper_test.rb
index 6e67da5555..50dee1e999 100644
--- a/actionview/test/template/form_helper_test.rb
+++ b/actionview/test/template/form_helper_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 require "controller/fake_models"
 
diff --git a/actionview/test/template/form_options_helper_i18n_test.rb b/actionview/test/template/form_options_helper_i18n_test.rb
index e23bd94307..a1048fbb89 100644
--- a/actionview/test/template/form_options_helper_i18n_test.rb
+++ b/actionview/test/template/form_options_helper_i18n_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 
 class FormOptionsHelperI18nTests < ActionView::TestCase
diff --git a/actionview/test/template/form_options_helper_test.rb b/actionview/test/template/form_options_helper_test.rb
index faeb84faef..3247f20ba7 100644
--- a/actionview/test/template/form_options_helper_test.rb
+++ b/actionview/test/template/form_options_helper_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 
 class Map < Hash
diff --git a/actionview/test/template/form_tag_helper_test.rb b/actionview/test/template/form_tag_helper_test.rb
index f4a26e232d..7ac15db9fe 100644
--- a/actionview/test/template/form_tag_helper_test.rb
+++ b/actionview/test/template/form_tag_helper_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 
 class FormTagHelperTest < ActionView::TestCase
diff --git a/actionview/test/template/html_test.rb b/actionview/test/template/html_test.rb
index 17560287bc..60f4b0aee6 100644
--- a/actionview/test/template/html_test.rb
+++ b/actionview/test/template/html_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 
 class HTMLTest < ActiveSupport::TestCase
diff --git a/actionview/test/template/javascript_helper_test.rb b/actionview/test/template/javascript_helper_test.rb
index 43ea8eacc6..67747a7a83 100644
--- a/actionview/test/template/javascript_helper_test.rb
+++ b/actionview/test/template/javascript_helper_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 
 class JavaScriptHelperTest < ActionView::TestCase
diff --git a/actionview/test/template/log_subscriber_test.rb b/actionview/test/template/log_subscriber_test.rb
index 765f644bb4..4c9f84f277 100644
--- a/actionview/test/template/log_subscriber_test.rb
+++ b/actionview/test/template/log_subscriber_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/log_subscriber/test_helper"
 require "action_view/log_subscriber"
diff --git a/actionview/test/template/lookup_context_test.rb b/actionview/test/template/lookup_context_test.rb
index b55f68e36b..b47d92df34 100644
--- a/actionview/test/template/lookup_context_test.rb
+++ b/actionview/test/template/lookup_context_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 require "abstract_controller/rendering"
 
diff --git a/actionview/test/template/number_helper_test.rb b/actionview/test/template/number_helper_test.rb
index 9077dbb0c8..678120a9c9 100644
--- a/actionview/test/template/number_helper_test.rb
+++ b/actionview/test/template/number_helper_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 
 class NumberHelperTest < ActionView::TestCase
diff --git a/actionview/test/template/output_safety_helper_test.rb b/actionview/test/template/output_safety_helper_test.rb
index 3b4b83110c..537b4393ee 100644
--- a/actionview/test/template/output_safety_helper_test.rb
+++ b/actionview/test/template/output_safety_helper_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 
 class OutputSafetyHelperTest < ActionView::TestCase
diff --git a/actionview/test/template/partial_iteration_test.rb b/actionview/test/template/partial_iteration_test.rb
index 3a31134e5b..3ebf3b550a 100644
--- a/actionview/test/template/partial_iteration_test.rb
+++ b/actionview/test/template/partial_iteration_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 require "action_view/renderer/partial_renderer"
 
diff --git a/actionview/test/template/record_identifier_test.rb b/actionview/test/template/record_identifier_test.rb
index 529de9a57b..ce446715fd 100644
--- a/actionview/test/template/record_identifier_test.rb
+++ b/actionview/test/template/record_identifier_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 require "controller/fake_models"
 
diff --git a/actionview/test/template/record_tag_helper_test.rb b/actionview/test/template/record_tag_helper_test.rb
index ab110d8314..3685230558 100644
--- a/actionview/test/template/record_tag_helper_test.rb
+++ b/actionview/test/template/record_tag_helper_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 
 class RecordTagPost
diff --git a/actionview/test/template/render_test.rb b/actionview/test/template/render_test.rb
index 909aa81833..1fd8b4fe1a 100644
--- a/actionview/test/template/render_test.rb
+++ b/actionview/test/template/render_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 require "controller/fake_models"
 
diff --git a/actionview/test/template/resolver_cache_test.rb b/actionview/test/template/resolver_cache_test.rb
index b881618a1d..0ecfccd375 100644
--- a/actionview/test/template/resolver_cache_test.rb
+++ b/actionview/test/template/resolver_cache_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 
 class ResolverCacheTest < ActiveSupport::TestCase
diff --git a/actionview/test/template/resolver_patterns_test.rb b/actionview/test/template/resolver_patterns_test.rb
index f5a28be400..8e21f4b828 100644
--- a/actionview/test/template/resolver_patterns_test.rb
+++ b/actionview/test/template/resolver_patterns_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 
 class ResolverPatternsTest < ActiveSupport::TestCase
diff --git a/actionview/test/template/sanitize_helper_test.rb b/actionview/test/template/sanitize_helper_test.rb
index 8ca8cb6d17..4d4ed3c35c 100644
--- a/actionview/test/template/sanitize_helper_test.rb
+++ b/actionview/test/template/sanitize_helper_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 
 # The exhaustive tests are in the rails-html-sanitizer gem.
diff --git a/actionview/test/template/streaming_render_test.rb b/actionview/test/template/streaming_render_test.rb
index 835f101c00..41b9063417 100644
--- a/actionview/test/template/streaming_render_test.rb
+++ b/actionview/test/template/streaming_render_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 
 class TestController < ActionController::Base
diff --git a/actionview/test/template/tag_helper_test.rb b/actionview/test/template/tag_helper_test.rb
index d338ff9d3f..f1e5946e14 100644
--- a/actionview/test/template/tag_helper_test.rb
+++ b/actionview/test/template/tag_helper_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 
 class TagHelperTest < ActionView::TestCase
diff --git a/actionview/test/template/template_error_test.rb b/actionview/test/template/template_error_test.rb
index a5201edfcf..54c1d53b60 100644
--- a/actionview/test/template/template_error_test.rb
+++ b/actionview/test/template/template_error_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 
 class TemplateErrorTest < ActiveSupport::TestCase
diff --git a/actionview/test/template/template_test.rb b/actionview/test/template/template_test.rb
index 817e2e4315..dd131f0246 100644
--- a/actionview/test/template/template_test.rb
+++ b/actionview/test/template/template_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 # encoding: US-ASCII
 require "abstract_unit"
 require "logger"
diff --git a/actionview/test/template/test_case_test.rb b/actionview/test/template/test_case_test.rb
index 4a8324b235..3deddd5706 100644
--- a/actionview/test/template/test_case_test.rb
+++ b/actionview/test/template/test_case_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 require "rails/engine"
 
diff --git a/actionview/test/template/test_test.rb b/actionview/test/template/test_test.rb
index ecc7a9a5a1..52cac77bc5 100644
--- a/actionview/test/template/test_test.rb
+++ b/actionview/test/template/test_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 
 module PeopleHelper
diff --git a/actionview/test/template/testing/fixture_resolver_test.rb b/actionview/test/template/testing/fixture_resolver_test.rb
index 45b4e1b309..effe453fc0 100644
--- a/actionview/test/template/testing/fixture_resolver_test.rb
+++ b/actionview/test/template/testing/fixture_resolver_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 
 class FixtureResolverTest < ActiveSupport::TestCase
diff --git a/actionview/test/template/testing/null_resolver_test.rb b/actionview/test/template/testing/null_resolver_test.rb
index cc7a732d21..5346fd3368 100644
--- a/actionview/test/template/testing/null_resolver_test.rb
+++ b/actionview/test/template/testing/null_resolver_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 
 class NullResolverTest < ActiveSupport::TestCase
diff --git a/actionview/test/template/text_helper_test.rb b/actionview/test/template/text_helper_test.rb
index ae923980fa..21ee4cc8e5 100644
--- a/actionview/test/template/text_helper_test.rb
+++ b/actionview/test/template/text_helper_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 
 class TextHelperTest < ActionView::TestCase
diff --git a/actionview/test/template/text_test.rb b/actionview/test/template/text_test.rb
index 4eb571eaa7..72ffd5f3be 100644
--- a/actionview/test/template/text_test.rb
+++ b/actionview/test/template/text_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 
 class TextTest < ActiveSupport::TestCase
diff --git a/actionview/test/template/translation_helper_test.rb b/actionview/test/template/translation_helper_test.rb
index f43e8b9a80..1cfc13f337 100644
--- a/actionview/test/template/translation_helper_test.rb
+++ b/actionview/test/template/translation_helper_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 
 module I18n
diff --git a/actionview/test/template/url_helper_test.rb b/actionview/test/template/url_helper_test.rb
index 24f9bbec79..a087c5c0cd 100644
--- a/actionview/test/template/url_helper_test.rb
+++ b/actionview/test/template/url_helper_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 
 class UrlHelperTest < ActiveSupport::TestCase
-- 
cgit v1.2.3