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 /actionview/test/template | |
| 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 'actionview/test/template')
| -rw-r--r-- | actionview/test/template/dependency_tracker_test.rb | 1 | ||||
| -rw-r--r-- | actionview/test/template/render_test.rb | 1 | ||||
| -rw-r--r-- | actionview/test/template/streaming_render_test.rb | 1 | ||||
| -rw-r--r-- | actionview/test/template/text_helper_test.rb | 1 | ||||
| -rw-r--r-- | actionview/test/template/url_helper_test.rb | 1 |
5 files changed, 0 insertions, 5 deletions
diff --git a/actionview/test/template/dependency_tracker_test.rb b/actionview/test/template/dependency_tracker_test.rb index bb375076c6..d74da4c318 100644 --- a/actionview/test/template/dependency_tracker_test.rb +++ b/actionview/test/template/dependency_tracker_test.rb @@ -1,4 +1,3 @@ -# encoding: utf-8 require 'abstract_unit' require 'action_view/dependency_tracker' diff --git a/actionview/test/template/render_test.rb b/actionview/test/template/render_test.rb index dc4abca048..66667e0474 100644 --- a/actionview/test/template/render_test.rb +++ b/actionview/test/template/render_test.rb @@ -1,4 +1,3 @@ -# encoding: utf-8 require 'abstract_unit' require 'controller/fake_models' diff --git a/actionview/test/template/streaming_render_test.rb b/actionview/test/template/streaming_render_test.rb index 8a24d78e74..ec537775be 100644 --- a/actionview/test/template/streaming_render_test.rb +++ b/actionview/test/template/streaming_render_test.rb @@ -1,4 +1,3 @@ -# encoding: utf-8 require 'abstract_unit' class TestController < ActionController::Base diff --git a/actionview/test/template/text_helper_test.rb b/actionview/test/template/text_helper_test.rb index f05b845e46..f1b84c4786 100644 --- a/actionview/test/template/text_helper_test.rb +++ b/actionview/test/template/text_helper_test.rb @@ -1,4 +1,3 @@ -# encoding: utf-8 require 'abstract_unit' class TextHelperTest < ActionView::TestCase diff --git a/actionview/test/template/url_helper_test.rb b/actionview/test/template/url_helper_test.rb index 0ce9d38fa3..ee3313489f 100644 --- a/actionview/test/template/url_helper_test.rb +++ b/actionview/test/template/url_helper_test.rb @@ -1,4 +1,3 @@ -# encoding: utf-8 require 'abstract_unit' require 'minitest/mock' |