aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller/request_test.rb
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2007-06-12 07:44:23 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2007-06-12 07:44:23 +0000
commit979c22444d832e51b29c0404e3b990cab00606e9 (patch)
tree6fb2a0d223dfcf8d97c36b7304a8b25dab6d9f87 /actionpack/test/controller/request_test.rb
parente4e275dde3b6ff1bcdc5f12631faa48585cb491f (diff)
downloadrails-979c22444d832e51b29c0404e3b990cab00606e9.tar.gz
rails-979c22444d832e51b29c0404e3b990cab00606e9.tar.bz2
rails-979c22444d832e51b29c0404e3b990cab00606e9.zip
Tolerate missing content type on multipart file uploads. Fix for Safari 3.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7005 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/test/controller/request_test.rb')
-rw-r--r--actionpack/test/controller/request_test.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/test/controller/request_test.rb b/actionpack/test/controller/request_test.rb
index e14036fd2f..49c404244f 100644
--- a/actionpack/test/controller/request_test.rb
+++ b/actionpack/test/controller/request_test.rb
@@ -690,8 +690,8 @@ 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 'file.csv', file.original_filename
+ assert_equal '', file.content_type
assert_equal 'contents', file.read
file = params['flowers']