diff options
author | José Valim <jose.valim@gmail.com> | 2011-12-24 05:47:21 -0800 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2011-12-24 05:47:21 -0800 |
commit | f5b9aefb574bf3cf1d3779606e54bd0a0a73d2aa (patch) | |
tree | da7a9a4d9cd8ad05648bde5d283715d5feea4d81 /actionpack/test/dispatch | |
parent | a5fa310f406e299a1ac54d1a227bde93b7ce282b (diff) | |
parent | 5ca86ac8f924b333a5a01a47cc07cbcf39c16e80 (diff) | |
download | rails-f5b9aefb574bf3cf1d3779606e54bd0a0a73d2aa.tar.gz rails-f5b9aefb574bf3cf1d3779606e54bd0a0a73d2aa.tar.bz2 rails-f5b9aefb574bf3cf1d3779606e54bd0a0a73d2aa.zip |
Merge pull request #4160 from lest/deprecate-encoding-aware
deprecate String#encoding_aware? and remove its usage
Diffstat (limited to 'actionpack/test/dispatch')
-rw-r--r-- | actionpack/test/dispatch/request/url_encoded_params_parsing_test.rb | 2 | ||||
-rw-r--r-- | actionpack/test/dispatch/response_test.rb | 3 | ||||
-rw-r--r-- | actionpack/test/dispatch/uploaded_file_test.rb | 8 |
3 files changed, 3 insertions, 10 deletions
diff --git a/actionpack/test/dispatch/request/url_encoded_params_parsing_test.rb b/actionpack/test/dispatch/request/url_encoded_params_parsing_test.rb index 04a0fb6f34..05569561d2 100644 --- a/actionpack/test/dispatch/request/url_encoded_params_parsing_test.rb +++ b/actionpack/test/dispatch/request/url_encoded_params_parsing_test.rb @@ -146,8 +146,6 @@ class UrlEncodedParamsParsingTest < ActionDispatch::IntegrationTest end def assert_utf8(object) - return unless "ruby".encoding_aware? - correct_encoding = Encoding.default_internal unless object.is_a?(Hash) diff --git a/actionpack/test/dispatch/response_test.rb b/actionpack/test/dispatch/response_test.rb index 9bdd5ecbc6..82d1200f8e 100644 --- a/actionpack/test/dispatch/response_test.rb +++ b/actionpack/test/dispatch/response_test.rb @@ -6,9 +6,6 @@ class ResponseTest < ActiveSupport::TestCase end def test_response_body_encoding - # FIXME: remove this conditional on Rails 4.0 - return unless "<3".encoding_aware? - body = ["hello".encode('utf-8')] response = ActionDispatch::Response.new 200, {}, body assert_equal Encoding::UTF_8, response.body.encoding diff --git a/actionpack/test/dispatch/uploaded_file_test.rb b/actionpack/test/dispatch/uploaded_file_test.rb index 7e4a1519fb..0b95291e18 100644 --- a/actionpack/test/dispatch/uploaded_file_test.rb +++ b/actionpack/test/dispatch/uploaded_file_test.rb @@ -13,11 +13,9 @@ module ActionDispatch assert_equal 'foo', uf.original_filename end - if "ruby".encoding_aware? - def test_filename_should_be_in_utf_8 - uf = Http::UploadedFile.new(:filename => 'foo', :tempfile => Object.new) - assert_equal "UTF-8", uf.original_filename.encoding.to_s - end + def test_filename_should_be_in_utf_8 + uf = Http::UploadedFile.new(:filename => 'foo', :tempfile => Object.new) + assert_equal "UTF-8", uf.original_filename.encoding.to_s end def test_content_type |