Don't paramify ActionDispatch::Http::UploadedFile in tests

To test uploading a file without using fixture_file_upload, a posted
ActionDispatch::Http::UploadedFile should not be paramified (just like
Rack::Test::UploadedFile).
(Rack::Test::UploadedFile and ActionDispatch::Http::UploadedFile don't
share the same API, tempfile is not accessible on
Rack::Test::UploadedFile as discussed in
rack/rack-test#30)

actionpack/CHANGELOG.md

@@ -46,6 +46,12 @@
 
     *Jeremy Kemper & Erich Menge*
 
+*   Handle `ActionDispatch::Http::UploadedFile` like `Rack::Test::UploadedFile`, don't call to_param on it. Since
+    `Rack::Test::UploadedFile` isn't API compatible this is needed to test file uploads that rely on `tempfile`
+    being available.
+
+    *Tim Vandecasteele*
+
 
 ## Rails 3.2.8 (Aug 9, 2012) ##
 

actionpack/lib/action_controller/test_case.rb

@@ -422,7 +422,7 @@ def paramify_values(hash_or_array_or_value)
           Hash[hash_or_array_or_value.map{|key, value| [key, paramify_values(value)] }]
         when Array
           hash_or_array_or_value.map {|i| paramify_values(i)}
-        when Rack::Test::UploadedFile
+        when Rack::Test::UploadedFile, ActionDispatch::Http::UploadedFile
           hash_or_array_or_value
         else
           hash_or_array_or_value.to_param

actionpack/test/controller/test_test.rb

@@ -766,6 +766,13 @@ def test_fixture_file_upload
     assert_equal '159528', @response.body
   end
 
+  def test_action_dispatch_uploaded_file_upload
+    filename = 'mona_lisa.jpg'
+    path = "#{FILES_DIR}/#{filename}"
+    post :test_file_upload, :file => ActionDispatch::Http::UploadedFile.new(:filename => path, :type => "image/jpg", :tempfile => File.open(path))
+    assert_equal '159528', @response.body
+  end
+
   def test_test_uploaded_file_exception_when_file_doesnt_exist
     assert_raise(RuntimeError) { Rack::Test::UploadedFile.new('non_existent_file') }
   end