testing multipart support

Author: ahmadnassri

CONTRIBUTING.md

@@ -312,7 +312,9 @@ postData: {
 
 ###### application/json
 
-*when postData.mimeType is one of: `application/json`, `text/json`, `text/x-json`, `application/x-json`*
+- will match when `postData.mimeType` is one of: `application/json`, `text/json`, `text/x-json`, `application/x-json`
+- In case of failure to parse `postData.text` as a JSON object, `postData.mimeType` is set to `text/plain`. this is done so that the implementing target, would still attempt to post the raw body as is.
+- This also emphasizes not to rely on `postData.mimeType` for the `Content-Type` header!
 
 ```js
 postData: {
@@ -338,15 +340,12 @@ postData: {
 }
 ```
 
-Notes:
-
-- In case of failure to parse `postData.text` as a JSON object, `postData.mimeType` is set to `text/plain`. this is done so that the implementing target, would still attempt to post the raw body as is.
-- This also emphasizes not to rely on `postData.mimeType` for the `Content-Type` header!
-
 ###### multipart/form-data
 
+- will match when `postData.mimeType` is one of: `multipart/mixed` `multipart/related`, `multipart/form-data`, `multipart/alternative`
+- will force `postData.mimeType` to `multipart/form-data`
 - will create/overwrite the `Content-Type` header if it does not exist, with the appropriate boundary flag.
-- will create/overwrite the `Content-Length` header
+- when no `params[].value` is present, will default to empty content
 
 ```js
 postData: {
@@ -379,10 +378,6 @@ postData: {
 
 ###### multipart/form-data (File Uploads)
 
-- will create/overwrite the `Content-Type` header if it does not exist, with the appropriate boundary flag.
-- will create/overwrite the `Content-Length` header
-- when no params[].value is present, will default to empty content
-
 ```js
 postData: {
   // added to pass har-validator

src/index.js

@@ -54,10 +54,6 @@ var HTTPSnippet = function (req, lang) {
       }, {});
     }
 
-    // create allHeaders object
-    // this.source.allHeaders = util._extend(this.source.allHeaders, this.source.headersObj);
-    this.source.allHeaders = util._extend(this.source.allHeaders, this.source.headersObj);
-
     // construct Cookie header
     var cookies = this.source.cookies.map(function (cookie) {
       return encodeURIComponent(cookie.name) + '=' + encodeURIComponent(cookie.value);
@@ -68,9 +64,13 @@ var HTTPSnippet = function (req, lang) {
     }
 
     switch (this.source.postData.mimeType) {
+      case 'multipart/mixed':
+      case 'multipart/related':
       case 'multipart/form-data':
-        // reset the text value
+      case 'multipart/alternative':
+        // reset values
         this.source.postData.text = '';
+        this.source.postData.mimeType = 'multipart/form-data';
 
         var form = new FormData();
 
@@ -89,7 +89,6 @@ var HTTPSnippet = function (req, lang) {
         }.bind(this)));
 
         this.source.headersObj['content-type'] = 'multipart/form-data; boundary=' + form.getBoundary();
-        this.source.headersObj['content-length'] = form.getLengthSync();
         break;
 
       case 'application/x-www-form-urlencoded':
@@ -107,20 +106,25 @@ var HTTPSnippet = function (req, lang) {
       case 'text/x-json':
       case 'application/json':
       case 'application/x-json':
+        this.source.postData.mimeType = 'application/json';
+
         if (this.source.postData.text) {
           try {
             this.source.postData.jsonObj = JSON.parse(this.source.postData.text);
           } catch (e) {
             debug(e);
-            
+
             // force back to text/plain
             // if headers have proper content-type value, then this should also work
-            this.source.postData.mimeType = 'text/plain'
+            this.source.postData.mimeType = 'text/plain';
           }
         }
         break;
     }
 
+    // create allHeaders object
+    this.source.allHeaders = util._extend(this.source.allHeaders, this.source.headersObj);
+
     // deconstruct the uri
     this.source.uriObj = url.parse(this.source.url, true, true);
 

src/targets/ocaml/cohttp.js

@@ -30,28 +30,17 @@ module.exports = function (source, options) {
   }
 
   // Add body
-  var bodyPresent = source.postData && source.postData.text;
-
-  if (bodyPresent) {
+  if (source.postData.text) {
     // Just text
     code.push(util.format('let body = %s in', JSON.stringify(source.postData.text)));
-  } else if (source.postData && !source.postData.text && source.postData.params && source.postData.params.length) {
-    // Post params
-    bodyPresent = true;
-
-    var body = source.postData.params.map(function (param) {
-      return param.name + '=' + param.value;
-    }).join('&');
-
-    code.push(util.format('let body = "%s" in', body));
   }
 
   // Do the request
   code.push('');
 
   code.push(util.format('Client.call %s%s(Code.method_of_string "%s") uri',
     headers.length ? '~headers ' : '',
-    bodyPresent ? '~body ' : '',
+    source.postData.text ? '~body ' : '',
     source.method
   ));
 

src/targets/wget.js

@@ -27,16 +27,6 @@ module.exports = function (source, options) {
     code.push('--body-data ' + JSON.stringify(source.postData.text));
   }
 
-  if (source.postData.mimeType === 'multipart/form-data') {
-    source.postData.params.forEach(function (param) {
-      if (param.value) {
-        code.push(util.format('--body-data %s', JSON.stringify(param.value)));
-      } else if (param.fileName) {
-        code.push(util.format('--body-file "%s"', param.fileName));
-      }
-    });
-  }
-
   code.push(opts.short ? '-O' : '--output-document');
 
   code.push(util.format('- "%s"', source.fullUrl));

test/fixtures/available-targets.json

@@ -48,7 +48,7 @@
     "clients": [
       {
         "key": "cohttp",
-        "title": "OCaml",
+        "title": "CoHTTP",
         "link": "https://github.com/mirage/ocaml-cohttp",
         "description": "Cohttp is a very lightweight HTTP server using Lwt or Async for OCaml"
       }

test/fixtures/output/curl/multipart-data.sh

@@ -0,0 +1,4 @@
+curl --request POST \
+  --url "http://mockbin.com/har" \
+  --header "content-type: multipart/form-data; boundary=---011000010111000001101001" \
+  --data "-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\nHello World\r\n-----011000010111000001101001--"

test/fixtures/output/curl/multipart-file.sh

@@ -0,0 +1,4 @@
+curl --request POST \
+  --url "http://mockbin.com/har" \
+  --header "content-type: multipart/form-data; boundary=---011000010111000001101001" \
+  --data "-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\n\r\n-----011000010111000001101001--"

test/fixtures/output/curl/multipart-form-data.sh

@@ -0,0 +1,4 @@
+curl --request POST \
+  --url "http://mockbin.com/har" \
+  --header "content-type: multipart/form-data; boundary=---011000010111000001101001" \
+  --data "-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"\r\n\r\nbar\r\n-----011000010111000001101001--"

test/fixtures/output/httpie/multipart-data.sh

@@ -0,0 +1,3 @@
+echo "-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\nHello World\r\n-----011000010111000001101001--" |  \
+  http POST http://mockbin.com/har \
+  content-type:multipart/form-data; boundary=---011000010111000001101001

test/fixtures/output/httpie/multipart-file.sh

@@ -0,0 +1,3 @@
+echo "-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\n\r\n-----011000010111000001101001--" |  \
+  http POST http://mockbin.com/har \
+  content-type:multipart/form-data; boundary=---011000010111000001101001