Multipart is now fixed in Rack.

1 files changed, 8 insertions, 14 deletions

diff --git a/actionpack/test/dispatch/request/multipart_params_parsing_test.rb b/actionpack/test/dispatch/request/multipart_params_parsing_test.rb
index 3ff558ec5a..560ea00923 100644
--- a/actionpack/test/dispatch/request/multipart_params_parsing_test.rb
+++ b/actionpack/test/dispatch/request/multipart_params_parsing_test.rb
@@ -82,21 +82,15 @@ class MultipartParamsParsingTest < ActionDispatch::IntegrationTest
     assert_equal 19512, file.size
   end
 
-  # Pending fix in Rack 1.2.2
-  # http://rack.lighthouseapp.com/projects/22435-rack/tickets/79-multipart-handling-incorrectly-assuming-file-upload
   test "parses mixed files" do
-    if Rack.release <= '1.2.1'
-      $stderr.puts 'multipart/mixed parsing pending fix in Rack 1.2.2'
-    else
-      params = parse_multipart('mixed_files')
-      assert_equal %w(files foo), params.keys.sort
-      assert_equal 'bar', params['foo']
-
-      # Rack doesn't handle multipart/mixed for us.
-      files = params['files']
-      files.force_encoding('ASCII-8BIT') if files.respond_to?(:force_encoding)
-      assert_equal 19756, files.size
-    end
+    params = parse_multipart('mixed_files')
+    assert_equal %w(files foo), params.keys.sort
+    assert_equal 'bar', params['foo']
+
+    # Rack doesn't handle multipart/mixed for us.
+    files = params['files']
+    files.force_encoding('ASCII-8BIT') if files.respond_to?(:force_encoding)
+    assert_equal 19756, files.size
   end
 
   test "does not create tempfile if no file has been selected" do