test: fixing broken multipart tests

erunion · erunion · commit 02356b62fcb0 · 2020-08-06T11:21:50.000-07:00
diff --git a/src/index.js b/src/index.js
@@ -122,12 +122,12 @@ HTTPSnippet.prototype.prepare = function (request) {
         // This hack is pretty awful but it's the only way we can use this library in the browser as if we code this
         // against just the native FormData object, we can't polyfill that back into Node because Blob and File objects,
         // which something like `formdata-polyfill` requires, don't exist there.
-        const isNativeFormData = (typeof form[Symbol.iterator] === 'function');
+        const isNativeFormData = (typeof form[Symbol.iterator] === 'function')
 
         // easter egg
         const boundary = '---011000010111000001101001'
         if (!isNativeFormData) {
-          form._boundary = boundary;
+          form._boundary = boundary
         }
 
         request.postData.params.forEach(function (param) {
diff --git a/test/fixtures/output/http/1.1/application-form-encoded b/test/fixtures/output/http/1.1/application-form-encoded
@@ -1,6 +1,6 @@
-POST /har HTTP/1.1
-Content-Type: application/x-www-form-urlencoded
-Host: mockbin.com
-Content-Length: 19
-
+POST /har HTTP/1.1
+Content-Type: application/x-www-form-urlencoded
+Host: mockbin.com
+Content-Length: 19
+
 foo=bar&hello=world
diff --git a/test/fixtures/output/http/1.1/application-json b/test/fixtures/output/http/1.1/application-json
@@ -1,6 +1,6 @@
-POST /har HTTP/1.1
-Content-Type: application/json
-Host: mockbin.com
-Content-Length: 118
-
+POST /har HTTP/1.1
+Content-Type: application/json
+Host: mockbin.com
+Content-Length: 118
+
 {"number":1,"string":"f\"oo","arr":[1,2,3],"nested":{"a":"b"},"arr_mix":[1,"a",{"arr_mix_nested":{}}],"boolean":false}
diff --git a/test/fixtures/output/http/1.1/cookies b/test/fixtures/output/http/1.1/cookies
@@ -1,5 +1,5 @@
-POST /har HTTP/1.1
-Cookie: foo=bar; bar=baz
-Host: mockbin.com
-
+POST /har HTTP/1.1
+Cookie: foo=bar; bar=baz
+Host: mockbin.com
+
 
diff --git a/test/fixtures/output/http/1.1/custom-method b/test/fixtures/output/http/1.1/custom-method
@@ -1,4 +1,4 @@
-PROPFIND /har HTTP/1.1
-Host: mockbin.com
-
+PROPFIND /har HTTP/1.1
+Host: mockbin.com
+
 
diff --git a/test/fixtures/output/http/1.1/full b/test/fixtures/output/http/1.1/full
@@ -1,8 +1,8 @@
-POST /har?foo=bar&foo=baz&baz=abc&key=value HTTP/1.1
-Cookie: foo=bar; bar=baz
-Accept: application/json
-Content-Type: application/x-www-form-urlencoded
-Host: mockbin.com
-Content-Length: 7
-
+POST /har?foo=bar&foo=baz&baz=abc&key=value HTTP/1.1
+Cookie: foo=bar; bar=baz
+Accept: application/json
+Content-Type: application/x-www-form-urlencoded
+Host: mockbin.com
+Content-Length: 7
+
 foo=bar
diff --git a/test/fixtures/output/http/1.1/headers b/test/fixtures/output/http/1.1/headers
@@ -1,6 +1,6 @@
-GET /har HTTP/1.1
-Accept: application/json
-X-Foo: Bar
-Host: mockbin.com
-
+GET /har HTTP/1.1
+Accept: application/json
+X-Foo: Bar
+Host: mockbin.com
+
 
diff --git a/test/fixtures/output/http/1.1/https b/test/fixtures/output/http/1.1/https
@@ -1,4 +1,4 @@
-GET /har HTTP/1.1
-Host: mockbin.com
-
+GET /har HTTP/1.1
+Host: mockbin.com
+
 
diff --git a/test/fixtures/output/http/1.1/jsonObj-multiline b/test/fixtures/output/http/1.1/jsonObj-multiline
@@ -1,8 +1,8 @@
-POST /har HTTP/1.1
-Content-Type: application/json
-Host: mockbin.com
-Content-Length: 18
-
+POST /har HTTP/1.1
+Content-Type: application/json
+Host: mockbin.com
+Content-Length: 18
+
 {
   "foo": "bar"
 }
diff --git a/test/fixtures/output/http/1.1/jsonObj-null-value b/test/fixtures/output/http/1.1/jsonObj-null-value
@@ -1,6 +1,6 @@
-POST /har HTTP/1.1
-Content-Type: application/json
-Host: mockbin.com
-Content-Length: 12
-
+POST /har HTTP/1.1
+Content-Type: application/json
+Host: mockbin.com
+Content-Length: 12
+
 {"foo":null}
diff --git a/test/fixtures/output/http/1.1/multipart-data b/test/fixtures/output/http/1.1/multipart-data
@@ -1,10 +1,11 @@
-POST /har HTTP/1.1
-Content-Type: multipart/form-data; boundary=---011000010111000001101001
-Host: mockbin.com
-Content-Length: 136
-
------011000010111000001101001
-Content-Disposition: form-data; name="foo"; filename="hello.txt"
-Content-Type: text/plain
-
+POST /har HTTP/1.1
+Content-Type: multipart/form-data; boundary=---011000010111000001101001
+Host: mockbin.com
+Content-Length: 171
+
+-----011000010111000001101001
+Content-Disposition: form-data; name="foo"; filename="hello.txt"
+Content-Type: text/plain
+
 Hello World
+-----011000010111000001101001--
diff --git a/test/fixtures/output/http/1.1/multipart-file b/test/fixtures/output/http/1.1/multipart-file
@@ -1,10 +1,11 @@
-POST /har HTTP/1.1
-Content-Type: multipart/form-data; boundary=---011000010111000001101001
-Host: mockbin.com
-Content-Length: 125
-
------011000010111000001101001
-Content-Disposition: form-data; name="foo"; filename="hello.txt"
-Content-Type: text/plain
-
+POST /har HTTP/1.1
+Content-Type: multipart/form-data; boundary=---011000010111000001101001
+Host: mockbin.com
+Content-Length: 160
 
+-----011000010111000001101001
+Content-Disposition: form-data; name="foo"; filename="hello.txt"
+Content-Type: text/plain
+
+
+-----011000010111000001101001--
diff --git a/test/fixtures/output/http/1.1/multipart-form-data b/test/fixtures/output/http/1.1/multipart-form-data
@@ -1,9 +1,10 @@
-POST /har HTTP/1.1
-Content-Type: multipart/form-data; boundary=---011000010111000001101001
-Host: mockbin.com
-Content-Length: 80
-
------011000010111000001101001
-Content-Disposition: form-data; name="foo"
-
+POST /har HTTP/1.1
+Content-Type: multipart/form-data; boundary=---011000010111000001101001
+Host: mockbin.com
+Content-Length: 115
+
+-----011000010111000001101001
+Content-Disposition: form-data; name="foo"
+
 bar
+-----011000010111000001101001--
diff --git a/test/fixtures/output/http/1.1/query b/test/fixtures/output/http/1.1/query
@@ -1,4 +1,4 @@
-GET /har?foo=bar&foo=baz&baz=abc&key=value HTTP/1.1
-Host: mockbin.com
-
+GET /har?foo=bar&foo=baz&baz=abc&key=value HTTP/1.1
+Host: mockbin.com
+
 
diff --git a/test/fixtures/output/http/1.1/short b/test/fixtures/output/http/1.1/short
@@ -1,4 +1,4 @@
-GET /har HTTP/1.1
-Host: mockbin.com
-
+GET /har HTTP/1.1
+Host: mockbin.com
+
 
diff --git a/test/fixtures/output/http/1.1/text-plain b/test/fixtures/output/http/1.1/text-plain
@@ -1,6 +1,6 @@
-POST /har HTTP/1.1
-Content-Type: text/plain
-Host: mockbin.com
-Content-Length: 11
-
+POST /har HTTP/1.1
+Content-Type: text/plain
+Host: mockbin.com
+Content-Length: 11
+
 Hello World
diff --git a/test/fixtures/output/node/request/multipart-data.js b/test/fixtures/output/node/request/multipart-data.js
@@ -7,10 +7,7 @@ var options = {
   formData: {
     foo: {
       value: 'Hello World',
-      options: {
-        filename: 'hello.txt',
-        contentType: 'text/plain'
-      }
+      options: {filename: 'hello.txt', contentType: 'text/plain'}
     }
   }
 };
diff --git a/test/fixtures/output/node/request/multipart-file.js b/test/fixtures/output/node/request/multipart-file.js
@@ -8,10 +8,7 @@ var options = {
   formData: {
     foo: {
       value: 'fs.createReadStream("test/fixtures/files/hello.txt")',
-        options: {
-          filename: 'test/fixtures/files/hello.txt',
-          contentType: 'text/plain'
-      }
+      options: {filename: 'test/fixtures/files/hello.txt', contentType: 'text/plain'}
     }
   }
 };
diff --git a/test/fixtures/output/php/http1/multipart-data.php b/test/fixtures/output/php/http1/multipart-data.php
@@ -8,12 +8,12 @@
   'content-type' => 'multipart/form-data; boundary=---011000010111000001101001'
 ));
 
-$request->setBody('-----011000010111000001101001
-Content-Disposition: form-data; name="foo"; filename="hello.txt"
-Content-Type: text/plain
-
-Hello World
------011000010111000001101001--
+$request->setBody('-----011000010111000001101001
+Content-Disposition: form-data; name="foo"; filename="hello.txt"
+Content-Type: text/plain
+
+Hello World
+-----011000010111000001101001--
 ');
 
 try {
diff --git a/test/fixtures/output/php/http1/multipart-file.php b/test/fixtures/output/php/http1/multipart-file.php
@@ -8,12 +8,12 @@
   'content-type' => 'multipart/form-data; boundary=---011000010111000001101001'
 ));
 
-$request->setBody('-----011000010111000001101001
-Content-Disposition: form-data; name="foo"; filename="hello.txt"
-Content-Type: text/plain
-
-
------011000010111000001101001--
+$request->setBody('-----011000010111000001101001
+Content-Disposition: form-data; name="foo"; filename="hello.txt"
+Content-Type: text/plain
+
+
+-----011000010111000001101001--
 ');
 
 try {
diff --git a/test/fixtures/output/php/http1/multipart-form-data.php b/test/fixtures/output/php/http1/multipart-form-data.php
@@ -8,11 +8,11 @@
   'content-type' => 'multipart/form-data; boundary=---011000010111000001101001'
 ));
 
-$request->setBody('-----011000010111000001101001
-Content-Disposition: form-data; name="foo"
-
-bar
------011000010111000001101001--
+$request->setBody('-----011000010111000001101001
+Content-Disposition: form-data; name="foo"
+
+bar
+-----011000010111000001101001--
 ');
 
 try {
diff --git a/test/fixtures/output/powershell/restmethod/multipart-data.ps1 b/test/fixtures/output/powershell/restmethod/multipart-data.ps1
@@ -1,7 +1,9 @@
 $headers=@{}
 $headers.Add("content-type", "multipart/form-data; boundary=---011000010111000001101001")
-$response = Invoke-RestMethod -Uri 'http://mockbin.com/har' -Method POST -Headers $headers -ContentType 'multipart/form-data; boundary=---011000010111000001101001' -Body '-----011000010111000001101001
-Content-Disposition: form-data; name="foo"; filename="hello.txt"
-Content-Type: text/plain
-
-Hello World'
+$response = Invoke-RestMethod -Uri 'http://mockbin.com/har' -Method POST -Headers $headers -ContentType 'multipart/form-data; boundary=---011000010111000001101001' -Body '-----011000010111000001101001
+Content-Disposition: form-data; name="foo"; filename="hello.txt"
+Content-Type: text/plain
+
+Hello World
+-----011000010111000001101001--
+'
diff --git a/test/fixtures/output/powershell/restmethod/multipart-file.ps1 b/test/fixtures/output/powershell/restmethod/multipart-file.ps1
@@ -1,7 +1,9 @@
 $headers=@{}
 $headers.Add("content-type", "multipart/form-data; boundary=---011000010111000001101001")
-$response = Invoke-RestMethod -Uri 'http://mockbin.com/har' -Method POST -Headers $headers -ContentType 'multipart/form-data; boundary=---011000010111000001101001' -Body '-----011000010111000001101001
-Content-Disposition: form-data; name="foo"; filename="hello.txt"
-Content-Type: text/plain
-
+$response = Invoke-RestMethod -Uri 'http://mockbin.com/har' -Method POST -Headers $headers -ContentType 'multipart/form-data; boundary=---011000010111000001101001' -Body '-----011000010111000001101001
+Content-Disposition: form-data; name="foo"; filename="hello.txt"
+Content-Type: text/plain
+
+
+-----011000010111000001101001--
 '
diff --git a/test/fixtures/output/powershell/restmethod/multipart-form-data.ps1 b/test/fixtures/output/powershell/restmethod/multipart-form-data.ps1
@@ -1,6 +1,8 @@
 $headers=@{}
 $headers.Add("content-type", "multipart/form-data; boundary=---011000010111000001101001")
-$response = Invoke-RestMethod -Uri 'http://mockbin.com/har' -Method POST -Headers $headers -ContentType 'multipart/form-data; boundary=---011000010111000001101001' -Body '-----011000010111000001101001
-Content-Disposition: form-data; name="foo"
-
-bar'
+$response = Invoke-RestMethod -Uri 'http://mockbin.com/har' -Method POST -Headers $headers -ContentType 'multipart/form-data; boundary=---011000010111000001101001' -Body '-----011000010111000001101001
+Content-Disposition: form-data; name="foo"
+
+bar
+-----011000010111000001101001--
+'
diff --git a/test/fixtures/output/powershell/webrequest/multipart-data.ps1 b/test/fixtures/output/powershell/webrequest/multipart-data.ps1
@@ -4,4 +4,6 @@ $response = Invoke-WebRequest -Uri 'http://mockbin.com/har' -Method POST -Header
 Content-Disposition: form-data; name="foo"; filename="hello.txt"
 Content-Type: text/plain
 
-Hello World'
+Hello World
+-----011000010111000001101001--
+'
diff --git a/test/fixtures/output/powershell/webrequest/multipart-file.ps1 b/test/fixtures/output/powershell/webrequest/multipart-file.ps1
@@ -4,4 +4,6 @@ $response = Invoke-WebRequest -Uri 'http://mockbin.com/har' -Method POST -Header
 Content-Disposition: form-data; name="foo"; filename="hello.txt"
 Content-Type: text/plain
 
+
+-----011000010111000001101001--
 '
diff --git a/test/fixtures/output/powershell/webrequest/multipart-form-data.ps1 b/test/fixtures/output/powershell/webrequest/multipart-form-data.ps1
@@ -3,4 +3,6 @@ $headers.Add("content-type", "multipart/form-data; boundary=---01100001011100000
 $response = Invoke-WebRequest -Uri 'http://mockbin.com/har' -Method POST -Headers $headers -ContentType 'multipart/form-data; boundary=---011000010111000001101001' -Body '-----011000010111000001101001
 Content-Disposition: form-data; name="foo"
 
-bar'
+bar
+-----011000010111000001101001--
+'
diff --git a/test/fixtures/output/shell/httpie/multipart-data.sh b/test/fixtures/output/shell/httpie/multipart-data.sh
@@ -1,9 +1,9 @@
-echo '-----011000010111000001101001
-Content-Disposition: form-data; name="foo"; filename="hello.txt"
-Content-Type: text/plain
-
-Hello World
------011000010111000001101001--
+echo '-----011000010111000001101001
+Content-Disposition: form-data; name="foo"; filename="hello.txt"
+Content-Type: text/plain
+
+Hello World
+-----011000010111000001101001--
 ' |  \
   http POST http://mockbin.com/har \
   content-type:'multipart/form-data; boundary=---011000010111000001101001'
diff --git a/test/fixtures/output/shell/httpie/multipart-file.sh b/test/fixtures/output/shell/httpie/multipart-file.sh
@@ -1,9 +1,9 @@
-echo '-----011000010111000001101001
-Content-Disposition: form-data; name="foo"; filename="hello.txt"
-Content-Type: text/plain
-
-
------011000010111000001101001--
+echo '-----011000010111000001101001
+Content-Disposition: form-data; name="foo"; filename="hello.txt"
+Content-Type: text/plain
+
+
+-----011000010111000001101001--
 ' |  \
   http POST http://mockbin.com/har \
   content-type:'multipart/form-data; boundary=---011000010111000001101001'
diff --git a/test/fixtures/output/shell/httpie/multipart-form-data.sh b/test/fixtures/output/shell/httpie/multipart-form-data.sh
@@ -1,8 +1,8 @@
-echo '-----011000010111000001101001
-Content-Disposition: form-data; name="foo"
-
-bar
------011000010111000001101001--
+echo '-----011000010111000001101001
+Content-Disposition: form-data; name="foo"
+
+bar
+-----011000010111000001101001--
 ' |  \
   http POST http://mockbin.com/har \
   content-type:'multipart/form-data; boundary=---011000010111000001101001'
diff --git a/test/targets.js b/test/targets.js

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`		`-POST /har HTTP/1.1`
`2`		`-Content-Type: application/json`
`3`		`-Host: mockbin.com`
`4`		`-Content-Length: 18`
`5`		`-`
	`1`	`+POST /har HTTP/1.1`
	`2`	`+Content-Type: application/json`
	`3`	`+Host: mockbin.com`
	`4`	`+Content-Length: 18`
	`5`	`+`
`6`	`6`	`{`
`7`	`7`	`"foo": "bar"`
`8`	`8`	`}`