test: integrates new implementation into old test suits

lib/api/test/integration/validateRequest.test.js → lib/api/test/integration/validataElement.test.js

@@ -1,7 +1,7 @@
 const { assert } = require('chai');
-const validateRequest = require('../../validateRequest');
+const validateElement = require('../../validateElement');
 
-describe('validateRequest', () => {
+describe('validateElement', () => {
   describe('with matching requests', () => {
     const request = {
       method: 'POST',
@@ -10,7 +10,7 @@ describe('validateRequest', () => {
       },
       body: '{ "foo": "bar" }'
     };
-    const res = validateRequest(request, request);
+    const res = validateElement(request, request);
 
     it('returns validation result object', () => {
       assert.isObject(res);
@@ -66,7 +66,7 @@ describe('validateRequest', () => {
   });
 
   describe('with non-matching requests', () => {
-    const res = validateRequest(
+    const res = validateElement(
       {
         method: 'POST',
         headers: {
@@ -86,14 +86,17 @@ describe('validateRequest', () => {
     });
 
     it('contains all validatable keys', () => {
-      assert.hasAllKeys(res, ['headers', 'body']);
+      // Note that "headers" are not present because
+      // Gavel demands a validatable key to be present
+      // in both real and expected elements.
+      assert.hasAllKeys(res, ['body']);
     });
 
     describe('method', () => {
       it.skip('compares methods');
     });
 
-    describe('headers', () => {
+    describe.skip('headers', () => {
       it('has no validator set', () => {
         assert.propertyVal(res.headers, 'validator', null);
       });
@@ -165,4 +168,8 @@ and expected data media type
       });
     });
   });
+
+  describe('with matching responses', () => {
+    it.skip('add');
+  });
 });

lib/api/validate.js

@@ -0,0 +1,23 @@
+const normalize = require('./units/normalize');
+const validateElement = require('./validateElement');
+
+function validate(real, expected, type, callback) {
+  const normalizedReal = normalize(real);
+  const normalizedExpected = normalize(expected);
+
+  if (type !== 'request' && type !== 'response') {
+    throw new Error(
+      `Can't validate: expected transaction "type" to be "request" or "response", but got: ${type}.`
+    );
+  }
+
+  const results = validateElement(normalizedReal, normalizedExpected);
+
+  // TODO Propagate the error.
+  callback(null, {
+    version: '2',
+    ...results
+  });
+}
+
+module.exports = validate;

lib/api/validateElement.js

@@ -0,0 +1,27 @@
+const isset = require('../utils/isset');
+const validateStatusCode = require('./units/validateStatusCode');
+const validateHeaders = require('./units/validateHeaders');
+const { validateBody } = require('./units/validateBody');
+
+function validateElement(real, expected) {
+  const results = {};
+
+  if (real.statusCode) {
+    results.statusCode = validateStatusCode(real, expected);
+  }
+
+  if (real.headers && expected.headers) {
+    results.headers = validateHeaders(real, expected);
+  }
+
+  if (
+    isset(real.body) &&
+    (isset(expected.body) || isset(expected.bodySchema))
+  ) {
+    results.body = validateBody(real, expected);
+  }
+
+  return results;
+}
+
+module.exports = validateElement;

lib/gavel.js

@@ -1,7 +1,8 @@
 const { HttpRequest, ExpectedHttpRequest } = require('./model/http-request');
 const { HttpResponse, ExpectedHttpResponse } = require('./model/http-response');
 
-const { validate, isValid, isValidatable } = require('./validate');
+const { isValid, isValidatable } = require('./validate');
+const validate = require('./api/validate');
 
 module.exports = {
   HttpRequest,

package.json

@@ -11,7 +11,7 @@
   },
   "scripts": {
     "lint": "eslint lib/**/*.js test/**/*.js",
-    "test": "npm run test:server && npm run test:browser && npm run test:features",
+    "test": "npm run test:new && npm run test:server && npm run test:browser && npm run test:features",
     "test:new": "mocha \"lib/api/test/**/*.test.js\"",
     "test:server": "mocha \"test/unit/**/*-test.js\"",
     "test:server:coverage": "nyc npm run test:server",

test/unit/validate-test.js

@@ -1,6 +1,6 @@
 const { assert } = require('chai');
 const clone = require('clone');
-const { validate, isValid, isValidatable } = require('../../lib/validate');
+const { validate, isValid, isValidatable } = require('../../lib/gavel');
 
 describe('Gavel proxies to functions with callbacks', () => {
   // Examples from README.md