Minor tidy; Slightly improve test coverage (#21)

Author: rwalle61

lib/resValidator.js

@@ -119,17 +119,13 @@ function getOAPath(req, openApiSpec) {
     throw new Error(`No server matching '${pathname}' path defined in OpenAPI spec`);
   }
   const pathnameWithoutServerUrl = removeServerURLFromPath(pathname, serverUrl);
-  if (openApiSpec.paths.hasOwnProperty(pathnameWithoutServerUrl)) {
-    return pathnameWithoutServerUrl;
-  }
   const OAPath = findOAPathMatchingPathname(pathnameWithoutServerUrl, openApiSpec);
   return OAPath || pathnameWithoutServerUrl;
 }
 
 function findOAPathMatchingPathname(pathname, openApiSpec) {
   const OAPaths = Object.keys(openApiSpec.paths);
-  const OAPathsWithPathParams = OAPaths.filter(path => path.includes('{'));
-  const OAPath = OAPathsWithPathParams.find(OAPath => {
+  const OAPath = OAPaths.find(OAPath => {
     const pathInColonForm = OAPath.replace(/{/g, ':').replace(/}/g, ''); // converts all {foo} to :foo
     const pathParser = new PathParser(pathInColonForm);
     const pathParamsInPathname = pathParser.test(pathname);
@@ -148,4 +144,4 @@ function getServerUrlUsed(openApiPathWithServerUrl, servers) {
 
 function removeServerURLFromPath(openApiPathWithServerUrl, serverUrlUsed) {
   return openApiPathWithServerUrl.replace(serverUrlUsed, '');
-}
+}

test/unit/assertions/usingServer.test.js

@@ -20,55 +20,49 @@ const path = require('path');
 const chaiResponseValidator = require('../../..');
 
 const pathToApiSpec = path.resolve('test/exampleOpenApiFiles/valid/openapi3.yml');
-
+chai.use(chaiResponseValidator(pathToApiSpec));
 const { expect } = chai;
 
+describe('Using an OA3 spec that defines server paths', function () {
+  describe('res.req.path matches a defined sever path', function () {
+    const differentServer = '/remote';
+    const res = {
+      status: 200,
+      req: {
+        method: 'GET',
+        path: `${differentServer}/test/responseBody/schemaDef`,
+      },
+      body: 'valid body (string)',
+    };
 
-describe('Server tests', function () {
-  before(function () {
-    chai.use(chaiResponseValidator(pathToApiSpec));
-  });
-  describe('using a different server', function () {
-    describe('the server path is defined', function () {
-      const differentServer = '/remote';
-      const res = {
-        status: 200,
-        req: {
-          method: 'GET',
-          path: `${differentServer}/test/responseBody/schemaDef`,
-        },
-        body: 'valid body (string)',
-      };
-
-      it('passes', function () {
-        expect(res).to.satisfyApiSpec;
-      });
+    it('passes', function () {
+      expect(res).to.satisfyApiSpec;
+    });
 
-      it('fails when using .not', function () {
-        const assertion = () => expect(res).to.not.satisfyApiSpec;
-        expect(assertion).to.throw('');
-      });
+    it('fails when using .not', function () {
+      const assertion = () => expect(res).to.not.satisfyApiSpec;
+      expect(assertion).to.throw('');
     });
-    describe('the server path is NOT defined', function () {
-      const differentServer = '/missing';
-      const res = {
-        status: 200,
-        req: {
-          method: 'GET',
-          path: `${differentServer}/test/responseBody/schemaDef`,
-        },
-        body: 'valid body (string)',
-      };
+  });
+  describe('res.req.path does not match a defined sever path', function () {
+    const differentServer = '/missing';
+    const res = {
+      status: 200,
+      req: {
+        method: 'GET',
+        path: `${differentServer}/test/responseBody/schemaDef`,
+      },
+      body: 'valid body (string)',
+    };
 
-      it('fails', function () {
-        const assertion = () => expect(res).to.satisfyApiSpec;
-        expect(assertion).to.throw('No server matching \'/missing/test/responseBody/schemaDef\' path defined in OpenAPI spec');
-      });
+    it('fails', function () {
+      const assertion = () => expect(res).to.satisfyApiSpec;
+      expect(assertion).to.throw('No server matching \'/missing/test/responseBody/schemaDef\' path defined in OpenAPI spec');
+    });
 
-      it('fails when using .not', function () {
-        const assertion = () => expect(res).to.not.satisfyApiSpec;
-        expect(assertion).to.throw('No server matching \'/missing/test/responseBody/schemaDef\' path defined in OpenAPI spec');
-      });
+    it('fails when using .not', function () {
+      const assertion = () => expect(res).to.not.satisfyApiSpec;
+      expect(assertion).to.throw('No server matching \'/missing/test/responseBody/schemaDef\' path defined in OpenAPI spec');
     });
   });
-});
+});