Compare commits

..

34 Commits

Author SHA1 Message Date
Rowan Manning
227de3638a Version 2.1.0 2016-11-07 15:03:19 +00:00
Rowan Manning
79c849d42b Use the latest Pa11y webservice 2016-11-07 14:58:15 +00:00
Rowan Manning
8195c5d2c5 Fix lint errors 2016-11-07 14:58:15 +00:00
Rowan Manning
568e068613 Parse task headers as HTTP headers rather than JSON 2016-11-07 14:58:15 +00:00
Rowan Manning
ee729d1d55 Write integration tests for hideElements and headers 2016-11-07 14:58:15 +00:00
Rowan Manning
509914d19a Fix the hideElements option
I broke this with my incorrect advice :D
2016-11-07 14:58:15 +00:00
Laura Carvajal
9df456c7c1 hide-elements and placeholders 2016-11-07 14:58:15 +00:00
Laura Carvajal
36dad55bb8 restore config filename 2016-11-07 14:58:15 +00:00
Laura Carvajal
39435f37e4 header and hide fields 2016-11-07 14:58:15 +00:00
Rowan Manning
c562bb07f3 Make optional fields optional (#154)
This fixes an issue that required people to manually specify a timeout
and wait for their tasks when they're created.
2016-11-07 14:06:12 +00:00
Frank van Gemeren
2976d5e391 Better client-side validation (#152) 2016-11-07 13:36:20 +00:00
Laura Carvajal
344efb9da3 allow for .js config 2016-10-20 14:15:55 +01:00
Hollie Kay
c2b1b1d1a1 Merge pull request #148 from pa11y/troubleshooting
add troubleshooting guide and link on the index page
2016-10-06 17:00:44 +01:00
hollsk
8c4517c830 put the links and refs the right way around 2016-10-06 17:12:50 +01:00
hollsk
40b6e79f81 add troubleshooting guide and link on the index page 2016-10-06 16:40:22 +01:00
Jose Bolos
02ce731e83 Version 2.0.1 2016-09-12 14:09:38 +01:00
Jose Bolos
4f46351d68 Merge pull request #143 from pa11y/secfixes
Update several packages in order to fix several vulns
2016-09-12 13:58:30 +01:00
Jose Bolos
ee7795a7a9 Merge pull request #144 from pa11y/license
Add license field to package.json
2016-09-09 14:09:43 +01:00
Jose Bolos
3a3cca881a Add license field to package.json 2016-09-09 12:58:55 +01:00
Jose Bolos
fa0c523e3f Require webservice-client-node 1.2.1 or greater
Fixes https://nodesecurity.io/advisories/130
2016-09-09 12:52:11 +01:00
Jose Bolos
36a677948b Upgrade mocha to version 3 2016-09-09 12:27:42 +01:00
Jose Bolos
22aab6bee2 Require request 2.74 or greater
Fixes https://nodesecurity.io/advisories/130
2016-09-09 12:27:09 +01:00
Jose Bolos
a30e82d5be Require webservice 2.0.1 or greater
Addresses the following vulns present on 2.0.0:
* https://nodesecurity.io/advisories/45
* https://nodesecurity.io/advisories/63
* https://nodesecurity.io/advisories/65
* https://nodesecurity.io/advisories/121
2016-09-09 12:22:34 +01:00
Jose Bolos
71432a3063 Upgrade express to 4.14 or greater
Prevents https://nodesecurity.io/advisories/106
2016-09-09 12:19:28 +01:00
Rowan Manning
6cd7630049 Merge pull request #141 from pa11y/digitial
Fix a typo in link text
2016-08-15 09:09:32 +01:00
Jose Bolos
979f7f244b Fix a typo in link text 2016-08-15 08:02:48 +01:00
Rowan Manning
e431fefbd8 Use the ES6 linting rules from the website (#138) 2016-07-22 14:34:10 +01:00
Rowan Manning
df8f5a7d07 Version 2.0.0 2016-06-05 13:35:36 +01:00
Rowan Manning
b727251862 Use Pa11y Webservice 2.0 2016-06-05 13:33:31 +01:00
Rowan Manning
9d53739c06 Add a migration guide 2016-06-05 12:59:10 +01:00
Rowan Manning
2633248ea1 Drop support for Node.js 0.10-0.12 2016-06-05 12:56:50 +01:00
Rowan Manning
ea7e6f4052 Version 1.12.1 2016-06-05 12:55:43 +01:00
Andrew Mee
a3bc8c0443 Merge pull request #136 from pa11y/repo-rename
Rename all the repos and uppercase Pa11y
2016-06-02 10:26:20 +01:00
Rowan Manning
b1ae55c802 Rename all the repos and uppercase Pa11y 2016-06-01 20:57:09 +01:00
62 changed files with 697 additions and 491 deletions

30
.jscsrc
View File

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

View File

@@ -1,7 +1,7 @@
{ {
"browser": true,
"curly": true, "curly": true,
"eqeqeq": true, "eqeqeq": true,
"esversion": 6,
"forin": true, "forin": true,
"globals": { "globals": {
"after": true, "after": true,
@@ -19,11 +19,8 @@
"node": true, "node": true,
"nonew": true, "nonew": true,
"nonstandard": true, "nonstandard": true,
"regexp": true, "shadow": false,
"shadow": true,
"strict": true, "strict": true,
"sub": true,
"trailing": true,
"undef": true, "undef": true,
"unused": true "unused": true
} }

View File

@@ -3,8 +3,6 @@
language: node_js language: node_js
matrix: matrix:
include: include:
- node_js: '0.10'
- node_js: '0.12'
- node_js: '4' - node_js: '4'
- node_js: '5' - node_js: '5'
- node_js: '6' - node_js: '6'

View File

@@ -1,6 +1,42 @@
# Changelog # 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.100.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) ## 1.12.0 (2016-05-26)
* Update Node.js version support to 0.106.0 * Update Node.js version support to 0.106.0

19
MIGRATION.md Normal file
View File

@@ -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.

View File

@@ -1,7 +1,7 @@
pa11y-dashboard Pa11y Dashboard
=============== ===============
pa11y-dashboard is a web interface to the [pa11y][pa11y] accessibility reporter; allowing you to focus on *fixing* issues rather than hunting them down. Pa11y Dashboard is a web interface to the [Pa11y][pa11y] accessibility reporter; allowing you to focus on *fixing* issues rather than hunting them down.
![Version][shield-version] ![Version][shield-version]
[![Node.js version support][shield-node]][info-node] [![Node.js version support][shield-node]][info-node]
@@ -10,7 +10,7 @@ pa11y-dashboard is a web interface to the [pa11y][pa11y] accessibility reporter;
--- ---
✨ 🔜 ✨ The Pa11y team is very excited to announce plans for the successor to pa11y-dashboard and pa11y-webservice, codename "Sidekick". Help us define the features that you want to see by visiting the [proposal][sidekick-proposal]. ✨ ✨ 🔜 ✨ The Pa11y team is very excited to announce plans for the successor to Pa11y Dashboard and Pa11y Webservice, codename "Sidekick". Help us define the features that you want to see by visiting the [proposal][sidekick-proposal]. ✨
--- ---
@@ -22,7 +22,7 @@ pa11y-dashboard is a web interface to the [pa11y][pa11y] accessibility reporter;
Setup Setup
----- -----
pa11y-dashboard requires [Node.js][node] 0.10+ and [PhantomJS][phantom]. See the [pa11y][pa11y] documentation for detailed instructions on how to install these dependencies on your operating system. Pa11y Dashboard requires [Node.js][node] 4+ and [PhantomJS][phantom]. See the [Pa11y][pa11y] documentation for detailed instructions on how to install these dependencies on your operating system.
You'll also need to have [MongoDB][mongo] installed and running. See the [MongoDB install guide][mongo-install] for more information on this. You'll also need to have [MongoDB][mongo] installed and running. See the [MongoDB install guide][mongo-install] for more information on this.
@@ -58,11 +58,13 @@ NODE_ENV=development node index.js
See [development instructions](#development) for more information about running locally (and restarting automatically when files change). 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 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 ### port
*(number)* The port to run the application on. Set via a config file or the `PORT` environment variable. *(number)* The port to run the application on. Set via a config file or the `PORT` environment variable.
@@ -77,13 +79,13 @@ The boot configurations for pa11y-dashboard are as follows. Look at the sample J
*(string)* A message to display prominently on the site home page. Defaults to `null`. *(string)* A message to display prominently on the site home page. Defaults to `null`.
### webservice ### webservice
This can either be an object containing [pa11y-webservice configurations][pa11y-webservice-config], or a string which is the base URL of a [pa11y-webservice][pa11y-webservice] instance you are running separately. If using environment variables, prefix the webservice vars with `WEBSERVICE_`. This can either be an object containing [Pa11y Webservice configurations][pa11y-webservice-config], or a string which is the base URL of a [Pa11y Webservice][pa11y-webservice] instance you are running separately. If using environment variables, prefix the webservice vars with `WEBSERVICE_`.
Development 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: You'll need to start the application in test mode with:
@@ -111,13 +113,28 @@ make uglify # Compile and uglify the client-side JavaScript
Useful Resources Useful Resources
------- -------
* [Setting up An Accessibility Dashboard from Scratch with Pa11y on DigitialOcean][resource-una-k] * [Setting up An Accessibility Dashboard from Scratch with Pa11y on DigitalOcean][resource-una-k]
Support and Migration
---------------------
Pa11y Dashboard major versions are normally supported for 6 months after their last minor release. This means that patch-level changes will be added and bugs will be fixed. The table below outlines the end-of-support dates for major versions, and the last minor release for that version.
We also maintain a [migration guide](MIGRATION.md) to help you migrate.
| :grey_question: | Major Version | Last Minor Release | Node.js Versions | Support End Date |
| :-------------- | :------------ | :----------------- | :--------------- | :--------------- |
| :heart: | 2 | N/A | 4+ | N/A |
| :hourglass: | 1 | 1.12 | 0.106 | 2016-12-05 |
If you're opening issues related to these, please mention the version that the issue relates to.
License License
------- -------
pa11y-dashboard is licensed under the [GNU General Public License 3.0][info-license]. Pa11y Dashboard is licensed under the [GNU General Public License 3.0][info-license].
Copyright © 20132016, Springer Nature Copyright © 20132016, Springer Nature
@@ -127,17 +144,18 @@ Copyright © 20132016, Springer Nature
[mongo-install]: https://docs.mongodb.org/manual/installation/ [mongo-install]: https://docs.mongodb.org/manual/installation/
[node]: http://nodejs.org/ [node]: http://nodejs.org/
[pa11y]: https://github.com/pa11y/pa11y [pa11y]: https://github.com/pa11y/pa11y
[pa11y-webservice-config]: https://github.com/pa11y/pa11y-webservice#configurations [pa11y-webservice-config]: https://github.com/pa11y/webservice#configurations
[phantom]: http://phantomjs.org/ [phantom]: http://phantomjs.org/
[resource-una-k]: https://una.im/pa11y-dash/ [resource-una-k]: https://una.im/pa11y-dash/
[sidekick-proposal]: https://github.com/pa11y/sidekick/blob/master/PROPOSAL.md [sidekick-proposal]: https://github.com/pa11y/sidekick/blob/master/PROPOSAL.md
[travis]: https://travis-ci.org/pa11y/pa11y-dashboard [travis]: https://travis-ci.org/pa11y/dashboard
[travis-img]: https://travis-ci.org/pa11y/pa11y-dashboard.png?branch=master [travis-img]: https://travis-ci.org/pa11y/dashboard.png?branch=master
[troubleshooting]: https://github.com/pa11y/dashboard/blob/master/TROUBLESHOOTING.md
[info-license]: LICENSE [info-license]: LICENSE
[info-node]: package.json [info-node]: package.json
[info-build]: https://travis-ci.org/pa11y/pa11y-dashboard [info-build]: https://travis-ci.org/pa11y/dashboard
[shield-license]: https://img.shields.io/badge/license-GPL%203.0-blue.svg [shield-license]: https://img.shields.io/badge/license-GPL%203.0-blue.svg
[shield-node]: https://img.shields.io/badge/node.js%20support-0.106-brightgreen.svg [shield-node]: https://img.shields.io/badge/node.js%20support-46-brightgreen.svg
[shield-version]: https://img.shields.io/badge/version-1.12.0-blue.svg [shield-version]: https://img.shields.io/badge/version-2.1.0-blue.svg
[shield-build]: https://img.shields.io/travis/pa11y/pa11y-dashboard/master.svg [shield-build]: https://img.shields.io/travis/pa11y/dashboard/master.svg

27
TROUBLESHOOTING.md Normal file
View File

@@ -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

54
app.js
View File

@@ -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 // it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or // the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version. // (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 // but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details. // GNU General Public License for more details.
// //
// You should have received a copy of the GNU General Public License // 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'; 'use strict';
var bodyParser = require('body-parser'); const bodyParser = require('body-parser');
var compression = require('compression'); const compression = require('compression');
var createClient = require('pa11y-webservice-client-node'); const createClient = require('pa11y-webservice-client-node');
var EventEmitter = require('events').EventEmitter; const EventEmitter = require('events').EventEmitter;
var express = require('express'); const express = require('express');
var hbs = require('express-hbs'); const hbs = require('express-hbs');
var http = require('http'); const http = require('http');
var pkg = require('./package.json'); const pkg = require('./package.json');
module.exports = initApp; module.exports = initApp;
@@ -30,12 +30,12 @@ module.exports = initApp;
function initApp(config, callback) { function initApp(config, callback) {
config = defaultConfig(config); config = defaultConfig(config);
var webserviceUrl = config.webservice; let webserviceUrl = config.webservice;
if (typeof webserviceUrl === 'object') { 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.address = null;
app.express = express(); app.express = express();
app.server = http.createServer(app.express); app.server = http.createServer(app.express);
@@ -45,7 +45,7 @@ function initApp(config, callback) {
app.express.use(compression()); app.express.use(compression());
// Public files // Public files
app.express.use(express.static(__dirname + '/public', { app.express.use(express.static(`${__dirname}/public`, {
maxAge: (process.env.NODE_ENV === 'production' ? 604800000 : 0) maxAge: (process.env.NODE_ENV === 'production' ? 604800000 : 0)
})); }));
@@ -59,11 +59,11 @@ function initApp(config, callback) {
app.express.engine('html', hbs.express4({ app.express.engine('html', hbs.express4({
extname: '.html', extname: '.html',
contentHelperName: 'content', 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('views', `${__dirname}/view`);
app.express.set('view engine', 'html'); app.express.set('view engine', 'html');
// View helpers // View helpers
@@ -84,7 +84,7 @@ function initApp(config, callback) {
settings: {} settings: {}
}; };
app.express.use(function(req, res, next) { app.express.use((req, res, next) => {
res.locals.isHomePage = (req.path === '/'); res.locals.isHomePage = (req.path === '/');
res.locals.host = req.hostname; res.locals.host = req.hostname;
next(); next();
@@ -105,14 +105,14 @@ function initApp(config, callback) {
} }
// Error handling // Error handling
app.express.get('*', function(req, res) { app.express.get('*', (req, res) => {
res.status(404); res.status(404);
res.render('404'); res.render('404');
}); });
app.express.use(function(err, req, res, next) { app.express.use((err, req, res, next) => {
/* jshint unused: false */ /* jshint unused: false */
if (err.code === 'ECONNREFUSED') { 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); app.emit('route-error', err);
if (process.env.NODE_ENV !== 'production') { if (process.env.NODE_ENV !== 'production') {
@@ -122,9 +122,9 @@ function initApp(config, callback) {
res.render('500'); 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); callback(err, app);
}); });

View File

@@ -1,25 +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 // it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or // the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version. // (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 // but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details. // GNU General Public License for more details.
// //
// You should have received a copy of the GNU General Public License // 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'; 'use strict';
var fs = require('fs'); const fs = require('fs');
var jsonPath = './config/' + (process.env.NODE_ENV || 'development') + '.json'; const environment = (process.env.NODE_ENV || 'development');
const jsonPath = `./config/${environment}.json`;
const jsPath = `./config/${environment}.js`;
if (fs.existsSync(jsonPath)) { if (fs.existsSync(jsonPath)) {
module.exports = require(jsonPath); module.exports = require(jsonPath);
} else if (fs.existsSync(jsPath)) {
module.exports = require(jsPath);
} else { } else {
module.exports = { module.exports = {
port: Number(env('PORT', '4000')), port: Number(env('PORT', '4000')),
@@ -36,6 +40,6 @@ if (fs.existsSync(jsonPath)) {
} }
function env(name, defaultValue) { function env(name, defaultValue) {
var value = process.env[name]; const value = process.env[name];
return typeof value === 'string' ? value : defaultValue; return typeof value === 'string' ? value : defaultValue;
} }

View File

@@ -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 // it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or // the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version. // (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 // but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details. // GNU General Public License for more details.
// //
// You should have received a copy of the GNU General Public License // 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 // jscs:disable maximumLineLength
'use strict'; 'use strict';

View File

@@ -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 // it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or // the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version. // (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 // but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details. // GNU General Public License for more details.
// //
// You should have received a copy of the GNU General Public License // 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'; 'use strict';
var chalk = require('chalk'); const chalk = require('chalk');
var config = require('./config'); const config = require('./config');
process.on('SIGINT', function() { process.on('SIGINT', () => {
console.log('\nGracefully shutting down from SIGINT (Ctrl-C)'); console.log('\nGracefully shutting down from SIGINT (Ctrl-C)');
process.exit(); process.exit();
}); });
require('./app')(config, function(err, app) { require('./app')(config, (err, app) => {
console.log(''); 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('mode: %s'), process.env.NODE_ENV);
console.log(chalk.grey('uri: %s'), app.address); 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('');
console.error(msg); console.error(msg);
console.error(chalk.grey(stack.join('\n'))); console.error(chalk.grey(stack.join('\n')));
@@ -40,9 +40,9 @@ require('./app')(config, function(err, app) {
// Start the webservice if required // Start the webservice if required
if (typeof config.webservice === 'object') { if (typeof config.webservice === 'object') {
require('pa11y-webservice')(config.webservice, function(err, webservice) { require('pa11y-webservice')(config.webservice, (err, webservice) => {
console.log(''); 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('mode: %s'), process.env.NODE_ENV);
console.log(chalk.grey('uri: %s'), webservice.server.info.uri); console.log(chalk.grey('uri: %s'), webservice.server.info.uri);
}); });

View File

@@ -1,9 +1,9 @@
{ {
"name": "pa11y-dashboard", "name": "pa11y-dashboard",
"version": "1.12.0", "version": "2.1.0",
"private": true, "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" ], "keywords": [ "accessibility", "analysis", "report" ],
"contributors": [ "contributors": [
"Perry Harlock (http://www.phwebs.co.uk/)", "Perry Harlock (http://www.phwebs.co.uk/)",
@@ -12,23 +12,25 @@
"repository": { "repository": {
"type": "git", "type": "git",
"url": "https://github.com/pa11y/pa11y-dashboard.git" "url": "https://github.com/pa11y/dashboard.git"
}, },
"homepage": "https://github.com/pa11y/pa11y-dashboard", "homepage": "https://github.com/pa11y/dashboard",
"bugs": "https://github.com/pa11y/pa11y-dashboard/issues", "bugs": "https://github.com/pa11y/dashboard/issues",
"license": "GPL-3.0",
"engines": { "engines": {
"node": ">=0.10" "node": ">=4"
}, },
"dependencies": { "dependencies": {
"body-parser": "~1.15", "body-parser": "~1.15",
"chalk": "~1.1", "chalk": "~1.1",
"compression": "~1.6", "compression": "~1.6",
"express": "~4.13", "express": "~4.14",
"express-hbs": "~1.0", "express-hbs": "~1.0",
"http-headers": "^3.0.1",
"moment": "~2.13", "moment": "~2.13",
"pa11y-webservice": "~1.11", "pa11y-webservice": "^2.1.2",
"pa11y-webservice-client-node": "~1.2", "pa11y-webservice-client-node": "^1.2.1",
"underscore": "~1.8" "underscore": "~1.8"
}, },
"devDependencies": { "devDependencies": {
@@ -39,7 +41,7 @@
"less": "~2.7", "less": "~2.7",
"mocha": "^2", "mocha": "^2",
"proclaim": "^3", "proclaim": "^3",
"request": "^2", "request": "^2.74",
"uglify-js": "~2.6" "uglify-js": "~2.6"
}, },

View File

@@ -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 // it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or // the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version. // (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 // but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details. // GNU General Public License for more details.
// //
// You should have received a copy of the GNU General Public License // 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(){ $(document).ready(function(){

View File

@@ -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 // it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or // the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version. // (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 // but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details. // GNU General Public License for more details.
// //
// You should have received a copy of the GNU General Public License // 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 // Making up for the non support of IE8 and IE7 in Bootstrap 3
.ie7, .ie8 { .ie7, .ie8 {

View File

@@ -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 // it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or // the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version. // (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 // but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details. // GNU General Public License for more details.
// //
// You should have received a copy of the GNU General Public License // 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 */
.no-javascript { .no-javascript {

View File

@@ -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 // it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or // the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version. // (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 // but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details. // GNU General Public License for more details.
// //
// You should have received a copy of the GNU General Public License // 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 queries */
@media (max-width:991px) { @media (max-width:991px) {

View File

@@ -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 // it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or // the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version. // (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 // but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details. // GNU General Public License for more details.
// //
// You should have received a copy of the GNU General Public License // 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 */ /* Site specific styling */

View File

@@ -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 // it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or // the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version. // (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 // but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details. // GNU General Public License for more details.
// //
// You should have received a copy of the GNU General Public License // 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'; 'use strict';
var presentTask = require('../view/presenter/task'); const presentTask = require('../view/presenter/task');
module.exports = route; module.exports = route;
// Route definition // Route definition
function route(app) { 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) { if (err) {
return next(err); return next(err);
} }

View File

@@ -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 // it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or // the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version. // (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 // but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details. // GNU General Public License for more details.
// //
// You should have received a copy of the GNU General Public License // 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'; 'use strict';
var getStandards = require('../data/standards'); const getStandards = require('../data/standards');
const httpHeaders = require('http-headers');
module.exports = route; module.exports = route;
// Route definition // Route definition
function route(app) { 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') { if (standard.title === 'WCAG2AA') {
standard.selected = true; standard.selected = true;
} }
@@ -35,24 +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, name: req.body.name,
url: req.body.url, url: req.body.url,
standard: req.body.standard, standard: req.body.standard,
ignore: req.body.ignore || [], ignore: req.body.ignore || [],
timeout: req.body.timeout, timeout: req.body.timeout || undefined,
wait: req.body.wait, wait: req.body.wait || undefined,
username: req.body.username, username: req.body.username || undefined,
password: req.body.password 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) { if (err) {
var standards = getStandards().map(function(standard) { const standards = getStandards().map(standard => {
if (standard.title === newTask.standard) { if (standard.title === newTask.standard) {
standard.selected = true; standard.selected = true;
} }
standard.rules = standard.rules.map(function(rule) { standard.rules = standard.rules.map(rule => {
if (newTask.ignore.indexOf(rule.name) !== -1) { if (newTask.ignore.indexOf(rule.name) !== -1) {
rule.ignored = true; rule.ignored = true;
} }
@@ -66,7 +79,7 @@ function route(app) {
task: newTask task: newTask
}); });
} }
res.redirect('/' + task.id + '?added'); res.redirect(`/${task.id}?added`);
}); });
}); });

View File

@@ -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 // it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or // the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version. // (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 // but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details. // GNU General Public License for more details.
// //
// You should have received a copy of the GNU General Public License // 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'; 'use strict';
var moment = require('moment'); const moment = require('moment');
module.exports = route; module.exports = route;
@@ -23,14 +23,14 @@ module.exports = route;
function route(app) { function route(app) {
function getTaskAndResult(req, res, next) { 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) { if (err) {
return next('route'); return next('route');
} }
app.webservice app.webservice
.task(req.params.id) .task(req.params.id)
.result(req.params.rid) .result(req.params.rid)
.get({full: true}, function(err, result) { .get({full: true}, (err, result) => {
if (err) { if (err) {
return next('route'); return next('route');
} }
@@ -58,11 +58,11 @@ function route(app) {
].join(''); ].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([ rows.push([
JSON.stringify(msg.code), JSON.stringify(msg.code),
JSON.stringify(msg.message), JSON.stringify(msg.message),
@@ -75,9 +75,9 @@ function route(app) {
res.send(rows.join('\n')); 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')); res.attachment(getDownloadFileName(task, result, 'json'));
delete task.id; delete task.id;
delete result.id; delete result.id;

View File

@@ -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 // it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or // the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version. // (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 // but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details. // GNU General Public License for more details.
// //
// You should have received a copy of the GNU General Public License // 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'; '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; module.exports = route;
// Route definition // Route definition
function route(app) { 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) { if (err) {
return next(); return next();
} }
app.webservice app.webservice
.task(req.params.id) .task(req.params.id)
.result(req.params.rid) .result(req.params.rid)
.get({full: true}, function(err, result) { .get({full: true}, (err, result) => {
if (err) { if (err) {
return next(); return next();
} }

View File

@@ -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 // it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or // the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version. // (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 // but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details. // GNU General Public License for more details.
// //
// You should have received a copy of the GNU General Public License // 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'; 'use strict';
var presentTask = require('../../view/presenter/task'); const presentTask = require('../../view/presenter/task');
module.exports = route; module.exports = route;
// Route definition // Route definition
function route(app) { 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) { if (err) {
return next(); 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) { if (err) {
return next(); return next();
} }

View File

@@ -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 // it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or // the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version. // (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 // but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details. // GNU General Public License for more details.
// //
// You should have received a copy of the GNU General Public License // 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'; '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; module.exports = route;
// Route definition // Route definition
function route(app) { 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) { if (err) {
return next(); return next();
} }
var standards = getStandards().map(function(standard) { const standards = getStandards().map(standard => {
if (standard.title === task.standard) { if (standard.title === task.standard) {
standard.selected = true; standard.selected = true;
} }
standard.rules = standard.rules.map(function(rule) { standard.rules = standard.rules.map(rule => {
if (task.ignore.indexOf(rule.name) !== -1) { if (task.ignore.indexOf(rule.name) !== -1) {
rule.ignored = true; rule.ignored = true;
} }
@@ -49,13 +52,20 @@ 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) { if (err) {
return next(); return next();
} }
const originalHeaders = req.body.headers;
req.body.ignore = req.body.ignore || []; 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) { if (err) {
task.name = req.body.name; task.name = req.body.name;
task.ignore = req.body.ignore; task.ignore = req.body.ignore;
@@ -63,11 +73,13 @@ function route(app) {
task.wait = req.body.wait; task.wait = req.body.wait;
task.username = req.body.username; task.username = req.body.username;
task.password = req.body.password; 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) { if (standard.title === task.standard) {
standard.selected = true; standard.selected = true;
} }
standard.rules = standard.rules.map(function(rule) { standard.rules = standard.rules.map(rule => {
if (task.ignore.indexOf(rule.name) !== -1) { if (task.ignore.indexOf(rule.name) !== -1) {
rule.ignored = true; rule.ignored = true;
} }
@@ -82,7 +94,7 @@ function route(app) {
isTaskSubPage: true isTaskSubPage: true
}); });
} }
res.redirect('/' + req.params.id + '/edit?edited'); res.redirect(`/${req.params.id}/edit?edited`);
}); });
}); });
}); });

View File

@@ -5,20 +5,20 @@ module.exports = route;
// Route definition // Route definition
function route(app) { 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) { if (err) {
return next(); return next();
} }
var edit = { const edit = {
name: task.name, name: task.name,
ignore: task.ignore ignore: task.ignore
}; };
if (typeof req.body.rule === 'string') { if (typeof req.body.rule === 'string') {
edit.ignore.push(req.body.rule); 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`);
}); });
}); });
}); });

View File

@@ -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 // it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or // the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version. // (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 // but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details. // GNU General Public License for more details.
// //
// You should have received a copy of the GNU General Public License // 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'; '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; module.exports = route;
// Route definition // Route definition
function route(app) { 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) { if (err) {
return next(); return next();
} }
app.webservice.task(req.params.id).results({}, function(err, results) { app.webservice.task(req.params.id).results({}, (err, results) => {
if (err) { if (err) {
return next(err); return next(err);
} }
var presentedResults = presentResultList(results.map(presentResult)); const presentedResults = presentResultList(results.map(presentResult));
res.render('task', { res.render('task', {
task: presentTask(task), task: presentTask(task),
results: presentedResults, results: presentedResults,

View File

@@ -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 // it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or // the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version. // (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 // but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details. // GNU General Public License for more details.
// //
// You should have received a copy of the GNU General Public License // 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'; 'use strict';
@@ -20,12 +20,12 @@ module.exports = route;
// Route definition // Route definition
function route(app) { 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) { if (err) {
return next(); return next();
} }
res.redirect('/' + req.params.id + '?running'); res.redirect(`/${req.params.id}?running`);
}); });
}); });

View File

@@ -5,21 +5,21 @@ module.exports = route;
// Route definition // Route definition
function route(app) { 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) { if (err) {
return next(); return next();
} }
var edit = { const edit = {
name: task.name, name: task.name,
ignore: task.ignore 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) { if (typeof req.body.rule === 'string' && indexOfRule !== -1) {
edit.ignore.splice(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`);
}); });
}); });
}); });

View File

@@ -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 // it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or // the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version. // (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 // but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details. // GNU General Public License for more details.
// //
// You should have received a copy of the GNU General Public License // 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'; 'use strict';
var cheerio = require('cheerio'); const cheerio = require('cheerio');
var request = require('request'); const request = require('request');
module.exports = createNavigator; module.exports = createNavigator;

View File

@@ -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 // it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or // the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version. // (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 // but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details. // GNU General Public License for more details.
// //
// You should have received a copy of the GNU General Public License // 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'; 'use strict';
var createClient = require('pa11y-webservice-client-node'); const createClient = require('pa11y-webservice-client-node');
module.exports = createWebserviceClient; module.exports = createWebserviceClient;
// Create a webservice client // Create a webservice client
function createWebserviceClient(config) { function createWebserviceClient(config) {
var webserviceUrl = config.webservice; let webserviceUrl = config.webservice;
if (typeof webserviceUrl === 'object') { if (typeof webserviceUrl === 'object') {
webserviceUrl = 'http://' + webserviceUrl.host + ':' + webserviceUrl.port + '/'; webserviceUrl = `http://${webserviceUrl.host}:${webserviceUrl.port}/`;
} }
return createClient(webserviceUrl); return createClient(webserviceUrl);
} }

View File

@@ -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 // it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or // the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version. // (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 // but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details. // GNU General Public License for more details.
// //
// You should have received a copy of the GNU General Public License // 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'; 'use strict';
var assert = require('proclaim'); const assert = require('proclaim');
describe.only('GET /', function() { describe.only('GET /', function() {
beforeEach(function(done) { beforeEach(function(done) {
var req = { const req = {
method: 'GET', method: 'GET',
endpoint: '/' endpoint: '/'
}; };
@@ -32,13 +33,13 @@ describe.only('GET /', function() {
}); });
it('should display an "Add new URL" button', function() { it('should display an "Add new URL" button', function() {
var elem = this.last.dom('[data-test=add-task]'); const elem = this.last.dom('[data-test=add-task]');
assert.strictEqual(elem.length, 1); assert.strictEqual(elem.length, 1);
assert.strictEqual(elem.eq(0).attr('href'), '/new'); assert.strictEqual(elem.eq(0).attr('href'), '/new');
}); });
it('should display all of the expected tasks', function() { it('should display all of the expected tasks', function() {
var tasks = this.last.dom('[data-test=task]'); const tasks = this.last.dom('[data-test=task]');
assert.strictEqual(tasks.length, 3); assert.strictEqual(tasks.length, 3);
assert.match(tasks.eq(0).text(), /npg home\s+\(wcag2aa\)/i); assert.match(tasks.eq(0).text(), /npg home\s+\(wcag2aa\)/i);
assert.match(tasks.eq(1).text(), /npg home\s+\(wcag2aaa\)/i); assert.match(tasks.eq(1).text(), /npg home\s+\(wcag2aaa\)/i);
@@ -46,42 +47,42 @@ describe.only('GET /', function() {
}); });
it('should have links to each task', function() { it('should have links to each task', function() {
var tasks = this.last.dom('[data-test=task]'); const tasks = this.last.dom('[data-test=task]');
assert.strictEqual(tasks.eq(0).find('[href="/abc000000000000000000001"]').length, 1); assert.strictEqual(tasks.eq(0).find('[href="/abc000000000000000000001"]').length, 1);
assert.strictEqual(tasks.eq(1).find('[href="/abc000000000000000000002"]').length, 1); assert.strictEqual(tasks.eq(1).find('[href="/abc000000000000000000002"]').length, 1);
assert.strictEqual(tasks.eq(2).find('[href="/abc000000000000000000003"]').length, 1); assert.strictEqual(tasks.eq(2).find('[href="/abc000000000000000000003"]').length, 1);
}); });
it('should display an "Edit" button for each task', function() { it('should display an "Edit" button for each task', function() {
var tasks = this.last.dom('[data-test=task]'); const tasks = this.last.dom('[data-test=task]');
assert.strictEqual(tasks.eq(0).find('[href="/abc000000000000000000001/edit"]').length, 1); assert.strictEqual(tasks.eq(0).find('[href="/abc000000000000000000001/edit"]').length, 1);
assert.strictEqual(tasks.eq(1).find('[href="/abc000000000000000000002/edit"]').length, 1); assert.strictEqual(tasks.eq(1).find('[href="/abc000000000000000000002/edit"]').length, 1);
assert.strictEqual(tasks.eq(2).find('[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() { it('should display a "Delete" button for each task', function() {
var tasks = this.last.dom('[data-test=task]'); const tasks = this.last.dom('[data-test=task]');
assert.strictEqual(tasks.eq(0).find('[href="/abc000000000000000000001/delete"]').length, 1); assert.strictEqual(tasks.eq(0).find('[href="/abc000000000000000000001/delete"]').length, 1);
assert.strictEqual(tasks.eq(1).find('[href="/abc000000000000000000002/delete"]').length, 1); assert.strictEqual(tasks.eq(1).find('[href="/abc000000000000000000002/delete"]').length, 1);
assert.strictEqual(tasks.eq(2).find('[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() { it('should display a "Run" button for each task', function() {
var tasks = this.last.dom('[data-test=task]'); const tasks = this.last.dom('[data-test=task]');
assert.strictEqual(tasks.eq(0).find('[href="/abc000000000000000000001/run"]').length, 1); assert.strictEqual(tasks.eq(0).find('[href="/abc000000000000000000001/run"]').length, 1);
assert.strictEqual(tasks.eq(1).find('[href="/abc000000000000000000002/run"]').length, 1); assert.strictEqual(tasks.eq(1).find('[href="/abc000000000000000000002/run"]').length, 1);
assert.strictEqual(tasks.eq(2).find('[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() { it('should display the task result counts if the task has been run', function() {
var tasks = this.last.dom('[data-test=task]'); const tasks = this.last.dom('[data-test=task]');
assert.match(tasks.eq(0).text(), /1\s*errors/i); assert.match(tasks.eq(0).text(), /1\s*errors/i);
assert.match(tasks.eq(0).text(), /2\s*warnings/i); assert.match(tasks.eq(0).text(), /2\s*warnings/i);
assert.match(tasks.eq(0).text(), /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() { it('should display a message indicating that there are no results if the task has not been run', function() {
var tasks = this.last.dom('[data-test=task]'); const tasks = this.last.dom('[data-test=task]');
assert.match(tasks.eq(2).text(), /no results/i); assert.match(tasks.eq(2).text(), /no results/i);
}); });

View File

@@ -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 // it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or // the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version. // (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 // but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details. // GNU General Public License for more details.
// //
// You should have received a copy of the GNU General Public License // 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'; 'use strict';
var assert = require('proclaim'); const assert = require('proclaim');
describe('GET /new', function() { describe('GET /new', function() {
beforeEach(function(done) { beforeEach(function(done) {
var req = { const req = {
method: 'GET', method: 'GET',
endpoint: '/new' endpoint: '/new'
}; };
@@ -36,7 +37,7 @@ describe('GET /new', function() {
}); });
it('should have an "Add new URL" form', function() { it('should have an "Add new URL" form', function() {
var form = this.last.dom('[data-test=new-url-form]').eq(0); const form = this.last.dom('[data-test=new-url-form]').eq(0);
assert.isDefined(form); assert.isDefined(form);
assert.strictEqual(form.attr('action'), '/new'); assert.strictEqual(form.attr('action'), '/new');
assert.strictEqual(form.attr('method'), 'post'); assert.strictEqual(form.attr('method'), 'post');
@@ -49,52 +50,64 @@ describe('GET /new', function() {
}); });
it('should have a "name" field', function() { it('should have a "name" field', function() {
var field = this.form.find('input[name=name]').eq(0); const field = this.form.find('input[name=name]').eq(0);
assert.isDefined(field); assert.isDefined(field);
assert.strictEqual(field.attr('type'), 'text'); assert.strictEqual(field.attr('type'), 'text');
assert.strictEqual(field.attr('value'), ''); assert.strictEqual(field.attr('value'), '');
}); });
it('should have a "url" field', function() { it('should have a "url" field', function() {
var field = this.form.find('input[name=url]').eq(0); const field = this.form.find('input[name=url]').eq(0);
assert.isDefined(field); assert.isDefined(field);
assert.strictEqual(field.attr('type'), 'url'); assert.strictEqual(field.attr('type'), 'url');
assert.strictEqual(field.attr('value'), ''); assert.strictEqual(field.attr('value'), '');
}); });
it('should have a "wait" field', function() { it('should have a "wait" field', function() {
var field = this.form.find('input[name=wait]').eq(0); const field = this.form.find('input[name=wait]').eq(0);
assert.isDefined(field); assert.isDefined(field);
assert.strictEqual(field.attr('type'), 'text'); assert.strictEqual(field.attr('type'), 'text');
assert.strictEqual(field.attr('value'), ''); assert.strictEqual(field.attr('value'), '');
}); });
it('should have a "username" field', function() { it('should have a "username" field', function() {
var field = this.form.find('input[name=username]').eq(0); const field = this.form.find('input[name=username]').eq(0);
assert.isDefined(field); assert.isDefined(field);
assert.strictEqual(field.attr('type'), 'text'); assert.strictEqual(field.attr('type'), 'text');
assert.strictEqual(field.attr('value'), ''); assert.strictEqual(field.attr('value'), '');
}); });
it('should have a "password" field', function() { it('should have a "password" field', function() {
var field = this.form.find('input[name=password]').eq(0); const field = this.form.find('input[name=password]').eq(0);
assert.isDefined(field); assert.isDefined(field);
assert.strictEqual(field.attr('type'), 'text'); assert.strictEqual(field.attr('type'), 'text');
assert.strictEqual(field.attr('value'), ''); assert.strictEqual(field.attr('value'), '');
}); });
it('should have a "standard" field', function() { it('should have a "standard" field', function() {
var field = this.form.find('select[name=standard]').eq(0); const field = this.form.find('select[name=standard]').eq(0);
assert.isDefined(field); assert.isDefined(field);
assert.strictEqual(field.find('option').length, 4); assert.strictEqual(field.find('option').length, 4);
}); });
it('should have "ignore" fields', function() { it('should have "ignore" fields', function() {
var fields = this.form.find('input[name="ignore[]"]'); const fields = this.form.find('input[name="ignore[]"]');
assert.isDefined(fields); assert.isDefined(fields);
assert.notStrictEqual(fields.length, 0); assert.notStrictEqual(fields.length, 0);
}); });
it('should have a "hideElements" field', function() {
const field = this.form.find('input[name=hideElements]').eq(0);
assert.isDefined(field);
assert.strictEqual(field.attr('type'), 'text');
assert.strictEqual(field.attr('value'), '');
});
it('should have a "headers" field', function() {
const field = this.form.find('textarea[name=headers]').eq(0);
assert.isDefined(field);
});
}); });
}); });
@@ -104,7 +117,7 @@ describe('POST /new', function() {
describe('with invalid query', function() { describe('with invalid query', function() {
beforeEach(function(done) { beforeEach(function(done) {
var req = { const req = {
method: 'POST', method: 'POST',
endpoint: '/new', endpoint: '/new',
form: { form: {
@@ -128,7 +141,7 @@ describe('POST /new', function() {
describe('with valid query', function() { describe('with valid query', function() {
beforeEach(function(done) { beforeEach(function(done) {
var req = { const req = {
method: 'POST', method: 'POST',
endpoint: '/new', endpoint: '/new',
form: { form: {
@@ -160,7 +173,7 @@ describe('POST /new', function() {
}); });
it('should display a success message', function() { it('should display a success message', function() {
var alert = this.last.dom('[data-test=alert]').eq(0); const alert = this.last.dom('[data-test=alert]').eq(0);
assert.isDefined(alert); assert.isDefined(alert);
assert.match(alert.textContent, /url has been added/i); assert.match(alert.textContent, /url has been added/i);
}); });

View File

@@ -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 // it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or // the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version. // (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 // but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details. // GNU General Public License for more details.
// //
// You should have received a copy of the GNU General Public License // 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'; 'use strict';
var assert = require('proclaim'); const assert = require('proclaim');
describe('GET /<task-id>/<result-id>.csv', function() { describe('GET /<task-id>/<result-id>.csv', function() {
beforeEach(function(done) { beforeEach(function(done) {
var req = { const req = {
method: 'GET', method: 'GET',
endpoint: '/abc000000000000000000001/def000000000000000000001.csv', endpoint: '/abc000000000000000000001/def000000000000000000001.csv',
nonDom: true nonDom: true
@@ -41,7 +42,7 @@ describe('GET /<task-id>/<result-id>.csv', function() {
describe('GET /<task-id>/<result-id>.json', function() { describe('GET /<task-id>/<result-id>.json', function() {
beforeEach(function(done) { beforeEach(function(done) {
var req = { const req = {
method: 'GET', method: 'GET',
endpoint: '/abc000000000000000000001/def000000000000000000001.json', endpoint: '/abc000000000000000000001/def000000000000000000001.json',
nonDom: true, nonDom: true,
@@ -55,7 +56,7 @@ describe('GET /<task-id>/<result-id>.json', function() {
}); });
it('should output JSON results', 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.name, 'NPG Home');
assert.strictEqual(json.task.url, 'nature.com'); assert.strictEqual(json.task.url, 'nature.com');
assert.strictEqual(json.count.error, 1); assert.strictEqual(json.count.error, 1);

View File

@@ -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 // it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or // the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version. // (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 // but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details. // GNU General Public License for more details.
// //
// You should have received a copy of the GNU General Public License // 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'; 'use strict';
var assert = require('proclaim'); const assert = require('proclaim');
describe('GET /<task-id>/<result-id>', function() { describe('GET /<task-id>/<result-id>', function() {
beforeEach(function(done) { beforeEach(function(done) {
var req = { const req = {
method: 'GET', method: 'GET',
endpoint: '/abc000000000000000000001/def000000000000000000001' endpoint: '/abc000000000000000000001/def000000000000000000001'
}; };
@@ -32,13 +33,13 @@ describe('GET /<task-id>/<result-id>', function() {
}); });
it('should display a "Download CSV" button', function() { it('should display a "Download CSV" button', function() {
var elem = this.last.dom('[data-test=download-csv]'); const elem = this.last.dom('[data-test=download-csv]');
assert.strictEqual(elem.length, 1); assert.strictEqual(elem.length, 1);
assert.strictEqual(elem.eq(0).attr('href'), '/abc000000000000000000001/def000000000000000000001.csv'); assert.strictEqual(elem.eq(0).attr('href'), '/abc000000000000000000001/def000000000000000000001.csv');
}); });
it('should display a "Download JSON" button', function() { it('should display a "Download JSON" button', function() {
var elem = this.last.dom('[data-test=download-json]'); const elem = this.last.dom('[data-test=download-json]');
assert.strictEqual(elem.length, 1); assert.strictEqual(elem.length, 1);
assert.strictEqual(elem.eq(0).attr('href'), '/abc000000000000000000001/def000000000000000000001.json'); assert.strictEqual(elem.eq(0).attr('href'), '/abc000000000000000000001/def000000000000000000001.json');
}); });
@@ -48,19 +49,19 @@ describe('GET /<task-id>/<result-id>', function() {
}); });
it('should display errors', function() { it('should display errors', function() {
var elem = this.last.dom('[data-test=task-errors]').eq(0); const elem = this.last.dom('[data-test=task-errors]').eq(0);
assert.isDefined(elem); assert.isDefined(elem);
assert.match(elem.text(), /errors \( 1 \)/i); assert.match(elem.text(), /errors \( 1 \)/i);
}); });
it('should display warnings', function() { it('should display warnings', function() {
var elem = this.last.dom('[data-test=task-warnings]').eq(0); const elem = this.last.dom('[data-test=task-warnings]').eq(0);
assert.isDefined(elem); assert.isDefined(elem);
assert.match(elem.text(), /warnings \( 2 \)/i); assert.match(elem.text(), /warnings \( 2 \)/i);
}); });
it('should display notices', function() { it('should display notices', function() {
var elem = this.last.dom('[data-test=task-notices]').eq(0); const elem = this.last.dom('[data-test=task-notices]').eq(0);
assert.isDefined(elem); assert.isDefined(elem);
assert.match(elem.text(), /notices \( 3 \)/i); assert.match(elem.text(), /notices \( 3 \)/i);
}); });

View File

@@ -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 // it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or // the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version. // (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 // but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details. // GNU General Public License for more details.
// //
// You should have received a copy of the GNU General Public License // 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'; 'use strict';
var assert = require('proclaim'); const assert = require('proclaim');
describe('GET /<task-id>/delete', function() { describe('GET /<task-id>/delete', function() {
beforeEach(function(done) { beforeEach(function(done) {
var req = { const req = {
method: 'GET', method: 'GET',
endpoint: '/abc000000000000000000001/delete' endpoint: '/abc000000000000000000001/delete'
}; };
@@ -32,7 +33,7 @@ describe('GET /<task-id>/delete', function() {
}); });
it('should have a "Delete URL" form', function() { it('should have a "Delete URL" form', function() {
var form = this.last.dom('[data-test=delete-url-form]').eq(0); const form = this.last.dom('[data-test=delete-url-form]').eq(0);
assert.isDefined(form); assert.isDefined(form);
assert.strictEqual(form.attr('action'), '/abc000000000000000000001/delete'); assert.strictEqual(form.attr('action'), '/abc000000000000000000001/delete');
assert.strictEqual(form.attr('method'), 'post'); assert.strictEqual(form.attr('method'), 'post');
@@ -47,7 +48,7 @@ describe('GET /<task-id>/delete', function() {
describe('POST /<task-id>/delete', function() { describe('POST /<task-id>/delete', function() {
beforeEach(function(done) { beforeEach(function(done) {
var req = { const req = {
method: 'POST', method: 'POST',
endpoint: '/abc000000000000000000001/delete' endpoint: '/abc000000000000000000001/delete'
}; };
@@ -70,7 +71,7 @@ describe('POST /<task-id>/delete', function() {
}); });
it('should display a success message', function() { it('should display a success message', function() {
var alert = this.last.dom('[data-test=alert]').eq(0); const alert = this.last.dom('[data-test=alert]').eq(0);
assert.isDefined(alert); assert.isDefined(alert);
assert.match(alert.text(), /been deleted/i); assert.match(alert.text(), /been deleted/i);
}); });

View File

@@ -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 // it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or // the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version. // (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 // but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details. // GNU General Public License for more details.
// //
// You should have received a copy of the GNU General Public License // 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'; 'use strict';
var assert = require('proclaim'); const assert = require('proclaim');
describe('GET /<task-id>/edit', function() { describe('GET /<task-id>/edit', function() {
beforeEach(function(done) { beforeEach(function(done) {
var req = { const req = {
method: 'GET', method: 'GET',
endpoint: '/abc000000000000000000001/edit' endpoint: '/abc000000000000000000001/edit'
}; };
@@ -32,7 +33,7 @@ describe('GET /<task-id>/edit', function() {
}); });
it('should have an "Edit URL" form', function() { it('should have an "Edit URL" form', function() {
var form = this.last.dom('[data-test=edit-url-form]').eq(0); const form = this.last.dom('[data-test=edit-url-form]').eq(0);
assert.isDefined(form); assert.isDefined(form);
assert.strictEqual(form.attr('action'), '/abc000000000000000000001/edit'); assert.strictEqual(form.attr('action'), '/abc000000000000000000001/edit');
assert.strictEqual(form.attr('method'), 'post'); assert.strictEqual(form.attr('method'), 'post');
@@ -49,14 +50,14 @@ describe('GET /<task-id>/edit', function() {
}); });
it('should have a "name" field', function() { it('should have a "name" field', function() {
var field = this.form.find('input[name=name]').eq(0); const field = this.form.find('input[name=name]').eq(0);
assert.isDefined(field); assert.isDefined(field);
assert.strictEqual(field.attr('type'), 'text'); assert.strictEqual(field.attr('type'), 'text');
assert.strictEqual(field.attr('value'), 'NPG Home'); assert.strictEqual(field.attr('value'), 'NPG Home');
}); });
it('should have a disabled "url" field', function() { it('should have a disabled "url" field', function() {
var field = this.form.find('input[name=url]').eq(0); const field = this.form.find('input[name=url]').eq(0);
assert.isDefined(field); assert.isDefined(field);
assert.strictEqual(field.attr('type'), 'url'); assert.strictEqual(field.attr('type'), 'url');
assert.strictEqual(field.attr('value'), 'nature.com'); assert.strictEqual(field.attr('value'), 'nature.com');
@@ -64,34 +65,46 @@ describe('GET /<task-id>/edit', function() {
}); });
it('should have a "wait" field', function() { it('should have a "wait" field', function() {
var field = this.form.find('input[name=wait]').eq(0); const field = this.form.find('input[name=wait]').eq(0);
assert.isDefined(field); assert.isDefined(field);
assert.strictEqual(field.attr('type'), 'text'); assert.strictEqual(field.attr('type'), 'text');
assert.strictEqual(field.attr('value'), '0'); assert.strictEqual(field.attr('value'), '0');
}); });
it('should have a disabled "standard" field', function() { it('should have a disabled "standard" field', function() {
var field = this.form.find('select[name=standard]').eq(0); const field = this.form.find('select[name=standard]').eq(0);
assert.isDefined(field); assert.isDefined(field);
assert.isDefined(field.attr('disabled')); assert.isDefined(field.attr('disabled'));
}); });
it('should have a "username" field', function() { it('should have a "username" field', function() {
var field = this.form.find('input[name=username]').eq(0); const field = this.form.find('input[name=username]').eq(0);
assert.isDefined(field); assert.isDefined(field);
assert.strictEqual(field.attr('type'), 'text'); assert.strictEqual(field.attr('type'), 'text');
assert.strictEqual(field.attr('value'), 'user'); assert.strictEqual(field.attr('value'), 'user');
}); });
it('should have a "password" field', function() { it('should have a "password" field', function() {
var field = this.form.find('input[name=password]').eq(0); const field = this.form.find('input[name=password]').eq(0);
assert.isDefined(field); assert.isDefined(field);
assert.strictEqual(field.attr('type'), 'text'); assert.strictEqual(field.attr('type'), 'text');
assert.strictEqual(field.attr('value'), 'access'); 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);
});
it('should have "ignore" fields', function() { it('should have "ignore" fields', function() {
var fields = this.form.find('input[name="ignore[]"]'); const fields = this.form.find('input[name="ignore[]"]');
assert.isDefined(fields); assert.isDefined(fields);
assert.notStrictEqual(fields.length, 0); assert.notStrictEqual(fields.length, 0);
}); });
@@ -103,7 +116,7 @@ describe('GET /<task-id>/edit', function() {
describe('POST /<task-id>/edit', function() { describe('POST /<task-id>/edit', function() {
beforeEach(function(done) { beforeEach(function(done) {
var req = { const req = {
method: 'POST', method: 'POST',
endpoint: '/abc000000000000000000001/edit', endpoint: '/abc000000000000000000001/edit',
form: { form: {
@@ -131,7 +144,7 @@ describe('POST /<task-id>/edit', function() {
}); });
it('should display a success message', function() { it('should display a success message', function() {
var alert = this.last.dom('[data-test=alert]').eq(0); const alert = this.last.dom('[data-test=alert]').eq(0);
assert.isDefined(alert); assert.isDefined(alert);
assert.match(alert.text(), /been saved/i); assert.match(alert.text(), /been saved/i);
}); });

View File

@@ -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 // it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or // the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version. // (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 // but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details. // GNU General Public License for more details.
// //
// You should have received a copy of the GNU General Public License // 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'; 'use strict';
var assert = require('proclaim'); const assert = require('proclaim');
describe('GET /<task-id>', function() { describe('GET /<task-id>', function() {
describe('when task has results', function() { describe('when task has results', function() {
beforeEach(function(done) { beforeEach(function(done) {
var req = { const req = {
method: 'GET', method: 'GET',
endpoint: '/abc000000000000000000001' endpoint: '/abc000000000000000000001'
}; };
@@ -59,19 +60,19 @@ describe('GET /<task-id>', function() {
}); });
it('should display errors', function() { it('should display errors', function() {
var elem = this.last.dom('[data-test=task-errors]').eq(0); const elem = this.last.dom('[data-test=task-errors]').eq(0);
assert.isDefined(elem); assert.isDefined(elem);
assert.match(elem.text(), /errors \( 1 \)/i); assert.match(elem.text(), /errors \( 1 \)/i);
}); });
it('should display warnings', function() { it('should display warnings', function() {
var elem = this.last.dom('[data-test=task-warnings]').eq(0); const elem = this.last.dom('[data-test=task-warnings]').eq(0);
assert.isDefined(elem); assert.isDefined(elem);
assert.match(elem.text(), /warnings \( 2 \)/i); assert.match(elem.text(), /warnings \( 2 \)/i);
}); });
it('should display notices', function() { it('should display notices', function() {
var elem = this.last.dom('[data-test=task-notices]').eq(0); const elem = this.last.dom('[data-test=task-notices]').eq(0);
assert.isDefined(elem); assert.isDefined(elem);
assert.match(elem.text(), /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() { describe('when task has no results', function() {
beforeEach(function(done) { beforeEach(function(done) {
var req = { const req = {
method: 'GET', method: 'GET',
endpoint: '/abc000000000000000000003' endpoint: '/abc000000000000000000003'
}; };
@@ -93,13 +94,13 @@ describe('GET /<task-id>', function() {
}); });
it('should display a "Run" button', function() { it('should display a "Run" button', function() {
var elem = this.last.dom('[data-test=run-task]'); const elem = this.last.dom('[data-test=run-task]');
assert.strictEqual(elem.length, 1); assert.strictEqual(elem.length, 1);
assert.strictEqual(elem.eq(0).attr('href'), '/abc000000000000000000003/run'); assert.strictEqual(elem.eq(0).attr('href'), '/abc000000000000000000003/run');
}); });
it('should display a message indicating that there are no results', function() { it('should display a message indicating that there are no results', function() {
var alert = this.last.dom('[data-test=alert]').eq(0); const alert = this.last.dom('[data-test=alert]').eq(0);
assert.isDefined(alert); assert.isDefined(alert);
assert.match(alert.text(), /there are no results to show/i); assert.match(alert.text(), /there are no results to show/i);
}); });

View File

@@ -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 // it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or // the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version. // (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 // but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details. // GNU General Public License for more details.
// //
// You should have received a copy of the GNU General Public License // 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'; 'use strict';
var assert = require('proclaim'); const assert = require('proclaim');
describe('GET /<task-id>/run', function() { describe('GET /<task-id>/run', function() {
beforeEach(function(done) { beforeEach(function(done) {
var req = { const req = {
method: 'GET', method: 'GET',
endpoint: '/abc000000000000000000001/run' endpoint: '/abc000000000000000000001/run'
}; };
@@ -36,7 +37,7 @@ describe('GET /<task-id>/run', function() {
}); });
it('should display a success message', function() { it('should display a success message', function() {
var alert = this.last.dom('[data-test=alert]').eq(0); const alert = this.last.dom('[data-test=alert]').eq(0);
assert.isDefined(alert); assert.isDefined(alert);
assert.match(alert.text(), /new results are being generated/i); assert.match(alert.text(), /new results are being generated/i);
}); });

View File

@@ -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 // it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or // the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version. // (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 // but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details. // GNU General Public License for more details.
// //
// You should have received a copy of the GNU General Public License // 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'; '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 // Run before all tests
before(function(done) { before(function(done) {
this.baseUrl = 'http://localhost:' + config.port; this.baseUrl = `http://localhost:${config.port}`;
this.last = {}; this.last = {};
this.navigate = createNavigator(this.baseUrl, this.last); this.navigate = createNavigator(this.baseUrl, this.last);
this.webservice = createWebserviceClient(config); this.webservice = createWebserviceClient(config);
assertTestAppIsRunning(this.baseUrl, function() { assertTestAppIsRunning(this.baseUrl, () => {
loadFixtures('test', config.webservice, done); loadFixtures('test', config.webservice, done);
}); });
}); });
@@ -39,7 +40,7 @@ afterEach(function(done) {
// Check that the test application is running, and exit if not // Check that the test application is running, and exit if not
function assertTestAppIsRunning(url, done) { function assertTestAppIsRunning(url, done) {
request(url, function(err) { request(url, err => {
if (err) { if (err) {
console.error('Error: Test app not started; run with `NODE_ENV=test node index.js`'); console.error('Error: Test app not started; run with `NODE_ENV=test node index.js`');
process.exit(1); process.exit(1);

View File

@@ -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 it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or the Free Software Foundation, either version 3 of the License, or
(at your option) any later version. (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 but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License 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"> <div class="col-md-8">
<h1>Hmmm, this page indicates a 404 error.</h1> <h1>Hmmm, this page indicates a 404 error.</h1>

View File

@@ -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 it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or the Free Software Foundation, either version 3 of the License, or
(at your option) any later version. (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 but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License 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"> <div class="col-md-8">
<h1>Eeek! 500 error. This is serious.</h1> <h1>Eeek! 500 error. This is serious.</h1>

View File

@@ -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 // it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or // the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version. // (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 // but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details. // GNU General Public License for more details.
// //
// You should have received a copy of the GNU General Public License // 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'; 'use strict';
var moment = require('moment'); const moment = require('moment');
module.exports = helper; module.exports = helper;
function helper(hbs) { function helper(hbs) {
// Format a date with Moment // Format a date with Moment
hbs.registerHelper('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); return moment(context).format(format);
}); });
// Get a relative date // Get a relative date
hbs.registerHelper('date-relative', function(context) { hbs.registerHelper('date-relative', context => moment(context).fromNow());
return moment(context).fromNow();
});
hbs.registerHelper('date-timestamp', function(context) {
return moment(context).valueOf();
});
hbs.registerHelper('date-timestamp', context => moment(context).valueOf());
} }

View File

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

View File

@@ -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 // it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or // the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version. // (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 // but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details. // GNU General Public License for more details.
// //
// You should have received a copy of the GNU General Public License // 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'; 'use strict';
@@ -20,7 +20,7 @@ module.exports = helper;
function helper(hbs) { function helper(hbs) {
// Simplify url by removing (eg http://, https://, trailing slashes) from url // Simplify url by removing (eg http://, https://, trailing slashes) from url
hbs.registerHelper('simplify-url', function(context) { hbs.registerHelper('simplify-url', context => {
return context.replace(/^https?:\/\//i, '').replace(/\/$/, '').toLowerCase(); return context.replace(/^https?:\/\//i, '').replace(/\/$/, '').toLowerCase();
}); });

View File

@@ -1,20 +1,20 @@
{{! {{!
This file is part of pa11y-dashboard. This file is part of Pa11y Dashboard.
pa11y-dashboard is free software: you can redistribute it and/or modify Pa11y Dashboard is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or the Free Software Foundation, either version 3 of the License, or
(at your option) any later version. (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 but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License 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 data-control="task-list">

View File

@@ -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 it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or the Free Software Foundation, either version 3 of the License, or
(at your option) any later version. (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 but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License 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> <!DOCTYPE html>
<html lang="{{lang}}" class="no-javascript"> <html lang="{{lang}}" class="no-javascript">

View File

@@ -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 it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or the Free Software Foundation, either version 3 of the License, or
(at your option) any later version. (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 but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License 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"}} {{#content "title"}}
@@ -38,7 +38,7 @@ along with pa11y-dashboard. If not, see <http://www.gnu.org/licenses/>.
<div class="row"> <div class="row">
<div class="col-md-8 col-sm-8 col-xs-10"> <div class="col-md-8 col-sm-8 col-xs-10">
<label class="control-label" for="new-task-name">Name</label> <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> </div>
</div> </div>
@@ -47,7 +47,7 @@ along with pa11y-dashboard. If not, see <http://www.gnu.org/licenses/>.
<div class="row"> <div class="row">
<div class="col-md-8 col-sm-8 col-xs-10"> <div class="col-md-8 col-sm-8 col-xs-10">
<label class="control-label" for="new-task-url">URL</label> <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> </div>
</div> </div>
@@ -102,6 +102,25 @@ along with pa11y-dashboard. If not, see <http://www.gnu.org/licenses/>.
</div> </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-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> <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"> <div class="standards-lists">

View File

@@ -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 it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or the Free Software Foundation, either version 3 of the License, or
(at your option) any later version. (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 but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License 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}} {{#unless isHomePage}}
<div class="container"> <div class="container">

View File

@@ -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 it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or the Free Software Foundation, either version 3 of the License, or
(at your option) any later version. (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 but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License 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="col-md-12 clearfix">
<div class="graph-container graph-spacer ruled 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="col-md-12 hidden">
<div class="graph-spacer ruled"> <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> <thead>
<tr> <tr>
<th>Date</th> <th>Date</th>

View File

@@ -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 it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or the Free Software Foundation, either version 3 of the License, or
(at your option) any later version. (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 but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License 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> <footer>
<div class="footer" role="contentinfo"> <div class="footer" role="contentinfo">
<div class="container"> <div class="container">
<div class="col-md-5"> <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>
<div class="col-md-7 clearfix"> <div class="col-md-7 clearfix">
<ul class="crunch-bottom floated-list nav"> <ul class="crunch-bottom floated-list nav">

View File

@@ -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 it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or the Free Software Foundation, either version 3 of the License, or
(at your option) any later version. (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 but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License 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> <header>
<div role="banner" class="header"> <div role="banner" class="header">
<div class="container"> <div class="container">
{{#if isHomePage}}<h1>{{else}}<div class="h1">{{/if}} {{#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> <span class="h3">your automated accessibility testing pal</span>
{{#if isHomePage}}</h1>{{else}}</div>{{/if}} {{#if isHomePage}}</h1>{{else}}</div>{{/if}}
</div> </div>
</div> </div>
</header> </header>

View File

@@ -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 it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or the Free Software Foundation, either version 3 of the License, or
(at your option) any later version. (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 but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License 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="col-md-12">
<div class="ruled task-header"> <div class="ruled task-header">

View File

@@ -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 it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or the Free Software Foundation, either version 3 of the License, or
(at your option) any later version. (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 but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License 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"> <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="col-md-12 col-sm-12 clearfix">
<div class="well"> <div class="well">
<h4 class="crunch-top">View results in browser</h4> <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> </div>
</div> </div>

View File

@@ -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 it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or the Free Software Foundation, either version 3 of the License, or
(at your option) any later version. (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 but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License 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="col-md-12 zfix">
<div class="ruled task-header"> <div class="ruled task-header">
@@ -27,7 +27,7 @@ along with pa11y-dashboard. If not, see <http://www.gnu.org/licenses/>.
<ul class="inline-list" role="menu"> <ul class="inline-list" role="menu">
<li><a href="/{{task.id}}/edit">Edit this task</a></li> <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.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> </ul>
{{/unless}} {{/unless}}
{{#if mainResult}} {{#if mainResult}}

View File

@@ -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 it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or the Free Software Foundation, either version 3 of the License, or
(at your option) any later version. (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 but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License 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"> <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}}/edit">Edit this task</a></li>
<li><a href="{{href}}/delete">Delete this task</a></li> <li><a href="{{href}}/delete">Delete this task</a></li>
<li class="divider"></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> </ul>
</div> </div>
{{/unless}} {{/unless}}

View File

@@ -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 // it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or // the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version. // (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 // but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details. // GNU General Public License for more details.
// //
// You should have received a copy of the GNU General Public License // 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'; 'use strict';
var standardsArray = require('../../data/standards')(); const standardsArray = require('../../data/standards')();
var rules = createStandardDescriptionMap(standardsArray); const rules = createStandardDescriptionMap(standardsArray);
module.exports = presentIgnoreRules; module.exports = presentIgnoreRules;
function presentIgnoreRules(ignore) { function presentIgnoreRules(ignore) {
return ignore.map(function(name) { return ignore.map(name => {
return { return {
name: name, name: name,
description: rules[name] description: rules[name]
@@ -30,9 +30,9 @@ function presentIgnoreRules(ignore) {
} }
function createStandardDescriptionMap(standards) { 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; map[rule.name] = rule.description;
}); });
}); });

View File

@@ -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 // it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or // the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version. // (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 // but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details. // GNU General Public License for more details.
// //
// You should have received a copy of the GNU General Public License // 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'; 'use strict';
var _ = require('underscore'); const _ = require('underscore');
var moment = require('moment'); const moment = require('moment');
module.exports = presentResultList; module.exports = presentResultList;
function presentResultList(results) { function presentResultList(results) {
var resultsByDay = _.groupBy(results, function(result) { const resultsByDay = _.groupBy(results, result => {
return moment(result.date).format('YYYY-MM-DD'); 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]); uniqueDayResults.push(resultsByDay[day][0]);
}); });
return uniqueDayResults; return uniqueDayResults;

View File

@@ -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 // it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or // the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version. // (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 // but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details. // GNU General Public License for more details.
// //
// You should have received a copy of the GNU General Public License // 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'; 'use strict';
var _ = require('underscore'); const _ = require('underscore');
var presentIgnoreRules = require('./ignore'); const presentIgnoreRules = require('./ignore');
module.exports = presentResult; module.exports = presentResult;
function presentResult(result) { function presentResult(result) {
// Add additional info // 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 // Parse date
result.date = new Date(result.date); result.date = new Date(result.date);
@@ -35,13 +35,13 @@ function presentResult(result) {
// Split out message types // Split out message types
if (result.results) { 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; firstMessage.count = groupedByCode[group].length;
return firstMessage; return firstMessage;
}); });

View File

@@ -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 // it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or // the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version. // (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 // but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details. // GNU General Public License for more details.
// //
// You should have received a copy of the GNU General Public License // 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'; 'use strict';
var presentIgnoreRules = require('./ignore'); const presentIgnoreRules = require('./ignore');
var presentResult = require('./result'); const presentResult = require('./result');
module.exports = presentTask; module.exports = presentTask;
function presentTask(task) { function presentTask(task) {
// Add additional info // 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 // Enhance the ignored rules
task.ignore = presentIgnoreRules(task.ignore); 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 // Present the last result if present
if (task.last_result) { if (task.last_result) {
task.lastResult = presentResult(task.last_result); task.lastResult = presentResult(task.last_result);

View File

@@ -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 it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or the Free Software Foundation, either version 3 of the License, or
(at your option) any later version. (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 but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License 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"}} {{#content "title"}}

View File

@@ -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 it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or the Free Software Foundation, either version 3 of the License, or
(at your option) any later version. (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 but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License 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"}} {{#content "title"}}

View File

@@ -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 it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or the Free Software Foundation, either version 3 of the License, or
(at your option) any later version. (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 but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License 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"}} {{#content "title"}}
@@ -50,7 +50,7 @@ along with pa11y-dashboard. If not, see <http://www.gnu.org/licenses/>.
<div class="row"> <div class="row">
<div class="col-md-8 col-sm-8 col-xs-10"> <div class="col-md-8 col-sm-8 col-xs-10">
<label class="control-label" for="new-task-name">Name</label> <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> </div>
</div> </div>
@@ -59,7 +59,7 @@ along with pa11y-dashboard. If not, see <http://www.gnu.org/licenses/>.
<div class="row"> <div class="row">
<div class="col-md-8 col-sm-8 col-xs-10"> <div class="col-md-8 col-sm-8 col-xs-10">
<label class="control-label" for="new-task-url">URL</label> <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> </div>
</div> </div>
@@ -114,6 +114,25 @@ along with pa11y-dashboard. If not, see <http://www.gnu.org/licenses/>.
</div> </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-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> <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"> <div class="standards-lists">

View File

@@ -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 it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or the Free Software Foundation, either version 3 of the License, or
(at your option) any later version. (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 but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License 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"}} {{#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="col-md-12" data-test="alert">
<div class="alert alert-info"> <div class="alert alert-info">
<h4>There are no results to show</h4> <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> <p><a href="{{task.hrefRun}}">Click here to generate results for this URL</a>.</p>
</div> </div>
</div> </div>