Empty file uploads shuold not cause errors.

tehnorm · Jan 4, 2011 · 822377a · 822377a
1 parent 441ba41
commit 822377a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/spec/forms-spec.coffee b/spec/forms-spec.coffee
@@ -78,11 +78,10 @@ brains.post "/upload", (req, res)->
   res.send """
   <html>
     <head><title>#{text?.filename || image?.filename}</title></head>
-    <body>#{text || image.length}</body>
+    <body>#{text || image?.length}</body>
   </html>
   """
 
-
 vows.describe("Forms").addBatch(
   "fill field":
     zombie.wants "http://localhost:3003/form"
@@ -307,6 +306,13 @@ vows.describe("Forms").addBatch(
       topic: (browser)->
         @filename = __dirname + "/data/zombie.jpg"
         browser.attach("image", @filename).pressButton "Upload", @callback
-      #"should upload file": (browser)-> assert.equal browser.text("body").trim(), "Random text"
       "should upload include name": (browser)-> assert.equal browser.text("title"), @filename
+
+  "empty file upload":
+    zombie.wants "http://localhost:3003/upload"
+      topic: (browser)->
+        browser.attach "text", ""
+        browser.pressButton "Upload", @callback
+      "should not upload any file": (browser)-> assert.equal browser.text("body").trim(), "undefined"
+
 ).export(module)
diff --git a/spec/helpers.coffee b/spec/helpers.coffee
@@ -92,7 +92,8 @@ zombie.Browser.prototype.wants = (url, options, callback)->
 # Handle multipart/form-data so we can test file upload.
 express.bodyDecoder.decode["multipart/form-data"] = (body)->
   # Find the boundary
-  if boundary = body.match(/^(--.*)\r\n(?:.|\n|\r)*\1--/m)[1]
+  match = body.match(/^(--.*)\r\n(?:.|\n|\r)*\1--/m)
+  if match && boundary = match[1]
     # Split body at boundary, ignore first (opening) and last (closing)
     # boundaries, and map the rest into name/value pairs.
     body.split("#{boundary}").slice(1,-1).reduce (parts, part)->
@@ -125,6 +126,8 @@ express.bodyDecoder.decode["multipart/form-data"] = (body)->
         parts[pairs.name] = contents if pairs.name
       parts
     , {}
+  else
+    {}
 
 
 vows.zombie = zombie