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.
---
 actionpack/lib/action_dispatch/testing/assertion_response.rb  | 1 -
 actionpack/lib/action_dispatch/testing/assertions.rb          | 1 -
 actionpack/lib/action_dispatch/testing/assertions/response.rb | 1 -
 actionpack/lib/action_dispatch/testing/assertions/routing.rb  | 1 -
 actionpack/lib/action_dispatch/testing/integration.rb         | 1 -
 actionpack/lib/action_dispatch/testing/request_encoder.rb     | 1 -
 actionpack/lib/action_dispatch/testing/test_process.rb        | 1 -
 actionpack/lib/action_dispatch/testing/test_request.rb        | 1 -
 actionpack/lib/action_dispatch/testing/test_response.rb       | 1 -
 9 files changed, 9 deletions(-)

(limited to 'actionpack/lib/action_dispatch/testing')

diff --git a/actionpack/lib/action_dispatch/testing/assertion_response.rb b/actionpack/lib/action_dispatch/testing/assertion_response.rb
index 869b98b480..c37726957e 100644
--- a/actionpack/lib/action_dispatch/testing/assertion_response.rb
+++ b/actionpack/lib/action_dispatch/testing/assertion_response.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 module ActionDispatch
   # This is a class that abstracts away an asserted response. It purposely
   # does not inherit from Response because it doesn't need it. That means it
diff --git a/actionpack/lib/action_dispatch/testing/assertions.rb b/actionpack/lib/action_dispatch/testing/assertions.rb
index c6eaae0a95..4ea18d671d 100644
--- a/actionpack/lib/action_dispatch/testing/assertions.rb
+++ b/actionpack/lib/action_dispatch/testing/assertions.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "rails-dom-testing"
 
 module ActionDispatch
diff --git a/actionpack/lib/action_dispatch/testing/assertions/response.rb b/actionpack/lib/action_dispatch/testing/assertions/response.rb
index 918174c241..749f2eab57 100644
--- a/actionpack/lib/action_dispatch/testing/assertions/response.rb
+++ b/actionpack/lib/action_dispatch/testing/assertions/response.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 module ActionDispatch
   module Assertions
     # A small suite of assertions that test responses from \Rails applications.
diff --git a/actionpack/lib/action_dispatch/testing/assertions/routing.rb b/actionpack/lib/action_dispatch/testing/assertions/routing.rb
index cde83dc537..8645df4370 100644
--- a/actionpack/lib/action_dispatch/testing/assertions/routing.rb
+++ b/actionpack/lib/action_dispatch/testing/assertions/routing.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "uri"
 require "active_support/core_ext/hash/indifferent_access"
 require "active_support/core_ext/string/access"
diff --git a/actionpack/lib/action_dispatch/testing/integration.rb b/actionpack/lib/action_dispatch/testing/integration.rb
index d38a364801..f16647fac8 100644
--- a/actionpack/lib/action_dispatch/testing/integration.rb
+++ b/actionpack/lib/action_dispatch/testing/integration.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "stringio"
 require "uri"
 require "active_support/core_ext/kernel/singleton_class"
diff --git a/actionpack/lib/action_dispatch/testing/request_encoder.rb b/actionpack/lib/action_dispatch/testing/request_encoder.rb
index a614a9d5bc..8c27e9ecb7 100644
--- a/actionpack/lib/action_dispatch/testing/request_encoder.rb
+++ b/actionpack/lib/action_dispatch/testing/request_encoder.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 module ActionDispatch
   class RequestEncoder # :nodoc:
     class IdentityEncoder
diff --git a/actionpack/lib/action_dispatch/testing/test_process.rb b/actionpack/lib/action_dispatch/testing/test_process.rb
index ea0e6dcb1a..0282eb15c3 100644
--- a/actionpack/lib/action_dispatch/testing/test_process.rb
+++ b/actionpack/lib/action_dispatch/testing/test_process.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "action_dispatch/middleware/cookies"
 require "action_dispatch/middleware/flash"
 
diff --git a/actionpack/lib/action_dispatch/testing/test_request.rb b/actionpack/lib/action_dispatch/testing/test_request.rb
index 0b2e8a6232..ec949c869b 100644
--- a/actionpack/lib/action_dispatch/testing/test_request.rb
+++ b/actionpack/lib/action_dispatch/testing/test_request.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "active_support/core_ext/hash/indifferent_access"
 require "rack/utils"
 
diff --git a/actionpack/lib/action_dispatch/testing/test_response.rb b/actionpack/lib/action_dispatch/testing/test_response.rb
index c63e4b5b09..5c89f9c75e 100644
--- a/actionpack/lib/action_dispatch/testing/test_response.rb
+++ b/actionpack/lib/action_dispatch/testing/test_response.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "action_dispatch/testing/request_encoder"
 
 module ActionDispatch
-- 
cgit v1.2.3