Allow empty files to be uploaded

1 files changed, 10 insertions, 2 deletions

diff --git a/actionpack/test/controller/request/multipart_params_parsing_test.rb b/actionpack/test/controller/request/multipart_params_parsing_test.rb
index 18235845f3..054519d0d2 100644
--- a/actionpack/test/controller/request/multipart_params_parsing_test.rb
+++ b/actionpack/test/controller/request/multipart_params_parsing_test.rb
@@ -101,11 +101,19 @@ class MultipartParamsParsingTest < ActionController::IntegrationTest
     assert_equal 19756, files.size
   end
 
-  test "skips empty upload field" do
+  test "does not create tempfile if no file has been selected" do
+    params = parse_multipart('none')
+    assert_equal %w(files submit-name), params.keys.sort
+    assert_equal 'Larry', params['submit-name']
+    assert_equal nil, params['files']
+  end
+
+  test "parses empty upload file" do
     params = parse_multipart('empty')
     assert_equal %w(files submit-name), params.keys.sort
     assert_equal 'Larry', params['submit-name']
-    assert_equal nil, params['file']
+    assert params['files']
+    assert_equal "", params['files'].read
   end
 
   test "uploads and reads binary file" do