diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-07-03 10:53:41 -0700 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-07-03 10:53:41 -0700 |
| commit | 501b27e716e7d98666bed9fd8fb4be76d0a7cc13 (patch) | |
| tree | f19f7f54cf0183cb9fc16e01debc9dafcc588e90 /activesupport/test | |
| parent | f3f7f31407eacc8d44b550aaa773ae802979f8ed (diff) | |
| parent | 36321d85e9975da7ef2667882cab742f9db0ad4b (diff) | |
| download | rails-501b27e716e7d98666bed9fd8fb4be76d0a7cc13.tar.gz rails-501b27e716e7d98666bed9fd8fb4be76d0a7cc13.tar.bz2 rails-501b27e716e7d98666bed9fd8fb4be76d0a7cc13.zip | |
Merge pull request #11273 from arunagw/deprecation-removed
Deprecation removed
Diffstat (limited to 'activesupport/test')
| -rw-r--r-- | activesupport/test/abstract_unit.rb | 1 | ||||
| -rw-r--r-- | activesupport/test/core_ext/string_ext_test.rb | 6 |
2 files changed, 0 insertions, 7 deletions
diff --git a/activesupport/test/abstract_unit.rb b/activesupport/test/abstract_unit.rb index dd17cb64f4..939bd7bfa8 100644 --- a/activesupport/test/abstract_unit.rb +++ b/activesupport/test/abstract_unit.rb @@ -8,7 +8,6 @@ ensure end require 'active_support/core_ext/kernel/reporting' -require 'active_support/core_ext/string/encoding' silence_warnings do Encoding.default_internal = "UTF-8" diff --git a/activesupport/test/core_ext/string_ext_test.rb b/activesupport/test/core_ext/string_ext_test.rb index 8f0ebc13ea..12126fb9ef 100644 --- a/activesupport/test/core_ext/string_ext_test.rb +++ b/activesupport/test/core_ext/string_ext_test.rb @@ -651,12 +651,6 @@ class OutputSafetyTest < ActiveSupport::TestCase assert_equal 'foo'.to_yaml, 'foo'.html_safe.to_yaml(:foo => 1) end - test 'knows whether it is encoding aware' do - assert_deprecated do - assert 'ruby'.encoding_aware? - end - end - test "call to_param returns a normal string" do string = @string.html_safe assert string.html_safe? |