improvement: form-data patch checks and tests

* add form-data patch checks for existing FormData prototype
* update http-multipart tests for compatibility with form-data patch
* linting

* live tests also refactored, remain in skip state
* tested on node 8

Author: tim-lai

src/http.js

@@ -3,7 +3,7 @@ import qs from 'qs'
 import jsYaml from 'js-yaml'
 import isString from 'lodash/isString'
 import isFunction from 'lodash/isFunction'
-import FormData from './internal/form-data-monkey-patch';
+import FormData from './internal/form-data-monkey-patch'
 
 // For testing
 export const self = {

src/internal/form-data-monkey-patch.js

@@ -1,57 +1,69 @@
-import IsomorphicFormData from 'isomorphic-form-data';
+import IsomorphicFormData from 'isomorphic-form-data'
 
 // patches FormData type by mutating it.
 // patch :: FormData -> PatchedFormData
 export const patch = (FormData) => {
-  const create_entry = (field, value) => ({ name: field, value: value });
+  const createEntry = (field, value) => ({name: field, value})
 
   class PatchedFormData extends FormData {
     constructor(form) {
-      super(form);
-      this._entryList = [];
+      super(form)
+      this._entryList = []
     }
 
     append(field, value, options) {
-      this._entryList.push(create_entry(field, value));
-      return super.append(field, value, options);
+      this._entryList.push(createEntry(field, value))
+      return super.append(field, value, options)
     }
 
     set(field, value) {
-      const entry = create_entry(field, value);
+      if (super.set) {
+        return super.set(field, value)
+      }
+      const newEntry = createEntry(field, value)
 
       this._entryList = this._entryList.filter((entry) => {
-        return entry.name !== field;
-      });
+        return entry.name !== field
+      })
 
-      this._entryList.push(entry);
+      this._entryList.push(newEntry)
     }
 
     get(field) {
+      if (super.get) {
+        return super.get(field)
+      }
       const foundEntry = this._entryList.find((entry) => {
-        return entry.name === field;
-      });
+        return entry.name === field
+      })
 
-      return foundEntry === undefined ? null : foundEntry;
+      return foundEntry === undefined ? null : foundEntry
     }
 
     getAll(field) {
+      if (super.getAll) {
+        return super.getAll(field)
+      }
       return this._entryList
         .filter((entry) => {
-          return entry.name === field;
+          return entry.name === field
         })
         .map((entry) => {
-          return entry.value;
-        });
+          return entry.value
+        })
     }
 
     has(field) {
+      if (super.has) {
+        return super.has(field)
+      }
       return this._entryList.some((entry) => {
-        return entry.name === field;
-      });
+        return entry.name === field
+      })
     }
   }
 
-  return PatchedFormData;
-};
+  return PatchedFormData
+}
 
-export default patch(IsomorphicFormData);
+export default patch(IsomorphicFormData)

test/http-multipart.js

@@ -52,16 +52,15 @@ describe('buildRequest - openapi 2.0', () => {
     test.skip('should (Live) POST multipart-formdata with entry item entries', () => {
       return fetch('http://localhost:3300/api/v1/formdata', { // eslint-disable-line no-undef
         method: 'POST',
-        body: req.body.stream, // per formdata-node docs
-        headers: req.body.headers // per formdata-node docs
+        body: req.body
       })
         .then((res) => {
           return res.json()
         })
         .then((json) => {
-          expect(json.email.length).toEqual(2)
-          expect(json.email[0]).toEqual('person1')
-          expect(json.email[1]).toEqual('person2')
+          expect(json.data.email.length).toEqual(2)
+          expect(json.data.email[0]).toEqual('person1')
+          expect(json.data.email[1]).toEqual('person2')
         })
     })
 
@@ -84,8 +83,8 @@ describe('buildRequest - openapi 2.0', () => {
 
       return fetch('http://localhost:3300/api/v1/formdata', { // eslint-disable-line no-undef
         method: 'POST',
-        body: req.body.stream, // per formdata-node docs
-        headers: req.body.headers // per formdata-node docs
+        body: req.body,
+        headers: req.headers
       })
         .then((res) => {
           return res.json()
@@ -94,10 +93,10 @@ describe('buildRequest - openapi 2.0', () => {
           expect(json.data.email.length).toEqual(2)
           expect(json.data.email[0]).toEqual('person1')
           expect(json.data.email[1]).toEqual('person2')
-          // duck typing that fetch received a formdata-node Stream instead of plain object
+          // duck typing that fetch received a FormData instance instead of plain object
           const lastOptions = fetchMock.lastOptions()
           expect(lastOptions.body.readable).toEqual(true)
-          expect(lastOptions.body._readableState).toBeDefined()
+          // expect(lastOptions.body._streams).toBeDefined()
         })
     })
   })
@@ -139,16 +138,15 @@ describe('buildRequest - openapi 3.0', () => {
     test.skip('should (Live) POST multipart-formdata with entry item entries', () => {
       return fetch('http://localhost:3300/api/v1/formdata', { // eslint-disable-line no-undef
         method: 'POST',
-        body: req.body.stream, // per formdata-node docs
-        headers: req.body.headers // per formdata-node docs
+        body: req.body
       })
       .then((res) => {
         return res.json()
       })
       .then((json) => {
-        expect(json.email.length).toEqual(2)
-        expect(json.email[0]).toEqual('person1')
-        expect(json.email[1]).toEqual('person2')
+        expect(json.data.email.length).toEqual(2)
+        expect(json.data.email[0]).toEqual('person1')
+        expect(json.data.email[1]).toEqual('person2')
       })
     })
 
@@ -171,8 +169,7 @@ describe('buildRequest - openapi 3.0', () => {
 
       return fetch('http://localhost:3300/api/v1/formdata', { // eslint-disable-line no-undef
         method: 'POST',
-        body: req.body.stream, // per formdata-node docs
-        headers: req.body.headers // per formdata-node docs
+        body: req.body,
       })
         .then((res) => {
           return res.json()
@@ -181,10 +178,10 @@ describe('buildRequest - openapi 3.0', () => {
           expect(json.data.email.length).toEqual(2)
           expect(json.data.email[0]).toEqual('person1')
           expect(json.data.email[1]).toEqual('person2')
-          // duck typing that fetch received a formdata-node Stream instead of plain object
+          // duck typing that fetch received a FormData instance instead of plain object
           const lastOptions = fetchMock.lastOptions()
           expect(lastOptions.body.readable).toEqual(true)
-          expect(lastOptions.body._readableState).toBeDefined()
+          // expect(lastOptions.body._streams).toBeDefined()
         })
     })
   })