-
Notifications
You must be signed in to change notification settings - Fork 783
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix(raw-reporter): do not output
DqElement
s (#1513)
This patch updates our "raw" reporter, ensuring it does not pass `DqElement`s to its callback. Instead, it serializes the `DqElement` by using the `DqElement#toJSON()` method. Unfortunately many of our tests pass non-results to the reporters, so several "guards" were added to the reporter ensuring we don't error while attempting to transform the provided results. In an ideal world, these tests would be rewritten to pass "proper" result objects to our reporters, but this felt out-of-scope for the task at hand. Closes #1195
- Loading branch information
1 parent
2ba83d3
commit 3babcb6
Showing
2 changed files
with
163 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,32 @@ | ||
axe.addReporter('raw', function(results, options, callback) { | ||
'use strict'; | ||
|
||
if (typeof options === 'function') { | ||
callback = options; | ||
options = {}; | ||
} | ||
callback(results); | ||
|
||
// Guard against tests which don't pass an array as the first param here. | ||
if (!results || !Array.isArray(results)) { | ||
return callback(results); | ||
} | ||
|
||
const transformedResults = results.map(result => { | ||
const transformedResult = { ...result }; | ||
const types = ['passes', 'violations', 'incomplete', 'inapplicable']; | ||
for (const type of types) { | ||
// Some tests don't include all of the types, so we have to guard against that here. | ||
// TODO: ensure tests always use "proper" results to avoid having these hacks in production code paths. | ||
if (transformedResult[type] && Array.isArray(transformedResult[type])) { | ||
transformedResult[type] = transformedResult[type].map(typeResult => ({ | ||
...typeResult, | ||
node: typeResult.node.toJSON() | ||
})); | ||
} | ||
} | ||
|
||
return transformedResult; | ||
}); | ||
|
||
callback(transformedResults); | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,18 +1,150 @@ | ||
describe('reporters - raw', function() { | ||
'use strict'; | ||
|
||
it('should pass through object', function() { | ||
var fixture = document.getElementById('fixture'); | ||
|
||
function createDqElement() { | ||
var node = document.createElement('div'); | ||
fixture.appendChild(node); | ||
return new axe.utils.DqElement(node); | ||
} | ||
|
||
var mockResults; | ||
var orig; | ||
|
||
before(function() { | ||
mockResults = [ | ||
{ | ||
id: 'gimmeLabel', | ||
helpUrl: 'things', | ||
description: 'something nifty', | ||
tags: ['tag1'], | ||
result: 'passed', | ||
violations: [], | ||
passes: [ | ||
{ | ||
result: 'passed', | ||
any: [ | ||
{ | ||
result: true, | ||
data: 'minkey' | ||
} | ||
], | ||
all: [], | ||
none: [], | ||
node: createDqElement() | ||
} | ||
] | ||
}, | ||
{ | ||
id: 'idkStuff', | ||
description: 'something more nifty', | ||
pageLevel: true, | ||
result: 'failed', | ||
impact: 'cats', | ||
tags: ['tag2'], | ||
passes: [], | ||
violations: [ | ||
{ | ||
result: 'failed', | ||
all: [ | ||
{ | ||
result: false, | ||
data: 'pillock', | ||
impact: 'cats' | ||
} | ||
], | ||
any: [], | ||
none: [], | ||
node: createDqElement(), | ||
impact: 'cats' | ||
} | ||
] | ||
}, | ||
{ | ||
id: 'bypass', | ||
description: 'something even more nifty', | ||
tags: ['tag3'], | ||
impact: 'monkeys', | ||
result: 'failed', | ||
passes: [], | ||
violations: [ | ||
{ | ||
result: 'failed', | ||
impact: 'monkeys', | ||
none: [ | ||
{ | ||
data: 'foon', | ||
impact: 'monkeys', | ||
result: true | ||
} | ||
], | ||
any: [], | ||
all: [], | ||
node: createDqElement() | ||
} | ||
] | ||
}, | ||
{ | ||
id: 'blinky', | ||
description: 'something awesome', | ||
tags: ['tag4'], | ||
violations: [], | ||
result: 'passed', | ||
passes: [ | ||
{ | ||
result: 'passed', | ||
none: [ | ||
{ | ||
data: 'clueso', | ||
result: true | ||
} | ||
], | ||
node: createDqElement() | ||
} | ||
] | ||
} | ||
]; | ||
|
||
axe.testUtils.fixtureSetup(); | ||
|
||
axe._load({}); | ||
var orig = axe._runRules; | ||
orig = axe._runRules; | ||
axe._runRules = function(_, __, cb) { | ||
cb('foo', function noop() {}); | ||
cb(mockResults, function noop() {}); | ||
}; | ||
}); | ||
|
||
after(function() { | ||
axe._runRules = orig; | ||
fixture.innerHTML = ''; | ||
}); | ||
|
||
it('should pass through object', function(done) { | ||
axe.run({ reporter: 'raw' }, function(err, results) { | ||
assert.isNull(err); | ||
assert.equal(results, 'foo'); | ||
if (err) { | ||
return done(err); | ||
} | ||
assert.isTrue(Array.isArray(results)); | ||
done(); | ||
}); | ||
}); | ||
|
||
axe._runRules = orig; | ||
it('should serialize DqElements (#1195)', function(done) { | ||
axe.run({ reporter: 'raw' }, function(err, results) { | ||
if (err) { | ||
return done(err); | ||
} | ||
|
||
for (var i = 0; i < results.length; i++) { | ||
var result = results[i]; | ||
for (var j = 0; j < result.passes.length; j++) { | ||
var p = result.passes[j]; | ||
assert.notInstanceOf(p.node, axe.utils.DqElement); | ||
} | ||
} | ||
|
||
done(); | ||
}); | ||
}); | ||
}); |