Move server test to a subfolder

Author: XhmikosR

.github/workflows/test.yml

@@ -53,7 +53,7 @@ jobs:
         if: matrix.os == 'ubuntu-latest'
 
       - name: Run tests
-        run: npm run test
+        run: npm run mocha
         if: matrix.os == 'windows-latest'
 
       - name: Run Coveralls

package.json

@@ -16,14 +16,14 @@
     "node": ">=12"
   },
   "scripts": {
-    "mocha": "mocha -i --fgrep=server",
+    "mocha": "mocha",
     "lint": "xo",
     "fix": "xo --fix",
     "test": "npm run lint && npm run mocha",
     "test:grunt": "grunt ci --force",
     "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://127.0.0.1:8080 \"mocha --fgrep=server\"",
+    "test:server": "start-server-and-test start:server http://127.0.0.1:8080 \"npm run mocha -- test/server/\"",
     "start:server": "java -Dnu.validator.servlet.bind-address=127.0.0.1 -cp ./node_modules/vnu-jar/build/dist/vnu.jar nu.validator.servlet.Main 8080"
   },
   "dependencies": {
@@ -76,7 +76,7 @@
     },
     "overrides": [
       {
-        "files": "test/*.js",
+        "files": "test/**/*.js",
         "envs": [
           "mocha"
         ]

test/server_test.js test/server/server_test.jstest/server_test.js renamed to test/server/server_test.js

@@ -1,7 +1,7 @@
 'use strict';
 
-const expectedResults = require('./helpers/expected_results.js');
-const run = require('./helpers/run.js');
+const expectedResults = require('../helpers/expected_results.js');
+const run = require('../helpers/run.js');
 
 describe('htmllint', () => {
   describe('server', () => {