Fix/fix assert.true

index.js

@@ -208,15 +208,16 @@ function getData(swagger, apiPath, operation, response, config, info) {
     // if we have requestData, fill the path params accordingly
     var mockParameters = {};
 
-    data.pathParameters.forEach(function(parameter) {
-      // find the mock data for this parameter name
-      mockParameters[parameter.name] = data.requestData.filter(function(mock) {
-        return mock.hasOwnProperty(parameter.name);
-      })[0][parameter.name];
-    });
-    // only write parameters if they are not already defined in config
-    // @todo we should rework this with code above to be more readable
-    if (!config.pathParams) {
+    if (config.pathParams) {
+      data.pathParams = config.pathParams;
+    } else {
+      // no path params in config, get them from per-endpoint data
+      data.pathParameters.forEach(function(parameter) {
+        // find the mock data for this parameter name
+        mockParameters[parameter.name] = data.requestData.filter(function(mock) {
+          return mock.hasOwnProperty(parameter.name);
+        })[0][parameter.name];
+      });
       data.pathParams = mockParameters;
     }
   }

templates/request/delete/delete.handlebars

@@ -58,7 +58,7 @@
         validator.validate(body, schema).should.be.true;
         {{/is}}
         {{#is assertion 'assert'}}
-        assert.true(validator.validate(body, schema));
+        assert(validator.validate(body, schema), 'Schema validation failed');
         {{/is}}
         {{else}}
         {{#is assertion 'expect'}}

templates/request/get/get.handlebars

@@ -58,7 +58,7 @@
         validator.validate(body, schema).should.be.true;
         {{/is}}
         {{#is assertion 'assert'}}
-        assert.true(validator.validate(body, schema));
+        assert(validator.validate(body, schema), 'Schema validation failed');
         {{/is}}
         {{else}}
         {{#isPdfMediaType returnType}}

templates/request/patch/patch.handlebars

@@ -87,7 +87,7 @@
         validator.validate(body, schema).should.be.true;
         {{/is}}
         {{#is assertion 'assert'}}
-        assert.true(validator.validate(body, schema));
+        assert(validator.validate(body, schema), 'Schema validation failed');
         {{/is}}
         {{else}}
         {{#isPdfMediaType returnType}}

templates/request/post/post.handlebars

@@ -85,7 +85,7 @@
         validator.validate(body, schema).should.be.true;
         {{/is}}
         {{#is assertion 'assert'}}
-        assert.true(validator.validate(body, schema));
+        assert(validator.validate(body, schema), 'Schema validation failed');
         {{/is}}
         {{else}}
         {{#isPdfMediaType returnType}}

templates/request/put/put.handlebars

@@ -85,7 +85,7 @@
         validator.validate(body, schema).should.be.true;
         {{/is}}
         {{#is assertion 'assert'}}
-        assert.true(validator.validate(body, schema));
+        assert(validator.validate(body, schema), 'Schema validation failed');
         {{/is}}
         {{else}}
         {{#isPdfMediaType returnType}}

templates/supertest/delete/delete.handlebars

@@ -43,7 +43,7 @@
         validator.validate(res.body, schema).should.be.true;
         {{/is}}
         {{#is assertion 'assert'}}
-        assert.true(validator.validate(res.body, schema));
+        assert(validator.validate(res.body, schema), 'Schema validation failed: ' + JSON.stringify(validator.getLastErrors()));
         {{/is}}
         {{else}}
         {{#is assertion 'expect'}}
@@ -53,7 +53,7 @@
         res.body.should.equal(null); // non-json response or no schema
         {{/is}}
         {{#is assertion 'assert'}}
-        assert.isNull(res.body); // non-json response or no schema
+        assert((Object.keys(res.body).length === 0) || (res.body === null)); // non-json response (sets body to empty obj) or no schema
         {{/is}}
         {{/validateResponse}}
         done();

templates/supertest/get/get.handlebars

@@ -43,7 +43,7 @@
         validator.validate(res.body, schema).should.be.true;
         {{/is}}
         {{#is assertion 'assert'}}
-        assert.true(validator.validate(res.body, schema));
+        assert(validator.validate(res.body, schema), 'Schema validation failed: ' + JSON.stringify(validator.getLastErrors()));
         {{/is}}
         {{else}}
         {{#isPdfMediaType returnType}}
@@ -64,7 +64,7 @@
         res.body.should.equal(null); // non-json response or no schema
         {{/is}}
         {{#is assertion 'assert'}}
-        assert.isNull(res.body); // non-json response or no schema
+        assert((Object.keys(res.body).length === 0) || (res.body === null)); // non-json response (sets body to empty obj) or no schema
         {{/is}}
         {{/isPdfMediaType}}
         {{/validateResponse}}

templates/supertest/options/options.handlebars

@@ -43,7 +43,7 @@
         validator.validate(res.body, schema).should.be.true;
         {{/is}}
         {{#is assertion 'assert'}}
-        assert.true(validator.validate(res.body, schema));
+        assert(validator.validate(res.body, schema), 'Schema validation failed: ' + JSON.stringify(validator.getLastErrors()));
         {{/is}}
         {{else}}
         {{#is assertion 'expect'}}
@@ -53,7 +53,7 @@
         res.body.should.equal(null); // non-json response or no schema
         {{/is}}
         {{#is assertion 'assert'}}
-        assert.isNull(res.body); // non-json response or no schema
+        assert((Object.keys(res.body).length === 0) || (res.body === null)); // non-json response (sets body to empty obj) or no schema
         {{/is}}
         {{/validateResponse}}
         done();

templates/supertest/patch/patch.handlebars

@@ -68,7 +68,7 @@
         validator.validate(res.body, schema).should.be.true;
         {{/is}}
         {{#is assertion 'assert'}}
-        assert.true(validator.validate(res.body, schema));
+        assert(validator.validate(res.body, schema), 'Schema validation failed: ' + JSON.stringify(validator.getLastErrors()));
         {{/is}}
         {{else}}
         {{#isPdfMediaType returnType}}
@@ -89,7 +89,7 @@
         res.body.should.equal(null); // non-json response or no schema
         {{/is}}
         {{#is assertion 'assert'}}
-        assert.isNull(res.body); // non-json response or no schema
+        assert((Object.keys(res.body).length === 0) || (res.body === null)); // non-json response (sets body to empty obj) or no schema
         {{/is}}
         {{/isPdfMediaType}}
         {{/validateResponse}}

templates/supertest/post/post.handlebars

@@ -67,7 +67,7 @@
         validator.validate(res.body, schema).should.be.true;
         {{/is}}
         {{#is assertion 'assert'}}
-        assert.true(validator.validate(res.body, schema));
+        assert(validator.validate(res.body, schema), 'Schema validation failed: ' + JSON.stringify(validator.getLastErrors()));
         {{/is}}
         {{else}}
         {{#isPdfMediaType returnType}}
@@ -88,7 +88,7 @@
         res.body.should.equal(null); // non-json response or no schema
         {{/is}}
         {{#is assertion 'assert'}}
-        assert.isNull(res.body); // non-json response or no schema
+        assert((Object.keys(res.body).length === 0) || (res.body === null)); // non-json response (sets body to empty obj) or no schema
         {{/is}}
         {{/isPdfMediaType}}
         {{/validateResponse}}

templates/supertest/put/put.handlebars

@@ -67,7 +67,7 @@
         validator.validate(res.body, schema).should.be.true;
         {{/is}}
         {{#is assertion 'assert'}}
-        assert.true(validator.validate(res.body, schema));
+        assert(validator.validate(res.body, schema), 'Schema validation failed: ' + JSON.stringify(validator.getLastErrors()));
         {{/is}}
         {{else}}
         {{#isPdfMediaType returnType}}
@@ -88,7 +88,7 @@
         res.body.should.equal(null); // non-json response or no schema
         {{/is}}
         {{#is assertion 'assert'}}
-        assert.isNull(res.body); // non-json response or no schema
+        assert((Object.keys(res.body).length === 0) || (res.body === null)); // non-json response (sets body to empty obj) or no schema
         {{/is}}
         {{/isPdfMediaType}}
         {{/validateResponse}}

test/loadTest/compare/request/assert/base-path-test.js

@@ -88,7 +88,7 @@ describe('/', function() {
 
         assert.equal(res.statusCode, 200);
 
-        assert.true(validator.validate(body, schema));
+        assert(validator.validate(body, schema), 'Schema validation failed');
         done();
       });
     });
@@ -120,7 +120,7 @@ describe('/', function() {
 
         assert.equal(res.statusCode, 400);
 
-        assert.true(validator.validate(body, schema));
+        assert(validator.validate(body, schema), 'Schema validation failed');
         done();
       });
     });
@@ -164,7 +164,7 @@ describe('/', function() {
 
         assert.equal(res.statusCode, 500);
 
-        assert.true(validator.validate(body, schema));
+        assert(validator.validate(body, schema), 'Schema validation failed');
         done();
       });
     });
@@ -210,7 +210,7 @@ describe('/', function() {
 
         assert.equal(res.statusCode, 200);
 
-        assert.true(validator.validate(body, schema));
+        assert(validator.validate(body, schema), 'Schema validation failed');
         done();
       });
     });
@@ -242,7 +242,7 @@ describe('/', function() {
 
         assert.equal(res.statusCode, 400);
 
-        assert.true(validator.validate(body, schema));
+        assert(validator.validate(body, schema), 'Schema validation failed');
         done();
       });
     });
@@ -274,7 +274,7 @@ describe('/', function() {
 
         assert.equal(res.statusCode, 500);
 
-        assert.true(validator.validate(body, schema));
+        assert(validator.validate(body, schema), 'Schema validation failed');
         done();
       });
     });

test/loadTest/compare/supertest/assert/base-path-test.js

@@ -82,7 +82,7 @@ describe('/', function() {
       .end(function(err, res) {
         if (err) return done(err);
 
-        assert.true(validator.validate(res.body, schema));
+        assert(validator.validate(res.body, schema), 'Schema validation failed: ' + JSON.stringify(validator.getLastErrors()));
         done();
       });
     });
@@ -107,7 +107,7 @@ describe('/', function() {
       .end(function(err, res) {
         if (err) return done(err);
 
-        assert.true(validator.validate(res.body, schema));
+        assert(validator.validate(res.body, schema), 'Schema validation failed: ' + JSON.stringify(validator.getLastErrors()));
         done();
       });
     });
@@ -144,7 +144,7 @@ describe('/', function() {
       .end(function(err, res) {
         if (err) return done(err);
 
-        assert.true(validator.validate(res.body, schema));
+        assert(validator.validate(res.body, schema), 'Schema validation failed: ' + JSON.stringify(validator.getLastErrors()));
         done();
       });
     });
@@ -185,7 +185,7 @@ describe('/', function() {
       .end(function(err, res) {
         if (err) return done(err);
 
-        assert.true(validator.validate(res.body, schema));
+        assert(validator.validate(res.body, schema), 'Schema validation failed: ' + JSON.stringify(validator.getLastErrors()));
         done();
       });
     });
@@ -212,7 +212,7 @@ describe('/', function() {
       .end(function(err, res) {
         if (err) return done(err);
 
-        assert.true(validator.validate(res.body, schema));
+        assert(validator.validate(res.body, schema), 'Schema validation failed: ' + JSON.stringify(validator.getLastErrors()));
         done();
       });
     });
@@ -239,7 +239,7 @@ describe('/', function() {
       .end(function(err, res) {
         if (err) return done(err);
 
-        assert.true(validator.validate(res.body, schema));
+        assert(validator.validate(res.body, schema), 'Schema validation failed: ' + JSON.stringify(validator.getLastErrors()));
         done();
       });
     });

test/loadTest/compare/supertest/assert/user-test.js

@@ -17,7 +17,7 @@ describe('/user', function() {
       .end(function(err, res) {
         if (err) return done(err);
 
-        assert.isNull(res.body); // non-json response or no schema
+        assert((Object.keys(res.body).length === 0) || (res.body === null)); // non-json response (sets body to empty obj) or no schema
         done();
       });
     });
@@ -60,7 +60,7 @@ describe('/user', function() {
       .end(function(err, res) {
         if (err) return done(err);
 
-        assert.isNull(res.body); // non-json response or no schema
+        assert((Object.keys(res.body).length === 0) || (res.body === null)); // non-json response (sets body to empty obj) or no schema
         done();
       });
     });
@@ -103,7 +103,7 @@ describe('/user', function() {
       .end(function(err, res) {
         if (err) return done(err);
 
-        assert.isNull(res.body); // non-json response or no schema
+        assert((Object.keys(res.body).length === 0) || (res.body === null)); // non-json response (sets body to empty obj) or no schema
         done();
       });
     });
@@ -155,7 +155,7 @@ describe('/user', function() {
       .end(function(err, res) {
         if (err) return done(err);
 
-        assert.isNull(res.body); // non-json response or no schema
+        assert((Object.keys(res.body).length === 0) || (res.body === null)); // non-json response (sets body to empty obj) or no schema
         done();
       });
     });
@@ -174,7 +174,7 @@ describe('/user', function() {
       .end(function(err, res) {
         if (err) return done(err);
 
-        assert.isNull(res.body); // non-json response or no schema
+        assert((Object.keys(res.body).length === 0) || (res.body === null)); // non-json response (sets body to empty obj) or no schema
         done();
       });
     });
@@ -193,7 +193,7 @@ describe('/user', function() {
       .end(function(err, res) {
         if (err) return done(err);
 
-        assert.isNull(res.body); // non-json response or no schema
+        assert((Object.keys(res.body).length === 0) || (res.body === null)); // non-json response (sets body to empty obj) or no schema
         done();
       });
     });
@@ -215,7 +215,7 @@ describe('/user', function() {
       .end(function(err, res) {
         if (err) return done(err);
 
-        assert.isNull(res.body); // non-json response or no schema
+        assert((Object.keys(res.body).length === 0) || (res.body === null)); // non-json response (sets body to empty obj) or no schema
         done();
       });
     });
@@ -270,7 +270,7 @@ describe('/user', function() {
       .end(function(err, res) {
         if (err) return done(err);
 
-        assert.isNull(res.body); // non-json response or no schema
+        assert((Object.keys(res.body).length === 0) || (res.body === null)); // non-json response (sets body to empty obj) or no schema
         done();
       });
     });
@@ -325,7 +325,7 @@ describe('/user', function() {
       .end(function(err, res) {
         if (err) return done(err);
 
-        assert.isNull(res.body); // non-json response or no schema
+        assert((Object.keys(res.body).length === 0) || (res.body === null)); // non-json response (sets body to empty obj) or no schema
         done();
       });
     });
@@ -380,7 +380,7 @@ describe('/user', function() {
       .end(function(err, res) {
         if (err) return done(err);
 
-        assert.isNull(res.body); // non-json response or no schema
+        assert((Object.keys(res.body).length === 0) || (res.body === null)); // non-json response (sets body to empty obj) or no schema
         done();
       });
     });
@@ -396,7 +396,7 @@ describe('/user', function() {
       .end(function(err, res) {
         if (err) return done(err);
 
-        assert.isNull(res.body); // non-json response or no schema
+        assert((Object.keys(res.body).length === 0) || (res.body === null)); // non-json response (sets body to empty obj) or no schema
         done();
       });
     });

test/minimal/compare/supertest/assert/base-path-test.js

@@ -18,7 +18,7 @@ describe('/', function() {
       .end(function(err, res) {
         if (err) return done(err);
 
-        assert.isNull(res.body); // non-json response or no schema
+        assert((Object.keys(res.body).length === 0) || (res.body === null)); // non-json response (sets body to empty obj) or no schema
         done();
       });
     });