Moved tests into a lib dir

This will make room for command tests

Author: Phil Sturgeon

.circleci/config.yml

@@ -3,17 +3,17 @@ version: 2.1
 commands:
     # Command based on instructions from CircleCI blog for avoiding fork secret leakage or failures
     # https://circleci.com/blog/managing-secrets-when-you-have-pull-requests-from-outside-contributors/
-    coverage:
+    early-return-forks:
         description: >-
-            Report coverage, and send to Coveralls if its not a fork.
+          If this build is from a fork, stop executing the current job and return success.
+          This is useful to avoid steps that will fail due to missing credentials.
         steps:
             - run:
-                name: Coverage
+                name: Early return if this build is from a forked PR
                 command: |
                     if [ -n "$CIRCLE_PR_NUMBER" ]; then
-                        npm run coverage
-                    else
-                        npm run coverage | coveralls
+                        echo "Nothing to do for forked PRs, so marking this step successful"
+                        circleci step halt
                     fi
 
     install-and-test:
@@ -33,8 +33,13 @@ commands:
                 key: dependency-cache-{{ checksum "package.json" }}
                 paths:
                     - node_modules
-            - run: npm test
-            - coverage
+            - run: 
+                name: Tests
+                command: npx jest --ci --coverage
+            - early-return-forks
+            - run: 
+                name: Report Coverage
+                command: npx coveralls < coverage/lcov.info
 
 jobs:
     node-latest:

test/samples/no-contact.yaml renamed to examples/no-contact.yaml

@@ -7,8 +7,7 @@
     "speccy": "./speccy.js"
   },
   "scripts": {
-    "test": "nyc --reporter=html --reporter=text mocha",
-    "coverage": "nyc report --reporter=text-lcov"
+    "test": "jest --coverage"
   },
   "preferGlobal": true,
   "repository": {
@@ -52,7 +51,6 @@
     "babel-preset-es2015": "^6.24.1",
     "coveralls": "^3.0.0",
     "jest": "^23.6.0",
-    "nock": "^10.0.0",
-    "nyc": "^13.0.0"
+    "nock": "^10.0.0"
   }
 }

test/samples/petstore.yaml renamed to examples/petstore.yaml

@@ -1,17 +1,17 @@
 'use strict';
 
-const config = require('../lib/config.js');
+const config = require('../../lib/config.js');
 
 describe('Config', () => {
     describe('init()', () => {
         test('does not throw for invalid file', () => {
-            const configFile = 'test/config/doesnotexist.yaml';
+            const configFile = 'test/fixtures/config/doesnotexist.yaml';
             const f = () => { config.init({ config: configFile }); }
             expect(f).not.toThrow;
         });
 
         describe('with a valid json file', () => {
-            const configFile = 'test/config/valid.json';
+            const configFile = 'test/fixtures/config/valid.json';
 
             test('can find expected values', () => {
                 config.init({ config: configFile });
@@ -22,7 +22,7 @@ describe('Config', () => {
         });
 
         describe('with a valid yaml file', () => {
-            const configFile = 'test/config/valid.yaml';
+            const configFile = 'test/fixtures/config/valid.yaml';
 
             test('can find expected values', () => {
                 config.init({ config: configFile });
@@ -43,7 +43,7 @@ describe('Config', () => {
 
     describe('load()', () => {
         describe('when an empty file is loaded', () => {
-            const configFile = 'test/config/empty.yaml';
+            const configFile = 'test/fixtures/config/empty.yaml';
 
             describe('and no config options are supplied', () => {
                 test('it will have undefined values', () => {

package.json

@@ -2,8 +2,8 @@
 
 const fs = require('fs');
 const path = require('path');
-const loader = require('../lib/loader.js');
-const linter = require('../lib/linter.js');
+const loader = require('../../lib/loader.js');
+const linter = require('../../lib/linter.js');
 
 const runLinter = (object, input, key, options = {}) => {
     return linter.lint(object, input, key, options);
@@ -45,7 +45,7 @@ const testFixture = (fixture, rules) => {
 
 describe('Linter', () => {
     describe('lint()', () => {
-        const profilesDir = path.join(__dirname, './profiles/');
+        const profilesDir = path.join(__dirname, '../fixtures/profiles/');
 
         ['default', 'strict'].forEach(profileName => {
             const profile = JSON.parse(fs.readFileSync(profilesDir + profileName + '.json', 'utf8'))

test/config/empty.yaml renamed to test/fixtures/config/empty.yaml

@@ -1,7 +1,7 @@
 'use strict';
 
 const fetch = require('node-fetch');
-const loader = require('../lib/loader.js');
+const loader = require('../../lib/loader.js');
 const nock = require('nock');
 const path = require('path');
 const yaml = require('js-yaml');
@@ -23,7 +23,7 @@ describe('Loader', () => {
 
         describe('when loading from a local file', () => {
             test('retrieves rules from the file', () => {
-                const file = __dirname + '/../rules/strict.json';
+                const file = __dirname + '/../../rules/strict.json';
                 return expect(loader.loadRuleFiles([file])).resolves.toEqual([file, 'default']);
             })
         })
@@ -33,7 +33,7 @@ describe('Loader', () => {
             const url = host + '/';
 
             test('retrieves rules from valid url', () => {
-                nock(host).get('/').replyWithFile(200, __dirname + '/../rules/strict.json', {
+                nock(host).get('/').replyWithFile(200, __dirname + '/../../rules/strict.json', {
                     'Content-Type': 'application/json'
                 });
 
@@ -61,7 +61,7 @@ describe('Loader', () => {
     });
 
     describe('loadSpec()', () => {
-        const samplesDir = path.join(__dirname, './samples/');
+        const samplesDir = path.join(__dirname, '../fixtures/loader/');
 
         test('loads json specs', async () => {
             const spec = await loader.loadSpec(samplesDir + 'openapi.json');

test/config/valid.json renamed to test/fixtures/config/valid.json

@@ -1,6 +1,6 @@
 'use strict';
 
-const server = require('../lib/server.js');
+const server = require('../../lib/server.js');
 
 describe('Server', () => {
     describe('loadHTML()', () => {