diff options
Diffstat (limited to 'actionpack/test/controller/request_test.rb')
| -rw-r--r-- | actionpack/test/controller/request_test.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/test/controller/request_test.rb b/actionpack/test/controller/request_test.rb index b45e7f8771..19ae17c171 100644 --- a/actionpack/test/controller/request_test.rb +++ b/actionpack/test/controller/request_test.rb @@ -667,7 +667,7 @@ class MultipartRequestParameterParsingTest < Test::Unit::TestCase file = params['file'] assert_kind_of StringIO, file assert_equal 'file.txt', file.original_filename - assert_equal "text/plain\r", file.content_type + assert_equal "text/plain", file.content_type assert_equal 'contents', file.read end @@ -679,7 +679,7 @@ class MultipartRequestParameterParsingTest < Test::Unit::TestCase file = params['file'] assert_kind_of Tempfile, file assert_equal 'file.txt', file.original_filename - assert_equal "text/plain\r", file.content_type + assert_equal "text/plain", file.content_type assert ('a' * 20480) == file.read end @@ -697,7 +697,7 @@ class MultipartRequestParameterParsingTest < Test::Unit::TestCase file = params['flowers'] assert_kind_of StringIO, file assert_equal 'flowers.jpg', file.original_filename - assert_equal "image/jpeg\r", file.content_type + assert_equal "image/jpeg", file.content_type assert_equal 19512, file.size #assert_equal File.read(File.dirname(__FILE__) + '/../../../activerecord/test/fixtures/flowers.jpg'), file.read end |