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/cache/behaviors.rb                                    | 1 -
 activesupport/test/cache/behaviors/autoloading_cache_behavior.rb         | 1 -
 activesupport/test/cache/behaviors/cache_delete_matched_behavior.rb      | 1 -
 activesupport/test/cache/behaviors/cache_increment_decrement_behavior.rb | 1 -
 activesupport/test/cache/behaviors/cache_store_behavior.rb               | 1 -
 activesupport/test/cache/behaviors/cache_store_version_behavior.rb       | 1 -
 activesupport/test/cache/behaviors/encoded_key_cache_behavior.rb         | 1 -
 activesupport/test/cache/behaviors/local_cache_behavior.rb               | 1 -
 activesupport/test/cache/cache_entry_test.rb                             | 1 -
 activesupport/test/cache/cache_key_test.rb                               | 1 -
 activesupport/test/cache/cache_store_logger_test.rb                      | 1 -
 activesupport/test/cache/cache_store_namespace_test.rb                   | 1 -
 activesupport/test/cache/cache_store_setting_test.rb                     | 1 -
 activesupport/test/cache/cache_store_write_multi_test.rb                 | 1 -
 activesupport/test/cache/local_cache_middleware_test.rb                  | 1 -
 activesupport/test/cache/stores/file_store_test.rb                       | 1 -
 activesupport/test/cache/stores/mem_cache_store_test.rb                  | 1 -
 activesupport/test/cache/stores/memory_store_test.rb                     | 1 -
 activesupport/test/cache/stores/null_store_test.rb                       | 1 -
 19 files changed, 19 deletions(-)

(limited to 'activesupport/test/cache')

diff --git a/activesupport/test/cache/behaviors.rb b/activesupport/test/cache/behaviors.rb
index c94cbc1156..efd045ac5e 100644
--- a/activesupport/test/cache/behaviors.rb
+++ b/activesupport/test/cache/behaviors.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require_relative "behaviors/autoloading_cache_behavior"
 require_relative "behaviors/cache_delete_matched_behavior"
 require_relative "behaviors/cache_increment_decrement_behavior"
diff --git a/activesupport/test/cache/behaviors/autoloading_cache_behavior.rb b/activesupport/test/cache/behaviors/autoloading_cache_behavior.rb
index 41a3a873b6..5f8af331f6 100644
--- a/activesupport/test/cache/behaviors/autoloading_cache_behavior.rb
+++ b/activesupport/test/cache/behaviors/autoloading_cache_behavior.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "dependencies_test_helpers"
 
 module AutoloadingCacheBehavior
diff --git a/activesupport/test/cache/behaviors/cache_delete_matched_behavior.rb b/activesupport/test/cache/behaviors/cache_delete_matched_behavior.rb
index b2cd919da9..b872eb0279 100644
--- a/activesupport/test/cache/behaviors/cache_delete_matched_behavior.rb
+++ b/activesupport/test/cache/behaviors/cache_delete_matched_behavior.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 module CacheDeleteMatchedBehavior
   def test_delete_matched
     @cache.write("foo", "bar")
diff --git a/activesupport/test/cache/behaviors/cache_increment_decrement_behavior.rb b/activesupport/test/cache/behaviors/cache_increment_decrement_behavior.rb
index 45f92f10b2..0d32339565 100644
--- a/activesupport/test/cache/behaviors/cache_increment_decrement_behavior.rb
+++ b/activesupport/test/cache/behaviors/cache_increment_decrement_behavior.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 module CacheIncrementDecrementBehavior
   def test_increment
     @cache.write("foo", 1, raw: true)
diff --git a/activesupport/test/cache/behaviors/cache_store_behavior.rb b/activesupport/test/cache/behaviors/cache_store_behavior.rb
index 32373644cf..4631e6aee8 100644
--- a/activesupport/test/cache/behaviors/cache_store_behavior.rb
+++ b/activesupport/test/cache/behaviors/cache_store_behavior.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 # Tests the base functionality that should be identical across all cache stores.
 module CacheStoreBehavior
   def test_should_read_and_write_strings
diff --git a/activesupport/test/cache/behaviors/cache_store_version_behavior.rb b/activesupport/test/cache/behaviors/cache_store_version_behavior.rb
index 82f392c86a..a0170c896f 100644
--- a/activesupport/test/cache/behaviors/cache_store_version_behavior.rb
+++ b/activesupport/test/cache/behaviors/cache_store_version_behavior.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 module CacheStoreVersionBehavior
   ModelWithKeyAndVersion = Struct.new(:cache_key, :cache_version)
 
diff --git a/activesupport/test/cache/behaviors/encoded_key_cache_behavior.rb b/activesupport/test/cache/behaviors/encoded_key_cache_behavior.rb
index 361903ab82..6adef2916d 100644
--- a/activesupport/test/cache/behaviors/encoded_key_cache_behavior.rb
+++ b/activesupport/test/cache/behaviors/encoded_key_cache_behavior.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 # https://rails.lighthouseapp.com/projects/8994/tickets/6225-memcachestore-cant-deal-with-umlauts-and-special-characters
 # The error is caused by character encodings that can't be compared with ASCII-8BIT regular expressions and by special
 # characters like the umlaut in UTF-8.
diff --git a/activesupport/test/cache/behaviors/local_cache_behavior.rb b/activesupport/test/cache/behaviors/local_cache_behavior.rb
index 730f0306b8..8530296374 100644
--- a/activesupport/test/cache/behaviors/local_cache_behavior.rb
+++ b/activesupport/test/cache/behaviors/local_cache_behavior.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 module LocalCacheBehavior
   def test_local_writes_are_persistent_on_the_remote_cache
     retval = @cache.with_local_cache do
diff --git a/activesupport/test/cache/cache_entry_test.rb b/activesupport/test/cache/cache_entry_test.rb
index 4a8fc5bed3..e446e39b10 100644
--- a/activesupport/test/cache/cache_entry_test.rb
+++ b/activesupport/test/cache/cache_entry_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/cache"
 
diff --git a/activesupport/test/cache/cache_key_test.rb b/activesupport/test/cache/cache_key_test.rb
index 19c40d44d6..ea39d7a299 100644
--- a/activesupport/test/cache/cache_key_test.rb
+++ b/activesupport/test/cache/cache_key_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/cache"
 
diff --git a/activesupport/test/cache/cache_store_logger_test.rb b/activesupport/test/cache/cache_store_logger_test.rb
index 3014c4d57f..621cfebb10 100644
--- a/activesupport/test/cache/cache_store_logger_test.rb
+++ b/activesupport/test/cache/cache_store_logger_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/cache"
 
diff --git a/activesupport/test/cache/cache_store_namespace_test.rb b/activesupport/test/cache/cache_store_namespace_test.rb
index 8df048aad0..e395c88271 100644
--- a/activesupport/test/cache/cache_store_namespace_test.rb
+++ b/activesupport/test/cache/cache_store_namespace_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/cache"
 
diff --git a/activesupport/test/cache/cache_store_setting_test.rb b/activesupport/test/cache/cache_store_setting_test.rb
index cc126ec930..cb9b006abe 100644
--- a/activesupport/test/cache/cache_store_setting_test.rb
+++ b/activesupport/test/cache/cache_store_setting_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/cache"
 require "dalli"
diff --git a/activesupport/test/cache/cache_store_write_multi_test.rb b/activesupport/test/cache/cache_store_write_multi_test.rb
index 9355dde0f4..16e3f3b842 100644
--- a/activesupport/test/cache/cache_store_write_multi_test.rb
+++ b/activesupport/test/cache/cache_store_write_multi_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/cache"
 
diff --git a/activesupport/test/cache/local_cache_middleware_test.rb b/activesupport/test/cache/local_cache_middleware_test.rb
index 3f0bd40fbd..352502fb43 100644
--- a/activesupport/test/cache/local_cache_middleware_test.rb
+++ b/activesupport/test/cache/local_cache_middleware_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/cache"
 
diff --git a/activesupport/test/cache/stores/file_store_test.rb b/activesupport/test/cache/stores/file_store_test.rb
index 6ba25bbaec..48b304fe6e 100644
--- a/activesupport/test/cache/stores/file_store_test.rb
+++ b/activesupport/test/cache/stores/file_store_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/cache"
 require_relative "../behaviors"
diff --git a/activesupport/test/cache/stores/mem_cache_store_test.rb b/activesupport/test/cache/stores/mem_cache_store_test.rb
index e188f5f881..2dd5264818 100644
--- a/activesupport/test/cache/stores/mem_cache_store_test.rb
+++ b/activesupport/test/cache/stores/mem_cache_store_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/cache"
 require_relative "../behaviors"
diff --git a/activesupport/test/cache/stores/memory_store_test.rb b/activesupport/test/cache/stores/memory_store_test.rb
index e8dfe24a2f..3dd1646d56 100644
--- a/activesupport/test/cache/stores/memory_store_test.rb
+++ b/activesupport/test/cache/stores/memory_store_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/cache"
 require_relative "../behaviors"
diff --git a/activesupport/test/cache/stores/null_store_test.rb b/activesupport/test/cache/stores/null_store_test.rb
index 0945aceee3..23c4e64ee4 100644
--- a/activesupport/test/cache/stores/null_store_test.rb
+++ b/activesupport/test/cache/stores/null_store_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "abstract_unit"
 require "active_support/cache"
 require_relative "../behaviors"
-- 
cgit v1.2.3