Skip to content

Commit

Permalink
feat: Convert to using external middleware reporter package
Browse files Browse the repository at this point in the history
  • Loading branch information
scalvert committed Aug 6, 2021
1 parent 3e36d5f commit 287eb98
Show file tree
Hide file tree
Showing 5 changed files with 44 additions and 58 deletions.
22 changes: 9 additions & 13 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@ const path = require('path');
const fs = require('fs');
const VersionChecker = require('ember-cli-version-checker');
const validatePeerDependencies = require('validate-peer-dependencies');
const setupMiddleware = require('./setup-middleware');
const {
setupMiddlewareHooks,
} = require('@scalvert/ember-setup-middleware-reporter');
const CliOptionsFilter = require('./cli-options-filter');

// The different types/area for which we have content for.
Expand Down Expand Up @@ -64,18 +66,6 @@ module.exports = {
}
},

serverMiddleware(startOptions) {
setupMiddleware(startOptions.app, {
root: this.project.root,
});
},

testemMiddleware(app) {
setupMiddleware(app, {
root: this.project.root,
});
},

/**
* Allow the option to enable a11y audit and middelware reporter using environmental
* variables. If set, environmental variable values are exposed to the browser
Expand All @@ -86,4 +76,10 @@ module.exports = {
const processedTree = new CliOptionsFilter(tree);
return this._super.treeForAddonTestSupport.call(this, processedTree);
},

...setupMiddlewareHooks({
name: 'ember-a11y-testing',
urlPath: 'report-violations',
reportDir: 'ember-a11y-report',
}),
};
11 changes: 9 additions & 2 deletions node-tests/setup-middleware-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@ const fs = require('fs');
const tmp = require('tmp');
const express = require('express');
const readJSONSync = require('fs-extra').readJSONSync;
const setupMiddleware = require('../setup-middleware');
const {
setupMiddleware,
} = require('@scalvert/ember-setup-middleware-reporter');
const violationsFixture = require('./fixtures/violations');

function createTmpDir() {
Expand Down Expand Up @@ -32,7 +34,12 @@ QUnit.module('setupMiddleware', function (hooks) {
tmpDir = createTmpDir();
app = express();

setupMiddleware(app, { root: tmpDir });
setupMiddleware(app, {
root: tmpDir,
name: 'ember-a11y-testing',
urlPath: 'report-violations',
reportDir: 'ember-a11y-report',
});

server = app.listen(3000);
});
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
},
"dependencies": {
"@ember/test-waiters": "^2.4.3",
"@scalvert/ember-setup-middleware-reporter": "^0.1.1",
"axe-core": "^4.1.4",
"body-parser": "^1.19.0",
"broccoli-persistent-filter": "^3.1.2",
Expand Down
43 changes: 0 additions & 43 deletions setup-middleware.js

This file was deleted.

25 changes: 25 additions & 0 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1506,6 +1506,16 @@
dependencies:
"@octokit/openapi-types" "^8.1.4"

"@scalvert/ember-setup-middleware-reporter@^0.1.1":
version "0.1.1"
resolved "https://registry.yarnpkg.com/@scalvert/ember-setup-middleware-reporter/-/ember-setup-middleware-reporter-0.1.1.tgz#bdd74c19d99feeef8807dea9c9ee2d272b6c1923"
integrity sha512-C5DHU6YlKaISB5utGQ+jpsMB57ZtY0uZ8UkD29j855BjqG6eJ98lhA2h/BoJbyPw89RKLP1EEXroy9+5JPoyVw==
dependencies:
"@types/fs-extra" "^9.0.12"
body-parser "^1.19.0"
errorhandler "^1.5.1"
fs-extra "^10.0.0"

"@simple-dom/interface@^1.4.0":
version "1.4.0"
resolved "https://registry.yarnpkg.com/@simple-dom/interface/-/interface-1.4.0.tgz#e8feea579232017f89b0138e2726facda6fbb71f"
Expand Down Expand Up @@ -1835,6 +1845,13 @@
dependencies:
"@types/node" "*"

"@types/fs-extra@^9.0.12":
version "9.0.12"
resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.12.tgz#9b8f27973df8a7a3920e8461517ebf8a7d4fdfaf"
integrity sha512-I+bsBr67CurCGnSenZZ7v94gd3tc3+Aj2taxMT4yu4ABLuOgOjeFxX3dokG24ztSRg5tnT00sL8BszO7gSMoIw==
dependencies:
"@types/node" "*"

"@types/glob@*", "@types/glob@^7.1.1":
version "7.1.3"
resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.3.tgz#e6ba80f36b7daad2c685acd9266382e68985c183"
Expand Down Expand Up @@ -6446,6 +6463,14 @@ error@^7.0.0:
dependencies:
string-template "~0.2.1"

errorhandler@^1.5.1:
version "1.5.1"
resolved "https://registry.yarnpkg.com/errorhandler/-/errorhandler-1.5.1.tgz#b9ba5d17cf90744cd1e851357a6e75bf806a9a91"
integrity sha512-rcOwbfvP1WTViVoUjcfZicVzjhjTuhSMntHh6mW3IrEiyE6mJyXvsToJUJGlGlw/2xU9P5whlWNGlIDVeCiT4A==
dependencies:
accepts "~1.3.7"
escape-html "~1.0.3"

es-abstract@^1.17.0-next.1, es-abstract@^1.17.5:
version "1.17.6"
resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.6.tgz#9142071707857b2cacc7b89ecb670316c3e2d52a"
Expand Down

0 comments on commit 287eb98

Please sign in to comment.