More PR feedback. Improve unit test performance

src/cli-validator/utils/processConfiguration.js

@@ -383,7 +383,7 @@ const getSpectralRuleset = async function(defaultRuleset) {
         ruleSetFile = await findUp(file);
       }
     }
-  } catch (err) {
+  } catch {
     // if there's any issue finding a custom ruleset, then
     // just use the default
     ruleSetFile = defaultRuleset;

src/lib/index.js

@@ -5,9 +5,6 @@ const validator = require('../cli-validator/utils/validator');
 const getOutput = require('./utils/printForMachine');
 const spectralValidator = require('../spectral/utils/spectral-validator');
 const { Spectral } = require('@stoplight/spectral');
-const fs = require('fs');
-const util = require('util');
-const preprocessFile = require('../cli-validator/utils/preprocessFile');
 
 module.exports = async function(input, defaultMode = false) {
   // process the config file for the validations &
@@ -27,12 +24,6 @@ module.exports = async function(input, defaultMode = false) {
   const swagger = await buildSwaggerObject(input);
 
   try {
-    if (typeof input !== 'object') {
-      // If input is not an object, assume it's a file
-      const readFile = util.promisify(fs.readFile);
-      input = await readFile(input, 'utf8');
-      input = preprocessFile(input);
-    }
     spectralResults = await spectral.run(input);
   } catch (err) {
     return Promise.reject(err);

src/spectral/utils/spectral-validator.js

@@ -38,7 +38,6 @@ const parseResults = function(results, debug) {
               JSON.stringify(validationResult)
             );
           }
-          continue;
         }
       }
     }

test/spectral/tests/disabled-rules.test.js

@@ -188,7 +188,7 @@ describe('spectral - test disabled rules - Swagger 2 In Memory', function() {
   let errors;
   let warnings;
 
-  beforeEach(async () => {
+  beforeAll(async () => {
     // set up mock user input
     const defaultMode = true;
     validationResults = await inCodeValidator(swaggerInMemory, defaultMode);
@@ -204,12 +204,6 @@ describe('spectral - test disabled rules - Swagger 2 In Memory', function() {
     expect(warnings.length).toBeGreaterThan(0);
   });
 
-  afterEach(() => {
-    validationResults = '';
-    errors = '';
-    warnings = '';
-  });
-
   it('test contact-properties rule using mockFiles/swagger/disabled-rules-in-memory', function() {
     expect(errors).not.toContain(
       'Contact object should have `name`, `url` and `email`.'
@@ -558,7 +552,7 @@ describe('spectral - test disabled rules - OAS3 In Memory', function() {
   let errors;
   let warnings;
 
-  beforeEach(async () => {
+  beforeAll(async () => {
     // set up mock user input
     const defaultMode = true;
     validationResults = await inCodeValidator(oas3InMemory, defaultMode);
@@ -574,12 +568,6 @@ describe('spectral - test disabled rules - OAS3 In Memory', function() {
     expect(warnings.length).toBeGreaterThan(0);
   });
 
-  afterEach(() => {
-    validationResults = '';
-    errors = '';
-    warnings = '';
-  });
-
   it('test contact-properties rule using mockFiles/oas3/disabled-rules-in-memory', function() {
     expect(errors).not.toContain(
       'Contact object should have `name`, `url` and `email`.'

test/spectral/tests/enabled-rules.test.js

@@ -121,7 +121,7 @@ describe('spectral - test enabled rules - Swagger 2 In Memory', function() {
   let errors;
   let warnings;
 
-  beforeEach(async () => {
+  beforeAll(async () => {
     // set up mock user input
     const defaultMode = true;
     validationResults = await inCodeValidator(swaggerInMemory, defaultMode);
@@ -137,12 +137,6 @@ describe('spectral - test enabled rules - Swagger 2 In Memory', function() {
     expect(warnings.length).toBeGreaterThan(0);
   });
 
-  afterEach(() => {
-    validationResults = '';
-    errors = '';
-    warnings = '';
-  });
-
   it('test no-eval-in-markdown rule using mockFiles/swagger/enabled-rules-in-memory', function() {
     expect(errors).not.toContain(
       'Markdown descriptions should not contain `eval(``.'
@@ -360,7 +354,7 @@ describe('spectral - test enabled rules - OAS3 In Memory', function() {
   let errors;
   let warnings;
 
-  beforeEach(async () => {
+  beforeAll(async () => {
     // set up mock user input
     const defaultMode = true;
     validationResults = await inCodeValidator(oas3InMemory, defaultMode);
@@ -376,12 +370,6 @@ describe('spectral - test enabled rules - OAS3 In Memory', function() {
     expect(warnings.length).toBeGreaterThan(0);
   });
 
-  afterEach(() => {
-    validationResults = '';
-    errors = '';
-    warnings = '';
-  });
-
   it('test no-eval-in-markdown rule using mockFiles/oas3/enabled-rules-in-memory', function() {
     expect(errors).not.toContain(
       'Markdown descriptions should not contain `eval(``.'

test/spectral/tests/spectral-validator.test.js

@@ -34,6 +34,10 @@ describe('spectral - test spectral-validator.js', function() {
 
     expect(parsedSpectralResults.errors.length).toEqual(1);
     expect(parsedSpectralResults.warnings.length).toEqual(0);
+    // Get the resulting error object & run validations
+    const errors = parsedSpectralResults.errors;
+    expect(errors[0].message).toEqual(mockResult[0].message);
+    expect(errors[0].path).toEqual(mockResult[0].path);
     expect(allOutput).not.toContain(
       'There was an error while parsing the spectral results:'
     );
@@ -61,6 +65,10 @@ describe('spectral - test spectral-validator.js', function() {
 
     expect(parsedSpectralResults.errors.length).toEqual(0);
     expect(parsedSpectralResults.warnings.length).toEqual(1);
+    // Get the resulting warning object & run validations
+    const warnings = parsedSpectralResults.warnings;
+    expect(warnings[0].message).toEqual(mockResult[0].message);
+    expect(warnings[0].path).toEqual(mockResult[0].path);
     expect(allOutput).not.toContain(
       'There was an error while parsing the spectral results:'
     );