Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions src/generator/testBody.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,13 @@ module.exports = function() {
"",
"var schema = "+schemaJSON+";",
"",
"var checkRecursive = false;",
"var banUnknownProperties = true;",
"var schemaIsValid = tv4.validateMultiple(json, schema, checkRecursive,banUnknownProperties);",
"pm.expect(schemaIsValid.valid, schemaIsValid.errors).to.be.true;"
"var Ajv = require(\"ajv\");",
"var ajv = new Ajv({ allErrors: false });",
"var validate = ajv.compile(schema);",
"var valid = validate(json);",
"pm.test(\"Schema is valid according to AJV\", function () {",
" pm.expect(valid, JSON.stringify(validate.errors, null, 2)).to.be.true;",
"});"
]);
return postmanRequest;
};
Expand Down
8 changes: 4 additions & 4 deletions src/generator/validateSchema.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,12 @@ module.exports = function() {
function deleteValidateSchema(execCode){
let findEnd = false
for (let i in execCode){
if (execCode[i] === "var schemaIsValid = tv4.validateMultiple(json, schema, checkRecursive,banUnknownProperties);"){
execCode[i] = "/*var schemaIsValid = tv4.validateMultiple(json, schema, checkRecursive,banUnknownProperties);"
if (execCode[i] === "var Ajv = require(\"ajv\");"){
execCode[i] = "/*var Ajv = require(\"ajv\");"
findEnd = true
}
if (findEnd && execCode[i] === "pm.expect(schemaIsValid.valid, schemaIsValid.errors).to.be.true;"){
execCode[i] = "pm.expect(schemaIsValid.valid, schemaIsValid.errors).to.be.true;*/"
if (findEnd && execCode[i] === "});"){
execCode[i] = "});*/"
return
}
}
Expand Down