Merge pull request #733 from dequelabs/axe-3-checks

Update remaining checks to support Shadow DOM
dequelabs · Feb 19, 2018 · 3aaacea · 3aaacea
2 parents 5d99c73 + 0e48413
commit 3aaacea
Show file tree

Hide file tree

Showing 44 changed files with 312 additions and 458 deletions.
diff --git a/lib/checks/keyboard/focusable-no-name.js b/lib/checks/keyboard/focusable-no-name.js
@@ -3,4 +3,4 @@ var tabIndex = node.getAttribute('tabindex'),
 if (!inFocusOrder) {
 	return false;
 }
-return !axe.commons.text.accessibleText(node);
+return !axe.commons.text.accessibleTextVirtual(virtualNode);
diff --git a/lib/checks/label/implicit.js b/lib/checks/label/implicit.js
@@ -1,6 +1,6 @@
 
 var label = axe.commons.dom.findUpVirtual(virtualNode, 'label');
 if (label) {
-	return !!axe.commons.text.accessibleText(label);
+	return !!axe.commons.text.accessibleTextVirtual(label);
 }
 return false;
diff --git a/lib/checks/navigation/header-present.js b/lib/checks/navigation/header-present.js
@@ -1 +1 @@
-return !!node.querySelector('h1, h2, h3, h4, h5, h6, [role="heading"]');
+return !!axe.utils.querySelectorAll(virtualNode, 'h1, h2, h3, h4, h5, h6, [role="heading"]')[0];
diff --git a/lib/checks/navigation/internal-link-present.js b/lib/checks/navigation/internal-link-present.js
@@ -1 +1,2 @@
-return !!node.querySelector('a[href^="#"]');
+const links = axe.utils.querySelectorAll(virtualNode, 'a[href]');
+return links.some(vLink => vLink.actualNode.getAttribute('href')[0] === '#');
diff --git a/lib/checks/shared/button-has-visible-text.js b/lib/checks/shared/button-has-visible-text.js
@@ -3,7 +3,7 @@ let role = node.getAttribute('role');
 let label;
 
 if (nodeName === 'BUTTON' || (role === 'button' && nodeName !== 'INPUT')) {
-	label = axe.commons.text.accessibleText(node);
+	label = axe.commons.text.accessibleTextVirtual(virtualNode);
 	this.data(label);
 
 	return !!label;

diff --git a/lib/checks/shared/has-visible-text.js b/lib/checks/shared/has-visible-text.js
@@ -1 +1 @@
-return axe.commons.text.accessibleText(node).length > 0;
+return axe.commons.text.accessibleTextVirtual(virtualNode).length > 0;
diff --git a/lib/checks/tables/same-caption-summary.js b/lib/checks/tables/same-caption-summary.js
@@ -1 +1,2 @@
+// passing node.caption to accessibleText instead of using the logic in accessibleTextVirtual on virtualNode
 return !!(node.summary && node.caption) && node.summary === axe.commons.text.accessibleText(node.caption);
diff --git a/test/checks/aria/allowed-attr.js b/test/checks/aria/allowed-attr.js
@@ -2,17 +2,11 @@ describe('aria-allowed-attr', function () {
 	'use strict';
 
 	var fixture = document.getElementById('fixture');
-
-	var checkContext = {
-		_data: null,
-		data: function (d) {
-			this._data = d;
-		}
-	};
+	var checkContext = axe.testUtils.MockCheckContext();
 
 	afterEach(function () {
 		fixture.innerHTML = '';
-		checkContext._data = null;
+		checkContext.reset();
 	});
 
 	it('should detect incorrectly used attributes', function () {
@@ -25,8 +19,6 @@ describe('aria-allowed-attr', function () {
 
 		assert.isFalse(checks['aria-allowed-attr'].evaluate.call(checkContext, node));
 		assert.deepEqual(checkContext._data, ['aria-selected="true"']);
-
-
 	});
 
 	it('should not report on required attributes', function () {
@@ -38,8 +30,6 @@ describe('aria-allowed-attr', function () {
 		fixture.appendChild(node);
 
 		assert.isTrue(checks['aria-allowed-attr'].evaluate.call(checkContext, node));
-
-
 	});
 
 	it('should detect incorrectly used attributes - implicit role', function () {
@@ -52,8 +42,6 @@ describe('aria-allowed-attr', function () {
 
 		assert.isFalse(checks['aria-allowed-attr'].evaluate.call(checkContext, node));
 		assert.deepEqual(checkContext._data, ['aria-selected="true"']);
-
-
 	});
 
 	it('should return true if there is no role', function () {
@@ -66,8 +54,6 @@ describe('aria-allowed-attr', function () {
 
 		assert.isTrue(checks['aria-allowed-attr'].evaluate.call(checkContext, node));
 		assert.isNull(checkContext._data);
-
-
 	});
 
 	it('should determine attribute validity by calling axe.commons.aria.allowedAttr', function () {
@@ -103,8 +89,6 @@ describe('aria-allowed-attr', function () {
 
 		assert.isTrue(checks['aria-allowed-attr'].evaluate.call(checkContext, node));
 		assert.isNull(checkContext._data);
-
-
 	});
 
 	it('should not report on allowed attributes', function () {

diff --git a/test/checks/aria/aria-hidden-body.js b/test/checks/aria/aria-hidden-body.js
@@ -2,16 +2,10 @@ describe('aria-hidden', function () {
 	'use strict';
 
 	var node = document.getElementsByTagName('body')[0];
-
-	var checkContext = {
-		_data: null,
-		data: function (d) {
-			this._data = d;
-		}
-	};
+	var checkContext = axe.testUtils.MockCheckContext();
 
 	afterEach(function () {
-		checkContext._data = null;
+		checkContext.reset();
 		node.removeAttribute('aria-hidden');
 	});
 

diff --git a/test/checks/aria/errormessage.js b/test/checks/aria/errormessage.js
@@ -2,12 +2,13 @@ describe('aria-errormessage', function () {
 	'use strict';
 
 	var fixture = document.getElementById('fixture');
-
+	var shadowSupported = axe.testUtils.shadowSupport.v1;
+	var shadowCheckSetup = axe.testUtils.shadowCheckSetup;
 	var checkContext = axe.testUtils.MockCheckContext();
 
 	afterEach(function () {
 		fixture.innerHTML = '';
-		checkContext._data = null;
+		checkContext.reset();
 	});
 
 	it('should return false if aria-errormessage value is invalid', function () {
@@ -46,4 +47,23 @@ describe('aria-errormessage', function () {
 		target.setAttribute('aria-describedby', 'plain');
 		assert.isTrue(checks['aria-errormessage'].evaluate.call(checkContext, target));
 	});
+
+	(shadowSupported ? it : xit)
+	('should return false if aria-errormessage value crosses shadow boundary', function () {
+		var params = shadowCheckSetup(
+			'<div id="target" aria-errormessage="live"></div>',
+			'<div id="live" aria-live="assertive"></div>'
+		);
+		assert.isFalse(checks['aria-errormessage'].evaluate.apply(checkContext, params));
+	});
+
+	(shadowSupported ? it : xit)
+	('should return true if aria-errormessage and value are inside shadow dom', function () {
+		var params = shadowCheckSetup(
+			'<div></div>',
+			'<div id="target" aria-errormessage="live"</div>' +
+			'<div id="live" aria-live="assertive"></div>'
+		);
+		assert.isTrue(checks['aria-errormessage'].evaluate.apply(checkContext, params));
+	});
 });
diff --git a/test/checks/aria/required-attr.js b/test/checks/aria/required-attr.js
@@ -2,17 +2,11 @@ describe('aria-required-attr', function () {
 	'use strict';
 
 	var fixture = document.getElementById('fixture');
-
-	var checkContext = {
-		_data: null,
-		data: function (d) {
-			this._data = d;
-		}
-	};
+	var checkContext = axe.testUtils.MockCheckContext();
 
 	afterEach(function () {
 		fixture.innerHTML = '';
-		checkContext._data = null;
+		checkContext.reset();
 	});
 
 	it('should detect missing attributes', function () {

diff --git a/test/checks/aria/required-children.js b/test/checks/aria/required-children.js
@@ -3,20 +3,13 @@ describe('aria-required-children', function () {
 
 	var fixture = document.getElementById('fixture');
 	var shadowSupported = axe.testUtils.shadowSupport.v1;
-
-	var checkContext = {
-		_data: null,
-		data: function (d) {
-			this._data = d;
-		}
-	};
-
+	var checkContext = axe.testUtils.MockCheckContext();
 	var checkSetup = axe.testUtils.checkSetup;
 
 	afterEach(function () {
 		fixture.innerHTML = '';
 		axe._tree = undefined;
-		checkContext._data = null;
+		checkContext.reset();
 	});
 
 	it('should detect missing sole required child', function () {

diff --git a/test/checks/aria/required-parent.js b/test/checks/aria/required-parent.js
@@ -3,19 +3,12 @@ describe('aria-required-parent', function () {
 
 	var fixture = document.getElementById('fixture');
 	var shadowSupported = axe.testUtils.shadowSupport.v1;
-
-	var checkContext = {
-		_data: null,
-		data: function (d) {
-			this._data = d;
-		}
-	};
-
+	var checkContext = axe.testUtils.MockCheckContext();
 	var checkSetup = axe.testUtils.checkSetup;
 
 	afterEach(function () {
 		fixture.innerHTML = '';
-		checkContext._data = null;
+		checkContext.reset();
 		axe._tree = undefined;
 	});
 

diff --git a/test/checks/aria/valid-attr-value.js b/test/checks/aria/valid-attr-value.js
@@ -2,17 +2,11 @@ describe('aria-valid-attr-value', function () {
 	'use strict';
 
 	var fixture = document.getElementById('fixture');
-
-	var checkContext = {
-		_data: null,
-		data: function (d) {
-			this._data = d;
-		}
-	};
+	var checkContext = axe.testUtils.MockCheckContext();
 
 	afterEach(function () {
 		fixture.innerHTML = '';
-		checkContext._data = null;
+		checkContext.reset();
 	});
 
 	it('should not check the validity of attribute names', function () {

diff --git a/test/checks/aria/valid-attr.js b/test/checks/aria/valid-attr.js
@@ -2,17 +2,11 @@ describe('aria-valid-attr', function () {
 	'use strict';
 
 	var fixture = document.getElementById('fixture');
-
-	var checkContext = {
-		_data: null,
-		data: function (d) {
-			this._data = d;
-		}
-	};
+	var checkContext = axe.testUtils.MockCheckContext();
 
 	afterEach(function () {
 		fixture.innerHTML = '';
-		checkContext._data = null;
+		checkContext.reset();
 	});
 
 	it('should return false if any invalid ARIA attributes are found', function () {

diff --git a/test/checks/color/color-contrast.js b/test/checks/color/color-contrast.js
@@ -5,22 +5,11 @@ describe('color-contrast', function () {
 	var fixtureSetup = axe.testUtils.fixtureSetup;
 	var shadowSupported = axe.testUtils.shadowSupport.v1;
 	var shadowCheckSetup = axe.testUtils.shadowCheckSetup;
-
-	var checkContext = {
-		_relatedNodes: [],
-		_data: null,
-		data: function (d) {
-			this._data = d;
-		},
-		relatedNodes: function (rn) {
-			this._relatedNodes = rn;
-		}
-	};
+	var checkContext = axe.testUtils.MockCheckContext();
 
 	afterEach(function () {
 		fixture.innerHTML = '';
-		checkContext._relatedNodes = [];
-		checkContext._data = null;
+		checkContext.reset();
 		axe._tree = undefined;
 	});
 

diff --git a/test/checks/color/link-in-text-block.js b/test/checks/color/link-in-text-block.js
@@ -5,16 +5,7 @@ describe('link-in-text-block', function () {
 	var shadowSupport = axe.testUtils.shadowSupport;
 	var styleElm;
 
-	var checkContext = {
-		_relatedNodes: [],
-		_data: null,
-		data: function (d) {
-			this._data = d;
-		},
-		relatedNodes: function (rn) {
-			this._relatedNodes = rn;
-		}
-	};
+	var checkContext = axe.testUtils.MockCheckContext();
 
 	before(function () {
 		styleElm = document.createElement('style');
@@ -33,8 +24,7 @@ describe('link-in-text-block', function () {
 	afterEach(function () {
 		fixture.innerHTML = '';
 		styleElm.innerHTML = '';
-		checkContext._relatedNodes = [];
-		checkContext._data = null;
+		checkContext.reset();
 	});
 
 	after(function () {

diff --git a/test/checks/forms/fieldset.js b/test/checks/forms/fieldset.js
@@ -4,19 +4,11 @@ describe('fieldset', function () {
 	var shadowSupport = axe.testUtils.shadowSupport.v1;
 	var fixtureSetup = axe.testUtils.fixtureSetup;
 
-	var checkContext = {
-		_data: null,
-		data: function (d) {
-			this._data = d;
-		},
-		relatedNodes: function (nodes) {
-			this._relatedNodes = Array.isArray(nodes) ? nodes : [nodes];
-		}
-	};
+	var checkContext = axe.testUtils.MockCheckContext();
 
 	afterEach(function () {
 		fixture.innerHTML = '';
-		checkContext._data = null;
+		checkContext.reset();
 	});
 
 	function tests(type) {

diff --git a/test/checks/forms/group-labelledby.js b/test/checks/forms/group-labelledby.js
@@ -5,20 +5,15 @@ describe('group-labelledby', function () {
 	var fixtureSetup = axe.testUtils.fixtureSetup;
 	var shadowSupport = axe.testUtils.shadowSupport.v1;
 
-	var checkContext = {
-		_data: null,
-		data: function (d) {
-			this._data = d;
-		}
-	};
+	var checkContext = axe.testUtils.MockCheckContext();
 
 	beforeEach(function () {
 		axe._tree = undefined;
 	});
 
 	afterEach(function () {
 		fixture.innerHTML = '';
-		checkContext._data = null;
+		checkContext.reset();
 	});
 
 	function tests(type) {

diff --git a/test/checks/keyboard/accesskeys.js b/test/checks/keyboard/accesskeys.js
@@ -3,22 +3,11 @@ describe('accesskeys', function () {
 
 	var fixture = document.getElementById('fixture');
 
-
-	var checkContext = {
-		_relatedNodes: [],
-		_data: null,
-		data: function (d) {
-			this._data = d;
-		},
-		relatedNodes: function (rn) {
-			this._relatedNodes = rn;
-		}
-	};
+	var checkContext = axe.testUtils.MockCheckContext();
 
 	afterEach(function () {
 		fixture.innerHTML = '';
-		checkContext._relatedNodes = [];
-		checkContext._data = null;
+		checkContext.reset();
 	});
 
 	it('should return true and record accesskey', function () {