Fix tests, test more, support Node 16-20

.editorconfig

@@ -1,5 +1,3 @@
-# http://editorconfig.org
-
 root = true
 
 [*]
@@ -11,7 +9,7 @@ insert_final_newline = true
 trim_trailing_whitespace = true
 
 [*.md]
-indent_style = spaces
+indent_style = space
 trim_trailing_whitespace = false
 
 [*.yml]

.eslintrc.js

@@ -1,3 +1,12 @@
 'use strict';
 
-module.exports = require('pa11y-lint-config/eslint/es2017');
+const pa11yConfig = require('pa11y-lint-config/eslint/es2017');
+
+const config = {
+	...pa11yConfig,
+	parserOptions: {
+		ecmaVersion: 2019
+	}
+};
+
+module.exports = config;

.github/workflows/tests.yml

@@ -1,44 +1,58 @@
-name: Build and lint
-
 on:
   push:
     branches:
       - main
   pull_request:
 
 jobs:
-  checkout_and_test:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 12
+      - run: npm ci
+      - run: npm run lint
+
+  test:
+    name: test (node ${{ matrix.node }}, mongodb ${{ matrix.mongo }})
     runs-on: ubuntu-20.04
     strategy:
+      fail-fast: false
       matrix:
+        node: [12, 14, 16, 18, 20]
+        mongo: [latest]
         include:
-          - node-version: 12.x
-            lint: true # Linter is run only once to shorten the total build time
-          - node-version: 14.x
+          - { node: 12, mongo: 6.0.11 }
+          - { node: 12, mongo: 5.0.22 }
+          - { node: 12, mongo: 4.4.25 }
+          - { node: 12, mongo: 3.6.23 }
+          - { node: 12, mongo: 2.6.12 }
 
     steps:
-      - name: Checkout code from ${{ github.repository }}
-        uses: actions/checkout@v2
-      - name: Setup node
-        uses: actions/setup-node@v2
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v3
         with:
-          node-version: ${{ matrix.node-version }}
-      - name: MongoDB in GitHub Actions
-        uses: supercharge/mongodb-github-action@1.3.0
+          node-version: ${{ matrix.node }}
+      - run: npm ci
+
+      - name: Supply MongoDB ${{ matrix.mongo }}
+        uses: supercharge/mongodb-github-action@1.5.0
         with:
-          mongodb-version: 3.4
-      - name: Install dependencies
-        run: npm i
-      - name: Run linter
-        if: ${{ matrix.lint }}
-        run: make lint
-      - name: Create test config
+          mongodb-version: ${{ matrix.mongo }}
+
+      - name: Supply integration test configuration file
         run: cp config/test.sample.json config/test.json
-      - name: Start test app
+
+      - name: Make dashboard available to be integration-tested
         run: NODE_ENV=test node index.js &
-      - name: Wait / Sleep
-        uses: jakejarvis/wait-action@v0.1.0
+      - name: Wait for dashboard to respond
+        uses: iFaxity/wait-on-action@v1.1.0
         with:
-          time: '10s'
-      - name: Run tests
-        run: make ci
+          resource: http://localhost:4000
+          delay: 1000
+          timeout: 30000
+          log: true
+
+      - run: NODE_ENV=test npm test

.gitignore

@@ -1,4 +1,3 @@
-
 # Config files
 config/development.json
 config/production.json
@@ -8,5 +7,5 @@ config/test.json
 node_modules
 npm-debug.log
 
-# JetBrains IDE
+# Editors
 .idea

.npmrc

@@ -0,0 +1 @@
+lockfile-version=2

.nvmrc

@@ -0,0 +1 @@
+14

CONTRIBUTING.md

@@ -1,6 +1,4 @@
-
-Contributing Guide
-==================
+# Contributing Guide
 
 Thanks for getting involved :tada:
 
@@ -14,8 +12,8 @@ Our website outlines the many ways that you can contribute to Pa11y:
 
 
 
-[code-of-conduct]: http://pa11y.org/contributing/code-of-conduct/
-[communications]: http://pa11y.org/contributing/communications/
-[companies]: http://pa11y.org/contributing/companies/
-[designers]: http://pa11y.org/contributing/designers/
-[developers]: http://pa11y.org/contributing/developers/
+[code-of-conduct]: https://pa11y.org/contributing/code-of-conduct/
+[communications]: https://pa11y.org/contributing/communications/
+[companies]: https://pa11y.org/contributing/companies/
+[designers]: https://pa11y.org/contributing/designers/
+[developers]: https://pa11y.org/contributing/developers/

Makefile

@@ -1,25 +1,10 @@
-include Makefile.node
-
-# We need to run integration tests recursively
-export INTEGRATION_FLAGS := --recursive
-
-
-# Verify tasks
-# ------------
-
-# Lint alias for backwards compatibility
-lint: verify
-
-
 # Client-side asset tasks
 # -----------------------
 
-# Compile LESS
 less:
 	@lessc -x ./public/less/main.less ./public/css/site.min.css
 	@$(TASK_DONE)
 
-# Compile client-side JavaScript
 uglify:
 	@uglifyjs \
 		public/js/vendor/jquery/jquery.min.js \