fix: allow empty form-data requests

KnisterPeter · May 24, 2018 · 323ed3a · 323ed3a
1 parent b9f0f36
commit 323ed3a
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 6 deletions.
diff --git a/src/index.ts b/src/index.ts
@@ -86,7 +86,9 @@ function execute(instance: Instance, method: string, tmpl: string, args: any[],
       const formData = new FormData();
       parameters.forEach(parameter => {
         const value = args[parameter.parameter];
-        formData.append(parameter.name, value, value.name);
+        if (value) {
+          formData.append(parameter.name, value, value.name);
+        }
       });
       return formData;
     }

diff --git a/test/index-test.ts b/test/index-test.ts
@@ -15,6 +15,7 @@ interface Test {
   postWithQueryAndBody(_query: any, _body: any): Promise<any>;
   postWithFormData(_formData: any): Promise<any>;
   postWithFormDataAndQuery(_query: any, _formData: any): Promise<any>;
+  postWithEmptyFormDataAndQuery(_query: any, _formData: any): Promise<any>;
   put(): Promise<any>;
   putWithQuery(_parameters: any): Promise<any>;
   delete(_id: string): Promise<any>;
@@ -41,6 +42,8 @@ class TestImpl implements Test {
   public postWithFormData(@FormData('name') _formData: any): any { /* */ }
   @Post('/path/withFormData', true)
   public postWithFormDataAndQuery(_query: any, @FormData('name') _formData: any): any { /* */ }
+  @Post('/path/withFormData', true)
+  public postWithEmptyFormDataAndQuery(_query: any, @FormData('name') _formData: any): any { /* */ }
   @Put('/path')
   public put(): any { /* */ }
   @Put('/path', true)
@@ -159,13 +162,28 @@ test('Pretend should call a post method with FormData', t => {
 test('Pretend should call a post method with FormData and query', t => {
   const test = setup();
   nock('http://host:port/', {
-      reqheaders: {
-        'Content-Type': /^multipart\/form-data/
-      }
-    })
+    reqheaders: {
+      'Content-Type': /^multipart\/form-data/
+    }
+  })
     .post('/path/withFormData?query=params', /Content-Disposition: form-data; name="name"/)
     .reply(200, mockResponse);
-  return test.postWithFormDataAndQuery({query: 'params'}, Buffer.alloc(10).toString('UTF-8') )
+  return test.postWithFormDataAndQuery({ query: 'params' }, Buffer.alloc(10).toString('UTF-8'))
+    .then(response => {
+      t.deepEqual(response, mockResponse);
+    });
+});
+
+test('Pretend should call a post method with empty FormData and query', t => {
+  const test = setup();
+  nock('http://host:port/', {
+    reqheaders: {
+      'Content-Type': /^multipart\/form-data/
+    }
+  })
+    .post('/path/withFormData?query=params', undefined)
+    .reply(200, mockResponse);
+  return test.postWithEmptyFormDataAndQuery({ query: 'params' }, undefined)
     .then(response => {
       t.deepEqual(response, mockResponse);
     });