diff options
| author | Jeremy Kemper <jeremykemper@gmail.com> | 2015-02-03 09:38:15 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremykemper@gmail.com> | 2015-02-03 09:38:15 -0700 |
| commit | e30cb83c7a063302c2fc1b4f913ae7d50f594425 (patch) | |
| tree | 2c8bfcca9b64b11747cf5b831b5800b6e086d5e3 /railties | |
| parent | 826ed62ff6bcc7bb5f91480c998cb1c04c139faf (diff) | |
| parent | 6eced6a1fe041db64a06298fb8203fbb5287a8db (diff) | |
| download | rails-e30cb83c7a063302c2fc1b4f913ae7d50f594425.tar.gz rails-e30cb83c7a063302c2fc1b4f913ae7d50f594425.tar.bz2 rails-e30cb83c7a063302c2fc1b4f913ae7d50f594425.zip | |
Merge pull request #18795 from vipulnsward/remove-magic-comments
Removed magic comments (`# encoding: utf-8`) from tests since it's default from ruby 2 onwards
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/test/application/assets_test.rb | 1 | ||||
| -rw-r--r-- | railties/test/application/middleware/exceptions_test.rb | 1 | ||||
| -rw-r--r-- | railties/test/application/middleware/session_test.rb | 1 | ||||
| -rw-r--r-- | railties/test/application/middleware/static_test.rb | 1 | ||||
| -rw-r--r-- | railties/test/path_generation_test.rb | 1 |
5 files changed, 0 insertions, 5 deletions
diff --git a/railties/test/application/assets_test.rb b/railties/test/application/assets_test.rb index d58a27403e..0a2f283cce 100644 --- a/railties/test/application/assets_test.rb +++ b/railties/test/application/assets_test.rb @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- require 'isolation/abstract_unit' require 'rack/test' require 'active_support/json' diff --git a/railties/test/application/middleware/exceptions_test.rb b/railties/test/application/middleware/exceptions_test.rb index a7472b37f1..4906f9a1e8 100644 --- a/railties/test/application/middleware/exceptions_test.rb +++ b/railties/test/application/middleware/exceptions_test.rb @@ -1,4 +1,3 @@ -# encoding: utf-8 require 'isolation/abstract_unit' require 'rack/test' diff --git a/railties/test/application/middleware/session_test.rb b/railties/test/application/middleware/session_test.rb index eb7885e5b1..a8dc79d10a 100644 --- a/railties/test/application/middleware/session_test.rb +++ b/railties/test/application/middleware/session_test.rb @@ -1,4 +1,3 @@ -# encoding: utf-8 require 'isolation/abstract_unit' require 'rack/test' diff --git a/railties/test/application/middleware/static_test.rb b/railties/test/application/middleware/static_test.rb index 0a793f8f60..121c5d3321 100644 --- a/railties/test/application/middleware/static_test.rb +++ b/railties/test/application/middleware/static_test.rb @@ -1,4 +1,3 @@ -# encoding: utf-8 require 'isolation/abstract_unit' require 'rack/test' diff --git a/railties/test/path_generation_test.rb b/railties/test/path_generation_test.rb index 13bf29d3c3..e3dfcdfb7d 100644 --- a/railties/test/path_generation_test.rb +++ b/railties/test/path_generation_test.rb @@ -1,4 +1,3 @@ -# encoding: utf-8 require 'abstract_unit' require 'active_support/core_ext/object/with_options' require 'active_support/core_ext/object/json' |