Test that parsing a multipart/mixed upload no longer blows up

test/multipart/mixed_files

@@ -0,0 +1,21 @@
+--AaB03x
+Content-Disposition: form-data; name="foo"
+
+bar
+--AaB03x
+Content-Disposition: form-data; name="files"
+Content-Type: multipart/mixed, boundary=BbC04y
+
+--BbC04y
+Content-Disposition: attachment; filename="file.txt"
+Content-Type: text/plain
+
+contents
+--BbC04y
+Content-Disposition: attachment; filename="flowers.jpg"
+Content-Type: image/jpeg
+Content-Transfer-Encoding: binary
+
+contents
+--BbC04y--
+--AaB03x--

test/spec_multipart.rb

@@ -110,6 +110,14 @@ def multipart_file(name)
     params.keys.should.not.include "files"
   end
 
+  should "parse multipart/mixed" do
+    env = Rack::MockRequest.env_for("/", multipart_fixture(:mixed_files))
+    params = Rack::Utils::Multipart.parse_multipart(env)
+    params["foo"].should.equal "bar"
+    params["files"].should.be.instance_of String
+    params["files"].size.should.equal 252
+  end
+
   should "parse IE multipart upload and clean up filename" do
     env = Rack::MockRequest.env_for("/", multipart_fixture(:ie))
     params = Rack::Multipart.parse_multipart(env)
@@ -276,4 +284,4 @@ def multipart_file(name)
       message.should.equal "value must be a Hash"
   end
 
-end
+end

test/spec_utils.rb

@@ -427,4 +427,4 @@ def context env, app=@app; app.call(env); end
     r5.status.should.equal 200
     r4.body.should.equal r5.body
   end
-end
+end