Version 2.2.2

The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/npm:qs:20170213
- https://snyk.io/vuln/npm:qs:20170213

Latest report for pa11y/dashboard:
https://snyk.io/test/github/pa11y/dashboard

.eslintignore

@@ -1,3 +1,2 @@
 coverage
-node_modules
 public/js

.eslintrc.js

@@ -0,0 +1,3 @@
+'use strict';
+
+module.exports = require('pa11y-lint-config/eslint/es6');

.jscsrc

@@ -1,88 +0,0 @@
-{
-	"disallowEmptyBlocks": true,
-	"disallowImplicitTypeConversion": [
-		"binary",
-		"numeric",
-		"string"
-	],
-	"disallowKeywordsOnNewLine": [
-		"catch",
-		"else"
-	],
-	"disallowMixedSpacesAndTabs": true,
-	"disallowMultipleSpaces": true,
-	"disallowMultipleVarDecl": true,
-	"disallowNewlineBeforeBlockStatements": true,
-	"disallowQuotedKeysInObjects": true,
-	"disallowSpaceAfterObjectKeys": true,
-	"disallowSpaceAfterPrefixUnaryOperators": true,
-	"disallowSpaceBeforeComma": true,
-	"disallowSpaceBeforeSemicolon": true,
-	"disallowSpacesInCallExpression": true,
-	"disallowSpacesInFunction": {
-		"beforeOpeningRoundBrace": true
-	},
-	"disallowSpacesInsideArrayBrackets": true,
-	"disallowSpacesInsideBrackets": true,
-	"disallowSpacesInsideObjectBrackets": true,
-	"disallowSpacesInsideParentheses": true,
-	"disallowTrailingComma": true,
-	"disallowTrailingWhitespace": true,
-	"disallowYodaConditions": true,
-	"maximumLineLength": 200,
-	"requireBlocksOnNewline": true,
-	"requireCapitalizedConstructors": true,
-	"requireCommaBeforeLineBreak": true,
-	"requireCurlyBraces": [
-		"if",
-		"else",
-		"for",
-		"while",
-		"do",
-		"switch",
-		"try",
-		"catch"
-	],
-	"requireDotNotation": true,
-	"requireLineBreakAfterVariableAssignment": true,
-	"requireLineFeedAtFileEnd": true,
-	"requireObjectKeysOnNewLine": true,
-	"requireParenthesesAroundIIFE": true,
-	"requireSemicolons": true,
-	"requireSpaceAfterBinaryOperators": true,
-	"requireSpaceAfterKeywords": [
-		"if",
-		"else",
-		"for",
-		"while",
-		"do",
-		"switch",
-		"try",
-		"catch"
-	],
-	"requireSpaceAfterLineComment": {
-		"allExcept": [
-			"="
-		]
-	},
-	"requireSpaceBeforeBinaryOperators": true,
-	"requireSpaceBeforeBlockStatements": true,
-	"requireSpaceBeforeObjectValues": true,
-	"requireSpaceBetweenArguments": true,
-	"requireSpacesInConditionalExpression": true,
-	"requireSpacesInForStatement": true,
-	"requireSpacesInFunction": {
-		"beforeOpeningCurlyBrace": true
-	},
-	"validateIndentation": "\t",
-	"validateLineBreaks": "LF",
-	"validateNewlineAfterArrayElements": true,
-	"validateParameterSeparator": ", ",
-	"validateQuoteMarks": "'",
-
-	"excludeFiles": [
-		"coverage",
-		"node_modules",
-		"public/js"
-	]
-}

.jshintrc

@@ -1,29 +0,0 @@
-{
-	"browser": true,
-	"curly": true,
-	"eqeqeq": true,
-	"forin": true,
-	"globals": {
-		"after": true,
-		"afterEach": true,
-		"before": true,
-		"beforeEach": true,
-		"describe": true,
-		"it": true
-	},
-	"latedef": "nofunc",
-	"maxcomplexity": 6,
-	"maxdepth": 2,
-	"maxparams": 4,
-	"noarg": true,
-	"node": true,
-	"nonew": true,
-	"nonstandard": true,
-	"regexp": true,
-	"shadow": true,
-	"strict": true,
-	"sub": true,
-	"trailing": true,
-	"undef": true,
-	"unused": true
-}

.travis.yml

@@ -3,16 +3,9 @@
 language: node_js
 matrix:
   include:
-
+    - node_js: '4'
-    # Run tests in Node.js 0.10 (unsupported)
+    - node_js: '5'
-    - node_js: '0.10'
+    - node_js: '6'
-
-    # Run tests in Node.js 0.12
-    - node_js: '0.12'
-
-  # Allow Node.js 0.10 to fail – it's unsupported
-  allow_failures:
-    - node_js: '0.10'
 
 # Build only master (and pull-requests)
 branches:

CHANGELOG.md

@@ -1,6 +1,84 @@
 
 # Changelog
 
+## 2.2.2 (2017-03-23)
+
+  * Upgrades `body-parser` and `express`. Fixes a vulnerability in `qs`: https://snyk.io/vuln/npm:qs:20170213
+
+## 2.2.1 (2017-02-07)
+
+  * Fix task editing when no actions are specified
+
+## 2.2.0 (2017-01-27)
+
+  * Add support for Pa11y actions
+  * Update dependencies
+    * pa11y-webservice: ~2.1.2 to ^2.3.0
+
+## 2.1.2 (2016-12-12)
+
+  * Hide the "add" button in readonly mode
+  * Add a contributing guide
+
+## 2.1.1 (2016-11-20)
+
+  * Use arrows instead of plus and minus for collapsibles/expanders
+  * Supply more detailed 500 messages
+
+## 2.1.0 (2016-11-07)
+
+  * Allow for configuration files to be JavaScript rather than JSON
+  * Allow setting of HTTP headers for task runs
+  * Allow hiding/ignoring elements for task runs
+  * Update dependencies and devDependencies
+    * pa11y-webservice: ~2.0.1 to ^2.1.2
+    * mocha: ^3 to ^2 (temporary – tests weren't running)
+
+## 2.0.1 (2016-09-12)
+
+  * Update dependencies and devDependencies
+    * express: ~4.13 to ~4.14
+    * pa11y-webservice: ~2.0 to ^2.0.1
+    * request: ^2 to ^2.74
+    * mocha: ^2 to ^3
+    * pa11y-webservice-client-node: ~1.2 to ^1.2.1
+    This fixes the following vulnerabilities:
+    * https://nodesecurity.io/advisories/45
+    * https://nodesecurity.io/advisories/63
+    * https://nodesecurity.io/advisories/65
+    * https://nodesecurity.io/advisories/106
+    * https://nodesecurity.io/advisories/121
+    * https://nodesecurity.io/advisories/130
+
+## 2.0.0 (2016-06-05)
+
+  * Drop Node.js 0.10–0.12 support
+  * Update dependencies
+    * pa11y-webservice: ~1.11 to ~2.0
+  * See the [migration guide](https://github.com/pa11y/dashboard/blob/master/MIGRATION.md#migrating-from-10-to-20) for details
+
+## 1.12.1 (2016-06-05)
+
+  * Update references/links after a repo rename
+
+## 1.12.0 (2016-05-26)
+
+  * Update Node.js version support to 0.10–6.0
+  * Update dependencies
+    * body-parser: added at ~1.15
+    * chalk: ~0.2 to ~1.1
+    * compression: added at ~1.6
+    * express: ~3.4 to ~4.13
+    * express-hbs: ~0.2 to ~1.0
+    * moment: ~2.2 to ~2.13
+    * pa11y-webservice: ~1.10 to ~1.11
+    * pa11y-webservice-client-node: ~1.1 to ~1.2
+    * bower: ~1.2 to ~1.7
+    * cheerio: added at ~0.20
+    * jsdom: removed
+    * request: ~2.27 to ^2
+    * uglify-js: ~2.4 to ~2.6
+
 ## 1.11.0 (2016-05-23)
 
   * Add the ability to configure task wait times

CONTRIBUTING.md

@@ -0,0 +1,21 @@
+
+Contributing Guide
+==================
+
+Thanks for getting involved :tada:
+
+The Pa11y team loves to see new contributors, and we strive to provide a welcoming and inclusive environment. We ask that all contributors read and follow [our code of conduct][code-of-conduct] before joining. If you represent an organisation, then you might find our [guide for companies][companies] helpful.
+
+Our website outlines the many ways that you can contribute to Pa11y:
+
+  - [Help us to talk to our users][communications]
+  - [Help us out with design][designers]
+  - [Help us with our code][developers]
+
+
+
+[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/

MIGRATION.md

@@ -0,0 +1,19 @@
+
+Migration Guide
+===============
+
+Pa11y Dashboard's API changes between major versions. This is a guide to help you make the switch when this happens.
+
+
+Table Of Contents
+-----------------
+
+- [Migrating from 1.0 to 2.0](#migrating-from-10-to-20)
+
+
+Migrating from 1.0 to 2.0
+-------------------------
+
+### Node.js Support
+
+The only breaking change in Pa11y Dashboard 2.0 is that Node.js 0.10 and 0.12 are no longer supported. We'll be using newer ES6 features in upcoming releases which will not work in these older Node.js versions.

Makefile

@@ -1,47 +1,27 @@
+include Makefile.node
 
-# Color helpers
+# We need to run integration tests recursively
-C_CYAN=\x1b[34;01m
+export INTEGRATION_FLAGS := --recursive
-C_RESET=\x1b[0m
 
-# Group targets
-all: deps lint test
-ci: lint test
 
-# Install dependencies
+# Verify tasks
-deps:
+# ------------
-	@echo "$(C_CYAN)> installing dependencies$(C_RESET)"
-	@npm install
 
-# Lint JavaScript
+# Lint alias for backwards compatibility
-lint: jshint jscs
+lint: verify
 
-# Run JSHint
-jshint:
-	@echo "$(C_CYAN)> linting javascript$(C_RESET)"
-	@./node_modules/.bin/jshint .
 
-# Run JavaScript Code Style
+# Client-side asset tasks
-jscs:
+# -----------------------
-	@echo "$(C_CYAN)> checking javascript code style$(C_RESET)"
-	@./node_modules/.bin/jscs .
-
-# Run all tests
-test: test-integration
-
-# Run integration tests
-test-integration:
-	@echo "$(C_CYAN)> running integration tests$(C_RESET)"
-	@./node_modules/.bin/mocha ./test/integration --reporter spec --recursive --timeout 5000 --slow 50
 
 # Compile LESS
 less:
-	@echo "$(C_CYAN)> compiling less$(C_RESET)"
+	@lessc -x ./public/less/main.less ./public/css/site.min.css
-	@./node_modules/.bin/lessc -x ./public/less/main.less ./public/css/site.min.css
+	@$(TASK_DONE)
 
 # Compile client-side JavaScript
 uglify:
-	@echo "$(C_CYAN)> compiling client-side JavaScript$(C_RESET)"
+	@uglifyjs \
-	@./node_modules/.bin/uglifyjs \
 		public/js/vendor/jquery/jquery.min.js \
 		public/js/vendor/bootstrap/js/alert.js \
 		public/js/vendor/bootstrap/js/dropdown.js \
@@ -55,5 +35,4 @@ uglify:
 		public/js/vendor/flot/jquery.flot.resize.js \
 		public/js/site.js \
 		-o ./public/js/site.min.js
-
+	@$(TASK_DONE)
-.PHONY: test

Makefile.node

@@ -0,0 +1,125 @@
+#
+# Node.js Makefile
+# ================
+#
+# Do not update this file manually – it's maintained separately on GitHub:
+# https://github.com/rowanmanning/makefiles/blob/master/Makefile.node
+#
+# To update to the latest version, run `make update-makefile`.
+#
+
+
+# Meta tasks
+# ----------
+
+.PHONY: test
+
+
+# Useful variables
+# ----------------
+
+NPM_BIN = ./node_modules/.bin
+export PATH := $(NPM_BIN):$(PATH)
+export EXPECTED_COVERAGE := 90
+export INTEGRATION_TIMEOUT := 5000
+export INTEGRATION_SLOW := 4000
+
+
+# Output helpers
+# --------------
+
+TASK_DONE = echo "✓ $@ done"
+
+
+# Group tasks
+# -----------
+
+all: install ci
+ci: verify test
+
+
+# Install tasks
+# -------------
+
+clean:
+	@git clean -fxd
+	@$(TASK_DONE)
+
+install: node_modules
+	@$(TASK_DONE)
+
+node_modules: package.json
+	@npm prune --production=false
+	@npm install
+	@$(TASK_DONE)
+
+
+# Verify tasks
+# ------------
+
+verify: verify-javascript verify-dust verify-spaces
+	@$(TASK_DONE)
+
+verify-javascript: verify-eslint verify-jshint verify-jscs
+	@$(TASK_DONE)
+
+verify-dust:
+	@if [ -e .dustmiterc* ]; then dustmite --path ./view && $(TASK_DONE); fi
+
+verify-eslint:
+	@if [ -e .eslintrc* ]; then eslint . && $(TASK_DONE); fi
+
+verify-jshint:
+	@if [ -e .jshintrc* ]; then jshint . && $(TASK_DONE); fi
+
+verify-jscs:
+	@if [ -e .jscsrc* ]; then jscs . && $(TASK_DONE); fi
+
+verify-spaces:
+	@if [ -e .editorconfig* ] && [ -x $(NPM_BIN)/lintspaces ]; then \
+		git ls-files | xargs lintspaces -e .editorconfig && $(TASK_DONE); \
+	fi
+
+verify-coverage:
+	@if [ -d coverage ]; then \
+		if [ -x $(NPM_BIN)/nyc ]; then \
+			nyc check-coverage --lines $(EXPECTED_COVERAGE) --functions $(EXPECTED_COVERAGE) --branches $(EXPECTED_COVERAGE) && $(TASK_DONE); \
+		else \
+			if [ -x $(NPM_BIN)/istanbul ]; then \
+				istanbul check-coverage --statement $(EXPECTED_COVERAGE) --branch $(EXPECTED_COVERAGE) --function $(EXPECTED_COVERAGE) && $(TASK_DONE); \
+			fi \
+		fi \
+	fi
+
+# Test tasks
+# ----------
+
+test: test-unit-coverage verify-coverage test-integration
+	@$(TASK_DONE)
+
+test-unit:
+	@if [ -d test/unit ]; then mocha test/unit --recursive && $(TASK_DONE); fi
+
+test-unit-coverage:
+	@if [ -d test/unit ]; then \
+		if [ -x $(NPM_BIN)/nyc ]; then \
+			nyc --reporter=text --reporter=html $(NPM_BIN)/_mocha test/unit --recursive && $(TASK_DONE); \
+		else \
+			if [ -x $(NPM_BIN)/istanbul ]; then \
+				istanbul cover $(NPM_BIN)/_mocha -- test/unit --recursive && $(TASK_DONE); \
+			else \
+				make test-unit; \
+			fi \
+		fi \
+	fi
+
+test-integration:
+	@if [ -d test/integration ]; then mocha test/integration --timeout $(INTEGRATION_TIMEOUT) --slow $(INTEGRATION_SLOW) $(INTEGRATION_FLAGS) && $(TASK_DONE); fi
+
+
+# Tooling tasks
+# -------------
+
+update-makefile:
+	@curl -s https://raw.githubusercontent.com/rowanmanning/makefiles/master/Makefile.node > Makefile.node
+	@$(TASK_DONE)

README.md

@@ -1,7 +1,7 @@
-pa11y-dashboard
+Pa11y Dashboard
 ===============
 
-pa11y-dashboard is a web interface to the [pa11y][pa11y] accessibility reporter; allowing you to focus on *fixing* issues rather than hunting them down.
+Pa11y Dashboard is a web interface to the [Pa11y][pa11y] accessibility reporter; allowing you to focus on *fixing* issues rather than hunting them down.
 
 ![Version][shield-version]
 [![Node.js version support][shield-node]][info-node]
@@ -10,7 +10,7 @@ pa11y-dashboard is a web interface to the [pa11y][pa11y] accessibility reporter;
 
 ---
 
-✨ 🔜 ✨ The Pa11y team is very excited to announce plans for the successor to pa11y-dashboard and pa11y-webservice, codename "Sidekick". Help us define the features that you want to see by visiting the [proposal][sidekick-proposal]. ✨  
+✨ 🔜 ✨ The Pa11y team is very excited to announce plans for the successor to Pa11y Dashboard and Pa11y Webservice, codename "Sidekick". Help us define the features that you want to see by visiting the [proposal][sidekick-proposal]. ✨  
 
 ---
 
@@ -22,7 +22,7 @@ pa11y-dashboard is a web interface to the [pa11y][pa11y] accessibility reporter;
 Setup
 -----
 
-pa11y-dashboard requires [Node.js][node] 0.10+ and [PhantomJS][phantom]. See the [pa11y][pa11y] documentation for detailed instructions on how to install these dependencies on your operating system.
+Pa11y Dashboard requires [Node.js][node] 4+. See the [Pa11y][pa11y] documentation for detailed instructions on how to install this on your operating system.
 
 You'll also need to have [MongoDB][mongo] installed and running. See the [MongoDB install guide][mongo-install] for more information on this.
 
@@ -58,11 +58,13 @@ NODE_ENV=development node index.js
 
 See [development instructions](#development) for more information about running locally (and restarting automatically when files change).
 
+If you run into problems, check the [troubleshooting guide][troubleshooting].
+
 
 Configurations
 --------------
 
-The boot configurations for pa11y-dashboard are as follows. Look at the sample JSON files in the repo for example usage.
+The boot configurations for Pa11y Dashboard are as follows. Look at the sample JSON files in the repo for example usage.
 
 ### port
 *(number)* The port to run the application on. Set via a config file or the `PORT` environment variable.
@@ -77,30 +79,28 @@ The boot configurations for pa11y-dashboard are as follows. Look at the sample J
 *(string)* A message to display prominently on the site home page. Defaults to `null`.
 
 ### webservice
-This can either be an object containing [pa11y-webservice configurations][pa11y-webservice-config], or a string which is the base URL of a [pa11y-webservice][pa11y-webservice] instance you are running separately. If using environment variables, prefix the webservice vars with `WEBSERVICE_`.
+This can either be an object containing [Pa11y Webservice configurations][pa11y-webservice-config], or a string which is the base URL of a [Pa11y Webservice][pa11y-webservice] instance you are running separately. If using environment variables, prefix the webservice vars with `WEBSERVICE_`.
 
 
-Development
+Contributing
------------
+------------
 
-To develop pa11y-dashboard, you'll need to clone the repo and get set up as outlined in the [setup guide](#setup).
+There are many ways to contribute to Pa11y Dashboard, we cover these in the [contributing guide](CONTRIBUTING.md) for this repo.
 
-You'll need to start the application in test mode with:
+If you're ready to contribute some code, you'll need to clone the repo and get set up as outlined in the [setup guide](#setup). You'll then need to start the application in test mode with:
 
 ```sh
 NODE_ENV=test node index.js
 ```
 
-Now you'll be able to run the following commands:
+You'll now be able to run the following commands:
 
 ```sh
-make       # Run the lint and test tasks together
+make verify              # Verify all of the code (ESLint)
-make lint  # Run linters with the correct config
+make test                # Run all tests
-make test  # Run integration tests
+make test-integration    # Run the integration tests
 ```
 
-Code with lint errors or failing tests will not be accepted, please use the build tools outlined above.
-
 To compile the client-side JavaScript and CSS, you'll need the following commands. Compiled code is committed to the repository.
 
 ```sh
@@ -111,14 +111,29 @@ make uglify  # Compile and uglify the client-side JavaScript
 
 Useful Resources
 -------
-* [Setting up An Accessibility Dashboard from Scratch with Pa11y on DigitialOcean][resource-una-k]
+* [Setting up An Accessibility Dashboard from Scratch with Pa11y on DigitalOcean][resource-una-k]
+
+
+Support and Migration
+---------------------
+
+Pa11y Dashboard major versions are normally supported for 6 months after their last minor release. This means that patch-level changes will be added and bugs will be fixed. The table below outlines the end-of-support dates for major versions, and the last minor release for that version.
+
+We also maintain a [migration guide](MIGRATION.md) to help you migrate.
+
+| :grey_question: | Major Version | Last Minor Release | Node.js Versions | Support End Date |
+| :-------------- | :------------ | :----------------- | :--------------- | :--------------- |
+| :heart:         | 2             | N/A                | 4+               | N/A              |
+| :skull:         | 1             | 1.12               | 0.10–6           | 2016-12-05       |
+
+If you're opening issues related to these, please mention the version that the issue relates to.
 
 
 License
 -------
 
-pa11y-dashboard is licensed under the [GNU General Public License 3.0][info-license].  
+Pa11y Dashboard is licensed under the [GNU General Public License 3.0][info-license].<br/>
-Copyright &copy; 2013–2016, Springer Nature
+Copyright &copy; 2013–2017, Team Pa11y
 
 
 
@@ -127,17 +142,18 @@ Copyright &copy; 2013–2016, Springer Nature
 [mongo-install]: https://docs.mongodb.org/manual/installation/
 [node]: http://nodejs.org/
 [pa11y]: https://github.com/pa11y/pa11y
-[pa11y-webservice-config]: https://github.com/pa11y/pa11y-webservice#configurations
+[pa11y-webservice-config]: https://github.com/pa11y/webservice#configurations
 [phantom]: http://phantomjs.org/
 [resource-una-k]: https://una.im/pa11y-dash/
 [sidekick-proposal]: https://github.com/pa11y/sidekick/blob/master/PROPOSAL.md
-[travis]: https://travis-ci.org/pa11y/pa11y-dashboard
+[travis]: https://travis-ci.org/pa11y/dashboard
-[travis-img]: https://travis-ci.org/pa11y/pa11y-dashboard.png?branch=master
+[travis-img]: https://travis-ci.org/pa11y/dashboard.png?branch=master
+[troubleshooting]: https://github.com/pa11y/dashboard/blob/master/TROUBLESHOOTING.md
 
 [info-license]: LICENSE
 [info-node]: package.json
-[info-build]: https://travis-ci.org/pa11y/pa11y-dashboard
+[info-build]: https://travis-ci.org/pa11y/dashboard
 [shield-license]: https://img.shields.io/badge/license-GPL%203.0-blue.svg
-[shield-node]: https://img.shields.io/badge/node.js%20support-0.10-brightgreen.svg
+[shield-node]: https://img.shields.io/badge/node.js%20support-4–6-brightgreen.svg
-[shield-version]: https://img.shields.io/badge/version-1.11.0-blue.svg
+[shield-version]: https://img.shields.io/badge/version-2.2.1-blue.svg
-[shield-build]: https://img.shields.io/travis/pa11y/pa11y-dashboard/master.svg
+[shield-build]: https://img.shields.io/travis/pa11y/dashboard/master.svg

TROUBLESHOOTING.md

@@ -0,0 +1,27 @@
+Troubleshooting
+===============
+
+
+Common issues
+-----
+
+* `500` errors or `Could not connect to pa11y-webservice` messages are often related to MongoDB. Ensure that you have the [latest version of MongoDB][mongo-install] installed, and that it's running - it doesn't always start automatically. 
+* Error messages saying that pa11y-webservice isn't running may be due to dependency installation problems. Try deleting your `pa11y-dashboard/node_modules` directory and running `npm install` again. 
+
+
+Check to see if the issue has been reported
+-----
+
+* Check the [issue tracker][issues] for similar issues.
+
+
+Create an issue
+-----
+
+If all else fails, [create an issue][create-issue] and we'll help you. Please include your node.js, Phantom, and MongoDB version numbers, and your operating system. 
+
+
+[issues]: https://github.com/pa11y/dashboard/issues?utf8=%E2%9C%93&q=is%3Aissue
+[mongo-install]: https://docs.mongodb.org/manual/installation/
+[create-issue]: https://github.com/pa11y/dashboard/issues/new
+

app.js

@@ -1,26 +1,27 @@
-// This file is part of pa11y-dashboard.
+// This file is part of Pa11y Dashboard.
 //
-// pa11y-dashboard is free software: you can redistribute it and/or modify
+// Pa11y Dashboard is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 //
-// pa11y-dashboard is distributed in the hope that it will be useful,
+// Pa11y Dashboard is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with pa11y-dashboard.  If not, see <http://www.gnu.org/licenses/>.
+// along with Pa11y Dashboard.  If not, see <http://www.gnu.org/licenses/>.
-
 'use strict';
 
-var createClient = require('pa11y-webservice-client-node');
+const bodyParser = require('body-parser');
-var EventEmitter = require('events').EventEmitter;
+const compression = require('compression');
-var express = require('express');
+const createClient = require('pa11y-webservice-client-node');
-var hbs = require('express-hbs');
+const EventEmitter = require('events').EventEmitter;
-var http = require('http');
+const express = require('express');
-var pkg = require('./package.json');
+const hbs = require('express-hbs');
+const http = require('http');
+const pkg = require('./package.json');
 
 module.exports = initApp;
 
@@ -28,47 +29,49 @@ module.exports = initApp;
 function initApp(config, callback) {
 	config = defaultConfig(config);
 
-	var webserviceUrl = config.webservice;
+	let webserviceUrl = config.webservice;
 	if (typeof webserviceUrl === 'object') {
-		webserviceUrl = 'http://' + webserviceUrl.host + ':' + webserviceUrl.port + '/';
+		webserviceUrl = `http://${webserviceUrl.host}:${webserviceUrl.port}/`;
 	}
 
-	var app = new EventEmitter();
+	const app = new EventEmitter();
 	app.address = null;
 	app.express = express();
 	app.server = http.createServer(app.express);
 	app.webservice = createClient(webserviceUrl);
 
 	// Compression
-	app.express.use(express.compress());
+	app.express.use(compression());
 
 	// Public files
-	app.express.use(express.static(__dirname + '/public', {
+	app.express.use(express.static(`${__dirname}/public`, {
 		maxAge: (process.env.NODE_ENV === 'production' ? 604800000 : 0)
 	}));
 
 	// General express config
 	app.express.disable('x-powered-by');
-	app.express.use(express.bodyParser());
+	app.express.use(bodyParser.urlencoded({
+		extended: true
+	}));
 
 	// View engine
-	app.express.set('views', __dirname + '/view');
+	app.express.engine('html', hbs.express4({
-	app.express.engine('html', hbs.express3({
 		extname: '.html',
 		contentHelperName: 'content',
-		layoutsDir: __dirname + '/view/layout',
+		layoutsDir: `${__dirname}/view/layout`,
-		partialsDir: __dirname + '/view/partial',
+		partialsDir: `${__dirname}/view/partial`,
-		defaultLayout: __dirname + '/view/layout/default'
+		defaultLayout: `${__dirname}/view/layout/default`
 	}));
+	app.express.set('views', `${__dirname}/view`);
 	app.express.set('view engine', 'html');
 
 	// View helpers
-	require('./view/helper/date')(hbs.registerHelper);
+	require('./view/helper/date')(hbs);
-	require('./view/helper/string')(hbs.registerHelper);
+	require('./view/helper/string')(hbs);
-	require('./view/helper/url')(hbs.registerHelper);
+	require('./view/helper/url')(hbs);
 
 	// Populate view locals
-	app.express.locals({
+	app.express.locals = {
 		lang: 'en',
 		year: (new Date()).getFullYear(),
 		version: pkg.version,
@@ -76,12 +79,13 @@ function initApp(config, callback) {
 		bugtracker: pkg.bugs,
 		noindex: config.noindex,
 		readonly: config.readonly,
-		siteMessage: config.siteMessage
+		siteMessage: config.siteMessage,
-	});
+		settings: {}
+	};
 
-	app.express.use(function(req, res, next) {
+	app.express.use((request, response, next) => {
-		res.locals.isHomePage = (req.path === '/');
+		response.locals.isHomePage = (request.path === '/');
-		res.locals.host = req.host;
+		response.locals.host = request.hostname;
 		next();
 	});
 
@@ -100,27 +104,27 @@ function initApp(config, callback) {
 	}
 
 	// Error handling
-	app.express.get('*', function(req, res) {
+	app.express.get('*', (request, response) => {
-		res.status(404);
+		response.status(404);
-		res.render('404');
+		response.render('404');
 	});
-	app.express.use(function(err, req, res, next) {
+	app.express.use((error, request, response, next) => {
-		/* jshint unused: false */
+		/* eslint no-unused-vars: 'off' */
-		if (err.code === 'ECONNREFUSED') {
+		if (error.code === 'ECONNREFUSED') {
-			err = new Error('Could not connect to pa11y-webservice');
+			error = new Error('Could not connect to Pa11y Webservice');
 		}
-		app.emit('route-error', err);
+		app.emit('route-error', error);
 		if (process.env.NODE_ENV !== 'production') {
-			res.locals.error = err;
+			response.locals.error = error;
 		}
-		res.status(500);
+		response.status(500);
-		res.render('500');
+		response.render('500');
 	});
 
-	app.server.listen(config.port, function(err) {
+	app.server.listen(config.port, error => {
-		var address = app.server.address();
+		const address = app.server.address();
-		app.address = 'http://' + address.address + ':' + address.port;
+		app.address = `http://${address.address}:${address.port}`;
-		callback(err, app);
+		callback(error, app);
 	});
 
 }

config.js

@@ -1,25 +1,28 @@
-// This file is part of pa11y-dashboard.
+// This file is part of Pa11y Dashboard.
 //
-// pa11y-dashboard is free software: you can redistribute it and/or modify
+// Pa11y Dashboard is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 //
-// pa11y-dashboard is distributed in the hope that it will be useful,
+// Pa11y Dashboard is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with pa11y-dashboard.  If not, see <http://www.gnu.org/licenses/>.
+// along with Pa11y Dashboard.  If not, see <http://www.gnu.org/licenses/>.
-
 'use strict';
 
-var fs = require('fs');
+const fs = require('fs');
-var jsonPath = './config/' + (process.env.NODE_ENV || 'development') + '.json';
+const environment = (process.env.NODE_ENV || 'development');
+const jsonPath = `./config/${environment}.json`;
+const jsPath = `./config/${environment}.js`;
 
 if (fs.existsSync(jsonPath)) {
 	module.exports = require(jsonPath);
+} else if (fs.existsSync(jsPath)) {
+	module.exports = require(jsPath);
 } else {
 	module.exports = {
 		port: Number(env('PORT', '4000')),
@@ -36,6 +39,6 @@ if (fs.existsSync(jsonPath)) {
 }
 
 function env(name, defaultValue) {
-	var value = process.env[name];
+	const value = process.env[name];
 	return typeof value === 'string' ? value : defaultValue;
 }

data/.eslintrc.js

@@ -0,0 +1,8 @@
+'use strict';
+
+// Clone the main config
+var config = module.exports = JSON.parse(JSON.stringify(require('../.eslintrc')));
+
+// Disable max line length/statements
+config.rules['max-len'] = 'off';
+config.rules['max-statements'] = 'off';

data/standards.js

@@ -1,17 +1,17 @@
-// This file is part of pa11y-dashboard.
+// This file is part of Pa11y Dashboard.
 //
-// pa11y-dashboard is free software: you can redistribute it and/or modify
+// Pa11y Dashboard is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 //
-// pa11y-dashboard is distributed in the hope that it will be useful,
+// Pa11y Dashboard is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with pa11y-dashboard.  If not, see <http://www.gnu.org/licenses/>.
+// along with Pa11y Dashboard.  If not, see <http://www.gnu.org/licenses/>.
 
 // jscs:disable maximumLineLength
 'use strict';

index.js

@@ -1,38 +1,41 @@
-// This file is part of pa11y-dashboard.
+// This file is part of Pa11y Dashboard.
 //
-// pa11y-dashboard is free software: you can redistribute it and/or modify
+// Pa11y Dashboard is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 //
-// pa11y-dashboard is distributed in the hope that it will be useful,
+// Pa11y Dashboard is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with pa11y-dashboard.  If not, see <http://www.gnu.org/licenses/>.
+// along with Pa11y Dashboard.  If not, see <http://www.gnu.org/licenses/>.
-
 'use strict';
 
-var chalk = require('chalk');
+const chalk = require('chalk');
-var config = require('./config');
+const config = require('./config');
 
-process.on('SIGINT', function() {
+process.on('SIGINT', () => {
 	console.log('\nGracefully shutting down from SIGINT (Ctrl-C)');
 	process.exit();
 });
 
-require('./app')(config, function(err, app) {
+require('./app')(config, (error, app) => {
+	if (error) {
+		console.error(error.stack);
+		process.exit(1);
+	}
 
 	console.log('');
-	console.log(chalk.underline.magenta('pa11y-dashboard started'));
+	console.log(chalk.underline.magenta('Pa11y Dashboard started'));
 	console.log(chalk.grey('mode: %s'), process.env.NODE_ENV);
 	console.log(chalk.grey('uri:  %s'), app.address);
 
-	app.on('route-error', function(err) {
+	app.on('route-error', error => {
-		var stack = (err.stack ? err.stack.split('\n') : [err.message]);
+		const stack = (error.stack ? error.stack.split('\n') : [error.message]);
-		var msg = chalk.red(stack.shift());
+		const msg = chalk.red(stack.shift());
 		console.error('');
 		console.error(msg);
 		console.error(chalk.grey(stack.join('\n')));
@@ -40,9 +43,14 @@ require('./app')(config, function(err, app) {
 
 	// Start the webservice if required
 	if (typeof config.webservice === 'object') {
-		require('pa11y-webservice')(config.webservice, function(err, webservice) {
+		require('pa11y-webservice')(config.webservice, (error, webservice) => {
+			if (error) {
+				console.error(error.stack);
+				process.exit(1);
+			}
+
 			console.log('');
-			console.log(chalk.underline.cyan('pa11y-webservice started'));
+			console.log(chalk.underline.cyan('Pa11y Webservice started'));
 			console.log(chalk.grey('mode: %s'), process.env.NODE_ENV);
 			console.log(chalk.grey('uri:  %s'), webservice.server.info.uri);
 		});

package.json

@@ -1,46 +1,51 @@
 {
   "name": "pa11y-dashboard",
-	"version": "1.11.0",
+  "version": "2.2.2",
   "private": true,
-
+  "description": "Pa11y Dashboard is a visual web interface to the Pa11y accessibility reporter",
-	"description": "pa11y-dashboard is a visual web interface to the pa11y accessibility reporter",
+  "keywords": [
-	"keywords": [ "accessibility", "analysis", "report" ],
+    "accessibility",
+    "analysis",
+    "report"
+  ],
+  "author": "Team Pa11y",
   "contributors": [
     "Perry Harlock (http://www.phwebs.co.uk/)",
     "Rowan Manning (http://rowanmanning.com/)"
   ],
-
   "repository": {
     "type": "git",
-		"url": "https://github.com/pa11y/pa11y-dashboard.git"
+    "url": "https://github.com/pa11y/dashboard.git"
   },
-	"homepage": "https://github.com/pa11y/pa11y-dashboard",
+  "homepage": "https://github.com/pa11y/dashboard",
-	"bugs": "https://github.com/pa11y/pa11y-dashboard/issues",
+  "bugs": "https://github.com/pa11y/dashboard/issues",
-
+  "license": "GPL-3.0",
   "engines": {
-		"node": ">=0.10"
+    "node": ">=4"
   },
   "dependencies": {
-		"chalk": "~0.2",
+    "body-parser": "~1.17.1",
-		"express": "~3.4",
+    "chalk": "~1.1",
-		"express-hbs": "~0.2",
+    "compression": "~1.6",
-		"moment": "~2.2",
+    "express": "~4.15.2",
-		"pa11y-webservice": "~1.10",
+    "express-hbs": "~1.0",
-		"pa11y-webservice-client-node": "~1.1",
+    "http-headers": "^3.0.1",
-		"underscore": "~1.5"
+    "moment": "~2.15.2",
+    "pa11y-webservice": "^2.3.0",
+    "pa11y-webservice-client-node": "^1.2.1",
+    "underscore": "~1.8"
   },
   "devDependencies": {
-		"bower": "~1.2",
+    "bower": "~1.7",
-		"jscs": "^2",
+    "cheerio": "~0.20",
-		"jsdom": "^3",
+    "eslint": "^3.18.0",
-		"jshint": "^2",
+    "less": "~2.7",
-		"less": "~1.5",
     "mocha": "^2",
+    "pa11y-lint-config": "^1.0.0",
     "proclaim": "^3",
-		"request": "~2.27",
+    "request": "^2.74",
-		"uglify-js": "~2.4"
+    "uglify-js": "~2.6"
   },
-
   "scripts": {
     "start": "node index.js",
     "test": "make ci"

public/js/site.js

@@ -1,17 +1,17 @@
-// This file is part of pa11y-dashboard.
+// This file is part of Pa11y Dashboard.
 //
-// pa11y-dashboard is free software: you can redistribute it and/or modify
+// Pa11y Dashboard is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 //
-// pa11y-dashboard is distributed in the hope that it will be useful,
+// Pa11y Dashboard is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with pa11y-dashboard.  If not, see <http://www.gnu.org/licenses/>.
+// along with Pa11y Dashboard.  If not, see <http://www.gnu.org/licenses/>.
 
 $(document).ready(function(){
 
@@ -77,11 +77,11 @@ $(document).ready(function(){
     expandLink.click( function(){
 		$(this).next().slideToggle('slow', function(){});
         if ($(this).hasClass('showing')) {
-            $(this).find('span.expander').html('+');
+            $(this).find('span.expander').html('↓');
             $(this).attr('aria-expanded', false);
         }
         else {
-            $(this).find('span.expander').html('-');
+            $(this).find('span.expander').html('↑');
             $(this).attr('aria-expanded', true);
         }
         $(this).toggleClass('showing');

public/less/site-ie8and.less

@@ -1,17 +1,17 @@
-// This file is part of pa11y-dashboard.
+// This file is part of Pa11y Dashboard.
 // 
-// pa11y-dashboard is free software: you can redistribute it and/or modify
+// Pa11y Dashboard is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 // 
-// pa11y-dashboard is distributed in the hope that it will be useful,
+// Pa11y Dashboard is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with pa11y-dashboard.  If not, see <http://www.gnu.org/licenses/>.
+// along with Pa11y Dashboard.  If not, see <http://www.gnu.org/licenses/>.
 
 // Making up for the non support of IE8 and IE7 in Bootstrap 3
 .ie7, .ie8 {

public/less/site-nojavascript.less

@@ -1,17 +1,17 @@
-// This file is part of pa11y-dashboard.
+// This file is part of Pa11y Dashboard.
 //
-// pa11y-dashboard is free software: you can redistribute it and/or modify
+// Pa11y Dashboard is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 //
-// pa11y-dashboard is distributed in the hope that it will be useful,
+// Pa11y Dashboard is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with pa11y-dashboard.  If not, see <http://www.gnu.org/licenses/>.
+// along with Pa11y Dashboard.  If not, see <http://www.gnu.org/licenses/>.
 
 /* No javascript */
 .no-javascript {

public/less/site-responsive.less

@@ -1,17 +1,17 @@
-// This file is part of pa11y-dashboard.
+// This file is part of Pa11y Dashboard.
 // 
-// pa11y-dashboard is free software: you can redistribute it and/or modify
+// Pa11y Dashboard is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 // 
-// pa11y-dashboard is distributed in the hope that it will be useful,
+// Pa11y Dashboard is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with pa11y-dashboard.  If not, see <http://www.gnu.org/licenses/>.
+// along with Pa11y Dashboard.  If not, see <http://www.gnu.org/licenses/>.
 
 /* Media queries */
 @media (max-width:991px) {

public/less/site.less

@@ -1,17 +1,17 @@
-// This file is part of pa11y-dashboard.
+// This file is part of Pa11y Dashboard.
 //
-// pa11y-dashboard is free software: you can redistribute it and/or modify
+// Pa11y Dashboard is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 //
-// pa11y-dashboard is distributed in the hope that it will be useful,
+// Pa11y Dashboard is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with pa11y-dashboard.  If not, see <http://www.gnu.org/licenses/>.
+// along with Pa11y Dashboard.  If not, see <http://www.gnu.org/licenses/>.
 
 /* Site specific styling */
 

route/index.js

@@ -1,34 +1,33 @@
-// This file is part of pa11y-dashboard.
+// This file is part of Pa11y Dashboard.
 //
-// pa11y-dashboard is free software: you can redistribute it and/or modify
+// Pa11y Dashboard is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 //
-// pa11y-dashboard is distributed in the hope that it will be useful,
+// Pa11y Dashboard is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with pa11y-dashboard.  If not, see <http://www.gnu.org/licenses/>.
+// along with Pa11y Dashboard.  If not, see <http://www.gnu.org/licenses/>.
-
 'use strict';
 
-var presentTask = require('../view/presenter/task');
+const presentTask = require('../view/presenter/task');
 
 module.exports = route;
 
 // Route definition
 function route(app) {
-	app.express.get('/', function(req, res, next) {
+	app.express.get('/', (request, response, next) => {
-		app.webservice.tasks.get({lastres: true}, function(err, tasks) {
+		app.webservice.tasks.get({lastres: true}, (error, tasks) => {
-			if (err) {
+			if (error) {
-				return next(err);
+				return next(error);
 			}
-			res.render('index', {
+			response.render('index', {
 				tasks: tasks.map(presentTask),
-				deleted: (typeof req.query.deleted !== 'undefined'),
+				deleted: (typeof request.query.deleted !== 'undefined'),
 				isHomePage: true
 			});
 		});

route/new.js

@@ -1,58 +1,79 @@
-// This file is part of pa11y-dashboard.
+// This file is part of Pa11y Dashboard.
 //
-// pa11y-dashboard is free software: you can redistribute it and/or modify
+// Pa11y Dashboard is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 //
-// pa11y-dashboard is distributed in the hope that it will be useful,
+// Pa11y Dashboard is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with pa11y-dashboard.  If not, see <http://www.gnu.org/licenses/>.
+// along with Pa11y Dashboard.  If not, see <http://www.gnu.org/licenses/>.
-
 'use strict';
 
-var getStandards = require('../data/standards');
+const getStandards = require('../data/standards');
+const httpHeaders = require('http-headers');
 
 module.exports = route;
 
 // Route definition
 function route(app) {
 
-	app.express.get('/new', function(req, res) {
+	app.express.get('/new', (request, response) => {
-		var standards = getStandards().map(function(standard) {
+		const standards = getStandards().map(standard => {
 			if (standard.title === 'WCAG2AA') {
 				standard.selected = true;
 			}
 			return standard;
 		});
-		res.render('new', {
+		response.render('new', {
 			standards: standards,
 			isNewTaskPage: true
 		});
 	});
 
-	app.express.post('/new', function(req, res) {
+	app.express.post('/new', (request, response) => {
-		var newTask = {
+
-			name: req.body.name,
+		let parsedActions;
-			url: req.body.url,
+		if (request.body.actions) {
-			standard: req.body.standard,
+			parsedActions = request.body.actions.split(/[\r\n]+/)
-			ignore: req.body.ignore || [],
+				.map(action => {
-			timeout: req.body.timeout,
+					return action.trim();
-			wait: req.body.wait,
+				})
-			username: req.body.username,
+				.filter(action => {
-			password: req.body.password
+					return Boolean(action);
+				});
+		}
+
+		let parsedHeaders;
+		if (request.body.headers) {
+			parsedHeaders = httpHeaders(request.body.headers, true);
+		}
+
+		const newTask = {
+			name: request.body.name,
+			url: request.body.url,
+			standard: request.body.standard,
+			ignore: request.body.ignore || [],
+			timeout: request.body.timeout || undefined,
+			wait: request.body.wait || undefined,
+			actions: parsedActions,
+			username: request.body.username || undefined,
+			password: request.body.password || undefined,
+			headers: parsedHeaders,
+			hideElements: request.body.hideElements || undefined
 		};
-		app.webservice.tasks.create(newTask, function(err, task) {
+
-			if (err) {
+		app.webservice.tasks.create(newTask, (error, task) => {
-				var standards = getStandards().map(function(standard) {
+			if (error) {
+				const standards = getStandards().map(standard => {
 					if (standard.title === newTask.standard) {
 						standard.selected = true;
 					}
-					standard.rules = standard.rules.map(function(rule) {
+					standard.rules = standard.rules.map(rule => {
 						if (newTask.ignore.indexOf(rule.name) !== -1) {
 							rule.ignored = true;
 						}
@@ -60,13 +81,15 @@ function route(app) {
 					});
 					return standard;
 				});
-				return res.render('new', {
+				newTask.actions = request.body.actions;
-					error: err,
+				newTask.headers = request.body.headers;
+				return response.render('new', {
+					error: error,
 					standards: standards,
 					task: newTask
 				});
 			}
-			res.redirect('/' + task.id + '?added');
+			response.redirect(`/${task.id}?added`);
 		});
 	});
 

route/result/download.js

@@ -1,41 +1,40 @@
-// This file is part of pa11y-dashboard.
+// This file is part of Pa11y Dashboard.
 //
-// pa11y-dashboard is free software: you can redistribute it and/or modify
+// Pa11y Dashboard is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 //
-// pa11y-dashboard is distributed in the hope that it will be useful,
+// Pa11y Dashboard is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with pa11y-dashboard.  If not, see <http://www.gnu.org/licenses/>.
+// along with Pa11y Dashboard.  If not, see <http://www.gnu.org/licenses/>.
-
 'use strict';
 
-var moment = require('moment');
+const moment = require('moment');
 
 module.exports = route;
 
 // Route definition
 function route(app) {
 
-	function getTaskAndResult(req, res, next) {
+	function getTaskAndResult(request, response, next) {
-		app.webservice.task(req.params.id).get({}, function(err, task) {
+		app.webservice.task(request.params.id).get({}, (error, task) => {
-			if (err) {
+			if (error) {
 				return next('route');
 			}
 			app.webservice
-				.task(req.params.id)
+				.task(request.params.id)
-				.result(req.params.rid)
+				.result(request.params.rid)
-				.get({full: true}, function(err, result) {
+				.get({full: true}, (error, result) => {
-					if (err) {
+					if (error) {
 						return next('route');
 					}
-					res.locals.task = task;
+					response.locals.task = task;
-					res.locals.result = result;
+					response.locals.result = result;
 					next();
 				});
 		});
@@ -48,7 +47,7 @@ function route(app) {
 			task.url
 				.replace(/^https?:\/\//i, '')
 				.replace(/\/$/, '')
-				.replace(/[^a-z0-9\.\-\_]+/gi, '-'),
+				.replace(/[^a-z0-9.\-_]+/gi, '-'),
 			'--',
 			task.standard.toLowerCase(),
 			'--',
@@ -58,11 +57,11 @@ function route(app) {
 		].join('');
 	}
 
-	app.express.get('/:id/:rid.csv', getTaskAndResult, function(req, res) {
+	app.express.get('/:id/:rid.csv', getTaskAndResult, (request, response) => {
-		var task = res.locals.task;
+		const task = response.locals.task;
-		var result = res.locals.result;
+		const result = response.locals.result;
-		var rows = ['"code","message","type","context","selector"'];
+		const rows = ['"code","message","type","context","selector"'];
-		result.results.forEach(function(msg) {
+		result.results.forEach(msg => {
 			rows.push([
 				JSON.stringify(msg.code),
 				JSON.stringify(msg.message),
@@ -71,18 +70,18 @@ function route(app) {
 				JSON.stringify(msg.selector)
 			].join(','));
 		});
-		res.attachment(getDownloadFileName(task, result, 'csv'));
+		response.attachment(getDownloadFileName(task, result, 'csv'));
-		res.send(rows.join('\n'));
+		response.send(rows.join('\n'));
 	});
 
-	app.express.get('/:id/:rid.json', getTaskAndResult, function(req, res) {
+	app.express.get('/:id/:rid.json', getTaskAndResult, (request, response) => {
-		var task = res.locals.task;
+		const task = response.locals.task;
-		var result = res.locals.result;
+		const result = response.locals.result;
-		res.attachment(getDownloadFileName(task, result, 'json'));
+		response.attachment(getDownloadFileName(task, result, 'json'));
 		delete task.id;
 		delete result.id;
 		result.task = task;
-		res.send(result);
+		response.send(result);
 	});
 
 }

route/result/index.js

@@ -1,41 +1,40 @@
-// This file is part of pa11y-dashboard.
+// This file is part of Pa11y Dashboard.
 //
-// pa11y-dashboard is free software: you can redistribute it and/or modify
+// Pa11y Dashboard is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 //
-// pa11y-dashboard is distributed in the hope that it will be useful,
+// Pa11y Dashboard is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with pa11y-dashboard.  If not, see <http://www.gnu.org/licenses/>.
+// along with Pa11y Dashboard.  If not, see <http://www.gnu.org/licenses/>.
-
 'use strict';
 
-var presentTask = require('../../view/presenter/task');
+const presentTask = require('../../view/presenter/task');
-var presentResult = require('../../view/presenter/result');
+const presentResult = require('../../view/presenter/result');
 
 module.exports = route;
 
 // Route definition
 function route(app) {
 
-	app.express.get('/:id/:rid', function(req, res, next) {
+	app.express.get('/:id/:rid', (request, response, next) => {
-		app.webservice.task(req.params.id).get({}, function(err, task) {
+		app.webservice.task(request.params.id).get({}, (error, task) => {
-			if (err) {
+			if (error) {
 				return next();
 			}
 			app.webservice
-				.task(req.params.id)
+				.task(request.params.id)
-				.result(req.params.rid)
+				.result(request.params.rid)
-				.get({full: true}, function(err, result) {
+				.get({full: true}, (error, result) => {
-					if (err) {
+					if (error) {
 						return next();
 					}
-					res.render('result', {
+					response.render('result', {
 						task: presentTask(task),
 						mainResult: presentResult(result),
 						isResultPage: true

route/task/delete.js

@@ -1,45 +1,44 @@
-// This file is part of pa11y-dashboard.
+// This file is part of Pa11y Dashboard.
 //
-// pa11y-dashboard is free software: you can redistribute it and/or modify
+// Pa11y Dashboard is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 //
-// pa11y-dashboard is distributed in the hope that it will be useful,
+// Pa11y Dashboard is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with pa11y-dashboard.  If not, see <http://www.gnu.org/licenses/>.
+// along with Pa11y Dashboard.  If not, see <http://www.gnu.org/licenses/>.
-
 'use strict';
 
-var presentTask = require('../../view/presenter/task');
+const presentTask = require('../../view/presenter/task');
 
 module.exports = route;
 
 // Route definition
 function route(app) {
 
-	app.express.get('/:id/delete', function(req, res, next) {
+	app.express.get('/:id/delete', (request, response, next) => {
-		app.webservice.task(req.params.id).get({}, function(err, task) {
+		app.webservice.task(request.params.id).get({}, (error, task) => {
-			if (err) {
+			if (error) {
 				return next();
 			}
-			res.render('task/delete', {
+			response.render('task/delete', {
 				task: presentTask(task),
 				isTaskSubPage: true
 			});
 		});
 	});
 
-	app.express.post('/:id/delete', function(req, res, next) {
+	app.express.post('/:id/delete', (request, response, next) => {
-		app.webservice.task(req.params.id).remove(function(err) {
+		app.webservice.task(request.params.id).remove(error => {
-			if (err) {
+			if (error) {
 				return next();
 			}
-			res.redirect('/?deleted');
+			response.redirect('/?deleted');
 		});
 	});
 

route/task/edit.js

@@ -1,38 +1,38 @@
-// This file is part of pa11y-dashboard.
+// This file is part of Pa11y Dashboard.
 //
-// pa11y-dashboard is free software: you can redistribute it and/or modify
+// Pa11y Dashboard is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 //
-// pa11y-dashboard is distributed in the hope that it will be useful,
+// Pa11y Dashboard is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with pa11y-dashboard.  If not, see <http://www.gnu.org/licenses/>.
+// along with Pa11y Dashboard.  If not, see <http://www.gnu.org/licenses/>.
-
 'use strict';
 
-var presentTask = require('../../view/presenter/task');
+const presentTask = require('../../view/presenter/task');
-var getStandards = require('../../data/standards');
+const getStandards = require('../../data/standards');
+const httpHeaders = require('http-headers');
 
 module.exports = route;
 
 // Route definition
 function route(app) {
 
-	app.express.get('/:id/edit', function(req, res, next) {
+	app.express.get('/:id/edit', (request, response, next) => {
-		app.webservice.task(req.params.id).get({}, function(err, task) {
+		app.webservice.task(request.params.id).get({}, (error, task) => {
-			if (err) {
+			if (error) {
 				return next();
 			}
-			var standards = getStandards().map(function(standard) {
+			const standards = getStandards().map(standard => {
 				if (standard.title === task.standard) {
 					standard.selected = true;
 				}
-				standard.rules = standard.rules.map(function(rule) {
+				standard.rules = standard.rules.map(rule => {
 					if (task.ignore.indexOf(rule.name) !== -1) {
 						rule.ignored = true;
 					}
@@ -40,8 +40,9 @@ function route(app) {
 				});
 				return standard;
 			});
-			res.render('task/edit', {
+			task.actions = (task.actions ? task.actions.join('\n') : '');
-				edited: (typeof req.query.edited !== 'undefined'),
+			response.render('task/edit', {
+				edited: (typeof request.query.edited !== 'undefined'),
 				standards: standards,
 				task: presentTask(task),
 				isTaskSubPage: true
@@ -49,25 +50,48 @@ function route(app) {
 		});
 	});
 
-	app.express.post('/:id/edit', function(req, res, next) {
+	app.express.post('/:id/edit', (request, response, next) => {
-		app.webservice.task(req.params.id).get({}, function(err, task) {
+		app.webservice.task(request.params.id).get({}, (error, task) => {
-			if (err) {
+			if (error) {
 				return next();
 			}
-			req.body.ignore = req.body.ignore || [];
+			const originalActions = request.body.actions;
-			app.webservice.task(req.params.id).edit(req.body, function(err) {
+			const originalHeaders = request.body.headers;
-				if (err) {
+			request.body.ignore = request.body.ignore || [];
-					task.name = req.body.name;
+			request.body.timeout = request.body.timeout || undefined;
-					task.ignore = req.body.ignore;
+			request.body.wait = request.body.wait || undefined;
-					task.timeout = req.body.timeout;
+			if (request.body.actions) {
-					task.wait = req.body.wait;
+				request.body.actions = request.body.actions.split(/[\r\n]+/)
-					task.username = req.body.username;
+					.map(action => {
-					task.password = req.body.password;
+						return action.trim();
-					var standards = getStandards().map(function(standard) {
+					})
+					.filter(action => {
+						return Boolean(action);
+					});
+			}
+			if (!request.body.actions) {
+				request.body.actions = [];
+			}
+			request.body.username = request.body.username || undefined;
+			request.body.password = request.body.password || undefined;
+			request.body.hideElements = request.body.hideElements || undefined;
+			request.body.headers = httpHeaders(request.body.headers || '', true);
+			app.webservice.task(request.params.id).edit(request.body, error => {
+				if (error) {
+					task.name = request.body.name;
+					task.ignore = request.body.ignore;
+					task.timeout = request.body.timeout;
+					task.wait = request.body.wait;
+					task.actions = originalActions;
+					task.username = request.body.username;
+					task.password = request.body.password;
+					task.headers = originalHeaders;
+					task.hideElements = request.body.hideElements;
+					const standards = getStandards().map(standard => {
 						if (standard.title === task.standard) {
 							standard.selected = true;
 						}
-						standard.rules = standard.rules.map(function(rule) {
+						standard.rules = standard.rules.map(rule => {
 							if (task.ignore.indexOf(rule.name) !== -1) {
 								rule.ignored = true;
 							}
@@ -75,14 +99,14 @@ function route(app) {
 						});
 						return standard;
 					});
-					return res.render('task/edit', {
+					return response.render('task/edit', {
-						error: err,
+						error: error,
 						standards: standards,
 						task: task,
 						isTaskSubPage: true
 					});
 				}
-				res.redirect('/' + req.params.id + '/edit?edited');
+				response.redirect(`/${request.params.id}/edit?edited`);
 			});
 		});
 	});

route/task/ignore.js

@@ -5,20 +5,20 @@ module.exports = route;
 // Route definition
 function route(app) {
 
-	app.express.post('/:id/ignore', function(req, res, next) {
+	app.express.post('/:id/ignore', (request, response, next) => {
-		app.webservice.task(req.params.id).get({}, function(err, task) {
+		app.webservice.task(request.params.id).get({}, (error, task) => {
-			if (err) {
+			if (error) {
 				return next();
 			}
-			var edit = {
+			const edit = {
 				name: task.name,
 				ignore: task.ignore
 			};
-			if (typeof req.body.rule === 'string') {
+			if (typeof request.body.rule === 'string') {
-				edit.ignore.push(req.body.rule);
+				edit.ignore.push(request.body.rule);
 			}
-			app.webservice.task(req.params.id).edit(edit, function() {
+			app.webservice.task(request.params.id).edit(edit, () => {
-				res.redirect('/' + req.params.id + '?rule-ignored');
+				response.redirect(`/${request.params.id}?rule-ignored`);
 			});
 		});
 	});

route/task/index.js

@@ -1,47 +1,46 @@
-// This file is part of pa11y-dashboard.
+// This file is part of Pa11y Dashboard.
 //
-// pa11y-dashboard is free software: you can redistribute it and/or modify
+// Pa11y Dashboard is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 //
-// pa11y-dashboard is distributed in the hope that it will be useful,
+// Pa11y Dashboard is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with pa11y-dashboard.  If not, see <http://www.gnu.org/licenses/>.
+// along with Pa11y Dashboard.  If not, see <http://www.gnu.org/licenses/>.
-
 'use strict';
 
-var presentTask = require('../../view/presenter/task');
+const presentTask = require('../../view/presenter/task');
-var presentResult = require('../../view/presenter/result');
+const presentResult = require('../../view/presenter/result');
-var presentResultList = require('../../view/presenter/result-list');
+const presentResultList = require('../../view/presenter/result-list');
 
 module.exports = route;
 
 // Route definition
 function route(app) {
 
-	app.express.get('/:id', function(req, res, next) {
+	app.express.get('/:id', (request, response, next) => {
-		app.webservice.task(req.params.id).get({lastres: true}, function(err, task) {
+		app.webservice.task(request.params.id).get({lastres: true}, (error, task) => {
-			if (err) {
+			if (error) {
 				return next();
 			}
-			app.webservice.task(req.params.id).results({}, function(err, results) {
+			app.webservice.task(request.params.id).results({}, (error, results) => {
-				if (err) {
+				if (error) {
-					return next(err);
+					return next(error);
 				}
-				var presentedResults = presentResultList(results.map(presentResult));
+				const presentedResults = presentResultList(results.map(presentResult));
-				res.render('task', {
+				response.render('task', {
 					task: presentTask(task),
 					results: presentedResults,
 					mainResult: task.lastResult || null,
-					added: (typeof req.query.added !== 'undefined'),
+					added: (typeof request.query.added !== 'undefined'),
-					running: (typeof req.query.running !== 'undefined'),
+					running: (typeof request.query.running !== 'undefined'),
-					ruleIgnored: (typeof req.query['rule-ignored'] !== 'undefined'),
+					ruleIgnored: (typeof request.query['rule-ignored'] !== 'undefined'),
-					ruleUnignored: (typeof req.query['rule-unignored'] !== 'undefined'),
+					ruleUnignored: (typeof request.query['rule-unignored'] !== 'undefined'),
 					hasOneResult: (presentedResults.length < 2),
 					isTaskPage: true
 				});

route/task/run.js

@@ -1,18 +1,17 @@
-// This file is part of pa11y-dashboard.
+// This file is part of Pa11y Dashboard.
 //
-// pa11y-dashboard is free software: you can redistribute it and/or modify
+// Pa11y Dashboard is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 //
-// pa11y-dashboard is distributed in the hope that it will be useful,
+// Pa11y Dashboard is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with pa11y-dashboard.  If not, see <http://www.gnu.org/licenses/>.
+// along with Pa11y Dashboard.  If not, see <http://www.gnu.org/licenses/>.
-
 'use strict';
 
 module.exports = route;
@@ -20,12 +19,12 @@ module.exports = route;
 // Route definition
 function route(app) {
 
-	app.express.get('/:id/run', function(req, res, next) {
+	app.express.get('/:id/run', (request, response, next) => {
-		app.webservice.task(req.params.id).run(function(err) {
+		app.webservice.task(request.params.id).run(error => {
-			if (err) {
+			if (error) {
 				return next();
 			}
-			res.redirect('/' + req.params.id + '?running');
+			response.redirect(`/${request.params.id}?running`);
 		});
 	});
 

route/task/unignore.js

@@ -5,21 +5,21 @@ module.exports = route;
 // Route definition
 function route(app) {
 
-	app.express.post('/:id/unignore', function(req, res, next) {
+	app.express.post('/:id/unignore', (request, response, next) => {
-		app.webservice.task(req.params.id).get({}, function(err, task) {
+		app.webservice.task(request.params.id).get({}, (error, task) => {
-			if (err) {
+			if (error) {
 				return next();
 			}
-			var edit = {
+			const edit = {
 				name: task.name,
 				ignore: task.ignore
 			};
-			var indexOfRule = edit.ignore.indexOf(req.body.rule);
+			const indexOfRule = edit.ignore.indexOf(request.body.rule);
-			if (typeof req.body.rule === 'string' && indexOfRule !== -1) {
+			if (typeof request.body.rule === 'string' && indexOfRule !== -1) {
 				edit.ignore.splice(indexOfRule, 1);
 			}
-			app.webservice.task(req.params.id).edit(edit, function() {
+			app.webservice.task(request.params.id).edit(edit, () => {
-				res.redirect('/' + req.params.id + '?rule-unignored');
+				response.redirect(`/${request.params.id}?rule-unignored`);
 			});
 		});
 	});

test/.eslintrc.js

@@ -0,0 +1,15 @@
+'use strict';
+
+// Clone the main config
+var config = module.exports = JSON.parse(JSON.stringify(require('../.eslintrc')));
+
+// We use `this` all over the integration tests
+config.rules['no-invalid-this'] = 'off';
+
+// Because of our use of `this`, arrow functions
+// aren't really gonna work in the integration tests
+config.rules['prefer-arrow-callback'] = 'off';
+
+// Disable max line length/statements
+config.rules['max-len'] = 'off';
+config.rules['max-statements'] = 'off';

test/integration/helper/navigate.js

@@ -1,22 +1,23 @@
-// This file is part of pa11y-dashboard.
+// This file is part of Pa11y Dashboard.
 //
-// pa11y-dashboard is free software: you can redistribute it and/or modify
+// Pa11y Dashboard is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 //
-// pa11y-dashboard is distributed in the hope that it will be useful,
+// Pa11y Dashboard is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with pa11y-dashboard.  If not, see <http://www.gnu.org/licenses/>.
+// along with Pa11y Dashboard.  If not, see <http://www.gnu.org/licenses/>.
 
+// jscs:disable requireArrowFunctions
 'use strict';
 
-var jsdom = require('jsdom');
+const cheerio = require('cheerio');
-var request = require('request');
+const request = require('request');
 
 module.exports = createNavigator;
 
@@ -29,36 +30,30 @@ function createNavigator(baseUrl, store) {
 		store.request = null;
 		store.response = null;
 		store.status = null;
-		store.window = null;
 
 		request({
 			url: baseUrl + opts.endpoint,
 			method: opts.method || 'GET',
-			body: opts.body,
+			form: opts.form,
-			json: true,
+			json: opts.json || false,
 			qs: opts.query,
 			followAllRedirects: true
-		}, function(err, res, body) {
+		}, function(error, response, body) {
+			if (error) {
+				return callback(error);
+			}
 
 			store.body = body;
-			store.request = res.request;
+			store.request = response.request;
-			store.response = res;
+			store.response = response;
-			store.status = res.statusCode;
+			store.status = response.statusCode;
 
 			if (opts.nonDom) {
-				store.window = null;
 				store.dom = null;
-				callback();
 			} else {
-				jsdom.env(
+				store.dom = cheerio.load(store.body);
-					store.body,
+			}
-					function(err, window) {
-						store.window = window;
-						store.dom = window.document;
 			callback();
-					}
-				);
-			}
 
 		});
 

test/integration/helper/webservice.js

@@ -1,29 +1,30 @@
-// This file is part of pa11y-dashboard.
+// This file is part of Pa11y Dashboard.
 //
-// pa11y-dashboard is free software: you can redistribute it and/or modify
+// Pa11y Dashboard is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 //
-// pa11y-dashboard is distributed in the hope that it will be useful,
+// Pa11y Dashboard is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with pa11y-dashboard.  If not, see <http://www.gnu.org/licenses/>.
+// along with Pa11y Dashboard.  If not, see <http://www.gnu.org/licenses/>.
 
+// jscs:disable requireArrowFunctions
 'use strict';
 
-var createClient = require('pa11y-webservice-client-node');
+const createClient = require('pa11y-webservice-client-node');
 
 module.exports = createWebserviceClient;
 
 // Create a webservice client
 function createWebserviceClient(config) {
-	var webserviceUrl = config.webservice;
+	let webserviceUrl = config.webservice;
 	if (typeof webserviceUrl === 'object') {
-		webserviceUrl = 'http://' + webserviceUrl.host + ':' + webserviceUrl.port + '/';
+		webserviceUrl = `http://${webserviceUrl.host}:${webserviceUrl.port}/`;
 	}
 	return createClient(webserviceUrl);
 }

test/integration/route/index.js

@@ -1,30 +1,31 @@
-// This file is part of pa11y-dashboard.
+// This file is part of Pa11y Dashboard.
 //
-// pa11y-dashboard is free software: you can redistribute it and/or modify
+// Pa11y Dashboard is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 //
-// pa11y-dashboard is distributed in the hope that it will be useful,
+// Pa11y Dashboard is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with pa11y-dashboard.  If not, see <http://www.gnu.org/licenses/>.
+// along with Pa11y Dashboard.  If not, see <http://www.gnu.org/licenses/>.
 
+// jscs:disable maximumLineLength, requireArrowFunctions
 'use strict';
 
-var assert = require('proclaim');
+const assert = require('proclaim');
 
-describe('GET /', function() {
+describe.only('GET /', function() {
 
 	beforeEach(function(done) {
-		var req = {
+		const request = {
 			method: 'GET',
 			endpoint: '/'
 		};
-		this.navigate(req, done);
+		this.navigate(request, done);
 	});
 
 	it('should send a 200 status', function() {
@@ -32,61 +33,61 @@ describe('GET /', function() {
 	});
 
 	it('should display an "Add new URL" button', function() {
-		var elem = this.last.dom.querySelectorAll('[data-test=add-task]');
+		const elem = this.last.dom('[data-test=add-task]');
 		assert.strictEqual(elem.length, 1);
-		assert.strictEqual(elem[0].getAttribute('href'), '/new');
+		assert.strictEqual(elem.eq(0).attr('href'), '/new');
 	});
 
 	it('should display all of the expected tasks', function() {
-		var tasks = this.last.dom.querySelectorAll('[data-test=task]');
+		const tasks = this.last.dom('[data-test=task]');
 		assert.strictEqual(tasks.length, 3);
-		assert.match(tasks[0].textContent, /npg home\s+\(wcag2aa\)/i);
+		assert.match(tasks.eq(0).text(), /npg home\s+\(wcag2aa\)/i);
-		assert.match(tasks[1].textContent, /npg home\s+\(wcag2aaa\)/i);
+		assert.match(tasks.eq(1).text(), /npg home\s+\(wcag2aaa\)/i);
-		assert.match(tasks[2].textContent, /nature news\s+\(section508\)/i);
+		assert.match(tasks.eq(2).text(), /nature news\s+\(section508\)/i);
 	});
 
 	it('should have links to each task', function() {
-		var tasks = this.last.dom.querySelectorAll('[data-test=task]');
+		const tasks = this.last.dom('[data-test=task]');
-		assert.strictEqual(tasks[0].querySelectorAll('[href="/abc000000000000000000001"]').length, 1);
+		assert.strictEqual(tasks.eq(0).find('[href="/abc000000000000000000001"]').length, 1);
-		assert.strictEqual(tasks[1].querySelectorAll('[href="/abc000000000000000000002"]').length, 1);
+		assert.strictEqual(tasks.eq(1).find('[href="/abc000000000000000000002"]').length, 1);
-		assert.strictEqual(tasks[2].querySelectorAll('[href="/abc000000000000000000003"]').length, 1);
+		assert.strictEqual(tasks.eq(2).find('[href="/abc000000000000000000003"]').length, 1);
 	});
 
 	it('should display an "Edit" button for each task', function() {
-		var tasks = this.last.dom.querySelectorAll('[data-test=task]');
+		const tasks = this.last.dom('[data-test=task]');
-		assert.strictEqual(tasks[0].querySelectorAll('[href="/abc000000000000000000001/edit"]').length, 1);
+		assert.strictEqual(tasks.eq(0).find('[href="/abc000000000000000000001/edit"]').length, 1);
-		assert.strictEqual(tasks[1].querySelectorAll('[href="/abc000000000000000000002/edit"]').length, 1);
+		assert.strictEqual(tasks.eq(1).find('[href="/abc000000000000000000002/edit"]').length, 1);
-		assert.strictEqual(tasks[2].querySelectorAll('[href="/abc000000000000000000003/edit"]').length, 1);
+		assert.strictEqual(tasks.eq(2).find('[href="/abc000000000000000000003/edit"]').length, 1);
 	});
 
 	it('should display a "Delete" button for each task', function() {
-		var tasks = this.last.dom.querySelectorAll('[data-test=task]');
+		const tasks = this.last.dom('[data-test=task]');
-		assert.strictEqual(tasks[0].querySelectorAll('[href="/abc000000000000000000001/delete"]').length, 1);
+		assert.strictEqual(tasks.eq(0).find('[href="/abc000000000000000000001/delete"]').length, 1);
-		assert.strictEqual(tasks[1].querySelectorAll('[href="/abc000000000000000000002/delete"]').length, 1);
+		assert.strictEqual(tasks.eq(1).find('[href="/abc000000000000000000002/delete"]').length, 1);
-		assert.strictEqual(tasks[2].querySelectorAll('[href="/abc000000000000000000003/delete"]').length, 1);
+		assert.strictEqual(tasks.eq(2).find('[href="/abc000000000000000000003/delete"]').length, 1);
 	});
 
 	it('should display a "Run" button for each task', function() {
-		var tasks = this.last.dom.querySelectorAll('[data-test=task]');
+		const tasks = this.last.dom('[data-test=task]');
-		assert.strictEqual(tasks[0].querySelectorAll('[href="/abc000000000000000000001/run"]').length, 1);
+		assert.strictEqual(tasks.eq(0).find('[href="/abc000000000000000000001/run"]').length, 1);
-		assert.strictEqual(tasks[1].querySelectorAll('[href="/abc000000000000000000002/run"]').length, 1);
+		assert.strictEqual(tasks.eq(1).find('[href="/abc000000000000000000002/run"]').length, 1);
-		assert.strictEqual(tasks[2].querySelectorAll('[href="/abc000000000000000000003/run"]').length, 1);
+		assert.strictEqual(tasks.eq(2).find('[href="/abc000000000000000000003/run"]').length, 1);
 	});
 
 	it('should display the task result counts if the task has been run', function() {
-		var tasks = this.last.dom.querySelectorAll('[data-test=task]');
+		const tasks = this.last.dom('[data-test=task]');
-		assert.match(tasks[0].textContent, /1\s*errors/i);
+		assert.match(tasks.eq(0).text(), /1\s*errors/i);
-		assert.match(tasks[0].textContent, /2\s*warnings/i);
+		assert.match(tasks.eq(0).text(), /2\s*warnings/i);
-		assert.match(tasks[0].textContent, /3\s*notices/i);
+		assert.match(tasks.eq(0).text(), /3\s*notices/i);
 	});
 
 	it('should display a message indicating that there are no results if the task has not been run', function() {
-		var tasks = this.last.dom.querySelectorAll('[data-test=task]');
+		const tasks = this.last.dom('[data-test=task]');
-		assert.match(tasks[2].textContent, /no results/i);
+		assert.match(tasks.eq(2).text(), /no results/i);
 	});
 
 	it('should not display an alert message', function() {
-		assert.strictEqual(this.last.dom.querySelectorAll('[data-test=alert]').length, 0);
+		assert.strictEqual(this.last.dom('[data-test=alert]').length, 0);
 	});
 
 });

test/integration/route/new.js

@@ -1,30 +1,31 @@
-// This file is part of pa11y-dashboard.
+// This file is part of Pa11y Dashboard.
 //
-// pa11y-dashboard is free software: you can redistribute it and/or modify
+// Pa11y Dashboard is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 //
-// pa11y-dashboard is distributed in the hope that it will be useful,
+// Pa11y Dashboard is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with pa11y-dashboard.  If not, see <http://www.gnu.org/licenses/>.
+// along with Pa11y Dashboard.  If not, see <http://www.gnu.org/licenses/>.
 
+// jscs:disable maximumLineLength, requireArrowFunctions
 'use strict';
 
-var assert = require('proclaim');
+const assert = require('proclaim');
 
 describe('GET /new', function() {
 
 	beforeEach(function(done) {
-		var req = {
+		const request = {
 			method: 'GET',
 			endpoint: '/new'
 		};
-		this.navigate(req, done);
+		this.navigate(request, done);
 	});
 
 	it('should send a 200 status', function() {
@@ -32,69 +33,86 @@ describe('GET /new', function() {
 	});
 
 	it('should not display an error message', function() {
-		assert.strictEqual(this.last.dom.querySelectorAll('[data-test=error]').length, 0);
+		assert.strictEqual(this.last.dom('[data-test=error]').length, 0);
 	});
 
 	it('should have an "Add new URL" form', function() {
-		var form = this.last.dom.querySelectorAll('[data-test=new-url-form]')[0];
+		const form = this.last.dom('[data-test=new-url-form]').eq(0);
 		assert.isDefined(form);
-		assert.strictEqual(form.getAttribute('action'), '/new');
+		assert.strictEqual(form.attr('action'), '/new');
-		assert.strictEqual(form.getAttribute('method'), 'post');
+		assert.strictEqual(form.attr('method'), 'post');
 	});
 
 	describe('"Add New URL" form', function() {
 
 		beforeEach(function() {
-			this.form = this.last.dom.querySelectorAll('[data-test=new-url-form]')[0];
+			this.form = this.last.dom('[data-test=new-url-form]').eq(0);
 		});
 
 		it('should have a "name" field', function() {
-			var field = this.form.querySelectorAll('input[name=name]')[0];
+			const field = this.form.find('input[name=name]').eq(0);
 			assert.isDefined(field);
-			assert.strictEqual(field.getAttribute('type'), 'text');
+			assert.strictEqual(field.attr('type'), 'text');
-			assert.strictEqual(field.getAttribute('value'), '');
+			assert.strictEqual(field.attr('value'), '');
 		});
 
 		it('should have a "url" field', function() {
-			var field = this.form.querySelectorAll('input[name=url]')[0];
+			const field = this.form.find('input[name=url]').eq(0);
 			assert.isDefined(field);
-			assert.strictEqual(field.getAttribute('type'), 'url');
+			assert.strictEqual(field.attr('type'), 'url');
-			assert.strictEqual(field.getAttribute('value'), '');
+			assert.strictEqual(field.attr('value'), '');
 		});
 
 		it('should have a "wait" field', function() {
-			var field = this.form.querySelectorAll('input[name=wait]')[0];
+			const field = this.form.find('input[name=wait]').eq(0);
+			assert.isDefined(field);
+			assert.strictEqual(field.attr('type'), 'text');
+			assert.strictEqual(field.attr('value'), '');
+		});
+
+		it('should have an "actions" field', function() {
+			const field = this.form.find('textarea[name=actions]').eq(0);
 			assert.isDefined(field);
-			assert.strictEqual(field.getAttribute('type'), 'text');
-			assert.strictEqual(field.getAttribute('value'), '');
 		});
 
 		it('should have a "username" field', function() {
-			var field = this.form.querySelectorAll('input[name=username]')[0];
+			const field = this.form.find('input[name=username]').eq(0);
 			assert.isDefined(field);
-			assert.strictEqual(field.getAttribute('type'), 'text');
+			assert.strictEqual(field.attr('type'), 'text');
-			assert.strictEqual(field.getAttribute('value'), '');
+			assert.strictEqual(field.attr('value'), '');
 		});
 
 		it('should have a "password" field', function() {
-			var field = this.form.querySelectorAll('input[name=password]')[0];
+			const field = this.form.find('input[name=password]').eq(0);
 			assert.isDefined(field);
-			assert.strictEqual(field.getAttribute('type'), 'text');
+			assert.strictEqual(field.attr('type'), 'text');
-			assert.strictEqual(field.getAttribute('value'), '');
+			assert.strictEqual(field.attr('value'), '');
 		});
 
 		it('should have a "standard" field', function() {
-			var field = this.form.querySelectorAll('select[name=standard]')[0];
+			const field = this.form.find('select[name=standard]').eq(0);
 			assert.isDefined(field);
-			assert.strictEqual(field.querySelectorAll('option').length, 4);
+			assert.strictEqual(field.find('option').length, 4);
 		});
 
 		it('should have "ignore" fields', function() {
-			var fields = this.form.querySelectorAll('input[name="ignore[]"]');
+			const fields = this.form.find('input[name="ignore[]"]');
 			assert.isDefined(fields);
 			assert.notStrictEqual(fields.length, 0);
 		});
 
+		it('should have a "hideElements" field', function() {
+			const field = this.form.find('input[name=hideElements]').eq(0);
+			assert.isDefined(field);
+			assert.strictEqual(field.attr('type'), 'text');
+			assert.strictEqual(field.attr('value'), '');
+		});
+
+		it('should have a "headers" field', function() {
+			const field = this.form.find('textarea[name=headers]').eq(0);
+			assert.isDefined(field);
+		});
+
 	});
 
 });
@@ -104,15 +122,15 @@ describe('POST /new', function() {
 	describe('with invalid query', function() {
 
 		beforeEach(function(done) {
-			var req = {
+			const request = {
 				method: 'POST',
 				endpoint: '/new',
-				body: {
+				form: {
 					name: '',
 					url: ''
 				}
 			};
-			this.navigate(req, done);
+			this.navigate(request, done);
 		});
 
 		it('should send a 200 status', function() {
@@ -120,7 +138,7 @@ describe('POST /new', function() {
 		});
 
 		it('should display an error message', function() {
-			assert.strictEqual(this.last.dom.querySelectorAll('[data-test=error]').length, 1);
+			assert.strictEqual(this.last.dom('[data-test=error]').length, 1);
 		});
 
 	});
@@ -128,16 +146,16 @@ describe('POST /new', function() {
 	describe('with valid query', function() {
 
 		beforeEach(function(done) {
-			var req = {
+			const request = {
 				method: 'POST',
 				endpoint: '/new',
-				body: {
+				form: {
 					name: 'Example',
 					url: 'http://example.com/',
 					standard: 'WCAG2AA'
 				}
 			};
-			this.navigate(req, done);
+			this.navigate(request, done);
 		});
 
 		it('should send a 200 status', function() {
@@ -145,9 +163,9 @@ describe('POST /new', function() {
 		});
 
 		it('should create the task', function(done) {
-			this.webservice.tasks.get({}, function(err, tasks) {
+			this.webservice.tasks.get({}, function(error, tasks) {
 				assert.strictEqual(tasks.length, 4);
-				done();
+				done(error);
 			});
 		});
 
@@ -156,11 +174,11 @@ describe('POST /new', function() {
 		});
 
 		it('should not display an error message', function() {
-			assert.strictEqual(this.last.dom.querySelectorAll('[data-test=error]').length, 0);
+			assert.strictEqual(this.last.dom('[data-test=error]').length, 0);
 		});
 
 		it('should display a success message', function() {
-			var alert = this.last.dom.querySelectorAll('[data-test=alert]')[0];
+			const alert = this.last.dom('[data-test=alert]').eq(0);
 			assert.isDefined(alert);
 			assert.match(alert.textContent, /url has been added/i);
 		});

test/integration/route/result/download.js

@@ -1,31 +1,32 @@
-// This file is part of pa11y-dashboard.
+// This file is part of Pa11y Dashboard.
 //
-// pa11y-dashboard is free software: you can redistribute it and/or modify
+// Pa11y Dashboard is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 //
-// pa11y-dashboard is distributed in the hope that it will be useful,
+// Pa11y Dashboard is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with pa11y-dashboard.  If not, see <http://www.gnu.org/licenses/>.
+// along with Pa11y Dashboard.  If not, see <http://www.gnu.org/licenses/>.
 
+// jscs:disable maximumLineLength, requireArrowFunctions
 'use strict';
 
-var assert = require('proclaim');
+const assert = require('proclaim');
 
 describe('GET /<task-id>/<result-id>.csv', function() {
 
 	beforeEach(function(done) {
-		var req = {
+		const request = {
 			method: 'GET',
 			endpoint: '/abc000000000000000000001/def000000000000000000001.csv',
 			nonDom: true
 		};
-		this.navigate(req, done);
+		this.navigate(request, done);
 	});
 
 	it('should send a 200 status', function() {
@@ -41,12 +42,13 @@ describe('GET /<task-id>/<result-id>.csv', function() {
 describe('GET /<task-id>/<result-id>.json', function() {
 
 	beforeEach(function(done) {
-		var req = {
+		const request = {
 			method: 'GET',
 			endpoint: '/abc000000000000000000001/def000000000000000000001.json',
-			nonDom: true
+			nonDom: true,
+			json: true
 		};
-		this.navigate(req, done);
+		this.navigate(request, done);
 	});
 
 	it('should send a 200 status', function() {
@@ -54,7 +56,7 @@ describe('GET /<task-id>/<result-id>.json', function() {
 	});
 
 	it('should output JSON results', function() {
-		var json = this.last.body;
+		const json = this.last.body;
 		assert.strictEqual(json.task.name, 'NPG Home');
 		assert.strictEqual(json.task.url, 'nature.com');
 		assert.strictEqual(json.count.error, 1);

test/integration/route/result/index.js

@@ -1,30 +1,31 @@
-// This file is part of pa11y-dashboard.
+// This file is part of Pa11y Dashboard.
 //
-// pa11y-dashboard is free software: you can redistribute it and/or modify
+// Pa11y Dashboard is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 //
-// pa11y-dashboard is distributed in the hope that it will be useful,
+// Pa11y Dashboard is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with pa11y-dashboard.  If not, see <http://www.gnu.org/licenses/>.
+// along with Pa11y Dashboard.  If not, see <http://www.gnu.org/licenses/>.
 
+// jscs:disable maximumLineLength, requireArrowFunctions
 'use strict';
 
-var assert = require('proclaim');
+const assert = require('proclaim');
 
 describe('GET /<task-id>/<result-id>', function() {
 
 	beforeEach(function(done) {
-		var req = {
+		const request = {
 			method: 'GET',
 			endpoint: '/abc000000000000000000001/def000000000000000000001'
 		};
-		this.navigate(req, done);
+		this.navigate(request, done);
 	});
 
 	it('should send a 200 status', function() {
@@ -32,37 +33,37 @@ describe('GET /<task-id>/<result-id>', function() {
 	});
 
 	it('should display a "Download CSV" button', function() {
-		var elem = this.last.dom.querySelectorAll('[data-test=download-csv]');
+		const elem = this.last.dom('[data-test=download-csv]');
 		assert.strictEqual(elem.length, 1);
-		assert.strictEqual(elem[0].getAttribute('href'), '/abc000000000000000000001/def000000000000000000001.csv');
+		assert.strictEqual(elem.eq(0).attr('href'), '/abc000000000000000000001/def000000000000000000001.csv');
 	});
 
 	it('should display a "Download JSON" button', function() {
-		var elem = this.last.dom.querySelectorAll('[data-test=download-json]');
+		const elem = this.last.dom('[data-test=download-json]');
 		assert.strictEqual(elem.length, 1);
-		assert.strictEqual(elem[0].getAttribute('href'), '/abc000000000000000000001/def000000000000000000001.json');
+		assert.strictEqual(elem.eq(0).attr('href'), '/abc000000000000000000001/def000000000000000000001.json');
 	});
 
 	it('should display a link back to the task', function() {
-		assert.isDefined(this.last.dom.querySelectorAll('[href="/abc000000000000000000001"]')[0]);
+		assert.isDefined(this.last.dom('[href="/abc000000000000000000001"]').eq(0));
 	});
 
 	it('should display errors', function() {
-		var elem = this.last.dom.querySelectorAll('[data-test=task-errors]')[0];
+		const elem = this.last.dom('[data-test=task-errors]').eq(0);
 		assert.isDefined(elem);
-		assert.match(elem.textContent, /errors \( 1 \)/i);
+		assert.match(elem.text(), /errors \( 1 \)/i);
 	});
 
 	it('should display warnings', function() {
-		var elem = this.last.dom.querySelectorAll('[data-test=task-warnings]')[0];
+		const elem = this.last.dom('[data-test=task-warnings]').eq(0);
 		assert.isDefined(elem);
-		assert.match(elem.textContent, /warnings \( 2 \)/i);
+		assert.match(elem.text(), /warnings \( 2 \)/i);
 	});
 
 	it('should display notices', function() {
-		var elem = this.last.dom.querySelectorAll('[data-test=task-notices]')[0];
+		const elem = this.last.dom('[data-test=task-notices]').eq(0);
 		assert.isDefined(elem);
-		assert.match(elem.textContent, /notices \( 3 \)/i);
+		assert.match(elem.text(), /notices \( 3 \)/i);
 	});
 
 });

test/integration/route/task/delete.js

@@ -1,30 +1,31 @@
-// This file is part of pa11y-dashboard.
+// This file is part of Pa11y Dashboard.
 //
-// pa11y-dashboard is free software: you can redistribute it and/or modify
+// Pa11y Dashboard is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 //
-// pa11y-dashboard is distributed in the hope that it will be useful,
+// Pa11y Dashboard is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with pa11y-dashboard.  If not, see <http://www.gnu.org/licenses/>.
+// along with Pa11y Dashboard.  If not, see <http://www.gnu.org/licenses/>.
 
+// jscs:disable maximumLineLength, requireArrowFunctions
 'use strict';
 
-var assert = require('proclaim');
+const assert = require('proclaim');
 
 describe('GET /<task-id>/delete', function() {
 
 	beforeEach(function(done) {
-		var req = {
+		const request = {
 			method: 'GET',
 			endpoint: '/abc000000000000000000001/delete'
 		};
-		this.navigate(req, done);
+		this.navigate(request, done);
 	});
 
 	it('should send a 200 status', function() {
@@ -32,14 +33,14 @@ describe('GET /<task-id>/delete', function() {
 	});
 
 	it('should have a "Delete URL" form', function() {
-		var form = this.last.dom.querySelectorAll('[data-test=delete-url-form]')[0];
+		const form = this.last.dom('[data-test=delete-url-form]').eq(0);
 		assert.isDefined(form);
-		assert.strictEqual(form.getAttribute('action'), '/abc000000000000000000001/delete');
+		assert.strictEqual(form.attr('action'), '/abc000000000000000000001/delete');
-		assert.strictEqual(form.getAttribute('method'), 'post');
+		assert.strictEqual(form.attr('method'), 'post');
 	});
 
 	it('should display a link back to the task page', function() {
-		assert.greaterThan(this.last.dom.querySelectorAll('[href="/abc000000000000000000001"]').length, 0);
+		assert.greaterThan(this.last.dom('[href="/abc000000000000000000001"]').length, 0);
 	});
 
 });
@@ -47,11 +48,11 @@ describe('GET /<task-id>/delete', function() {
 describe('POST /<task-id>/delete', function() {
 
 	beforeEach(function(done) {
-		var req = {
+		const request = {
 			method: 'POST',
 			endpoint: '/abc000000000000000000001/delete'
 		};
-		this.navigate(req, done);
+		this.navigate(request, done);
 	});
 
 	it('should send a 200 status', function() {
@@ -59,8 +60,8 @@ describe('POST /<task-id>/delete', function() {
 	});
 
 	it('should delete the task', function(done) {
-		this.webservice.task('abc000000000000000000001').get({}, function(err) {
+		this.webservice.task('abc000000000000000000001').get({}, function(error) {
-			assert.strictEqual(err.message, 'Error 404');
+			assert.strictEqual(error.message, 'Error 404');
 			done();
 		});
 	});
@@ -70,9 +71,9 @@ describe('POST /<task-id>/delete', function() {
 	});
 
 	it('should display a success message', function() {
-		var alert = this.last.dom.querySelectorAll('[data-test=alert]')[0];
+		const alert = this.last.dom('[data-test=alert]').eq(0);
 		assert.isDefined(alert);
-		assert.match(alert.textContent, /been deleted/i);
+		assert.match(alert.text(), /been deleted/i);
 	});
 
 });

test/integration/route/task/edit.js

@@ -1,30 +1,31 @@
-// This file is part of pa11y-dashboard.
+// This file is part of Pa11y Dashboard.
 //
-// pa11y-dashboard is free software: you can redistribute it and/or modify
+// Pa11y Dashboard is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 //
-// pa11y-dashboard is distributed in the hope that it will be useful,
+// Pa11y Dashboard is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with pa11y-dashboard.  If not, see <http://www.gnu.org/licenses/>.
+// along with Pa11y Dashboard.  If not, see <http://www.gnu.org/licenses/>.
 
+// jscs:disable maximumLineLength, requireArrowFunctions
 'use strict';
 
-var assert = require('proclaim');
+const assert = require('proclaim');
 
 describe('GET /<task-id>/edit', function() {
 
 	beforeEach(function(done) {
-		var req = {
+		const request = {
 			method: 'GET',
 			endpoint: '/abc000000000000000000001/edit'
 		};
-		this.navigate(req, done);
+		this.navigate(request, done);
 	});
 
 	it('should send a 200 status', function() {
@@ -32,66 +33,83 @@ describe('GET /<task-id>/edit', function() {
 	});
 
 	it('should have an "Edit URL" form', function() {
-		var form = this.last.dom.querySelectorAll('[data-test=edit-url-form]')[0];
+		const form = this.last.dom('[data-test=edit-url-form]').eq(0);
 		assert.isDefined(form);
-		assert.strictEqual(form.getAttribute('action'), '/abc000000000000000000001/edit');
+		assert.strictEqual(form.attr('action'), '/abc000000000000000000001/edit');
-		assert.strictEqual(form.getAttribute('method'), 'post');
+		assert.strictEqual(form.attr('method'), 'post');
 	});
 
 	it('should display a link back to the task page', function() {
-		assert.greaterThan(this.last.dom.querySelectorAll('[href="/abc000000000000000000001"]').length, 0);
+		assert.greaterThan(this.last.dom('[href="/abc000000000000000000001"]').length, 0);
 	});
 
 	describe('"Edit URL" form', function() {
 
 		beforeEach(function() {
-			this.form = this.last.dom.querySelectorAll('[data-test=edit-url-form]')[0];
+			this.form = this.last.dom('[data-test=edit-url-form]').eq(0);
 		});
 
 		it('should have a "name" field', function() {
-			var field = this.form.querySelectorAll('input[name=name]')[0];
+			const field = this.form.find('input[name=name]').eq(0);
 			assert.isDefined(field);
-			assert.strictEqual(field.getAttribute('type'), 'text');
+			assert.strictEqual(field.attr('type'), 'text');
-			assert.strictEqual(field.getAttribute('value'), 'NPG Home');
+			assert.strictEqual(field.attr('value'), 'NPG Home');
 		});
 
 		it('should have a disabled "url" field', function() {
-			var field = this.form.querySelectorAll('input[name=url]')[0];
+			const field = this.form.find('input[name=url]').eq(0);
 			assert.isDefined(field);
-			assert.strictEqual(field.getAttribute('type'), 'url');
+			assert.strictEqual(field.attr('type'), 'url');
-			assert.strictEqual(field.getAttribute('value'), 'nature.com');
+			assert.strictEqual(field.attr('value'), 'nature.com');
-			assert.isDefined(field.getAttribute('disabled'));
+			assert.isDefined(field.attr('disabled'));
 		});
 
 		it('should have a "wait" field', function() {
-			var field = this.form.querySelectorAll('input[name=wait]')[0];
+			const field = this.form.find('input[name=wait]').eq(0);
+			assert.isDefined(field);
+			assert.strictEqual(field.attr('type'), 'text');
+			assert.strictEqual(field.attr('value'), '0');
+		});
+
+		it('should have an "actions" field', function() {
+			const field = this.form.find('textarea[name=actions]').eq(0);
 			assert.isDefined(field);
-			assert.strictEqual(field.getAttribute('type'), 'text');
-			assert.strictEqual(field.getAttribute('value'), '0');
 		});
 
 		it('should have a disabled "standard" field', function() {
-			var field = this.form.querySelectorAll('select[name=standard]')[0];
+			const field = this.form.find('select[name=standard]').eq(0);
 			assert.isDefined(field);
-			assert.isDefined(field.getAttribute('disabled'));
+			assert.isDefined(field.attr('disabled'));
 		});
 
 		it('should have a "username" field', function() {
-			var field = this.form.querySelectorAll('input[name=username]')[0];
+			const field = this.form.find('input[name=username]').eq(0);
 			assert.isDefined(field);
-			assert.strictEqual(field.getAttribute('type'), 'text');
+			assert.strictEqual(field.attr('type'), 'text');
-			assert.strictEqual(field.getAttribute('value'), 'user');
+			assert.strictEqual(field.attr('value'), 'user');
 		});
 
 		it('should have a "password" field', function() {
-			var field = this.form.querySelectorAll('input[name=password]')[0];
+			const field = this.form.find('input[name=password]').eq(0);
+			assert.isDefined(field);
+			assert.strictEqual(field.attr('type'), 'text');
+			assert.strictEqual(field.attr('value'), 'access');
+		});
+
+		it('should have a "hideElements" field', function() {
+			const field = this.form.find('input[name=hideElements]').eq(0);
+			assert.isDefined(field);
+			assert.strictEqual(field.attr('type'), 'text');
+			assert.strictEqual(field.attr('value'), '');
+		});
+
+		it('should have a "headers" field', function() {
+			const field = this.form.find('textarea[name=headers]').eq(0);
 			assert.isDefined(field);
-			assert.strictEqual(field.getAttribute('type'), 'text');
-			assert.strictEqual(field.getAttribute('value'), 'access');
 		});
 
 		it('should have "ignore" fields', function() {
-			var fields = this.form.querySelectorAll('input[name="ignore[]"]');
+			const fields = this.form.find('input[name="ignore[]"]');
 			assert.isDefined(fields);
 			assert.notStrictEqual(fields.length, 0);
 		});
@@ -103,17 +121,17 @@ describe('GET /<task-id>/edit', function() {
 describe('POST /<task-id>/edit', function() {
 
 	beforeEach(function(done) {
-		var req = {
+		const request = {
 			method: 'POST',
 			endpoint: '/abc000000000000000000001/edit',
-			body: {
+			form: {
 				name: 'foo',
 				username: 'newuser',
 				password: 'secure',
 				ignore: ['bar', 'baz']
 			}
 		};
-		this.navigate(req, done);
+		this.navigate(request, done);
 	});
 
 	it('should send a 200 status', function() {
@@ -121,19 +139,19 @@ describe('POST /<task-id>/edit', function() {
 	});
 
 	it('should edit the task', function(done) {
-		this.webservice.task('abc000000000000000000001').get({}, function(err, task) {
+		this.webservice.task('abc000000000000000000001').get({}, function(error, task) {
 			assert.strictEqual(task.name, 'foo');
 			assert.strictEqual(task.username, 'newuser');
 			assert.strictEqual(task.password, 'secure');
 			assert.deepEqual(task.ignore, ['bar', 'baz']);
-			done();
+			done(error);
 		});
 	});
 
 	it('should display a success message', function() {
-		var alert = this.last.dom.querySelectorAll('[data-test=alert]')[0];
+		const alert = this.last.dom('[data-test=alert]').eq(0);
 		assert.isDefined(alert);
-		assert.match(alert.textContent, /been saved/i);
+		assert.match(alert.text(), /been saved/i);
 	});
 
 });

test/integration/route/task/index.js

@@ -1,32 +1,33 @@
-// This file is part of pa11y-dashboard.
+// This file is part of Pa11y Dashboard.
 //
-// pa11y-dashboard is free software: you can redistribute it and/or modify
+// Pa11y Dashboard is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 //
-// pa11y-dashboard is distributed in the hope that it will be useful,
+// Pa11y Dashboard is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with pa11y-dashboard.  If not, see <http://www.gnu.org/licenses/>.
+// along with Pa11y Dashboard.  If not, see <http://www.gnu.org/licenses/>.
 
+// jscs:disable maximumLineLength, requireArrowFunctions
 'use strict';
 
-var assert = require('proclaim');
+const assert = require('proclaim');
 
 describe('GET /<task-id>', function() {
 
 	describe('when task has results', function() {
 
 		beforeEach(function(done) {
-			var req = {
+			const request = {
 				method: 'GET',
 				endpoint: '/abc000000000000000000001'
 			};
-			this.navigate(req, done);
+			this.navigate(request, done);
 		});
 
 		it('should send a 200 status', function() {
@@ -34,46 +35,46 @@ describe('GET /<task-id>', function() {
 		});
 
 		it('should display an "Edit" button', function() {
-			assert.strictEqual(this.last.dom.querySelectorAll('[href="/abc000000000000000000001/edit"]').length, 1);
+			assert.strictEqual(this.last.dom('[href="/abc000000000000000000001/edit"]').length, 1);
 		});
 
 		it('should display a "Delete" button', function() {
-			assert.strictEqual(this.last.dom.querySelectorAll('[href="/abc000000000000000000001/delete"]').length, 1);
+			assert.strictEqual(this.last.dom('[href="/abc000000000000000000001/delete"]').length, 1);
 		});
 
 		it('should display a "Run" button', function() {
-			assert.strictEqual(this.last.dom.querySelectorAll('[href="/abc000000000000000000001/run"]').length, 1);
+			assert.strictEqual(this.last.dom('[href="/abc000000000000000000001/run"]').length, 1);
 		});
 
 		it('should display a "Download CSV" button for the latest result', function() {
-			assert.strictEqual(this.last.dom.querySelectorAll('[href="/abc000000000000000000001/def000000000000000000001.csv"]').length, 1);
+			assert.strictEqual(this.last.dom('[href="/abc000000000000000000001/def000000000000000000001.csv"]').length, 1);
 		});
 
 		it('should display a "Download JSON" button for the latest result', function() {
-			assert.strictEqual(this.last.dom.querySelectorAll('[href="/abc000000000000000000001/def000000000000000000001.json"]').length, 1);
+			assert.strictEqual(this.last.dom('[href="/abc000000000000000000001/def000000000000000000001.json"]').length, 1);
 		});
 
 		it('should display links to all results', function() {
-			assert.isDefined(this.last.dom.querySelectorAll('[href="/abc000000000000000000001/def000000000000000000001"]')[0]);
+			assert.isDefined(this.last.dom('[href="/abc000000000000000000001/def000000000000000000001"]').eq(0));
-			assert.isDefined(this.last.dom.querySelectorAll('[href="/abc000000000000000000001/def000000000000000000003"]')[0]);
+			assert.isDefined(this.last.dom('[href="/abc000000000000000000001/def000000000000000000003"]').eq(0));
 		});
 
 		it('should display errors', function() {
-			var elem = this.last.dom.querySelectorAll('[data-test=task-errors]')[0];
+			const elem = this.last.dom('[data-test=task-errors]').eq(0);
 			assert.isDefined(elem);
-			assert.match(elem.textContent, /errors \( 1 \)/i);
+			assert.match(elem.text(), /errors \( 1 \)/i);
 		});
 
 		it('should display warnings', function() {
-			var elem = this.last.dom.querySelectorAll('[data-test=task-warnings]')[0];
+			const elem = this.last.dom('[data-test=task-warnings]').eq(0);
 			assert.isDefined(elem);
-			assert.match(elem.textContent, /warnings \( 2 \)/i);
+			assert.match(elem.text(), /warnings \( 2 \)/i);
 		});
 
 		it('should display notices', function() {
-			var elem = this.last.dom.querySelectorAll('[data-test=task-notices]')[0];
+			const elem = this.last.dom('[data-test=task-notices]').eq(0);
 			assert.isDefined(elem);
-			assert.match(elem.textContent, /notices \( 3 \)/i);
+			assert.match(elem.text(), /notices \( 3 \)/i);
 		});
 
 	});
@@ -81,11 +82,11 @@ describe('GET /<task-id>', function() {
 	describe('when task has no results', function() {
 
 		beforeEach(function(done) {
-			var req = {
+			const request = {
 				method: 'GET',
 				endpoint: '/abc000000000000000000003'
 			};
-			this.navigate(req, done);
+			this.navigate(request, done);
 		});
 
 		it('should send a 200 status', function() {
@@ -93,15 +94,15 @@ describe('GET /<task-id>', function() {
 		});
 
 		it('should display a "Run" button', function() {
-			var elem = this.last.dom.querySelectorAll('[data-test=run-task]');
+			const elem = this.last.dom('[data-test=run-task]');
 			assert.strictEqual(elem.length, 1);
-			assert.strictEqual(elem[0].getAttribute('href'), '/abc000000000000000000003/run');
+			assert.strictEqual(elem.eq(0).attr('href'), '/abc000000000000000000003/run');
 		});
 
 		it('should display a message indicating that there are no results', function() {
-			var alert = this.last.dom.querySelectorAll('[data-test=alert]')[0];
+			const alert = this.last.dom('[data-test=alert]').eq(0);
 			assert.isDefined(alert);
-			assert.match(alert.textContent, /there are no results to show/i);
+			assert.match(alert.text(), /there are no results to show/i);
 		});
 
 	});

test/integration/route/task/run.js

@@ -1,30 +1,31 @@
-// This file is part of pa11y-dashboard.
+// This file is part of Pa11y Dashboard.
 //
-// pa11y-dashboard is free software: you can redistribute it and/or modify
+// Pa11y Dashboard is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 //
-// pa11y-dashboard is distributed in the hope that it will be useful,
+// Pa11y Dashboard is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with pa11y-dashboard.  If not, see <http://www.gnu.org/licenses/>.
+// along with Pa11y Dashboard.  If not, see <http://www.gnu.org/licenses/>.
 
+// jscs:disable maximumLineLength, requireArrowFunctions
 'use strict';
 
-var assert = require('proclaim');
+const assert = require('proclaim');
 
 describe('GET /<task-id>/run', function() {
 
 	beforeEach(function(done) {
-		var req = {
+		const request = {
 			method: 'GET',
 			endpoint: '/abc000000000000000000001/run'
 		};
-		this.navigate(req, done);
+		this.navigate(request, done);
 	});
 
 	it('should send a 200 status', function() {
@@ -36,9 +37,9 @@ describe('GET /<task-id>/run', function() {
 	});
 
 	it('should display a success message', function() {
-		var alert = this.last.dom.querySelectorAll('[data-test=alert]')[0];
+		const alert = this.last.dom('[data-test=alert]').eq(0);
 		assert.isDefined(alert);
-		assert.match(alert.textContent, /new results are being generated/i);
+		assert.match(alert.text(), /new results are being generated/i);
 	});
 
 });

test/integration/setup.js

@@ -1,33 +1,34 @@
-// This file is part of pa11y-dashboard.
+// This file is part of Pa11y Dashboard.
 //
-// pa11y-dashboard is free software: you can redistribute it and/or modify
+// Pa11y Dashboard is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 //
-// pa11y-dashboard is distributed in the hope that it will be useful,
+// Pa11y Dashboard is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with pa11y-dashboard.  If not, see <http://www.gnu.org/licenses/>.
+// along with Pa11y Dashboard.  If not, see <http://www.gnu.org/licenses/>.
 
+// jscs:disable requireArrowFunctions
 'use strict';
 
-var config = require('../../config/test.json');
+const config = require('../../config/test.json');
-var createNavigator = require('./helper/navigate');
+const createNavigator = require('./helper/navigate');
-var createWebserviceClient = require('./helper/webservice');
+const createWebserviceClient = require('./helper/webservice');
-var loadFixtures = require('pa11y-webservice/data/fixture/load');
+const loadFixtures = require('pa11y-webservice/data/fixture/load');
-var request = require('request');
+const request = require('request');
 
 // Run before all tests
 before(function(done) {
-	this.baseUrl = 'http://localhost:' + config.port;
+	this.baseUrl = `http://localhost:${config.port}`;
 	this.last = {};
 	this.navigate = createNavigator(this.baseUrl, this.last);
 	this.webservice = createWebserviceClient(config);
-	assertTestAppIsRunning(this.baseUrl, function() {
+	assertTestAppIsRunning(this.baseUrl, () => {
 		loadFixtures('test', config.webservice, done);
 	});
 });
@@ -39,8 +40,8 @@ afterEach(function(done) {
 
 // Check that the test application is running, and exit if not
 function assertTestAppIsRunning(url, done) {
-	request(url, function(err) {
+	request(url, error => {
-		if (err) {
+		if (error) {
 			console.error('Error: Test app not started; run with `NODE_ENV=test node index.js`');
 			process.exit(1);
 		}

view/404.html

@@ -1,18 +1,18 @@
 {{! 
-This file is part of pa11y-dashboard.
+This file is part of Pa11y Dashboard.
 
-pa11y-dashboard is free software: you can redistribute it and/or modify
+Pa11y Dashboard is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation, either version 3 of the License, or
 (at your option) any later version.
 
-pa11y-dashboard is distributed in the hope that it will be useful,
+Pa11y Dashboard is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with pa11y-dashboard.  If not, see <http://www.gnu.org/licenses/>.
+along with Pa11y Dashboard.  If not, see <http://www.gnu.org/licenses/>.
 }}
 <div class="col-md-8">
 	<h1>Hmmm, this page indicates a 404 error.</h1>

view/500.html

@@ -1,23 +1,27 @@
 {{! 
-This file is part of pa11y-dashboard.
+This file is part of Pa11y Dashboard.
 
-pa11y-dashboard is free software: you can redistribute it and/or modify
+Pa11y Dashboard is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation, either version 3 of the License, or
 (at your option) any later version.
 
-pa11y-dashboard is distributed in the hope that it will be useful,
+Pa11y Dashboard is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with pa11y-dashboard.  If not, see <http://www.gnu.org/licenses/>.
+along with Pa11y Dashboard.  If not, see <http://www.gnu.org/licenses/>.
 }}
 <div class="col-md-8">
-	<h1>Eeek! 500 error. This is serious.</h1>
+	<h1>Eeek! 500 error.</h1>
-	<p class="h2">There isn't much you can do about this.</h2>
+	<p class="h2">Let's see what we can do here:</h2>
-	<p class="h4">Give it another go or try the <a href="/">home page</a>.</h4>
+	<ul>
+		<li>Do you have <a href="https://www.mongodb.com/">MongoDB</a> installed and <code>mongod</code> running?</li>
+		<li>Check out the <a href="https://github.com/pa11y/dashboard/blob/master/TROUBLESHOOTING.md">Troubleshooting doc</a> for more information.</li>
+		<li>Search for a related <a href="https://github.com/pa11y/dashboard/issues">Github issue</a>, or open one yourself.</li>
+	</ul>
 	{{#if error}}
 		<h2>Stack-Trace</h2>
 		<pre>{{error.stack}}</pre>

view/helper/date.js

@@ -1,40 +1,34 @@
-// This file is part of pa11y-dashboard.
+// This file is part of Pa11y Dashboard.
 //
-// pa11y-dashboard is free software: you can redistribute it and/or modify
+// Pa11y Dashboard is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 //
-// pa11y-dashboard is distributed in the hope that it will be useful,
+// Pa11y Dashboard is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with pa11y-dashboard.  If not, see <http://www.gnu.org/licenses/>.
+// along with Pa11y Dashboard.  If not, see <http://www.gnu.org/licenses/>.
-
 'use strict';
 
-var moment = require('moment');
+const moment = require('moment');
 
 module.exports = helper;
 
-function helper(register) {
+function helper(hbs) {
 
 	// Format a date with Moment
-	register('date-format', function(context, block) {
+	hbs.registerHelper('date-format', (context, block) => {
-		var format = block.hash.format || 'YYYY-MM-DD HH:mm:ss';
+		const format = block.hash.format || 'YYYY-MM-DD HH:mm:ss';
 		return moment(context).format(format);
 	});
 
 	// Get a relative date
-	register('date-relative', function(context) {
+	hbs.registerHelper('date-relative', context => moment(context).fromNow());
-		return moment(context).fromNow();
-	});
-
-	register('date-timestamp', function(context) {
-		return moment(context).valueOf();
-	});
 
+	hbs.registerHelper('date-timestamp', context => moment(context).valueOf());
 
 }

view/helper/string.js

@@ -2,11 +2,9 @@
 
 module.exports = helper;
 
-function helper(register) {
+function helper(hbs) {
 
 	// Convert a string to lower-case
-	register('lowercase', function(context) {
+	hbs.registerHelper('lowercase', context => context.toLowerCase());
-		return context.toLowerCase();
-	});
 
 }

view/helper/url.js

@@ -1,26 +1,25 @@
-// This file is part of pa11y-dashboard.
+// This file is part of Pa11y Dashboard.
 //
-// pa11y-dashboard is free software: you can redistribute it and/or modify
+// Pa11y Dashboard is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 //
-// pa11y-dashboard is distributed in the hope that it will be useful,
+// Pa11y Dashboard is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with pa11y-dashboard.  If not, see <http://www.gnu.org/licenses/>.
+// along with Pa11y Dashboard.  If not, see <http://www.gnu.org/licenses/>.
-
 'use strict';
 
 module.exports = helper;
 
-function helper(register) {
+function helper(hbs) {
 
 	// Simplify url by removing (eg http://, https://, trailing slashes) from url
-	register('simplify-url', function(context) {
+	hbs.registerHelper('simplify-url', context => {
 		return context.replace(/^https?:\/\//i, '').replace(/\/$/, '').toLowerCase();
 	});
 

view/index.html

@@ -1,20 +1,20 @@
 {{!
-This file is part of pa11y-dashboard.
+This file is part of Pa11y Dashboard.
 
-pa11y-dashboard is free software: you can redistribute it and/or modify
+Pa11y Dashboard is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation, either version 3 of the License, or
 (at your option) any later version.
 
-pa11y-dashboard is distributed in the hope that it will be useful,
+Pa11y Dashboard is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with pa11y-dashboard.  If not, see <http://www.gnu.org/licenses/>.
+along with Pa11y Dashboard.  If not, see <http://www.gnu.org/licenses/>.
 }}
-{{#content "title"}}pa11y-dashboard{{/content}}
+{{#content "title"}}Pa11y Dashboard{{/content}}
 
 <div data-control="task-list">
 

view/layout/default.html

@@ -1,18 +1,18 @@
 {{! 
-This file is part of pa11y-dashboard.
+This file is part of Pa11y Dashboard.
 
-pa11y-dashboard is free software: you can redistribute it and/or modify
+Pa11y Dashboard is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation, either version 3 of the License, or
 (at your option) any later version.
 
-pa11y-dashboard is distributed in the hope that it will be useful,
+Pa11y Dashboard is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with pa11y-dashboard.  If not, see <http://www.gnu.org/licenses/>.
+along with Pa11y Dashboard.  If not, see <http://www.gnu.org/licenses/>.
 }}
 <!DOCTYPE html>
 <html lang="{{lang}}" class="no-javascript">

view/new.html

@@ -1,18 +1,18 @@
 {{!
-This file is part of pa11y-dashboard.
+This file is part of Pa11y Dashboard.
 
-pa11y-dashboard is free software: you can redistribute it and/or modify
+Pa11y Dashboard is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation, either version 3 of the License, or
 (at your option) any later version.
 
-pa11y-dashboard is distributed in the hope that it will be useful,
+Pa11y Dashboard is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with pa11y-dashboard.  If not, see <http://www.gnu.org/licenses/>.
+along with Pa11y Dashboard.  If not, see <http://www.gnu.org/licenses/>.
 }}
 
 {{#content "title"}}
@@ -38,7 +38,7 @@ along with pa11y-dashboard.  If not, see <http://www.gnu.org/licenses/>.
 		<div class="row">
 			<div class="col-md-8 col-sm-8 col-xs-10">
 				<label class="control-label" for="new-task-name">Name</label>
-				<input class="form-control" id="new-task-name" type="text" placeholder="E.g. My Home Page" name="name" value="{{task.name}}"/>
+				<input class="form-control" id="new-task-name" type="text" required placeholder="E.g. My Home Page" name="name" value="{{task.name}}"/>
 			</div>
 		</div>
 	</div>
@@ -47,7 +47,7 @@ along with pa11y-dashboard.  If not, see <http://www.gnu.org/licenses/>.
 		<div class="row">
 			<div class="col-md-8 col-sm-8 col-xs-10">
 				<label class="control-label" for="new-task-url">URL</label>
-				<input class="form-control" id="new-task-url" type="url" placeholder="E.g. http://mysite.com/" name="url" value="{{task.url}}"/>
+				<input class="form-control" id="new-task-url" type="url" required pattern="https?:\/\/.+" placeholder="E.g. http://mysite.com/" name="url" value="{{task.url}}"/>
 			</div>
 		</div>
 	</div>
@@ -84,6 +84,19 @@ along with pa11y-dashboard.  If not, see <http://www.gnu.org/licenses/>.
 		</div>
 	</div>
 
+	<div class="form-group clearfix">
+		<div class="row">
+			<div class="col-md-4 col-sm-4 col-xs-6">
+				<label class="control-label" for="new-task-actions">
+					Task Actions
+					(<a href="https://github.com/pa11y/pa11y#actions">see Pa11y documentation</a>)
+				</label>
+				<textarea class="form-control" id="new-task-actions" name="actions" aria-describedby="action-detail" placeholder="E.g. Click element #login-button">{{task.actions}}</textarea>
+				<em id="action-detail">(one action per line)</em>
+			</div>
+		</div>
+	</div>
+
 	<div class="form-group clearfix">
 		<div class="row">
 			<div class="col-md-4 col-sm-4 col-xs-6">
@@ -102,6 +115,25 @@ along with pa11y-dashboard.  If not, see <http://www.gnu.org/licenses/>.
 		</div>
 	</div>
 
+	<div class="form-group clearfix">
+		<div class="row">
+			<div class="col-md-4 col-sm-4 col-xs-6">
+				<label class="control-label" for="new-task-headers">HTTP Headers</label>
+				<textarea class="form-control" id="new-task-headers" name="headers" placeholder="Cookie: foo=bar">{{task.headers}}</textarea>
+				<em>(As key/value pairs, separated by newlines/colons)</em>
+			</div>
+		</div>
+	</div>
+
+	<div class="form-group clearfix">
+		<div class="row">
+			<div class="col-md-4 col-sm-4 col-xs-6">
+				<label class="control-label" for="new-task-hide-elements">Hide Elements</label>
+				<input class="form-control" id="new-task-hide-elements" type="text" name="hideElements" value="{{task.hideElements}}" placeholder=".advert, #modal, div[aria-role=presentation]"/> <em>(CSS selector)</em>
+			</div>
+		</div>
+	</div>
+
 	<p class="control-label"><b>Ignore these rules</b> <a target="_blank" href="https://github.com/pa11y/pa11y/wiki/HTML-CodeSniffer-Rules">(full list of rules here)</a></p>
 
 	<div class="standards-lists">

view/partial/breadcrumb.html

@@ -1,18 +1,18 @@
 {{! 
-This file is part of pa11y-dashboard.
+This file is part of Pa11y Dashboard.
 
-pa11y-dashboard is free software: you can redistribute it and/or modify
+Pa11y Dashboard is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation, either version 3 of the License, or
 (at your option) any later version.
 
-pa11y-dashboard is distributed in the hope that it will be useful,
+Pa11y Dashboard is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with pa11y-dashboard.  If not, see <http://www.gnu.org/licenses/>.
+along with Pa11y Dashboard.  If not, see <http://www.gnu.org/licenses/>.
 }}
 {{#unless isHomePage}}
 	<div class="container">

view/partial/graph.html

@@ -1,18 +1,18 @@
 {{!
-This file is part of pa11y-dashboard.
+This file is part of Pa11y Dashboard.
 
-pa11y-dashboard is free software: you can redistribute it and/or modify
+Pa11y Dashboard is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation, either version 3 of the License, or
 (at your option) any later version.
 
-pa11y-dashboard is distributed in the hope that it will be useful,
+Pa11y Dashboard is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with pa11y-dashboard.  If not, see <http://www.gnu.org/licenses/>.
+along with Pa11y Dashboard.  If not, see <http://www.gnu.org/licenses/>.
 }}
 <div class="col-md-12 clearfix">
 	<div class="graph-container graph-spacer ruled clearfix">
@@ -58,8 +58,8 @@ along with pa11y-dashboard.  If not, see <http://www.gnu.org/licenses/>.
 
 <div class="col-md-12 hidden">
 	<div class="graph-spacer ruled">
-		<table id="graph-data" class="table graph-table" summary="Accessibility results from pa11y for this page">
+		<table id="graph-data" class="table graph-table" summary="Accessibility results from Pa11y for this page">
-			<caption>pa11y results for this URL</caption>
+			<caption>Pa11y results for this URL</caption>
 			<thead>
 				<tr>
 					<th>Date</th>

view/partial/page-footer.html

@@ -1,24 +1,24 @@
 {{!
-This file is part of pa11y-dashboard.
+This file is part of Pa11y Dashboard.
 
-pa11y-dashboard is free software: you can redistribute it and/or modify
+Pa11y Dashboard is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation, either version 3 of the License, or
 (at your option) any later version.
 
-pa11y-dashboard is distributed in the hope that it will be useful,
+Pa11y Dashboard is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with pa11y-dashboard.  If not, see <http://www.gnu.org/licenses/>.
+along with Pa11y Dashboard.  If not, see <http://www.gnu.org/licenses/>.
 }}
 <footer>
 	<div class="footer" role="contentinfo">
 		<div class="container">
 			<div class="col-md-5">
-				<small>&copy; {{year}} Springer Nature.<br/>pa11y dashboard is licensed under the GNU General Public License 3.0.<br/>Version {{version}}</small>
+				<small>&copy; 2013–{{year}} Team Pa11y.<br/>Pa11y Dashboard is licensed under the GNU General Public License 3.0.<br/>Version {{version}}</small>
 			</div>
 			<div class="col-md-7 clearfix">
 				<ul class="crunch-bottom floated-list nav">

view/partial/page-header.html

@@ -1,24 +1,24 @@
 {{!
-This file is part of pa11y-dashboard.
+This file is part of Pa11y Dashboard.
 
-pa11y-dashboard is free software: you can redistribute it and/or modify
+Pa11y Dashboard is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation, either version 3 of the License, or
 (at your option) any later version.
 
-pa11y-dashboard is distributed in the hope that it will be useful,
+Pa11y Dashboard is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with pa11y-dashboard.  If not, see <http://www.gnu.org/licenses/>.
+along with Pa11y Dashboard.  If not, see <http://www.gnu.org/licenses/>.
 }}
 <header>
 	<div role="banner" class="header">
 		<div class="container">
 			{{#if isHomePage}}<h1>{{else}}<div class="h1">{{/if}}
-				<a href="/">pa11y dashboard</a> -
+				<a href="/">Pa11y Dashboard</a> -
 				<span class="h3">your automated accessibility testing pal</span>
 			{{#if isHomePage}}</h1>{{else}}</div>{{/if}}
 		</div>

view/partial/result-header.html

@@ -1,18 +1,18 @@
 {{!
-This file is part of pa11y-dashboard.
+This file is part of Pa11y Dashboard.
 
-pa11y-dashboard is free software: you can redistribute it and/or modify
+Pa11y Dashboard is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation, either version 3 of the License, or
 (at your option) any later version.
 
-pa11y-dashboard is distributed in the hope that it will be useful,
+Pa11y Dashboard is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with pa11y-dashboard.  If not, see <http://www.gnu.org/licenses/>.
+along with Pa11y Dashboard.  If not, see <http://www.gnu.org/licenses/>.
 }}
 <div class="col-md-12">
 	<div class="ruled task-header">

view/partial/result.html

@@ -1,18 +1,18 @@
 {{!
-This file is part of pa11y-dashboard.
+This file is part of Pa11y Dashboard.
 
-pa11y-dashboard is free software: you can redistribute it and/or modify
+Pa11y Dashboard is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation, either version 3 of the License, or
 (at your option) any later version.
 
-pa11y-dashboard is distributed in the hope that it will be useful,
+Pa11y Dashboard is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with pa11y-dashboard.  If not, see <http://www.gnu.org/licenses/>.
+along with Pa11y Dashboard.  If not, see <http://www.gnu.org/licenses/>.
 }}
 
 <div class="col-md-3 aside">
@@ -64,7 +64,7 @@ along with pa11y-dashboard.  If not, see <http://www.gnu.org/licenses/>.
 		<div class="col-md-12 col-sm-12 clearfix">
 			<div class="well">
 				<h4 class="crunch-top">View results in browser</h4>
-				<p class="crunch-bottom">pa11y uses HTML_CodeSniffer to find accessibility issues. <a href="http://squizlabs.github.io/HTML_CodeSniffer/">Use their bookmarklet</a> to view results on the page you are testing.</p>
+				<p class="crunch-bottom">Pa11y uses HTML_CodeSniffer to find accessibility issues. <a href="http://squizlabs.github.io/HTML_CodeSniffer/">Use their bookmarklet</a> to view results on the page you are testing.</p>
 			</div>
 	    </div>
 	</div>
@@ -73,7 +73,7 @@ along with pa11y-dashboard.  If not, see <http://www.gnu.org/licenses/>.
 <div class="col-md-9" data-role="expandable-results" role="main">
 	{{#if mainResult.count.error}}
 		<div class="heading label-danger pointer showing first" id="errors" data-test="task-errors" data-role="expander" role="button" tabindex="0" aria-expanded="true" aria-controls="errors-list">
-			<span class="pull-right expander"> - <span class="hide">(close panel)</span></span>
+			<span class="pull-right expander"> ↑ <span class="hide">(close panel)</span></span>
 			Errors ( {{mainResult.count.error}} )
 		</div>
 		<div class="task-danger tasks-list collapse clearfix in" id="errors-list">
@@ -109,7 +109,7 @@ along with pa11y-dashboard.  If not, see <http://www.gnu.org/licenses/>.
 
 	{{#if mainResult.count.warning}}
 		<div class="heading label-warning pointer" id="warnings" data-test="task-warnings" data-role="expander" role="button" tabindex="0" aria-expanded="false" aria-controls="warnings-list">
-			<span class="pull-right expander"> + <span class="hide">(open panel)</span></span>
+			<span class="pull-right expander"> ↓ <span class="hide">(open panel)</span></span>
 			Warnings ( {{mainResult.count.warning}} )
 		</div>
 		<div class="task-warning tasks-list collapse clearfix" id="warnings-list">
@@ -145,7 +145,7 @@ along with pa11y-dashboard.  If not, see <http://www.gnu.org/licenses/>.
 
 	{{#if mainResult.count.notice}}
 		<div class="heading label-info pointer" id="notices" data-test="task-notices" data-role="expander" role="button" tabindex="0" aria-expanded="false" aria-controls="notices-list">
-			<span class="pull-right expander"> + <span class="hide">(open panel)</span></span>
+			<span class="pull-right expander"> ↓ <span class="hide">(open panel)</span></span>
 			Notices ( {{mainResult.count.notice}} )
 		</div>
 		<div class="task-info tasks-list collapse clearfix" id="notices-list">
@@ -180,7 +180,7 @@ along with pa11y-dashboard.  If not, see <http://www.gnu.org/licenses/>.
 
 	{{#if mainResult.ignore.length}}
 		<div class="heading label-default pointer" id="ignore" data-role="expander" role="button" tabindex="0" aria-expanded="false" aria-controls="ignore-list">
-			<span class="pull-right expander"> + <span class="hide">(open panel)</span></span>
+			<span class="pull-right expander"> ↓ <span class="hide">(open panel)</span></span>
 			Ignored Rules ( {{mainResult.ignore.length}} )
 		</div>
 		<div class="task-default tasks-list collapse clearfix" id="ignore-list">

view/partial/task-header.html

@@ -1,18 +1,18 @@
 {{!
-This file is part of pa11y-dashboard.
+This file is part of Pa11y Dashboard.
 
-pa11y-dashboard is free software: you can redistribute it and/or modify
+Pa11y Dashboard is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation, either version 3 of the License, or
 (at your option) any later version.
 
-pa11y-dashboard is distributed in the hope that it will be useful,
+Pa11y Dashboard is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with pa11y-dashboard.  If not, see <http://www.gnu.org/licenses/>.
+along with Pa11y Dashboard.  If not, see <http://www.gnu.org/licenses/>.
 }}
 <div class="col-md-12 zfix">
 	<div class="ruled task-header">
@@ -27,7 +27,7 @@ along with pa11y-dashboard.  If not, see <http://www.gnu.org/licenses/>.
 				        <ul class="inline-list" role="menu">
 				          	<li><a href="/{{task.id}}/edit">Edit this task</a></li>
 							<li><a href="/{{task.id}}/delete">Delete this task</a></li>
-							<li><a href="{{task.hrefRun}}" data-test="run-task">Run pa11y</a></li>
+							<li><a href="{{task.hrefRun}}" data-test="run-task">Run Pa11y</a></li>
 						</ul>
 					{{/unless}}
 					{{#if mainResult}}

view/partial/tasks.html

@@ -1,34 +1,30 @@
 {{!
-This file is part of pa11y-dashboard.
+This file is part of Pa11y Dashboard.
 
-pa11y-dashboard is free software: you can redistribute it and/or modify
+Pa11y Dashboard is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation, either version 3 of the License, or
 (at your option) any later version.
 
-pa11y-dashboard is distributed in the hope that it will be useful,
+Pa11y Dashboard is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with pa11y-dashboard.  If not, see <http://www.gnu.org/licenses/>.
+along with Pa11y Dashboard.  If not, see <http://www.gnu.org/licenses/>.
 }}
 
 <ul class="list-unstyled clearfix crunch-bottom">
+
+	{{#unless readonly}}
 	        <li class="col-md-4 col-sm-6 task-card add-task">
-		{{#if readonly}}
-			<span class="well task-card-link crunch-bottom">
-				<p class="h3 crunch">Add new URL</p>
-				<p class="supersize-me crunch">+</p>
-			</span>
-		{{else}}
 			<a class="well task-card-link crunch-bottom" data-role="add-task" href="/new" data-test="add-task">
 				<p class="h3 crunch">Add new URL</p>
 				<p class="supersize-me crunch">+</p>
 			</a>
-		{{/if}}
 		</li>
+	{{/unless}}
 	{{#each tasks}}
 		<li class="col-md-4 col-sm-6 task-card" data-test="task" data-role="task" data-keywords="{{lowercase name}} {{lowercase standard}} {{simplify-url url}}">
 			<a class="well task-card-link crunch-bottom" title="Details for URL {{simplify-url url}}" href="{{href}}">
@@ -54,7 +50,7 @@ along with pa11y-dashboard.  If not, see <http://www.gnu.org/licenses/>.
 						<li><a href="{{href}}/edit">Edit this task</a></li>
 						<li><a href="{{href}}/delete">Delete this task</a></li>
 						<li class="divider"></li>
-							<li><a href="{{href}}/run" data-test="run-task">Run pa11y</a></li>
+						<li><a href="{{href}}/run" data-test="run-task">Run Pa11y</a></li>
 					</ul>
 				</div>
 			{{/unless}}

view/presenter/ignore.js

@@ -1,27 +1,26 @@
-// This file is part of pa11y-dashboard.
+// This file is part of Pa11y Dashboard.
 //
-// pa11y-dashboard is free software: you can redistribute it and/or modify
+// Pa11y Dashboard is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 //
-// pa11y-dashboard is distributed in the hope that it will be useful,
+// Pa11y Dashboard is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with pa11y-dashboard.  If not, see <http://www.gnu.org/licenses/>.
+// along with Pa11y Dashboard.  If not, see <http://www.gnu.org/licenses/>.
-
 'use strict';
 
-var standardsArray = require('../../data/standards')();
+const standardsArray = require('../../data/standards')();
-var rules = createStandardDescriptionMap(standardsArray);
+const rules = createStandardDescriptionMap(standardsArray);
 
 module.exports = presentIgnoreRules;
 
 function presentIgnoreRules(ignore) {
-	return ignore.map(function(name) {
+	return ignore.map(name => {
 		return {
 			name: name,
 			description: rules[name]
@@ -30,9 +29,9 @@ function presentIgnoreRules(ignore) {
 }
 
 function createStandardDescriptionMap(standards) {
-	var map = {};
+	const map = {};
-	standards.forEach(function(standard) {
+	standards.forEach(standard => {
-		standard.rules.forEach(function(rule) {
+		standard.rules.forEach(rule => {
 			map[rule.name] = rule.description;
 		});
 	});

view/presenter/result-list.js

@@ -1,31 +1,30 @@
-// This file is part of pa11y-dashboard.
+// This file is part of Pa11y Dashboard.
 //
-// pa11y-dashboard is free software: you can redistribute it and/or modify
+// Pa11y Dashboard is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 //
-// pa11y-dashboard is distributed in the hope that it will be useful,
+// Pa11y Dashboard is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with pa11y-dashboard.  If not, see <http://www.gnu.org/licenses/>.
+// along with Pa11y Dashboard.  If not, see <http://www.gnu.org/licenses/>.
-
 'use strict';
 
-var _ = require('underscore');
+const _ = require('underscore');
-var moment = require('moment');
+const moment = require('moment');
 
 module.exports = presentResultList;
 
 function presentResultList(results) {
-	var resultsByDay = _.groupBy(results, function(result) {
+	const resultsByDay = _.groupBy(results, result => {
 		return moment(result.date).format('YYYY-MM-DD');
 	});
-	var uniqueDayResults = [];
+	const uniqueDayResults = [];
-	_.keys(resultsByDay).forEach(function(day) {
+	_.keys(resultsByDay).forEach(day => {
 		uniqueDayResults.push(resultsByDay[day][0]);
 	});
 	return uniqueDayResults;

view/presenter/result.js

@@ -1,31 +1,30 @@
-// This file is part of pa11y-dashboard.
+// This file is part of Pa11y Dashboard.
 //
-// pa11y-dashboard is free software: you can redistribute it and/or modify
+// Pa11y Dashboard is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 //
-// pa11y-dashboard is distributed in the hope that it will be useful,
+// Pa11y Dashboard is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with pa11y-dashboard.  If not, see <http://www.gnu.org/licenses/>.
+// along with Pa11y Dashboard.  If not, see <http://www.gnu.org/licenses/>.
-
 'use strict';
 
-var _ = require('underscore');
+const _ = require('underscore');
-var presentIgnoreRules = require('./ignore');
+const presentIgnoreRules = require('./ignore');
 
 module.exports = presentResult;
 
 function presentResult(result) {
 
 	// Add additional info
-	result.href = '/' + result.task + '/' + result.id;
+	result.href = `/${result.task}/${result.id}`;
-	result.hrefCsv = '/' + result.task + '/' + result.id + '.csv';
+	result.hrefCsv = `/${result.task}/${result.id}.csv`;
-	result.hrefJson = '/' + result.task + '/' + result.id + '.json';
+	result.hrefJson = `/${result.task}/${result.id}.json`;
 
 	// Parse date
 	result.date = new Date(result.date);
@@ -35,13 +34,13 @@ function presentResult(result) {
 
 	// Split out message types
 	if (result.results) {
-		var groupedByType = _.groupBy(result.results, 'type');
+		const groupedByType = _.groupBy(result.results, 'type');
-		['error', 'warning', 'notice'].forEach(function(type) {
+		['error', 'warning', 'notice'].forEach(type => {
-			var pluralType = type + 's';
+			const pluralType = `${type}s`;
-			var results = groupedByType[type] || [];
+			const results = groupedByType[type] || [];
-			var groupedByCode = _.groupBy(results, 'code');
+			const groupedByCode = _.groupBy(results, 'code');
-			result[pluralType] = _.keys(groupedByCode).map(function(group) {
+			result[pluralType] = _.keys(groupedByCode).map(group => {
-				var firstMessage = groupedByCode[group][0];
+				const firstMessage = groupedByCode[group][0];
 				firstMessage.count = groupedByCode[group].length;
 				return firstMessage;
 			});

view/presenter/task.js

@@ -1,39 +1,45 @@
-// This file is part of pa11y-dashboard.
+// This file is part of Pa11y Dashboard.
 //
-// pa11y-dashboard is free software: you can redistribute it and/or modify
+// Pa11y Dashboard is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 //
-// pa11y-dashboard is distributed in the hope that it will be useful,
+// Pa11y Dashboard is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with pa11y-dashboard.  If not, see <http://www.gnu.org/licenses/>.
+// along with Pa11y Dashboard.  If not, see <http://www.gnu.org/licenses/>.
-
 'use strict';
 
-var presentIgnoreRules = require('./ignore');
+const presentIgnoreRules = require('./ignore');
-var presentResult = require('./result');
+const presentResult = require('./result');
 
 module.exports = presentTask;
 
 function presentTask(task) {
 
 	// Add additional info
-	task.href = '/' + task.id;
+	task.href = `/${task.id}`;
-	task.hrefDelete = '/' + task.id + '/delete';
+	task.hrefDelete = `/${task.id}/delete`;
-	task.hrefRun = '/' + task.id + '/run';
+	task.hrefRun = `/${task.id}/run`;
-	task.hrefJson = '/' + task.id + '.json';
+	task.hrefJson = `/${task.id}.json`;
-	task.hrefEdit = '/' + task.id + '/edit';
+	task.hrefEdit = `/${task.id}/edit`;
-	task.hrefIgnore = '/' + task.id + '/ignore';
+	task.hrefIgnore = `/${task.id}/ignore`;
-	task.hrefUnignore = '/' + task.id + '/unignore';
+	task.hrefUnignore = `/${task.id}/unignore`;
 
 	// Enhance the ignored rules
 	task.ignore = presentIgnoreRules(task.ignore);
 
+	// Change headers to a string format
+	if (task.headers && typeof task.headers === 'object') {
+		task.headers = Object.keys(task.headers).map(header => {
+			return `${header}: ${task.headers[header]}`;
+		}).join('\n');
+	}
+
 	// Present the last result if present
 	if (task.last_result) {
 		task.lastResult = presentResult(task.last_result);

view/result/index.html

@@ -1,18 +1,18 @@
 {{!
-This file is part of pa11y-dashboard.
+This file is part of Pa11y Dashboard.
 
-pa11y-dashboard is free software: you can redistribute it and/or modify
+Pa11y Dashboard is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation, either version 3 of the License, or
 (at your option) any later version.
 
-pa11y-dashboard is distributed in the hope that it will be useful,
+Pa11y Dashboard is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with pa11y-dashboard.  If not, see <http://www.gnu.org/licenses/>.
+along with Pa11y Dashboard.  If not, see <http://www.gnu.org/licenses/>.
 }}
 
 {{#content "title"}}

view/task/delete.html

@@ -1,18 +1,18 @@
 {{! 
-This file is part of pa11y-dashboard.
+This file is part of Pa11y Dashboard.
 
-pa11y-dashboard is free software: you can redistribute it and/or modify
+Pa11y Dashboard is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation, either version 3 of the License, or
 (at your option) any later version.
 
-pa11y-dashboard is distributed in the hope that it will be useful,
+Pa11y Dashboard is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with pa11y-dashboard.  If not, see <http://www.gnu.org/licenses/>.
+along with Pa11y Dashboard.  If not, see <http://www.gnu.org/licenses/>.
 }}
 
 {{#content "title"}}

view/task/edit.html

@@ -1,18 +1,18 @@
 {{!
-This file is part of pa11y-dashboard.
+This file is part of Pa11y Dashboard.
 
-pa11y-dashboard is free software: you can redistribute it and/or modify
+Pa11y Dashboard is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation, either version 3 of the License, or
 (at your option) any later version.
 
-pa11y-dashboard is distributed in the hope that it will be useful,
+Pa11y Dashboard is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with pa11y-dashboard.  If not, see <http://www.gnu.org/licenses/>.
+along with Pa11y Dashboard.  If not, see <http://www.gnu.org/licenses/>.
 }}
 
 {{#content "title"}}
@@ -50,7 +50,7 @@ along with pa11y-dashboard.  If not, see <http://www.gnu.org/licenses/>.
 		<div class="row">
 			<div class="col-md-8 col-sm-8 col-xs-10">
 				<label class="control-label" for="new-task-name">Name</label>
-				<input class="form-control" id="new-task-name" type="text" placeholder="E.g. My Home Page" name="name" value="{{task.name}}"/>
+				<input class="form-control" id="new-task-name" type="text" required placeholder="E.g. My Home Page" name="name" value="{{task.name}}"/>
 			</div>
 		</div>
 	</div>
@@ -59,7 +59,7 @@ along with pa11y-dashboard.  If not, see <http://www.gnu.org/licenses/>.
 		<div class="row">
 			<div class="col-md-8 col-sm-8 col-xs-10">
 				<label class="control-label" for="new-task-url">URL</label>
-				<input class="form-control" id="new-task-url" type="url" placeholder="E.g. http://mysite.com/" name="url" value="{{task.url}}" disabled/>
+				<input class="form-control" id="new-task-url" type="url" required pattern="https?:\/\/.+" placeholder="E.g. http://mysite.com/" name="url" value="{{task.url}}" disabled/>
 			</div>
 		</div>
 	</div>
@@ -96,6 +96,19 @@ along with pa11y-dashboard.  If not, see <http://www.gnu.org/licenses/>.
 		</div>
 	</div>
 
+	<div class="form-group clearfix">
+		<div class="row">
+			<div class="col-md-4 col-sm-4 col-xs-6">
+				<label class="control-label" for="new-task-actions">
+					Task Actions
+					(<a href="https://github.com/pa11y/pa11y#actions">see Pa11y documentation</a>)
+				</label>
+				<textarea class="form-control" id="new-task-actions" name="actions" aria-describedby="action-detail" placeholder="E.g. Click element #login-button">{{task.actions}}</textarea>
+				<em id="action-detail">(one action per line)</em>
+			</div>
+		</div>
+	</div>
+
 	<div class="form-group clearfix">
 		<div class="row">
 			<div class="col-md-4 col-sm-4 col-xs-6">
@@ -114,6 +127,25 @@ along with pa11y-dashboard.  If not, see <http://www.gnu.org/licenses/>.
 		</div>
 	</div>
 
+	<div class="form-group clearfix">
+		<div class="row">
+			<div class="col-md-4 col-sm-4 col-xs-6">
+				<label class="control-label" for="new-task-headers">HTTP Headers</label>
+				<textarea class="form-control" id="new-task-headers" name="headers" placeholder="Cookie: foo=bar">{{task.headers}}</textarea>
+				<em>(As key/value pairs, separated by newlines/colons)</em>
+			</div>
+		</div>
+	</div>
+
+	<div class="form-group clearfix">
+		<div class="row">
+			<div class="col-md-4 col-sm-4 col-xs-6">
+				<label class="control-label" for="new-task-hide-elements">Hide Elements</label>
+				<input class="form-control" id="new-task-hide-elements" type="text" name="hideElements" value="{{task.hideElements}}" placeholder=".advert, #modal, div[aria-role=presentation]"/> <em>(CSS selector)</em>
+			</div>
+		</div>
+	</div>
+
 	<p class="control-label"><b>Ignore these rules</b> <a target="_blank" href="https://github.com/pa11y/pa11y/wiki/HTML-CodeSniffer-Rules">(full list of rules here)</a></p>
 
 	<div class="standards-lists">

view/task/index.html

@@ -1,18 +1,18 @@
 {{!
-This file is part of pa11y-dashboard.
+This file is part of Pa11y Dashboard.
 
-pa11y-dashboard is free software: you can redistribute it and/or modify
+Pa11y Dashboard is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation, either version 3 of the License, or
 (at your option) any later version.
 
-pa11y-dashboard is distributed in the hope that it will be useful,
+Pa11y Dashboard is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with pa11y-dashboard.  If not, see <http://www.gnu.org/licenses/>.
+along with Pa11y Dashboard.  If not, see <http://www.gnu.org/licenses/>.
 }}
 
 {{#content "title"}}
@@ -84,7 +84,7 @@ along with pa11y-dashboard.  If not, see <http://www.gnu.org/licenses/>.
 	<div class="col-md-12" data-test="alert">
 		<div class="alert alert-info">
 			<h4>There are no results to show</h4>
-			<p>pa11y has not been run against this URL yet so there are no results to show.</p>
+			<p>Pa11y has not been run against this URL yet so there are no results to show.</p>
 			<p><a href="{{task.hrefRun}}">Click here to generate results for this URL</a>.</p>
 		</div>
 	</div>