Split tests

Author: XhmikosR

package.json

@@ -16,14 +16,14 @@
     "node": ">=12"
   },
   "scripts": {
-    "mocha": "mocha",
+    "mocha": "mocha -i --fgrep=server",
     "lint": "xo",
     "fix": "xo --fix",
     "test": "npm run lint && npm run mocha",
     "test:grunt": "grunt ci --force",
-    "test:ci": "npm run test:server && npm run test:grunt",
+    "test:ci": "npm run mocha && npm run test:server && npm run test:grunt",
     "test:coverage": "c8 npm run test:ci",
-    "test:server": "start-server-and-test start:server http://localhost:8888 mocha",
+    "test:server": "start-server-and-test start:server http://localhost:8888 \"mocha --fgrep=server\"",
     "start:server": "java -cp ./node_modules/vnu-jar/build/dist/vnu.jar nu.validator.servlet.Main"
   },
   "dependencies": {

test/helpers/run.js

@@ -0,0 +1,20 @@
+'use strict';
+
+const assert = require('assert').strict;
+const htmllint = require('../../lib/htmllint.js');
+
+function run(config, expected, message, done) {
+  htmllint(config, (error, result) => {
+    if (error) {
+      throw error;
+    }
+
+    // Only keep the properties we want to test;
+    // the url property is an absolute, system-dependent path
+    const newResult = result.map(({ file, type, message, lastLine, lastColumn }) => ({ file, type, message, lastLine, lastColumn }));
+    assert.deepEqual(newResult, expected, message);
+    done();
+  });
+}
+
+module.exports = run;

test/html_test.js

@@ -1,24 +1,9 @@
 'use strict';
 
-const assert = require('assert').strict;
 const fs = require('fs');
 const path = require('path');
-const htmllint = require('../lib/htmllint.js');
 const expectedResults = require('./helpers/expected_results.js');
-
-function run(config, expected, message, done) {
-  htmllint(config, (error, result) => {
-    if (error) {
-      throw error;
-    }
-
-    // Only keep the properties we want to test;
-    // the url property is an absolute, system-dependent path
-    const newResult = result.map(({ file, type, message, lastLine, lastColumn }) => ({ file, type, message, lastLine, lastColumn }));
-    assert.deepEqual(newResult, expected, message);
-    done();
-  });
-}
+const run = require('./helpers/run.js');
 
 describe('htmllint', () => {
   describe('all', () => {
@@ -32,17 +17,6 @@ describe('htmllint', () => {
       run(options, expected, 'four errors from test/fixtures/invalid.html', done);
     });
 
-    it('with relative paths using server', done => {
-      const options = {
-        files: ['test/fixtures/valid.html', 'test/fixtures/invalid.html'],
-        server: {},
-        errorlevels: ['info', 'warning', 'error']
-      };
-      const expected = expectedResults.server.invalid;
-
-      run(options, expected, 'four errors from test/fixtures/invalid.html', done);
-    });
-
     it('with absolute paths', done => {
       const options = {
         files: ['test/fixtures/valid.html', 'test/fixtures/invalid.html'],

test/server_test.js

@@ -0,0 +1,19 @@
+'use strict';
+
+const expectedResults = require('./helpers/expected_results.js');
+const run = require('./helpers/run.js');
+
+describe('htmllint', () => {
+  describe('server', () => {
+    it('with relative paths using server', done => {
+      const options = {
+        files: ['test/fixtures/valid.html', 'test/fixtures/invalid.html'],
+        server: {},
+        errorlevels: ['info', 'warning', 'error']
+      };
+      const expected = expectedResults.server.invalid;
+
+      run(options, expected, 'four errors from test/fixtures/invalid.html', done);
+    });
+  });
+});