provide test cases for required file changes and always invoke verify…

…Response even in case of error to properly execute the assertions even in case of an error

tests/esm/integration/express.spec.ts

@@ -33,6 +33,7 @@ describe('Express Server', () => {
           }
 
           if (err) {
+            verifyResponse(err, res);
             reject({
               error: err,
               response: parsedError,

tests/integration/dynamic-controllers-express-server.spec.ts

@@ -1242,6 +1242,7 @@ describe('Express Server', () => {
           }
 
           if (err) {
+            verifyResponse(err, res);
             reject({
               error: err,
               response: parsedError,

tests/integration/express-router-server.spec.ts

@@ -39,6 +39,7 @@ describe('Express Router Server', () => {
           }
 
           if (err) {
+            verifyResponse(err, res);
             reject({
               error: err,
               response: parsedError,

tests/integration/express-server-custom-multer.spec.ts

@@ -41,6 +41,22 @@ describe('Express Server With custom multer', () => {
       });
     });
 
+    it('cannot post a file with no file', async () => {
+      const formData = { notAFileAttribute: 'not a file' };
+      verifyFileUploadRequest(basePath + '/PostTest/File', formData, (_err, res) => {
+        expect(res.status).to.equal(400);
+        expect(res.text).to.equal('{"fields":{"someFile":{"message":"\'someFile\' is required"}},"message":"An error occurred during the request.","name":"ValidateError","status":400}');
+      });
+    });
+
+    it('can post a file with no file', async () => {
+      const formData = { notAFileAttribute: 'not a file' };
+      verifyFileUploadRequest(basePath + '/PostTest/FileOptional', formData, (_err, res) => {
+        expect(res.status).to.equal(200);
+        expect(res.text).to.equal('no file');
+      });
+    });
+
     it('can post multiple files with other form fields', () => {
       const formData = {
         a: 'b',
@@ -197,6 +213,7 @@ describe('Express Server With custom multer', () => {
           }
 
           if (err) {
+            verifyResponse(err, res);
             reject({
               error: err,
               response: parsedError,

tests/integration/express-server-root-security.spec.ts

@@ -68,6 +68,7 @@ describe('Express Server with api_key Root Security', () => {
           }
 
           if (err) {
+            verifyResponse(err, res);
             reject({
               error: err,
               response: parsedError,

tests/integration/express-server.spec.ts

@@ -1514,7 +1514,7 @@ describe('Express Server', () => {
       const mainResourceId = 'main-123';
 
       return verifyGetRequest(basePath + `/SubResourceTest/${mainResourceId}/SubResource`, (_err, res) => {
-        expect(res.body).to.equal(mainResourceId);
+        expect(res.text).to.equal(mainResourceId);
       });
     });
 
@@ -1523,7 +1523,7 @@ describe('Express Server', () => {
       const subResourceId = 'sub-456';
 
       return verifyGetRequest(basePath + `/SubResourceTest/${mainResourceId}/SubResource/${subResourceId}`, (_err, res) => {
-        expect(res.body).to.equal(`${mainResourceId}:${subResourceId}`);
+        expect(res.text).to.equal(`${mainResourceId}:${subResourceId}`);
       });
     });
   });
@@ -1559,6 +1559,22 @@ describe('Express Server', () => {
       });
     });
 
+    it('cannot post a file with no file', async () => {
+      const formData = { notAFileAttribute: 'not a file' };
+      verifyFileUploadRequest(basePath + '/PostTest/File', formData, (_err, res) => {
+        expect(res.status).to.equal(400);
+        expect(res.text).to.equal('{"fields":{"someFile":{"message":"\'someFile\' is required"}},"message":"An error occurred during the request.","name":"ValidateError","status":400}');
+      });
+    });
+
+    it('can post a file with no file', async () => {
+      const formData = { notAFileAttribute: 'not a file' };
+      verifyFileUploadRequest(basePath + '/PostTest/FileOptional', formData, (_err, res) => {
+        expect(res.status).to.equal(200);
+        expect(res.text).to.equal('no file');
+      });
+    });
+
     it('can post multiple files with other form fields', () => {
       const formData = {
         a: 'b',
@@ -1723,6 +1739,7 @@ describe('Express Server', () => {
           }
 
           if (err) {
+            verifyResponse(err, res);
             reject({
               error: err,
               response: parsedError,

tests/integration/hapi-server.spec.ts

@@ -1437,8 +1437,24 @@ describe('Hapi Server', () => {
     it('cannot post a file with wrong attribute name', async () => {
       const formData = { wrongAttributeName: '@../package.json' };
       verifyFileUploadRequest(basePath + '/PostTest/File', formData, (_err, res) => {
-        expect(res.status).to.equal(500);
-        expect(res.text).to.equal('{"message":"Unexpected field","name":"MulterError","status":500}');
+        expect(res.status).to.equal(400);
+        expect(res.text).to.equal('{"name":"ValidateError","fields":{"someFile":{"message":"\'someFile\' is required"}},"message":"Bad Request"}');
+      });
+    });
+
+    it('cannot post a file with no file', async () => {
+      const formData = { notAFileAttribute: 'not a file' };
+      verifyFileUploadRequest(basePath + '/PostTest/File', formData, (_err, res) => {
+        expect(res.status).to.equal(400);
+        expect(res.text).to.equal('{"name":"ValidateError","fields":{"someFile":{"message":"\'someFile\' is required"}},"message":"Bad Request"}');
+      });
+    });
+
+    it('can post a file with no file', async () => {
+      const formData = { notAFileAttribute: 'not a file' };
+      verifyFileUploadRequest(basePath + '/PostTest/FileOptional', formData, (_err, res) => {
+        expect(res.status).to.equal(200);
+        expect(res.text).to.equal('no file');
       });
     });
 
@@ -1606,6 +1622,7 @@ describe('Hapi Server', () => {
           }
 
           if (err) {
+            verifyResponse(err, res);
             reject({
               error: err,
               response: parsedError,

tests/integration/inversify-async-server.spec.ts

@@ -43,6 +43,7 @@ describe('Inversify async IoC Express Server', () => {
           }
 
           if (err) {
+            verifyResponse(err, res);
             reject({
               error: err,
               response: parsedError,

tests/integration/inversify-dynamic-container.spec.ts

@@ -10,7 +10,7 @@ const basePath = '/v1';
 describe('Inversify Express Server Dynamic Container', () => {
   it('can handle get request with no path argument', () => {
     return verifyGetRequest(basePath + '/ManagedTest?tsoa=abc123456', (err, res) => {
-      const model = res.body as string;
+      const model = res.text;
       expect(model).to.equal(basePath + '/ManagedTest');
     });
   });
@@ -32,6 +32,7 @@ describe('Inversify Express Server Dynamic Container', () => {
           }
 
           if (err) {
+            verifyResponse(err, res);
             reject({
               error: err,
               response: parsedError,

tests/integration/inversify-glob.spec.ts

@@ -50,6 +50,7 @@ describe('Inversify Express Server with ControllerPathGlob', () => {
           }
 
           if (err) {
+            verifyResponse(err, res);
             reject({
               error: err,
               response: parsedError,

tests/integration/inversify-server.spec.ts

@@ -92,6 +92,7 @@ describe('Inversify Express Server', () => {
           }
 
           if (err) {
+            verifyResponse(err, res);
             reject({
               error: err,
               response: parsedError,

tests/integration/koa-multer-options.spec.ts

@@ -97,6 +97,7 @@ describe('Koa Server (with multerOpts)', () => {
           }
 
           if (err) {
+            verifyResponse(err, res);
             reject({
               error: err,
               response: parsedError,

tests/integration/koa-server-no-additional-allowed.spec.ts

@@ -482,6 +482,7 @@ describe('Koa Server (with noImplicitAdditionalProperties turned on)', () => {
           }
 
           if (err) {
+            verifyResponse(err, res);
             reject({
               error: err,
               response: parsedError,

tests/integration/koa-server.spec.ts

@@ -1418,7 +1418,23 @@ describe('Koa Server', () => {
       const formData = { wrongAttributeName: '@../package.json' };
       verifyFileUploadRequest(basePath + '/PostTest/File', formData, (_err, res) => {
         expect(res.status).to.equal(500);
-        expect(res.text).to.equal('{"message":"Unexpected field","name":"MulterError","status":500}');
+        expect(res.text).to.equal('Unexpected field');
+      });
+    });
+
+    it('cannot post a file with no file', async () => {
+      const formData = { notAFileAttribute: 'not a file' };
+      verifyFileUploadRequest(basePath + '/PostTest/File', formData, (_err, res) => {
+        expect(res.status).to.equal(400);
+        expect(res.text).to.equal('{"fields":{"someFile":{"message":"\'someFile\' is required"}}}');
+      });
+    });
+
+    it('can post a file with no file', async () => {
+      const formData = { notAFileAttribute: 'not a file' };
+      verifyFileUploadRequest(basePath + '/PostTest/FileOptional', formData, (_err, res) => {
+        expect(res.status).to.equal(200);
+        expect(res.text).to.equal('no file');
       });
     });
 
@@ -1589,6 +1605,7 @@ describe('Koa Server', () => {
           }
 
           if (err) {
+            verifyResponse(err, res);
             reject({
               error: err,
               response: parsedError,

tests/integration/openapi3-express.spec.ts

@@ -464,6 +464,7 @@ describe('OpenAPI3 Express Server', () => {
           }
 
           if (err) {
+            verifyResponse(err, res);
             reject({
               error: err,
               response: parsedError,