Version 2.1.0

I broke this with my incorrect advice :D

.jscsrc

@@ -2,6 +2,7 @@
 	"disallowEmptyBlocks": true,
 	"disallowImplicitTypeConversion": [
 		"binary",
+		"boolean",
 		"numeric",
 		"string"
 	],
@@ -13,8 +14,13 @@
 	"disallowMultipleSpaces": true,
 	"disallowMultipleVarDecl": true,
 	"disallowNewlineBeforeBlockStatements": true,
+	"disallowParenthesesAroundArrowParam": true,
 	"disallowQuotedKeysInObjects": true,
-	"disallowSpaceAfterObjectKeys": true,
+	"disallowSpaceAfterObjectKeys": {
+		"allExcept": [
+			"method"
+		]
+	},
 	"disallowSpaceAfterPrefixUnaryOperators": true,
 	"disallowSpaceBeforeComma": true,
 	"disallowSpaceBeforeSemicolon": true,
@@ -26,24 +32,22 @@
 	"disallowSpacesInsideBrackets": true,
 	"disallowSpacesInsideObjectBrackets": true,
 	"disallowSpacesInsideParentheses": true,
+	"disallowSpacesInsideTemplateStringPlaceholders": true,
 	"disallowTrailingComma": true,
 	"disallowTrailingWhitespace": true,
+	"disallowVar": true,
 	"disallowYodaConditions": true,
-	"maximumLineLength": 200,
+
+	"maximumLineLength": 100,
+
+	"requireArrowFunctions": true,
 	"requireBlocksOnNewline": true,
+	"requireCamelCaseOrUpperCaseIdentifiers": true,
 	"requireCapitalizedConstructors": true,
 	"requireCommaBeforeLineBreak": true,
-	"requireCurlyBraces": [
+	"requireCurlyBraces": true,
-		"if",
-		"else",
-		"for",
-		"while",
-		"do",
-		"switch",
-		"try",
-		"catch"
-	],
 	"requireDotNotation": true,
+	"requireFunctionDeclarations": true,
 	"requireLineBreakAfterVariableAssignment": true,
 	"requireLineFeedAtFileEnd": true,
 	"requireObjectKeysOnNewLine": true,
@@ -74,6 +78,8 @@
 	"requireSpacesInFunction": {
 		"beforeOpeningCurlyBrace": true
 	},
+	"requireTemplateStrings": true,
+
 	"validateIndentation": "\t",
 	"validateLineBreaks": "LF",
 	"validateNewlineAfterArrayElements": true,

.jshintrc

@@ -1,7 +1,7 @@
 {
-	"browser": true,
 	"curly": true,
 	"eqeqeq": true,
+	"esversion": 6,
 	"forin": true,
 	"globals": {
 		"after": true,
@@ -19,11 +19,8 @@
 	"node": true,
 	"nonew": true,
 	"nonstandard": true,
-	"regexp": true,
+	"shadow": false,
-	"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

@@ -0,0 +1,221 @@
+
+# Changelog
+
+## 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
+  * Allow configuration by environment variables
+  * Update repository references to the new Pa11y organisation
+  * Add a changelog
+
+## 1.10.0 (2016-05-18)
+
+  * Automatically focus on the filter input box when you select the filter
+  * Make a task URL clickable
+  * Tweak the documentation to make it more usable
+  * Add a resources section to the README
+
+## 1.9.0 (2016-04-25)
+
+  * Show errors' context and selector on the results page
+  * Add context and selector to CSV output
+  * Fix lint errors
+  * Switch from Grunt to Make
+  * Add a `SIGINT` handler
+  * Update dependencies
+    * pa11y-webservice: ~1.6 to ~1.8
+
+## 1.8.2 (2016-02-10)
+
+  * Update the license in the footer
+
+## 1.8.1 (2016-02-10)
+
+  * Update repository references to springernature
+
+## 1.8.0 (2016-02-04)
+
+  * Make the graph more accessible to color-blind users
+  * Fix lint errors
+
+## 1.7.0 (2016-01-29)
+
+  * Hide the date list from individual result pages
+  * Make the date selector properly keyboard accessible
+  * Change the options button into a more accessible list
+  * Make the errors/warnings/notices lists keyboard accessible
+
+## 1.6.1 (2016-01-26)
+
+  * Add keyboard access for filters
+  * Fix lint errors
+
+## 1.6.0 (2015-08-20)
+
+  * Hide all graph data except for errors by default
+
+## 1.5.0 (2015-07-06)
+
+  * Add the ability to use HTTP basic auth with task URLs
+  * Update dependencies
+    * pa11y-webservice: ~1.5 to ~1.6
+
+## 1.4.0 (2015-07-02)
+
+  * Add the ability to set a per-task timeout
+
+## 1.3.2 (2015-01-17)
+
+  * Update dependencies
+    * pa11y-webservice: ~1.3 to ~1.4
+
+## 1.3.1 (2014-03-05)
+
+  * Fix the URL filter position when in demo mode
+
+## 1.3.0 (2014-03-04)
+
+  * Add filtering of tasks on the home page
+  * Add the ability to ignore certain rules
+  * Add the ability to ignore a rule from the result page
+  * Tweak the display of task cards
+
+## 1.2.3 (2014-01-13)
+
+  * Fix CSV export for the OS X version of Excel
+
+## 1.2.2 (2014-01-09)
+
+  * Fix spacing issues when the graph is not visible
+  * Add notes on publishing a release
+
+## 1.2.1 (2014-01-08)
+
+  * Fix dropdown positioning in Internet Explorer 7 and 8
+
+## 1.2.0 (2013-12-12)
+
+  * Add HTML Codesniffer links on the results page
+  * Display the ignore rules for results on the results page
+  * Link the breadcrumbs on task sub-pages
+  * Fix an issue with saving empty ignore rules
+  * Cache-bust the CSS and JavaScript
+  * Add the ability to edit tasks
+  * Fix lint errors
+  * Tweaks to the display of the graphs
+  * Update dependencies
+    * pa11y-webservice: ~1.1 to ~1.2
+    * pa11y-webservice-client-node: ~1.0 to ~1.1
+
+## 1.1.0 (2013-11-22)
+
+  * Add a functional test suite
+  * Allow the webservice to run automatically
+  * Documentation improvements
+  * Add a Travis config
+  * Fix lint errors
+
+## 1.0.0 (2013-11-19)
+
+  * Initial stable release
+  * Add the ability to set a site-wide message
+  * Add a demo mode for demo/public-facing sites
+  * Disable search engine indexing by default
+  * Tweak the task header at smaller screen sizes
+  * Make checkboxes on the graph WCAG2AA compliant
+  * Make checkbox inputs and labels WCAG2AA compliant on new URL page
+  * Colour changes to ensure there are no contrast issues
+  * Make the copy more consistent
+  * Update screenshots
+  * Update dependencies
+    * pa11y-webservice-client-node: 1.0.0-beta.7 to ~1.0
+
+## 1.0.0-beta.3 pre-release (2013-11-12)
+
+  * Fix lint errors
+  * Add descriptive labels to tasks
+  * Add a name field to "New URL" form
+  * Add a WCAG 2.0 link to the footer
+  * Tweak the layout at smaller screen sizes
+  * Notify users when there are no ignored rules
+  * Fix the expires headers for front end assets
+  * Move from Make to Grunt
+  * Compress static files
+  * Minify the site JavaScript
+  * Compile LESS files with grunt
+  * Add a watch task to recompile assets on change
+  * Commit compiled front-end code to the repo
+  * Add development instructions
+  * Update screenshots
+  * Update dependencies
+    * pa11y-webservice-client-node: 1.0.0-beta.4 to 1.0.0-beta.7
+
+## 1.0.0-beta.2 pre-release (2013-10-04)
+
+  * Add screenshots to the README
+  * Fix margins
+  * Add bower package management
+  * Stop the graph from appearing if there's only one result
+  * Add the ability to run tasks ad-hoc
+  * Add more useful information to the footer
+  * General copy edits
+  * Update dependencies
+    * pa11y-webservice-client-node: 1.0.0-beta.3 to 1.0.0-beta.4
+
+## 1.0.0-beta.1 pre-release (2013-09-27)
+
+  * Initial release

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.

README.md

@@ -1,11 +1,18 @@
-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.
 
-**Current Version:** *1.9.0*  
+![Version][shield-version]
-**Build Status:** [![Build Status][travis-img]][travis]  
+[![Node.js version support][shield-node]][info-node]
-**Node Version Support:** *0.10*
+[![Build status][shield-build]][info-build]
+[![GPL-3.0 licensed][shield-license]][info-license]
+
+---
+
+✨ 🔜 ✨ 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]. ✨  
+
+---
 
 
 ![dashboard](https://f.cloud.github.com/assets/1225142/1549567/f0361e72-4de8-11e3-8d14-3fe6900cc15d.jpg)
@@ -15,11 +22,25 @@ pa11y-dashboard is a web interface to the [pa11y][pa11y] accessibility reporter;
 Setup
 -----
 
-pa11y-dashboard requires [Node.js][node] 0.10+, [PhantomJS][phantom], and [MongoDB][mongo] to be installed. See the [pa11y][pa11y] and [pa11y-webservice][pa11y-webservice] documentation for more information on these dependencies.
+Pa11y Dashboard requires [Node.js][node] 4+ and [PhantomJS][phantom]. See the [Pa11y][pa11y] documentation for detailed instructions on how to install these dependencies on your operating system.
 
-You'll then need to clone this repo locally and install dependencies with `npm install`.
+You'll also need to have [MongoDB][mongo] installed and running. See the [MongoDB install guide][mongo-install] for more information on this.
 
-Once you have a local clone, you'll need to copy some sample configuration files in order to run the application. From within the repo, run the following commands:
+You'll then need to clone this repo locally and install dependencies with `npm install`. Now you need to add some configuration before you can run the application. We can do this in two ways:
+
+### Option 1: Using Environment Variables
+
+Each configuration can be set with an environment variable rather than a config file. For example to run the application on port `8080` you can use the following:
+
+```sh
+PORT=8080 node index.js
+```
+
+The [available configurations are documented here](#configurations).
+
+### Option 2: Using Config Files
+
+You'll need to copy and modify different config files depending on your environment (set with `NODE_ENV`):
 
 ```sh
 cp config/development.sample.json config/development.json
@@ -27,44 +48,44 @@ cp config/production.sample.json config/production.json
 cp config/test.sample.json config/test.json
 ```
 
-Each of these files defines configurations for a different environment. If you're just running the application locally, then you should be OK with just development configurations. The [available configurations are documented here](#configurations).
+Each of these files defines configurations for a different environment. If you're just running the application locally, then you should be OK with just development and test configurations. The [available configurations are documented here](#configurations).
 
-Now that you've got your application configured, you can run in each mode with the following commands:
+Now that you've got your application configured, make sure you have a MongoDB server running with the `mongod` command in another terminal window. You can run in each mode by changing the `NODE_ENV` environment variable:
 
 ```sh
-NODE_ENV=production node index.js   # Run in production
+NODE_ENV=development node index.js
-NODE_ENV=development node index.js  # Run in development
-NODE_ENV=test node index.js         # Run in test
 ```
 
-Check the [development instructions](#development) for more information about running locally (and restarting automatically when files change).
+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.
+*(number)* The port to run the application on. Set via a config file or the `PORT` environment variable.
 
 ### noindex
-*(boolean)* If set to `true` (default), the dashboard will not be indexed by search engines. Set to `false` to allow indexing.
+*(boolean)* If set to `true` (default), the dashboard will not be indexed by search engines. Set to `false` to allow indexing. Set via a config file or the `NOINDEX` environment variable.
 
 ### readonly
-*(boolean)* If set to `true`, users will not be able to add, delete or run URLs (defaults to `false`).
+*(boolean)* If set to `true`, users will not be able to add, delete or run URLs (defaults to `false`). Set via a config file or the `READONLY` environment variable.
 
 ### siteMessage
 *(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.
+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
 -----------
 
-To develop pa11y-dashboard, you'll need to clone the repo and get set up as outlined in the [setup guide](#setup).
+To develop Pa11y Dashboard, you'll need to clone the repo and get set up as outlined in the [setup guide](#setup).
 
 You'll need to start the application in test mode with:
 
@@ -85,25 +106,56 @@ Code with lint errors or failing tests will not be accepted, please use the buil
 To compile the client-side JavaScript and CSS, you'll need the following commands. Compiled code is committed to the repository.
 
 ```sh
-make css     # Compile the site CSS from LESS files
+make less    # Compile the site CSS from LESS files
 make uglify  # Compile and uglify the client-side JavaScript
 ```
 
 
+Useful Resources
+-------
+* [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              |
+| :hourglass:     | 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
 -------
 
-[Copyright 2013 Springer Nature](LICENSE.txt).  
+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][gpl].
+Copyright © 2013–2016, Springer Nature
 
 
 
 [gpl]: http://www.gnu.org/licenses/gpl-3.0.html
 [mongo]: http://www.mongodb.org/
+[mongo-install]: https://docs.mongodb.org/manual/installation/
 [node]: http://nodejs.org/
-[pa11y]: https://github.com/springernature/pa11y
+[pa11y]: https://github.com/pa11y/pa11y
-[pa11y-webservice]: https://github.com/springernature/pa11y-webservice
+[pa11y-webservice-config]: https://github.com/pa11y/webservice#configurations
-[pa11y-webservice-config]: https://github.com/springernature/pa11y-webservice#configurations
 [phantom]: http://phantomjs.org/
-[travis]: https://travis-ci.org/springernature/pa11y-dashboard
+[resource-una-k]: https://una.im/pa11y-dash/
-[travis-img]: https://travis-ci.org/springernature/pa11y-dashboard.png?branch=master
+[sidekick-proposal]: https://github.com/pa11y/sidekick/blob/master/PROPOSAL.md
+[travis]: https://travis-ci.org/pa11y/dashboard
+[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/dashboard
+[shield-license]: https://img.shields.io/badge/license-GPL%203.0-blue.svg
+[shield-node]: https://img.shields.io/badge/node.js%20support-4–6-brightgreen.svg
+[shield-version]: https://img.shields.io/badge/version-2.1.0-blue.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,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 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 +30,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 +80,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((req, res, next) => {
 		res.locals.isHomePage = (req.path === '/');
-		res.locals.host = req.host;
+		res.locals.host = req.hostname;
 		next();
 	});
 
@@ -100,14 +105,14 @@ function initApp(config, callback) {
 	}
 
 	// Error handling
-	app.express.get('*', function(req, res) {
+	app.express.get('*', (req, res) => {
 		res.status(404);
 		res.render('404');
 	});
-	app.express.use(function(err, req, res, next) {
+	app.express.use((err, req, res, next) => {
 		/* jshint unused: false */
 		if (err.code === 'ECONNREFUSED') {
-			err = new Error('Could not connect to pa11y-webservice');
+			err = new Error('Could not connect to Pa11y Webservice');
 		}
 		app.emit('route-error', err);
 		if (process.env.NODE_ENV !== 'production') {
@@ -117,9 +122,9 @@ function initApp(config, callback) {
 		res.render('500');
 	});
 
-	app.server.listen(config.port, function(err) {
+	app.server.listen(config.port, err => {
-		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);
 	});
 

config.js

@@ -0,0 +1,45 @@
+// This file is part of Pa11y Dashboard.
+//
+// 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,
+// 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/>.
+
+'use strict';
+
+const fs = require('fs');
+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')),
+		noindex: env('NOINDEX', 'true') === 'true',
+		readonly: env('READONLY', 'false') === 'true',
+
+		webservice: env('WEBSERVICE_URL', {
+			database: env('WEBSERVICE_DATABASE', 'mongodb://localhost/pa11y-webservice'),
+			host: env('WEBSERVICE_HOST', '0.0.0.0'),
+			port: Number(env('WEBSERVICE_PORT', '3000')),
+			cron: env('WEBSERVICE_CRON', false)
+		})
+	};
+}
+
+function env(name, defaultValue) {
+	const value = process.env[name];
+	return typeof value === 'string' ? value : defaultValue;
+}

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,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 chalk = require('chalk');
+const chalk = require('chalk');
-var config = require('./config/' + (process.env.NODE_ENV || 'development') + '.json');
+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, (err, app) => {
 
 	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', err => {
-		var stack = (err.stack ? err.stack.split('\n') : [err.message]);
+		const stack = (err.stack ? err.stack.split('\n') : [err.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 +40,9 @@ 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, (err, webservice) => {
 			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,9 +1,9 @@
 {
 	"name": "pa11y-dashboard",
-	"version": "1.9.0",
+	"version": "2.1.0",
 	"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": [ "accessibility", "analysis", "report" ],
 	"contributors": [
 		"Perry Harlock (http://www.phwebs.co.uk/)",
@@ -12,33 +12,37 @@
 
 	"repository": {
 		"type": "git",
-		"url": "https://github.com/springernature/pa11y-dashboard.git"
+		"url": "https://github.com/pa11y/dashboard.git"
 	},
-	"homepage": "https://github.com/springernature/pa11y-dashboard",
+	"homepage": "https://github.com/pa11y/dashboard",
-	"bugs": "https://github.com/springernature/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.15",
-		"express": "~3.4",
+		"chalk": "~1.1",
-		"express-hbs": "~0.2",
+		"compression": "~1.6",
-		"moment": "~2.2",
+		"express": "~4.14",
-		"pa11y-webservice": "~1.8",
+		"express-hbs": "~1.0",
-		"pa11y-webservice-client-node": "~1.1",
+		"http-headers": "^3.0.1",
-		"underscore": "~1.5"
+		"moment": "~2.13",
+		"pa11y-webservice": "^2.1.2",
+		"pa11y-webservice-client-node": "^1.2.1",
+		"underscore": "~1.8"
 	},
 	"devDependencies": {
-		"bower": "~1.2",
+		"bower": "~1.7",
+		"cheerio": "~0.20",
 		"jscs": "^2",
-		"jsdom": "^3",
 		"jshint": "^2",
-		"less": "~1.5",
+		"less": "~2.7",
 		"mocha": "^2",
 		"proclaim": "^3",
-		"request": "~2.27",
+		"request": "^2.74",
-		"uglify-js": "~2.4"
+		"uglify-js": "~2.6"
 	},
 
 	"scripts": {

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(){
 

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,28 +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 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('/', (req, res, next) => {
-		app.webservice.tasks.get({lastres: true}, function(err, tasks) {
+		app.webservice.tasks.get({lastres: true}, (err, tasks) => {
 			if (err) {
 				return next(err);
 			}

route/new.js

@@ -1,29 +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/>.
+
+/*jshint maxcomplexity:10*/
 
 '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', (req, res) => {
-		var standards = getStandards().map(function(standard) {
+		const standards = getStandards().map(standard => {
 			if (standard.title === 'WCAG2AA') {
 				standard.selected = true;
 			}
@@ -35,23 +38,34 @@ function route(app) {
 		});
 	});
 
-	app.express.post('/new', function(req, res) {
+	app.express.post('/new', (req, res) => {
-		var newTask = {
+
+		let parsedHeaders;
+		if (req.body.headers) {
+			parsedHeaders = httpHeaders(req.body.headers, true);
+		}
+		console.log(parsedHeaders);
+
+		const newTask = {
 			name: req.body.name,
 			url: req.body.url,
 			standard: req.body.standard,
 			ignore: req.body.ignore || [],
-			timeout: req.body.timeout,
+			timeout: req.body.timeout || undefined,
-			username: req.body.username,
+			wait: req.body.wait || undefined,
-			password: req.body.password
+			username: req.body.username || undefined,
+			password: req.body.password || undefined,
+			headers: parsedHeaders,
+			hideElements: req.body.hideElements || undefined
 		};
-		app.webservice.tasks.create(newTask, function(err, task) {
+
+		app.webservice.tasks.create(newTask, (err, task) => {
 			if (err) {
-				var standards = getStandards().map(function(standard) {
+				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;
 						}
@@ -65,7 +79,7 @@ function route(app) {
 					task: newTask
 				});
 			}
-			res.redirect('/' + task.id + '?added');
+			res.redirect(`/${task.id}?added`);
 		});
 	});
 

route/result/download.js

@@ -1,21 +1,21 @@
-// 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;
 
@@ -23,14 +23,14 @@ module.exports = route;
 function route(app) {
 
 	function getTaskAndResult(req, res, next) {
-		app.webservice.task(req.params.id).get({}, function(err, task) {
+		app.webservice.task(req.params.id).get({}, (err, task) => {
 			if (err) {
 				return next('route');
 			}
 			app.webservice
 				.task(req.params.id)
 				.result(req.params.rid)
-				.get({full: true}, function(err, result) {
+				.get({full: true}, (err, result) => {
 					if (err) {
 						return next('route');
 					}
@@ -58,11 +58,11 @@ function route(app) {
 		].join('');
 	}
 
-	app.express.get('/:id/:rid.csv', getTaskAndResult, function(req, res) {
+	app.express.get('/:id/:rid.csv', getTaskAndResult, (req, res) => {
-		var task = res.locals.task;
+		const task = res.locals.task;
-		var result = res.locals.result;
+		const result = res.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),
@@ -75,9 +75,9 @@ function route(app) {
 		res.send(rows.join('\n'));
 	});
 
-	app.express.get('/:id/:rid.json', getTaskAndResult, function(req, res) {
+	app.express.get('/:id/:rid.json', getTaskAndResult, (req, res) => {
-		var task = res.locals.task;
+		const task = res.locals.task;
-		var result = res.locals.result;
+		const result = res.locals.result;
 		res.attachment(getDownloadFileName(task, result, 'json'));
 		delete task.id;
 		delete result.id;

route/result/index.js

@@ -1,37 +1,37 @@
-// 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', (req, res, next) => {
-		app.webservice.task(req.params.id).get({}, function(err, task) {
+		app.webservice.task(req.params.id).get({}, (err, task) => {
 			if (err) {
 				return next();
 			}
 			app.webservice
 				.task(req.params.id)
 				.result(req.params.rid)
-				.get({full: true}, function(err, result) {
+				.get({full: true}, (err, result) => {
 					if (err) {
 						return next();
 					}

route/task/delete.js

@@ -1,29 +1,29 @@
-// 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', (req, res, next) => {
-		app.webservice.task(req.params.id).get({}, function(err, task) {
+		app.webservice.task(req.params.id).get({}, (err, task) => {
 			if (err) {
 				return next();
 			}
@@ -34,8 +34,8 @@ function route(app) {
 		});
 	});
 
-	app.express.post('/:id/delete', function(req, res, next) {
+	app.express.post('/:id/delete', (req, res, next) => {
-		app.webservice.task(req.params.id).remove(function(err) {
+		app.webservice.task(req.params.id).remove(err => {
 			if (err) {
 				return next();
 			}

route/task/edit.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/>.
+
+/*jshint maxcomplexity:10*/
 
 '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', (req, res, next) => {
-		app.webservice.task(req.params.id).get({}, function(err, task) {
+		app.webservice.task(req.params.id).get({}, (err, task) => {
 			if (err) {
 				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;
 					}
@@ -49,24 +52,34 @@ function route(app) {
 		});
 	});
 
-	app.express.post('/:id/edit', function(req, res, next) {
+	app.express.post('/:id/edit', (req, res, next) => {
-		app.webservice.task(req.params.id).get({}, function(err, task) {
+		app.webservice.task(req.params.id).get({}, (err, task) => {
 			if (err) {
 				return next();
 			}
+			const originalHeaders = req.body.headers;
 			req.body.ignore = req.body.ignore || [];
-			app.webservice.task(req.params.id).edit(req.body, function(err) {
+			req.body.timeout = req.body.timeout || undefined;
+			req.body.wait = req.body.wait || undefined;
+			req.body.username = req.body.username || undefined;
+			req.body.password = req.body.password || undefined;
+			req.body.hideElements = req.body.hideElements || undefined;
+			req.body.headers = httpHeaders(req.body.headers || '', true);
+			app.webservice.task(req.params.id).edit(req.body, err => {
 				if (err) {
 					task.name = req.body.name;
 					task.ignore = req.body.ignore;
 					task.timeout = req.body.timeout;
+					task.wait = req.body.wait;
 					task.username = req.body.username;
 					task.password = req.body.password;
-					var standards = getStandards().map(function(standard) {
+					task.headers = originalHeaders;
+					task.hideElements = req.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;
 							}
@@ -81,7 +94,7 @@ function route(app) {
 						isTaskSubPage: true
 					});
 				}
-				res.redirect('/' + req.params.id + '/edit?edited');
+				res.redirect(`/${req.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', (req, res, next) => {
-		app.webservice.task(req.params.id).get({}, function(err, task) {
+		app.webservice.task(req.params.id).get({}, (err, task) => {
 			if (err) {
 				return next();
 			}
-			var edit = {
+			const edit = {
 				name: task.name,
 				ignore: task.ignore
 			};
 			if (typeof req.body.rule === 'string') {
 				edit.ignore.push(req.body.rule);
 			}
-			app.webservice.task(req.params.id).edit(edit, function() {
+			app.webservice.task(req.params.id).edit(edit, () => {
-				res.redirect('/' + req.params.id + '?rule-ignored');
+				res.redirect(`/${req.params.id}?rule-ignored`);
 			});
 		});
 	});

route/task/index.js

@@ -1,39 +1,39 @@
-// 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', (req, res, next) => {
-		app.webservice.task(req.params.id).get({lastres: true}, function(err, task) {
+		app.webservice.task(req.params.id).get({lastres: true}, (err, task) => {
 			if (err) {
 				return next();
 			}
-			app.webservice.task(req.params.id).results({}, function(err, results) {
+			app.webservice.task(req.params.id).results({}, (err, results) => {
 				if (err) {
 					return next(err);
 				}
-				var presentedResults = presentResultList(results.map(presentResult));
+				const presentedResults = presentResultList(results.map(presentResult));
 				res.render('task', {
 					task: presentTask(task),
 					results: presentedResults,

route/task/run.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/>.
 
 'use strict';
 
@@ -20,12 +20,12 @@ module.exports = route;
 // Route definition
 function route(app) {
 
-	app.express.get('/:id/run', function(req, res, next) {
+	app.express.get('/:id/run', (req, res, next) => {
-		app.webservice.task(req.params.id).run(function(err) {
+		app.webservice.task(req.params.id).run(err => {
 			if (err) {
 				return next();
 			}
-			res.redirect('/' + req.params.id + '?running');
+			res.redirect(`/${req.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', (req, res, next) => {
-		app.webservice.task(req.params.id).get({}, function(err, task) {
+		app.webservice.task(req.params.id).get({}, (err, task) => {
 			if (err) {
 				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(req.body.rule);
 			if (typeof req.body.rule === 'string' && indexOfRule !== -1) {
 				edit.ignore.splice(indexOfRule, 1);
 			}
-			app.webservice.task(req.params.id).edit(edit, function() {
+			app.webservice.task(req.params.id).edit(edit, () => {
-				res.redirect('/' + req.params.id + '?rule-unignored');
+				res.redirect(`/${req.params.id}?rule-unignored`);
 			});
 		});
 	});

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,13 +30,12 @@ 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) {
@@ -46,19 +46,11 @@ function createNavigator(baseUrl, store) {
 			store.status = res.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();
-					}
-				);
 			}
+			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,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/>.
 
+// 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 req = {
 			method: 'GET',
 			endpoint: '/'
 		};
@@ -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,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/>.
 
+// jscs:disable maximumLineLength, requireArrowFunctions
 'use strict';
 
-var assert = require('proclaim');
+const assert = require('proclaim');
 
 describe('GET /new', function() {
 
 	beforeEach(function(done) {
-		var req = {
+		const req = {
 			method: 'GET',
 			endpoint: '/new'
 		};
@@ -32,62 +33,81 @@ 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() {
+			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 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);
+		});
+
 	});
 
 });
@@ -97,10 +117,10 @@ describe('POST /new', function() {
 	describe('with invalid query', function() {
 
 		beforeEach(function(done) {
-			var req = {
+			const req = {
 				method: 'POST',
 				endpoint: '/new',
-				body: {
+				form: {
 					name: '',
 					url: ''
 				}
@@ -113,7 +133,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);
 		});
 
 	});
@@ -121,10 +141,10 @@ describe('POST /new', function() {
 	describe('with valid query', function() {
 
 		beforeEach(function(done) {
-			var req = {
+			const req = {
 				method: 'POST',
 				endpoint: '/new',
-				body: {
+				form: {
 					name: 'Example',
 					url: 'http://example.com/',
 					standard: 'WCAG2AA'
@@ -149,11 +169,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,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/>.
 
+// 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 req = {
 			method: 'GET',
 			endpoint: '/abc000000000000000000001/def000000000000000000001.csv',
 			nonDom: true
@@ -41,10 +42,11 @@ describe('GET /<task-id>/<result-id>.csv', function() {
 describe('GET /<task-id>/<result-id>.json', function() {
 
 	beforeEach(function(done) {
-		var req = {
+		const req = {
 			method: 'GET',
 			endpoint: '/abc000000000000000000001/def000000000000000000001.json',
-			nonDom: true
+			nonDom: true,
+			json: true
 		};
 		this.navigate(req, done);
 	});
@@ -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,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/>.
 
+// 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 req = {
 			method: 'GET',
 			endpoint: '/abc000000000000000000001/def000000000000000000001'
 		};
@@ -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,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/>.
 
+// 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 req = {
 			method: 'GET',
 			endpoint: '/abc000000000000000000001/delete'
 		};
@@ -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,7 +48,7 @@ describe('GET /<task-id>/delete', function() {
 describe('POST /<task-id>/delete', function() {
 
 	beforeEach(function(done) {
-		var req = {
+		const req = {
 			method: 'POST',
 			endpoint: '/abc000000000000000000001/delete'
 		};
@@ -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,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/>.
 
+// 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 req = {
 			method: 'GET',
 			endpoint: '/abc000000000000000000001/edit'
 		};
@@ -32,59 +33,78 @@ 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() {
+			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 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);
 		});
@@ -96,10 +116,10 @@ describe('GET /<task-id>/edit', function() {
 describe('POST /<task-id>/edit', function() {
 
 	beforeEach(function(done) {
-		var req = {
+		const req = {
 			method: 'POST',
 			endpoint: '/abc000000000000000000001/edit',
-			body: {
+			form: {
 				name: 'foo',
 				username: 'newuser',
 				password: 'secure',
@@ -124,9 +144,9 @@ describe('POST /<task-id>/edit', 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 saved/i);
+		assert.match(alert.text(), /been saved/i);
 	});
 
 });

test/integration/route/task/index.js

@@ -1,28 +1,29 @@
-// 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 req = {
 				method: 'GET',
 				endpoint: '/abc000000000000000000001'
 			};
@@ -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,7 +82,7 @@ describe('GET /<task-id>', function() {
 	describe('when task has no results', function() {
 
 		beforeEach(function(done) {
-			var req = {
+			const req = {
 				method: 'GET',
 				endpoint: '/abc000000000000000000003'
 			};
@@ -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,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/>.
 
+// 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 req = {
 			method: 'GET',
 			endpoint: '/abc000000000000000000001/run'
 		};
@@ -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,7 +40,7 @@ afterEach(function(done) {
 
 // Check that the test application is running, and exit if not
 function assertTestAppIsRunning(url, done) {
-	request(url, function(err) {
+	request(url, err => {
 		if (err) {
 			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,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>Eeek! 500 error. This is serious.</h1>

view/helper/date.js

@@ -1,40 +1,35 @@
-// 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,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';
 
 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,26 +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/>.
 }}
-{{#content "title"}}pa11y-dashboard{{/content}}
+{{#content "title"}}Pa11y Dashboard{{/content}}
 
 <div data-control="task-list">
 
   <div class="clearfix">
     <div class="col-md-6 col-md-offset-3 filter-toggle no-js-hide text-center">
-      <label for="filter-input" class="filter-trigger" data-toggle="collapse" data-target="#filter-input">Filter<span class="glyphicon glyphicon-filter"></span>
+      <label for="task-filter" class="filter-trigger" data-toggle="collapse" data-target="#filter-input">Filter<span class="glyphicon glyphicon-filter"></span>
       </label>
       <div id="filter-input" class="collapse">
         <input class="form-control" id="task-filter" type="text" data-role="input" placeholder="Type filter term (name or standard)"/>

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>
@@ -74,6 +74,16 @@ 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-wait">Wait (milliseconds)</label>
+				<input class="form-control" id="new-task-wait" type="text" placeholder="E.g. 3000" name="wait" value="{{task.wait}}"/>
+				<em>(Note: default wait time is 0ms)</em>
+			</div>
+		</div>
+	</div>
+
 	<div class="form-group clearfix">
 		<div class="row">
 			<div class="col-md-4 col-sm-4 col-xs-6">
@@ -92,7 +102,26 @@ along with pa11y-dashboard.  If not, see <http://www.gnu.org/licenses/>.
 		</div>
 	</div>
 
-	<p class="control-label"><b>Ignore these rules</b> <a target="_blank" href="https://github.com/springernature/pa11y/wiki/HTML-CodeSniffer-Rules">(full list of rules here)</a></p>
+	<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">
 		{{#standards}}

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; {{year}} Springer Nature.<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,26 +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/>.
 }}
 <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>
 	</div>
-</header>
+</header>

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>

view/partial/task-header.html

@@ -1,25 +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/>.
 }}
 <div class="col-md-12 zfix">
 	<div class="ruled task-header">
 		<div class="row clearfix">
 			<div class="col-md-12">
 				<h1 class="h2 crunch-top">{{task.name}}</h1>
-				<p class="h4">{{simplify-url task.url}}<span class="h5"> ({{task.standard}})</span></p>
+				<p class="h4"><a href="{{task.url}}">{{simplify-url task.url}}</a><span class="h5"> ({{task.standard}})</span></p>
 			</div>
 			<div class="run-details task-header clearfix">
 				<div class="col-md-12 clearfix">
@@ -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,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/>.
 }}
 
 <ul class="list-unstyled clearfix crunch-bottom">
@@ -54,7 +54,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,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 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 +30,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,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/>.
 
 '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,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/>.
 
 '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 +35,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,47 @@
-// 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 requireCamelCaseOrUpperCaseIdentifiers
 '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>
@@ -86,6 +86,16 @@ 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-wait">Wait (milliseconds)</label>
+				<input class="form-control" id="new-task-wait" type="text" placeholder="E.g. 3000" name="wait" value="{{task.wait}}"/>
+				<em>(Note: default wait time is 0ms)</em>
+			</div>
+		</div>
+	</div>
+
 	<div class="form-group clearfix">
 		<div class="row">
 			<div class="col-md-4 col-sm-4 col-xs-6">
@@ -104,7 +114,26 @@ along with pa11y-dashboard.  If not, see <http://www.gnu.org/licenses/>.
 		</div>
 	</div>
 
-	<p class="control-label"><b>Ignore these rules</b> <a target="_blank" href="https://github.com/springernature/pa11y/wiki/HTML-CodeSniffer-Rules">(full list of rules here)</a></p>
+	<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">
 		{{#standards}}

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>