Merge branch 'master' into responsestarttime

request · Aug 28, 2016 · 20156e3 · 20156e3
2 parents ba2d946 + 0304bc1
commit 20156e3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -29,7 +29,7 @@
     "combined-stream": "~1.0.5",
     "extend": "~3.0.0",
     "forever-agent": "~0.6.1",
-    "form-data": "~1.0.0-rc4",
+    "form-data": "~1.0.1",
     "har-validator": "~2.0.6",
     "hawk": "~3.1.3",
     "http-signature": "~1.1.0",

diff --git a/tests/test-form-data-error.js b/tests/test-form-data-error.js
@@ -75,12 +75,12 @@ tape('form-data should throw on null value', function (t) {
         key: null
       }
     })
-  }, /Cannot read property 'path' of null/)
+  }, TypeError)
   t.end()
 })
 
 tape('cleanup', function(t) {
   s.close(function() {
     t.end()
   })
-})
+})