From 937a7abe4556f06e056af33c40a07c3b58652ed7 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Tue, 24 Jul 2007 01:20:18 +0000 Subject: Fixed that file.content_type for uploaded files would include a trailing \r #9053 [bgreenlee] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7212 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/test/controller/request_test.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'actionpack/test/controller/request_test.rb') 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 -- cgit v1.2.3