From 289af761d707c14d5c2aa42d8fc44949c5ad1272 Mon Sep 17 00:00:00 2001
From: Dylan Barrell <dylan@barrell.com>
Date: Fri, 24 Mar 2017 15:28:10 -0400
Subject: [PATCH 001/142] add first implementation of getComposedTree with v1
 tests

---
 lib/core/utils/composed-tree.js  |  95 ++++++++++++++++++++++++++
 test/core/utils/composed-tree.js | 110 +++++++++++++++++++++++++++++++
 2 files changed, 205 insertions(+)
 create mode 100644 lib/core/utils/composed-tree.js
 create mode 100644 test/core/utils/composed-tree.js

diff --git a/lib/core/utils/composed-tree.js b/lib/core/utils/composed-tree.js
new file mode 100644
index 0000000000..53991b4eb8
--- /dev/null
+++ b/lib/core/utils/composed-tree.js
@@ -0,0 +1,95 @@
+/* global console */
+var axe = axe || { utils: {} };
+/**
+ * NOTE: level only increases on "real" nodes because others do not exist in the composed tree
+ */
+axe.utils.printComposedTree = function (node, level) {
+	var indent = '  '.repeat(level) + '\u2514> ';
+	var nodeName;
+	if (node.shadowRoot) {
+		node.shadowRoot.childNodes.forEach(function (child) {
+			axe.utils.printComposedTree(child, level);
+		});
+	} else {
+		nodeName = node.nodeName.toLowerCase();
+		if (['style', 'template', 'script'].indexOf(nodeName) !== -1) {
+			return;
+		}
+		if (nodeName === 'content') {
+			node.getDistributedNodes().forEach(function (child) {
+				axe.utils.printComposedTree(child, level);
+			});
+		} else if (nodeName === 'slot') {
+			node.assignedNodes().forEach(function (child) {
+				axe.utils.printComposedTree(child, level);
+			});
+		} else {
+			if (node.nodeType === 1) {
+				console.log(indent, node);
+				node.childNodes.forEach(function (child) {
+					axe.utils.printComposedTree(child, level + 1);
+				});
+			}
+		}
+	}
+};
+
+function virtualDOMfromNode (node, shadowId) {
+	// todo: attributes'n shit (maybe)
+	return {
+		shadowId: shadowId,
+		children: [],
+		actualNode: node
+	};
+}
+
+/**
+ * recursvely returns an array of the virtual DOM nodes at this level
+ * excluding comment nodes and of course the shadow DOM nodes
+ * <content> and <slot>
+ *
+ * @param {Node} node the current node
+ * @param {String} shadowId, optional ID of the shadow DOM that is the closest shadow
+ *                           ancestor of the node
+ */
+
+axe.utils.getComposedTree = function (node, shadowId) {
+	// using a closure here and therefore cannot easily refactor toreduce the statements
+	//jshint maxstatements: false
+	var retVal, realArray, nodeName;
+	function reduceShadowDOM (res, child) {
+		var replacements = axe.utils.getComposedTree(child, shadowId);
+		if (replacements) {
+			res = res.concat(replacements);
+		}
+		return res;
+	}
+
+	if (node.shadowRoot) {
+		// generate an ID for this shadow root and overwrite the current
+		// closure shadowId with this value so that it cascades down the tree
+		shadowId = 'a' + Math.random().toString().substring(2);
+		realArray = Array.from(node.shadowRoot.childNodes);
+		return realArray.reduce(reduceShadowDOM, []);
+	} else {
+		nodeName = node.nodeName.toLowerCase();
+		if (nodeName === 'content') {
+			realArray = Array.from(node.getDistributedNodes());
+			return realArray.reduce(reduceShadowDOM, []);
+		} else if (nodeName === 'slot') {
+			realArray = Array.from(node.assignedNodes());
+			return realArray.reduce(reduceShadowDOM, []);
+		} else {
+			if (node.nodeType === 1) {
+				retVal = virtualDOMfromNode(node, shadowId);
+				realArray = Array.from(node.childNodes);
+				retVal.children = realArray.reduce(reduceShadowDOM, []);
+				return [retVal];
+			} else if (node.nodeType === 3) {
+				// text
+				return [virtualDOMfromNode(node)];
+			}
+			return undefined;
+		}
+	}
+};
diff --git a/test/core/utils/composed-tree.js b/test/core/utils/composed-tree.js
new file mode 100644
index 0000000000..9509402e28
--- /dev/null
+++ b/test/core/utils/composed-tree.js
@@ -0,0 +1,110 @@
+var fixture = document.getElementById('fixture');
+
+if (document.body && typeof document.body.createShadowRoot === 'function') {
+	describe('composed-tree shadow DOM v0', function () {
+		'use strict';
+		afterEach(function () {
+			fixture.innerHTML = '';
+		});
+		it('shadow DOM v0');
+	});
+}
+
+if (document.body && typeof document.body.attachShadow === 'function') {
+	describe('composed-tree shadow DOM v1', function () {
+		'use strict';
+		afterEach(function () {
+			fixture.innerHTML = '';
+		});
+		beforeEach(function () {
+			function createStoryGroup (className, slotName) {
+				var group = document.createElement('div');
+				group.className = className;
+				// Empty string in slot name attribute or absence thereof work the same, so no need for special handling.
+				group.innerHTML = '<ul><slot name="' + slotName + '"></slot></ul>';
+				return group;
+			}
+
+			function createStyle () {
+				var style = document.createElement('style');
+				style.textContent = 'div.breaking { color: Red;font-size: 20px; border: 1px dashed Purple; }' +
+					'div.other { padding: 2px 0 0 0; border: 1px solid Cyan; }';
+				return style;
+			}
+
+			function makeShadowTree (storyList) {
+				var root = storyList.attachShadow({mode: 'open'});
+				root.appendChild(createStyle());
+				root.appendChild(createStoryGroup('breaking', 'breaking'));
+				root.appendChild(createStoryGroup('other', ''));
+			}
+			var str = '<div class="stories"><li>1</li>' +
+			'<li>2</li><li class="breaking" slot="breaking">3</li>' +
+			'<li>4</li><li>5</li><li class="breaking" slot="breaking">6</li></div>';
+			str += '<div class="stories"><li>1</li>' +
+			'<li>2</li><li class="breaking" slot="breaking">3</li>' +
+			'<li>4</li><li>5</li><li class="breaking" slot="breaking">6</li></div>';
+			fixture.innerHTML = str;
+
+			fixture.querySelectorAll('.stories').forEach(makeShadowTree);
+		});
+		it('should support shadow DOM v1', function () {
+			assert.isDefined(fixture.firstChild.shadowRoot);
+		});
+		it('getComposedTree should return an array of stuff', function () {
+			assert.isTrue(Array.isArray(axe.utils.getComposedTree(fixture.firstChild)));
+		});
+		it('getComposedTree\'s virtual DOM should represent the composed tree', function () {
+			var virtualDOM = axe.utils.getComposedTree(fixture.firstChild);
+			assert.equal(virtualDOM.length, 3);
+			assert.equal(virtualDOM[0].actualNode.nodeName, 'STYLE');
+
+			// breaking news stories
+			assert.equal(virtualDOM[1].actualNode.nodeName, 'DIV');
+			assert.equal(virtualDOM[1].actualNode.className, 'breaking');
+
+			// other news stories
+			assert.equal(virtualDOM[2].actualNode.nodeName, 'DIV');
+			assert.equal(virtualDOM[2].actualNode.className, 'other');
+
+			// breaking
+			assert.equal(virtualDOM[1].children.length, 1);
+			assert.equal(virtualDOM[1].children[0].actualNode.nodeName, 'UL');
+			virtualDOM[1].children[0].children.forEach(function (child, index) {
+				assert.equal(child.actualNode.nodeName, 'LI');
+				assert.isTrue(child.actualNode.textContent === 3*(index + 1) + '');
+			});
+			assert.equal(virtualDOM[1].children[0].children.length, 2);
+
+			// other
+			assert.equal(virtualDOM[2].children.length, 1);
+			assert.equal(virtualDOM[2].children[0].actualNode.nodeName, 'UL');
+			assert.equal(virtualDOM[2].children[0].children.length, 4);
+		});
+		it('getComposedTree\'s virtual DOM should give an ID to the shadow DOM', function () {
+			var virtualDOM = axe.utils.getComposedTree(fixture);
+			assert.isUndefined(virtualDOM[0].shadowId);
+			assert.isDefined(virtualDOM[0].children[0].shadowId);
+			assert.isDefined(virtualDOM[0].children[1].shadowId);
+			assert.isDefined(virtualDOM[0].children[4].shadowId);
+			// shadow IDs in the same shadowRoot must be the same
+			assert.equal(virtualDOM[0].children[0].shadowId,
+				virtualDOM[0].children[1].shadowId);
+			// should cascade
+			assert.equal(virtualDOM[0].children[1].shadowId,
+				virtualDOM[0].children[1].children[0].shadowId);
+			// shadow IDs in different shadowRoots must be different
+			assert.notEqual(virtualDOM[0].children[0].shadowId,
+				virtualDOM[0].children[4].shadowId);
+
+		});
+	});
+}
+
+if (document.body && typeof document.body.attachShadow === 'undefined' &&
+	typeof document.body.createShadowRoot === 'undefined') {
+	describe('composed-tree', function () {
+		'use strict';
+		it('SHADOW DOM TESTS DEFERRED, NO SUPPORT');
+	});
+}

From 2d8c40a8752a75b408e0629f9da5aa8986851966 Mon Sep 17 00:00:00 2001
From: Dylan Barrell <dylan@barrell.com>
Date: Fri, 24 Mar 2017 16:58:03 -0400
Subject: [PATCH 002/142] add tests for shadow DOM v0

---
 test/core/utils/composed-tree.js | 145 ++++++++++++++++++++-----------
 1 file changed, 93 insertions(+), 52 deletions(-)

diff --git a/test/core/utils/composed-tree.js b/test/core/utils/composed-tree.js
index 9509402e28..5772daf92c 100644
--- a/test/core/utils/composed-tree.js
+++ b/test/core/utils/composed-tree.js
@@ -1,12 +1,102 @@
 var fixture = document.getElementById('fixture');
 
+function createStyle () {
+	'use strict';
+
+	var style = document.createElement('style');
+	style.textContent = 'div.breaking { color: Red;font-size: 20px; border: 1px dashed Purple; }' +
+		'div.other { padding: 2px 0 0 0; border: 1px solid Cyan; }';
+	return style;
+}
+
+function composedTreeAssertions () {
+	'use strict';
+
+	var virtualDOM = axe.utils.getComposedTree(fixture.firstChild);
+	assert.equal(virtualDOM.length, 3);
+	assert.equal(virtualDOM[0].actualNode.nodeName, 'STYLE');
+
+	// breaking news stories
+	assert.equal(virtualDOM[1].actualNode.nodeName, 'DIV');
+	assert.equal(virtualDOM[1].actualNode.className, 'breaking');
+
+	// other news stories
+	assert.equal(virtualDOM[2].actualNode.nodeName, 'DIV');
+	assert.equal(virtualDOM[2].actualNode.className, 'other');
+
+	// breaking
+	assert.equal(virtualDOM[1].children.length, 1);
+	assert.equal(virtualDOM[1].children[0].actualNode.nodeName, 'UL');
+	virtualDOM[1].children[0].children.forEach(function (child, index) {
+		assert.equal(child.actualNode.nodeName, 'LI');
+		assert.isTrue(child.actualNode.textContent === 3*(index + 1) + '');
+	});
+	assert.equal(virtualDOM[1].children[0].children.length, 2);
+
+	// other
+	assert.equal(virtualDOM[2].children.length, 1);
+	assert.equal(virtualDOM[2].children[0].actualNode.nodeName, 'UL');
+	assert.equal(virtualDOM[2].children[0].children.length, 4);
+}
+
+function shadowIdAssertions () {
+	'use strict';
+
+	var virtualDOM = axe.utils.getComposedTree(fixture);
+	assert.isUndefined(virtualDOM[0].shadowId);
+	assert.isDefined(virtualDOM[0].children[0].shadowId);
+	assert.isDefined(virtualDOM[0].children[1].shadowId);
+	assert.isDefined(virtualDOM[0].children[4].shadowId);
+	// shadow IDs in the same shadowRoot must be the same
+	assert.equal(virtualDOM[0].children[0].shadowId,
+		virtualDOM[0].children[1].shadowId);
+	// should cascade
+	assert.equal(virtualDOM[0].children[1].shadowId,
+		virtualDOM[0].children[1].children[0].shadowId);
+	// shadow IDs in different shadowRoots must be different
+	assert.notEqual(virtualDOM[0].children[0].shadowId,
+		virtualDOM[0].children[4].shadowId);
+
+}
+
 if (document.body && typeof document.body.createShadowRoot === 'function') {
 	describe('composed-tree shadow DOM v0', function () {
 		'use strict';
 		afterEach(function () {
 			fixture.innerHTML = '';
 		});
-		it('shadow DOM v0');
+		beforeEach(function () {
+			function createStoryGroup (className, contentSelector) {
+				var group = document.createElement('div');
+				group.className = className;
+				group.innerHTML = '<ul><content select="' + contentSelector + '"></content></ul>';
+				return group;
+			}
+
+			function makeShadowTree (storyList) {
+				var root = storyList.createShadowRoot();
+				root.appendChild(createStyle());
+				root.appendChild(createStoryGroup('breaking', '.breaking'));
+				root.appendChild(createStoryGroup('other', ''));
+			}
+			var str = '<div class="stories"><li>1</li>' +
+			'<li>2</li><li class="breaking" slot="breaking">3</li>' +
+			'<li>4</li><li>5</li><li class="breaking">6</li></div>';
+			str += '<div class="stories"><li>1</li>' +
+			'<li>2</li><li class="breaking" slot="breaking">3</li>' +
+			'<li>4</li><li>5</li><li class="breaking">6</li></div>';
+			fixture.innerHTML = str;
+
+			fixture.querySelectorAll('.stories').forEach(makeShadowTree);
+		});
+		it('it should support shadow DOM v0', function () {
+			assert.isDefined(fixture.firstChild.shadowRoot);
+		});
+		it('getComposedTree should return an array of stuff', function () {
+			assert.isTrue(Array.isArray(axe.utils.getComposedTree(fixture.firstChild)));
+		});
+		it('getComposedTree\'s virtual DOM should represent the composed tree', composedTreeAssertions);
+		it('getComposedTree\'s virtual DOM should give an ID to the shadow DOM', shadowIdAssertions);
 	});
 }
 
@@ -25,13 +115,6 @@ if (document.body && typeof document.body.attachShadow === 'function') {
 				return group;
 			}
 
-			function createStyle () {
-				var style = document.createElement('style');
-				style.textContent = 'div.breaking { color: Red;font-size: 20px; border: 1px dashed Purple; }' +
-					'div.other { padding: 2px 0 0 0; border: 1px solid Cyan; }';
-				return style;
-			}
-
 			function makeShadowTree (storyList) {
 				var root = storyList.attachShadow({mode: 'open'});
 				root.appendChild(createStyle());
@@ -54,50 +137,8 @@ if (document.body && typeof document.body.attachShadow === 'function') {
 		it('getComposedTree should return an array of stuff', function () {
 			assert.isTrue(Array.isArray(axe.utils.getComposedTree(fixture.firstChild)));
 		});
-		it('getComposedTree\'s virtual DOM should represent the composed tree', function () {
-			var virtualDOM = axe.utils.getComposedTree(fixture.firstChild);
-			assert.equal(virtualDOM.length, 3);
-			assert.equal(virtualDOM[0].actualNode.nodeName, 'STYLE');
-
-			// breaking news stories
-			assert.equal(virtualDOM[1].actualNode.nodeName, 'DIV');
-			assert.equal(virtualDOM[1].actualNode.className, 'breaking');
-
-			// other news stories
-			assert.equal(virtualDOM[2].actualNode.nodeName, 'DIV');
-			assert.equal(virtualDOM[2].actualNode.className, 'other');
-
-			// breaking
-			assert.equal(virtualDOM[1].children.length, 1);
-			assert.equal(virtualDOM[1].children[0].actualNode.nodeName, 'UL');
-			virtualDOM[1].children[0].children.forEach(function (child, index) {
-				assert.equal(child.actualNode.nodeName, 'LI');
-				assert.isTrue(child.actualNode.textContent === 3*(index + 1) + '');
-			});
-			assert.equal(virtualDOM[1].children[0].children.length, 2);
-
-			// other
-			assert.equal(virtualDOM[2].children.length, 1);
-			assert.equal(virtualDOM[2].children[0].actualNode.nodeName, 'UL');
-			assert.equal(virtualDOM[2].children[0].children.length, 4);
-		});
-		it('getComposedTree\'s virtual DOM should give an ID to the shadow DOM', function () {
-			var virtualDOM = axe.utils.getComposedTree(fixture);
-			assert.isUndefined(virtualDOM[0].shadowId);
-			assert.isDefined(virtualDOM[0].children[0].shadowId);
-			assert.isDefined(virtualDOM[0].children[1].shadowId);
-			assert.isDefined(virtualDOM[0].children[4].shadowId);
-			// shadow IDs in the same shadowRoot must be the same
-			assert.equal(virtualDOM[0].children[0].shadowId,
-				virtualDOM[0].children[1].shadowId);
-			// should cascade
-			assert.equal(virtualDOM[0].children[1].shadowId,
-				virtualDOM[0].children[1].children[0].shadowId);
-			// shadow IDs in different shadowRoots must be different
-			assert.notEqual(virtualDOM[0].children[0].shadowId,
-				virtualDOM[0].children[4].shadowId);
-
-		});
+		it('getComposedTree\'s virtual DOM should represent the composed tree', composedTreeAssertions);
+		it('getComposedTree\'s virtual DOM should give an ID to the shadow DOM', shadowIdAssertions);
 	});
 }
 

From a2b37e9ecf8f491bee6285fca5eeded532fb3d9c Mon Sep 17 00:00:00 2001
From: Dylan Barrell <dylan@barrell.com>
Date: Sat, 25 Mar 2017 14:30:04 -0400
Subject: [PATCH 003/142] Add the Slick CSS selector parser to the utils

---
 lib/core/utils/slick-parser.js | 218 +++++++++++++++++++++++++++++++++
 1 file changed, 218 insertions(+)
 create mode 100644 lib/core/utils/slick-parser.js

diff --git a/lib/core/utils/slick-parser.js b/lib/core/utils/slick-parser.js
new file mode 100644
index 0000000000..613a012b3a
--- /dev/null
+++ b/lib/core/utils/slick-parser.js
@@ -0,0 +1,218 @@
+/* jshint ignore:start */
+/*
+---
+name: Slick.Parser
+description: Standalone CSS3 Selector parser
+provides: Slick.Parser
+...
+*/
+(function (axe) {
+	var parsed,
+		separatorIndex,
+		combinatorIndex,
+		reversed,
+		cache = {},
+		reverseCache = {},
+		reUnescape = /\\/g;
+
+	var parse = function(expression, isReversed){
+		if (expression == null) return null;
+		if (expression.Slick === true) return expression;
+		expression = ('' + expression).replace(/^\s+|\s+$/g, '');
+		reversed = !!isReversed;
+		var currentCache = (reversed) ? reverseCache : cache;
+		if (currentCache[expression]) return currentCache[expression];
+		parsed = {
+			Slick: true,
+			expressions: [],
+			raw: expression,
+			reverse: function(){
+				return parse(this.raw, true);
+			}
+		};
+		separatorIndex = -1;
+		while (expression != (expression = expression.replace(regexp, parser)));
+		parsed.length = parsed.expressions.length;
+		return currentCache[parsed.raw] = (reversed) ? reverse(parsed) : parsed;
+	};
+
+	var reverseCombinator = function(combinator){
+		if (combinator === '!') return ' ';
+		else if (combinator === ' ') return '!';
+		else if ((/^!/).test(combinator)) return combinator.replace(/^!/, '');
+		else return '!' + combinator;
+	};
+
+	var reverse = function(expression){
+		var expressions = expression.expressions;
+		for (var i = 0; i < expressions.length; i++){
+			var exp = expressions[i];
+			var last = {parts: [], tag: '*', combinator: reverseCombinator(exp[0].combinator)};
+
+			for (var j = 0; j < exp.length; j++){
+				var cexp = exp[j];
+				if (!cexp.reverseCombinator) cexp.reverseCombinator = ' ';
+				cexp.combinator = cexp.reverseCombinator;
+				delete cexp.reverseCombinator;
+			}
+
+			exp.reverse().push(last);
+		}
+		return expression;
+	};
+
+	var escapeRegExp = (function(){
+		// Credit: XRegExp 0.6.1 (c) 2007-2008 Steven Levithan <http://stevenlevithan.com/regex/xregexp/> MIT License
+		var from = /(?=[\-\[\]{}()*+?.\\\^$|,#\s])/g, to = '\\';
+		return function(string){ return string.replace(from, to) }
+	}())
+
+	var regexp = new RegExp(
+	/*
+	#!/usr/bin/env ruby
+	puts "\t\t" + DATA.read.gsub(/\(\?x\)|\s+#.*$|\s+|\\$|\\n/,'')
+	__END__
+		"(?x)^(?:\
+		  \\s* ( , ) \\s*               # Separator          \n\
+		| \\s* ( <combinator>+ ) \\s*   # Combinator         \n\
+		|      ( \\s+ )                 # CombinatorChildren \n\
+		|      ( <unicode>+ | \\* )     # Tag                \n\
+		| \\#  ( <unicode>+       )     # ID                 \n\
+		| \\.  ( <unicode>+       )     # ClassName          \n\
+		|                               # Attribute          \n\
+		\\[  \
+			\\s* (<unicode1>+)  (?:  \
+				\\s* ([*^$!~|]?=)  (?:  \
+					\\s* (?:\
+						([\"']?)(.*?)\\9 \
+					)\
+				)  \
+			)?  \\s*  \
+		\\](?!\\]) \n\
+		|   :+ ( <unicode>+ )(?:\
+		\\( (?:\
+			(?:([\"'])([^\\12]*)\\12)|((?:\\([^)]+\\)|[^()]*)+)\
+		) \\)\
+		)?\
+		)"
+	*/
+		"^(?:\\s*(,)\\s*|\\s*(<combinator>+)\\s*|(\\s+)|(<unicode>+|\\*)|\\#(<unicode>+)|\\.(<unicode>+)|\\[\\s*(<unicode1>+)(?:\\s*([*^$!~|]?=)(?:\\s*(?:([\"']?)(.*?)\\9)))?\\s*\\](?!\\])|(:+)(<unicode>+)(?:\\((?:(?:([\"'])([^\\13]*)\\13)|((?:\\([^)]+\\)|[^()]*)+))\\))?)"
+		.replace(/<combinator>/, '[' + escapeRegExp(">+~`!@$%^&={}\\;</") + ']')
+		.replace(/<unicode>/g, '(?:[\\w\\u00a1-\\uFFFF-]|\\\\[^\\s0-9a-f])')
+		.replace(/<unicode1>/g, '(?:[:\\w\\u00a1-\\uFFFF-]|\\\\[^\\s0-9a-f])')
+	);
+
+	function parser(
+		rawMatch,
+
+		separator,
+		combinator,
+		combinatorChildren,
+
+		tagName,
+		id,
+		className,
+
+		attributeKey,
+		attributeOperator,
+		attributeQuote,
+		attributeValue,
+
+		pseudoMarker,
+		pseudoClass,
+		pseudoQuote,
+		pseudoClassQuotedValue,
+		pseudoClassValue
+	){
+		if (separator || separatorIndex === -1){
+			parsed.expressions[++separatorIndex] = [];
+			combinatorIndex = -1;
+			if (separator) return '';
+		}
+
+		if (combinator || combinatorChildren || combinatorIndex === -1){
+			combinator = combinator || ' ';
+			var currentSeparator = parsed.expressions[separatorIndex];
+			if (reversed && currentSeparator[combinatorIndex])
+				currentSeparator[combinatorIndex].reverseCombinator = reverseCombinator(combinator);
+			currentSeparator[++combinatorIndex] = {combinator: combinator, tag: '*'};
+		}
+
+		var currentParsed = parsed.expressions[separatorIndex][combinatorIndex];
+
+		if (tagName){
+			currentParsed.tag = tagName.replace(reUnescape, '');
+
+		} else if (id){
+			currentParsed.id = id.replace(reUnescape, '');
+
+		} else if (className){
+			className = className.replace(reUnescape, '');
+
+			if (!currentParsed.classList) currentParsed.classList = [];
+			if (!currentParsed.classes) currentParsed.classes = [];
+			currentParsed.classList.push(className);
+			currentParsed.classes.push({
+				value: className,
+				regexp: new RegExp('(^|\\s)' + escapeRegExp(className) + '(\\s|$)')
+			});
+
+		} else if (pseudoClass){
+			pseudoClassValue = pseudoClassValue || pseudoClassQuotedValue;
+			pseudoClassValue = pseudoClassValue ? pseudoClassValue.replace(reUnescape, '') : null;
+
+			if (!currentParsed.pseudos) currentParsed.pseudos = [];
+			currentParsed.pseudos.push({
+				key: pseudoClass.replace(reUnescape, ''),
+				value: pseudoClassValue,
+				type: pseudoMarker.length == 1 ? 'class' : 'element'
+			});
+
+		} else if (attributeKey){
+			attributeKey = attributeKey.replace(reUnescape, '');
+			attributeValue = (attributeValue || '').replace(reUnescape, '');
+
+			var test, regexp;
+
+			switch (attributeOperator){
+				case '^=' : regexp = new RegExp(       '^'+ escapeRegExp(attributeValue)            ); break;
+				case '$=' : regexp = new RegExp(            escapeRegExp(attributeValue) +'$'       ); break;
+				case '~=' : regexp = new RegExp( '(^|\\s)'+ escapeRegExp(attributeValue) +'(\\s|$)' ); break;
+				case '|=' : regexp = new RegExp(       '^'+ escapeRegExp(attributeValue) +'(-|$)'   ); break;
+				case  '=' : test = function(value){
+					return attributeValue == value;
+				}; break;
+				case '*=' : test = function(value){
+					return value && value.indexOf(attributeValue) > -1;
+				}; break;
+				case '!=' : test = function(value){
+					return attributeValue != value;
+				}; break;
+				default   : test = function(value){
+					return !!value;
+				};
+			}
+
+			if (attributeValue == '' && (/^[*$^]=$/).test(attributeOperator)) test = function(){
+				return false;
+			};
+
+			if (!test) test = function(value){
+				return value && regexp.test(value);
+			};
+
+			if (!currentParsed.attributes) currentParsed.attributes = [];
+			currentParsed.attributes.push({
+				key: attributeKey,
+				operator: attributeOperator,
+				value: attributeValue,
+				test: test
+			});
+
+		}
+
+		return '';
+	};
+
+	axe.utils.cssParser = parse;	
+})(axe);

From 1df25c11bcaf35a6ef3a59695bc0a289ae3655f6 Mon Sep 17 00:00:00 2001
From: Dylan Barrell <dylan@barrell.com>
Date: Sat, 25 Mar 2017 14:34:26 -0400
Subject: [PATCH 004/142] add acknowledgement for the Slick parser

---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index ba14767284..b2264214e7 100644
--- a/README.md
+++ b/README.md
@@ -99,3 +99,7 @@ Read the [documentation on contributing](CONTRIBUTING.md)
 ## Projects using axe-core
 
 [List of projects using axe-core](doc/projects.md)
+
+## Acknowledgements
+
+Thanks to the [Slick Parser](https://github.com/mootools/slick/blob/master/Source/Slick.Parser.js) implementers for their contribution, we have used it in the shadowDOM support code.

From be9b9a0e3894fe4d8f99d8529e546b1cfdfbcea3 Mon Sep 17 00:00:00 2001
From: Dylan Barrell <dylan@barrell.com>
Date: Sat, 25 Mar 2017 14:47:37 -0400
Subject: [PATCH 005/142] add Slick parser copyright

---
 lib/core/utils/slick-parser.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/core/utils/slick-parser.js b/lib/core/utils/slick-parser.js
index 613a012b3a..188ad8fb18 100644
--- a/lib/core/utils/slick-parser.js
+++ b/lib/core/utils/slick-parser.js
@@ -1,4 +1,5 @@
 /* jshint ignore:start */
+/* Copyright Mootools Developers, licensed under the MIT license https://opensource.org/licenses/MIT */
 /*
 ---
 name: Slick.Parser

From 096c57187a4d61875b8ee23d8fd84d29e1926fcf Mon Sep 17 00:00:00 2001
From: Dylan Barrell <dylan@barrell.com>
Date: Sun, 26 Mar 2017 13:15:05 -0400
Subject: [PATCH 006/142] implement virtual DOM querySelectorAll

---
 lib/core/utils/qsa.js  |  69 ++++++++++++++++++++
 test/core/utils/qsa.js | 140 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 209 insertions(+)
 create mode 100644 lib/core/utils/qsa.js
 create mode 100644 test/core/utils/qsa.js

diff --git a/lib/core/utils/qsa.js b/lib/core/utils/qsa.js
new file mode 100644
index 0000000000..5b679707f7
--- /dev/null
+++ b/lib/core/utils/qsa.js
@@ -0,0 +1,69 @@
+/**
+ * querySelectorAll implementation that works on the virtual DOM and
+ * supports shadowDOM
+ */
+
+// todo: implement an option to follow aria-owns
+
+function matchesTag (node, exp) {
+	return exp.tag === '*' || node.nodeName.toLowerCase() === exp.tag;
+}
+
+function matchesClasses (node, exp) {
+	return !exp.classes || exp.classes.reduce((result, cl) => {
+		return result && (node.className && node.className.match(cl.regexp));
+	}, true);
+}
+
+function matchesAttributes (node, exp) {
+	return !exp.attributes || exp.attributes.reduce((result, att) => {
+		var nodeAtt = node.getAttribute(att.key);
+		return result && nodeAtt && att.test(nodeAtt);
+	}, true);
+}
+
+function matchesId (node, exp) {
+	return !exp.id || node.id === exp.id;
+}
+
+function matchSelector (targets, exp, recurse) {
+	var result = [];
+
+	if (exp.pseudos) {
+		throw new Error('matchSelector does not support pseudo selector: ' + exp.pseudos[0].key);
+	}
+	targets = Array.isArray(targets) ? targets : [targets];
+	targets.forEach((target) => {
+		if (matchesTag(target.actualNode, exp) &&
+			matchesClasses(target.actualNode, exp) &&
+			matchesAttributes(target.actualNode, exp) &&
+			matchesId(target.actualNode, exp)) {
+			result.push(target);
+		}
+		if (recurse) {
+			result = result.concat(matchSelector(target.children.filter((child) => {
+				return !exp.id || child.shadowId === target.shadowId;
+			}), exp, recurse));
+		}
+	});
+	return result;
+}
+
+axe.utils.querySelectorAll = function (domTree, selector) {
+	domTree = Array.isArray(domTree) ? domTree : [domTree];
+
+	return axe.utils.cssParser(selector).expressions.reduce((collected, exprArr) => {
+		var candidates = domTree;
+		exprArr.forEach((exp, index) => {
+			var recurse = exp.combinator === '>' ? false : true;
+			if ([' ', '>'].indexOf(exp.combinator) === -1) {
+				throw new Error('axe.utils.querySelectorAll does not support the combinator: ' + exp.combinator);
+			}
+			exp.tag = exp.tag.toLowerCase(); // do this once
+			candidates = candidates.reduce((result, node) => {
+				return result.concat(matchSelector(index ? node.children : node, exp, recurse));
+			}, []);
+		});
+		return collected.concat(candidates);
+	}, []);
+};
\ No newline at end of file
diff --git a/test/core/utils/qsa.js b/test/core/utils/qsa.js
new file mode 100644
index 0000000000..3a7f4a1760
--- /dev/null
+++ b/test/core/utils/qsa.js
@@ -0,0 +1,140 @@
+function Vnode (nodeName, className, attributes, id) {
+	'use strict';
+	this.nodeName = nodeName.toUpperCase();
+	this.id = id;
+	this.attributes = attributes || [];
+	this.className = className;
+}
+
+Vnode.prototype.getAttribute = function (att) {
+	'use strict';
+	var attribute = this.attributes.find(function (item) {
+		return item.key === att;
+	});
+	return attribute ? attribute.value : '';
+};
+
+describe('axe.utils.querySelectorAll', function () {
+	'use strict';
+	var dom;
+	afterEach(function () {
+	});
+	beforeEach(function () {
+		dom = [{
+			actualNode: new Vnode('html'),
+			children: [{
+				actualNode: new Vnode('body'),
+				children: [{
+					actualNode: new Vnode('div', 'first',[{
+						key: 'data-a11yhero',
+						value: 'faulkner'
+					}]),
+					shadowId: 'a',
+					children: [{
+						actualNode: new Vnode('ul'),
+						shadowId: 'a',
+						children: [{
+							actualNode: new Vnode('li', 'breaking'),
+							shadowId: 'a',
+							children: []
+						},{
+							actualNode: new Vnode('li', 'breaking'),
+							shadowId: 'a',
+							children: []
+						}]
+					}]
+				}, {
+					actualNode: new Vnode('div', '', [], 'one'),
+					children: []
+				}, {
+					actualNode: new Vnode('div', 'second third'),
+					shadowId: 'b',
+					children: [{
+						actualNode: new Vnode('ul'),
+						shadowId: 'b',
+						children: [{
+							actualNode: new Vnode('li', undefined, [{
+								key: 'role',
+								value: 'tab'
+							}], 'one'),
+							shadowId: 'b',
+							children: []
+						},{
+							actualNode: new Vnode('li', undefined, [{
+								key: 'role',
+								value: 'button'
+							}], 'one'),
+							shadowId: 'c',
+							children: []
+						}]
+					}]
+				}]
+			}]
+		}];
+	});
+	it('should find nodes using just the tag', function () {
+		var result = axe.utils.querySelectorAll(dom, 'li');
+		assert.equal(result.length, 4);
+	});
+	it('should find nodes using parent selector', function () {
+		var result = axe.utils.querySelectorAll(dom, 'ul > li');
+		assert.equal(result.length, 4);
+	});
+	it('should NOT find nodes using parent selector', function () {
+		var result = axe.utils.querySelectorAll(dom, 'div > li');
+		assert.equal(result.length, 0);
+	});
+	it('should find nodes using hierarchical selector', function () {
+		var result = axe.utils.querySelectorAll(dom, 'div li');
+		assert.equal(result.length, 4);
+	});
+	it('should find nodes using class selector', function () {
+		var result = axe.utils.querySelectorAll(dom, '.breaking');
+		assert.equal(result.length, 2);
+	});
+	it('should find nodes using hierarchical class selector', function () {
+		var result = axe.utils.querySelectorAll(dom, '.first .breaking');
+		assert.equal(result.length, 2);
+	});
+	it('should NOT find nodes using hierarchical class selector', function () {
+		var result = axe.utils.querySelectorAll(dom, '.second .breaking');
+		assert.equal(result.length, 0);
+	});
+	it('should find nodes using multiple class selector', function () {
+		var result = axe.utils.querySelectorAll(dom, '.second.third');
+		assert.equal(result.length, 1);
+	});
+	it('should find nodes using id', function () {
+		var result = axe.utils.querySelectorAll(dom, '#one');
+		assert.equal(result.length, 1);
+	});
+	it('should find nodes using id, within a shadow DOM', function () {
+		var result = axe.utils.querySelectorAll(dom[0].children[0].children[2], '#one');
+		assert.equal(result.length, 1);
+	});
+	it('should find nodes using attribute', function () {
+		var result = axe.utils.querySelectorAll(dom, '[role]');
+		assert.equal(result.length, 2);
+	});
+	it('should find nodes using attribute with value', function () {
+		var result = axe.utils.querySelectorAll(dom, '[role=tab]');
+		assert.equal(result.length, 1);
+	});
+	it('should find nodes using attribute with value', function () {
+		var result = axe.utils.querySelectorAll(dom, '[role="button"]');
+		assert.equal(result.length, 1);
+	});
+	it('should find nodes using parent attribute with value', function () {
+		var result = axe.utils.querySelectorAll(dom, '[data-a11yhero="faulkner"] > ul');
+		assert.equal(result.length, 1);
+	});
+	it('should find nodes using hierarchical attribute with value', function () {
+		var result = axe.utils.querySelectorAll(dom, '[data-a11yhero="faulkner"] li');
+		assert.equal(result.length, 2);
+	});
+	it('should put it all together', function () {
+		var result = axe.utils.querySelectorAll(dom,
+			'.first[data-a11yhero="faulkner"] > ul li.breaking');
+		assert.equal(result.length, 2);
+	});
+});

From dcd4e1a83877f96f1c8dd9e7270a06175886c248 Mon Sep 17 00:00:00 2001
From: Dylan Barrell <dylan@barrell.com>
Date: Sun, 26 Mar 2017 19:03:47 -0400
Subject: [PATCH 007/142] make use of axe.utils.querySelectorAll and get all
 tests to work

---
 lib/checks/navigation/href-no-hash.js   |  2 +-
 lib/checks/navigation/href-no-hash.json |  4 +-
 lib/core/base/check.js                  |  2 +-
 lib/core/base/context.js                | 23 +++++---
 lib/core/base/rule.js                   |  6 +-
 lib/core/utils/composed-tree.js         |  8 ++-
 lib/core/utils/contains.js              |  6 +-
 lib/core/utils/get-selector.js          |  1 +
 lib/core/utils/node-sorter.js           |  4 +-
 lib/core/utils/qsa.js                   |  4 +-
 lib/core/utils/select.js                | 14 +++--
 lib/rules/definition-list.json          |  3 +-
 lib/rules/dlitem.json                   |  3 +-
 lib/rules/frame-title-unique.json       |  2 +-
 lib/rules/label-matches.js              | 14 +++++
 lib/rules/label-title-only.json         |  3 +-
 lib/rules/label.json                    |  3 +-
 lib/rules/link-in-text-block-matches.js |  4 ++
 lib/rules/link-in-text-block.json       |  2 +-
 lib/rules/link-name.json                |  3 +-
 lib/rules/list.json                     |  3 +-
 lib/rules/listitem.json                 |  3 +-
 lib/rules/no-role-matches.js            |  1 +
 lib/rules/not-html-matches.js           |  1 +
 lib/rules/role-not-button-matches.js    |  1 +
 lib/rules/valid-lang.json               |  3 +-
 test/core/base/audit.js                 |  8 +--
 test/core/base/check.js                 |  2 +-
 test/core/base/context.js               | 76 +++++++++++++------------
 test/core/base/rule.js                  | 55 +++++++++---------
 test/core/public/run-rules.js           |  2 +-
 test/core/utils/contains.js             | 40 +++++++------
 test/core/utils/node-sorter.js          | 10 ++--
 test/core/utils/qsa.js                  |  3 +-
 test/core/utils/select.js               | 41 +++++++------
 35 files changed, 213 insertions(+), 147 deletions(-)
 create mode 100644 lib/rules/label-matches.js
 create mode 100644 lib/rules/no-role-matches.js
 create mode 100644 lib/rules/not-html-matches.js
 create mode 100644 lib/rules/role-not-button-matches.js

diff --git a/lib/checks/navigation/href-no-hash.js b/lib/checks/navigation/href-no-hash.js
index fff3a1699a..d89cc23034 100644
--- a/lib/checks/navigation/href-no-hash.js
+++ b/lib/checks/navigation/href-no-hash.js
@@ -1,6 +1,6 @@
 var href = node.getAttribute('href');
 
-if(href === '#'){
+if (href === '#') {
 	return false;
 }
 
diff --git a/lib/checks/navigation/href-no-hash.json b/lib/checks/navigation/href-no-hash.json
index 2652999aaa..45a3d770fd 100644
--- a/lib/checks/navigation/href-no-hash.json
+++ b/lib/checks/navigation/href-no-hash.json
@@ -4,8 +4,8 @@
   "metadata": {
     "impact": "moderate",
     "messages": {
-      "pass": "Anchor does not have a href quals #",
-      "fail": "Anchor has a href quals #"
+      "pass": "Anchor does not have an href that equals #",
+      "fail": "Anchor has an href that equals #"
     }
   }
 }
diff --git a/lib/core/base/check.js b/lib/core/base/check.js
index 9e94adcdf0..b8034641dd 100644
--- a/lib/core/base/check.js
+++ b/lib/core/base/check.js
@@ -70,7 +70,7 @@ Check.prototype.run = function (node, options, resolve, reject) {
 		var result;
 
 		try {
-			result = this.evaluate.call(checkHelper, node, checkOptions);
+			result = this.evaluate.call(checkHelper, node.actualNode, checkOptions, node);
 		} catch (e) {
 			reject(e);
 			return;
diff --git a/lib/core/base/context.js b/lib/core/base/context.js
index 327fc69f8d..cbb0c8aa1f 100644
--- a/lib/core/base/context.js
+++ b/lib/core/base/context.js
@@ -121,22 +121,31 @@ function parseSelectorArray(context, type) {
 	'use strict';
 
 	var item,
-		result = [];
+		result = [], nodeList;
 	for (var i = 0, l = context[type].length; i < l; i++) {
 		item = context[type][i];
 		// selector
 		if (typeof item === 'string') {
-			result = result.concat(axe.utils.toArray(document.querySelectorAll(item)));
+			nodeList = Array.from(document.querySelectorAll(item));
+			//jshint loopfunc:true
+			result = result.concat(nodeList.map((node) => {
+				return axe.utils.getComposedTree(node)[0];
+			}));
 			break;
 		} else if (item && item.length && !(item instanceof Node)) {
 
 			if (item.length > 1) {
 				pushUniqueFrameSelector(context, type, item);
 			} else {
-				result = result.concat(axe.utils.toArray(document.querySelectorAll(item[0])));
+				nodeList = Array.from(document.querySelectorAll(item[0]));
+				//jshint loopfunc:true
+				result = result.concat(nodeList.map((node) => {
+					return axe.utils.getComposedTree(node)[0];
+				}));
 			}
-		} else {
-			result.push(item);
+		} else if (item instanceof Node) {
+
+			result.push(axe.utils.getComposedTree(item)[0]);
 		}
 	}
 
@@ -207,11 +216,11 @@ function Context(spec) {
 
 	axe.utils.select('frame, iframe', this).forEach(function (frame) {
 		if (isNodeInContext(frame, self)) {
-			pushUniqueFrame(self.frames, frame);
+			pushUniqueFrame(self.frames, frame.actualNode);
 		}
 	});
 
-	if (this.include.length === 1 && this.include[0] === document) {
+	if (this.include.length === 1 && this.include[0].actualNode === document.documentElement) {
 		this.page = true;
 	}
 
diff --git a/lib/core/base/rule.js b/lib/core/base/rule.js
index 4c6aaf7a3c..9a26659381 100644
--- a/lib/core/base/rule.js
+++ b/lib/core/base/rule.js
@@ -92,7 +92,7 @@ Rule.prototype.gather = function (context) {
 	var elements = axe.utils.select(this.selector, context);
 	if (this.excludeHidden) {
 		return elements.filter(function (element) {
-			return !axe.utils.isHidden(element);
+			return !axe.utils.isHidden(element.actualNode);
 		});
 	}
 	return elements;
@@ -134,7 +134,7 @@ Rule.prototype.run = function (context, options, resolve, reject) {
 	try {
 		// Matches throws an error when it lacks support for document methods
 		nodes = this.gather(context)
-					.filter(node => this.matches(node));
+					.filter(node => this.matches(node.actualNode));
 	} catch (error) {
 		// Exit the rule execution if matches fails
 		reject(new SupportError({cause: error, ruleId: this.id}));
@@ -171,7 +171,7 @@ Rule.prototype.run = function (context, options, resolve, reject) {
 						}
 					});
 					if (hasResults) {
-						result.node = new axe.utils.DqElement(node);
+						result.node = new axe.utils.DqElement(node.actualNode);
 						ruleResult.nodes.push(result);
 					}
 				}
diff --git a/lib/core/utils/composed-tree.js b/lib/core/utils/composed-tree.js
index 53991b4eb8..954f62227a 100644
--- a/lib/core/utils/composed-tree.js
+++ b/lib/core/utils/composed-tree.js
@@ -65,14 +65,18 @@ axe.utils.getComposedTree = function (node, shadowId) {
 		return res;
 	}
 
-	if (node.shadowRoot) {
+	if (node.documentElement) { // document
+		node = node.documentElement;
+	}
+	nodeName = node.nodeName.toLowerCase();
+	// for some reason Chrome's marquee element has an open shadow DOM
+	if (node.shadowRoot && nodeName !== 'marquee') {
 		// generate an ID for this shadow root and overwrite the current
 		// closure shadowId with this value so that it cascades down the tree
 		shadowId = 'a' + Math.random().toString().substring(2);
 		realArray = Array.from(node.shadowRoot.childNodes);
 		return realArray.reduce(reduceShadowDOM, []);
 	} else {
-		nodeName = node.nodeName.toLowerCase();
 		if (nodeName === 'content') {
 			realArray = Array.from(node.getDistributedNodes());
 			return realArray.reduce(reduceShadowDOM, []);
diff --git a/lib/core/utils/contains.js b/lib/core/utils/contains.js
index 2ba198d5e2..04b68bc67c 100644
--- a/lib/core/utils/contains.js
+++ b/lib/core/utils/contains.js
@@ -9,10 +9,10 @@ axe.utils.contains = function (node, otherNode) {
 	//jshint bitwise: false
 	'use strict';
 
-	if (typeof node.contains === 'function') {
-		return node.contains(otherNode);
+	if (typeof node.actualNode.contains === 'function') {
+		return node.actualNode.contains(otherNode.actualNode);
 	}
 
-	return !!(node.compareDocumentPosition(otherNode) & 16);
+	return !!(node.actualNode.compareDocumentPosition(otherNode.actualNode) & 16);
 
 };
\ No newline at end of file
diff --git a/lib/core/utils/get-selector.js b/lib/core/utils/get-selector.js
index 7d339b6ff1..1179251c3e 100644
--- a/lib/core/utils/get-selector.js
+++ b/lib/core/utils/get-selector.js
@@ -58,6 +58,7 @@ function siblingsHaveSameSelector(node, selector) {
  * @return {String}      Unique CSS selector for the node
  */
 axe.utils.getSelector = function getSelector(node) {
+	//todo: implement shadowDOM support
 	//jshint maxstatements: 21
 	'use strict';
 
diff --git a/lib/core/utils/node-sorter.js b/lib/core/utils/node-sorter.js
index b92829aa81..d4aa8972fe 100644
--- a/lib/core/utils/node-sorter.js
+++ b/lib/core/utils/node-sorter.js
@@ -10,11 +10,11 @@ axe.utils.nodeSorter = function nodeSorter(a, b) {
 
 	'use strict';
 
-	if (a === b) {
+	if (a.actualNode === b.actualNode) {
 		return 0;
 	}
 
-	if (a.compareDocumentPosition(b) & 4) { // a before b
+	if (a.actualNode.compareDocumentPosition(b.actualNode) & 4) { // a before b
 		return -1;
 	}
 
diff --git a/lib/core/utils/qsa.js b/lib/core/utils/qsa.js
index 5b679707f7..3690e78216 100644
--- a/lib/core/utils/qsa.js
+++ b/lib/core/utils/qsa.js
@@ -6,7 +6,7 @@
 // todo: implement an option to follow aria-owns
 
 function matchesTag (node, exp) {
-	return exp.tag === '*' || node.nodeName.toLowerCase() === exp.tag;
+	return node.nodeType === 1 && (exp.tag === '*' || node.nodeName.toLowerCase() === exp.tag);
 }
 
 function matchesClasses (node, exp) {
@@ -18,7 +18,7 @@ function matchesClasses (node, exp) {
 function matchesAttributes (node, exp) {
 	return !exp.attributes || exp.attributes.reduce((result, att) => {
 		var nodeAtt = node.getAttribute(att.key);
-		return result && nodeAtt && att.test(nodeAtt);
+		return result && nodeAtt !== null && (!att.value || att.test(nodeAtt));
 	}, true);
 }
 
diff --git a/lib/core/utils/select.js b/lib/core/utils/select.js
index 54156d4a63..43389ca208 100644
--- a/lib/core/utils/select.js
+++ b/lib/core/utils/select.js
@@ -49,17 +49,20 @@ function pushNode(result, nodes, context) {
 	'use strict';
 
 	for (var i = 0, l = nodes.length; i < l; i++) {
-		if (result.indexOf(nodes[i]) === -1 && isNodeInContext(nodes[i], context)) {
+		//jshint loopfunc:true
+		if (!result.find(function (item) {
+				return item.actualNode === nodes[i].actualNode;
+			}) && isNodeInContext(nodes[i], context)) {
 			result.push(nodes[i]);
 		}
 	}
 }
 
 /**
- * Selects elements which match `select` that are included and excluded via the `Context` object
+ * Selects elements which match `selector` that are included and excluded via the `Context` object
  * @param  {String} selector  CSS selector of the HTMLElements to select
  * @param  {Context} context  The "resolved" context object, @see Context
- * @return {Array}            Matching nodes sorted by DOM order
+ * @return {Array}            Matching virtual DOM nodes sorted by DOM order
  */
 axe.utils.select = function select(selector, context) {
 	'use strict';
@@ -67,10 +70,11 @@ axe.utils.select = function select(selector, context) {
 	var result = [], candidate;
 	for (var i = 0, l = context.include.length; i < l; i++) {
 		candidate = context.include[i];
-		if (candidate.nodeType === candidate.ELEMENT_NODE && axe.utils.matchesSelector(candidate, selector)) {
+		if (candidate.actualNode.nodeType === candidate.actualNode.ELEMENT_NODE &&
+			axe.utils.matchesSelector(candidate.actualNode, selector)) {
 			pushNode(result, [candidate], context);
 		}
-		pushNode(result, candidate.querySelectorAll(selector), context);
+		pushNode(result, axe.utils.querySelectorAll(candidate, selector), context);
 	}
 
 	return result.sort(axe.utils.nodeSorter);
diff --git a/lib/rules/definition-list.json b/lib/rules/definition-list.json
index 6306f0d2db..74661e1be4 100644
--- a/lib/rules/definition-list.json
+++ b/lib/rules/definition-list.json
@@ -1,6 +1,7 @@
 {
   "id": "definition-list",
-  "selector": "dl:not([role])",
+  "selector": "dl",
+  "matches": "no-role-matches.js",
   "tags": [
     "cat.structure",
     "wcag2a",
diff --git a/lib/rules/dlitem.json b/lib/rules/dlitem.json
index f4676f4253..829f78b1f6 100644
--- a/lib/rules/dlitem.json
+++ b/lib/rules/dlitem.json
@@ -1,6 +1,7 @@
 {
   "id": "dlitem",
-  "selector": "dd:not([role]), dt:not([role])",
+  "selector": "dd, dt",
+  "matches": "no-role-matches.js",
   "tags": [
     "cat.structure",
     "wcag2a",
diff --git a/lib/rules/frame-title-unique.json b/lib/rules/frame-title-unique.json
index 587d4ea9a5..644b6884f8 100644
--- a/lib/rules/frame-title-unique.json
+++ b/lib/rules/frame-title-unique.json
@@ -1,6 +1,6 @@
 {
   "id": "frame-title-unique",
-  "selector": "frame[title]:not([title='']), iframe[title]:not([title=''])",
+  "selector": "frame[title], iframe[title]",
   "matches": "frame-title-has-text.js",
   "tags": [
     "cat.text-alternatives",
diff --git a/lib/rules/label-matches.js b/lib/rules/label-matches.js
new file mode 100644
index 0000000000..4feb6d3131
--- /dev/null
+++ b/lib/rules/label-matches.js
@@ -0,0 +1,14 @@
+// :not([type='hidden'])
+// :not([type='image'])
+// :not([type='button'])
+// :not([type='submit'])
+// :not([type='reset'])
+if (node.nodeName.toLowerCase() !== 'input') {
+	return true;
+}
+var t = node.getAttribute('type').toLowerCase();
+if (t === 'hidden' || t === 'image' || t === 'button' || t === 'submit' ||
+	t === 'reset') {
+	return false;
+}
+return true;
diff --git a/lib/rules/label-title-only.json b/lib/rules/label-title-only.json
index b59b6b57ce..f01910a599 100644
--- a/lib/rules/label-title-only.json
+++ b/lib/rules/label-title-only.json
@@ -1,6 +1,7 @@
 {
   "id": "label-title-only",
-  "selector": "input:not([type='hidden']):not([type='image']):not([type='button']):not([type='submit']):not([type='reset']), select, textarea",
+  "selector": "input, select, textarea",
+  "matches": "label-matches.js",
   "enabled": false,
   "tags": [
     "cat.forms",
diff --git a/lib/rules/label.json b/lib/rules/label.json
index 582c492b69..df36f551a2 100644
--- a/lib/rules/label.json
+++ b/lib/rules/label.json
@@ -1,6 +1,7 @@
 {
   "id": "label",
-  "selector": "input:not([type='hidden']):not([type='image']):not([type='button']):not([type='submit']):not([type='reset']), select, textarea",
+  "selector": "input, select, textarea",
+  "matches": "label-matches.js",
   "tags": [
     "cat.forms",
     "wcag2a",
diff --git a/lib/rules/link-in-text-block-matches.js b/lib/rules/link-in-text-block-matches.js
index 7e2184f8d3..4605c4da5c 100644
--- a/lib/rules/link-in-text-block-matches.js
+++ b/lib/rules/link-in-text-block-matches.js
@@ -1,5 +1,9 @@
 var text = axe.commons.text.sanitize(node.textContent);
+var role = node.getAttribute('role');
 
+if (role && role !== 'link') {
+	return false;
+}
 if (!text) {
 	return false;
 }
diff --git a/lib/rules/link-in-text-block.json b/lib/rules/link-in-text-block.json
index f6c8eaa35e..be9386ec7f 100644
--- a/lib/rules/link-in-text-block.json
+++ b/lib/rules/link-in-text-block.json
@@ -1,6 +1,6 @@
 {
   "id": "link-in-text-block",
-  "selector": "a[href]:not([role]), *[role=link]",
+  "selector": "a[href], *[role=link]",
   "matches": "link-in-text-block-matches.js",
   "excludeHidden": false,
   "enabled": false,
diff --git a/lib/rules/link-name.json b/lib/rules/link-name.json
index c1d681cea9..63f193ce53 100644
--- a/lib/rules/link-name.json
+++ b/lib/rules/link-name.json
@@ -1,6 +1,7 @@
 {
   "id": "link-name",
-  "selector": "a[href]:not([role=\"button\"]), [role=link][href]",
+  "selector": "a[href], [role=link][href]",
+  "matches": "role-not-button-matches.js",
   "tags": [
     "cat.name-role-value",
     "wcag2a",
diff --git a/lib/rules/list.json b/lib/rules/list.json
index c62b6b0320..752f4705a2 100644
--- a/lib/rules/list.json
+++ b/lib/rules/list.json
@@ -1,6 +1,7 @@
 {
   "id": "list",
-  "selector": "ul:not([role]), ol:not([role])",
+  "selector": "ul, ol",
+  "matches": "no-role-matches.js",
   "tags": [
     "cat.structure",
     "wcag2a",
diff --git a/lib/rules/listitem.json b/lib/rules/listitem.json
index f90b9f7f24..806fb32785 100644
--- a/lib/rules/listitem.json
+++ b/lib/rules/listitem.json
@@ -1,6 +1,7 @@
 {
   "id": "listitem",
-  "selector": "li:not([role])",
+  "selector": "li",
+  "matches": "no-role-matches.js",
   "tags": [
     "cat.structure",
     "wcag2a",
diff --git a/lib/rules/no-role-matches.js b/lib/rules/no-role-matches.js
new file mode 100644
index 0000000000..c7fa630d7c
--- /dev/null
+++ b/lib/rules/no-role-matches.js
@@ -0,0 +1 @@
+return !node.getAttribute('role');
\ No newline at end of file
diff --git a/lib/rules/not-html-matches.js b/lib/rules/not-html-matches.js
new file mode 100644
index 0000000000..ecea309e48
--- /dev/null
+++ b/lib/rules/not-html-matches.js
@@ -0,0 +1 @@
+return node.nodeName.toLowerCase() !== 'html';
diff --git a/lib/rules/role-not-button-matches.js b/lib/rules/role-not-button-matches.js
new file mode 100644
index 0000000000..41fe6fc535
--- /dev/null
+++ b/lib/rules/role-not-button-matches.js
@@ -0,0 +1 @@
+return node.getAttribute('role') !== 'button';
diff --git a/lib/rules/valid-lang.json b/lib/rules/valid-lang.json
index f6d47c7e32..11d687279d 100644
--- a/lib/rules/valid-lang.json
+++ b/lib/rules/valid-lang.json
@@ -1,6 +1,7 @@
 {
   "id": "valid-lang",
-  "selector": "[lang]:not(html), [xml\\:lang]:not(html)",
+  "selector": "[lang], [xml\\:lang]",
+  "matches": "not-html-matches.js",
   "tags": [
     "cat.language",
     "wcag2aa",
diff --git a/test/core/base/audit.js b/test/core/base/audit.js
index af6a18c948..08ca791c36 100644
--- a/test/core/base/audit.js
+++ b/test/core/base/audit.js
@@ -368,7 +368,7 @@ describe('Audit', function () {
 				'<input aria-labelledby="monkeys">' +
 				'<blink>FAIL ME</blink>';
 
-			a.run({ include: [fixture] }, {}, function (results) {
+			a.run({ include: [axe.utils.getComposedTree(fixture)[0]] }, {}, function (results) {
 				var expected = [{
 					id: 'positive1',
 					result: 'inapplicable',
@@ -510,7 +510,7 @@ describe('Audit', function () {
 				}
 			});
 
-			a.run({ include: [fixture] }, {
+			a.run({ include: [axe.utils.getComposedTree(fixture)[0]] }, {
 				runOnly: {
 					'type': 'rule',
 					'values': ['throw1']
@@ -537,7 +537,7 @@ describe('Audit', function () {
 					throw new Error('Launch the super sheep!');
 				}
 			});
-			a.run({ include: [fixture] }, {
+			a.run({ include: [axe.utils.getComposedTree(fixture)[0]] }, {
 				runOnly: {
 					'type': 'rule',
 					'values': ['throw1', 'positive1']
@@ -575,7 +575,7 @@ describe('Audit', function () {
 					throw new Error('Launch the super sheep!');
 				}
 			});
-			a.run({ include: [fixture] }, {
+			a.run({ include: [axe.utils.getComposedTree(fixture)[0]] }, {
 				debug: true,
 				runOnly: {
 					'type': 'rule',
diff --git a/test/core/base/check.js b/test/core/base/check.js
index 916fa181a8..fde3d4d8ab 100644
--- a/test/core/base/check.js
+++ b/test/core/base/check.js
@@ -128,7 +128,7 @@ describe('Check', function () {
 						assert.equal(node, fixture);
 						done();
 					}
-				}).run(fixture, {}, noop);
+				}).run(axe.utils.getComposedTree(fixture)[0], {}, noop);
 
 			});
 
diff --git a/test/core/base/context.js b/test/core/base/context.js
index 7470617572..a83914d41e 100644
--- a/test/core/base/context.js
+++ b/test/core/base/context.js
@@ -28,7 +28,7 @@ describe('Context', function() {
 			fixture.innerHTML = '<div id="foo"></div>';
 			var result = new Context('#foo');
 
-			assert.deepEqual(result.include, [$id('foo')]);
+			assert.deepEqual([result.include[0].actualNode], [$id('foo')]);
 		});
 
 		it('should accept multiple selectors', function() {
@@ -38,7 +38,8 @@ describe('Context', function() {
 				['#bar']
 			]);
 
-			assert.deepEqual(result.include, [$id('foo'), $id('bar')]);
+			assert.deepEqual([result.include[0].actualNode, result.include[1].actualNode],
+				[$id('foo'), $id('bar')]);
 		});
 
 		it('should accept a node reference', function() {
@@ -47,43 +48,41 @@ describe('Context', function() {
 
 			var result = new Context(div);
 
-			assert.deepEqual(result.include, [div]);
+			assert.deepEqual([result.include[0].actualNode], [div]);
 
 		});
 
-              it('should accept a node reference consisting of nested divs', function() {
-                     var div1 = document.createElement('div');
-                     var div2 = document.createElement('div');
+		it('should accept a node reference consisting of nested divs', function() {
+			var div1 = document.createElement('div');
+			var div2 = document.createElement('div');
 
-                     div1.appendChild(div2);
-                     fixture.appendChild(div1);
+			div1.appendChild(div2);
+			fixture.appendChild(div1);
 
-                     var result = new Context(div1);
+			var result = new Context(div1);
 
-                     assert.deepEqual(result.include, [div1]);
-
-              });
-
-              it('should accept a node reference consisting of a form with nested controls', function() {
-                     var form = document.createElement('form');
-                     var input = document.createElement('input');
+			assert.deepEqual([result.include[0].actualNode], [div1]);
+		});
 
-                     form.appendChild(input);
-                     fixture.appendChild(form);
+		it('should accept a node reference consisting of a form with nested controls', function() {
+			var form = document.createElement('form');
+			var input = document.createElement('input');
 
-                     var result = new Context(form);
+			form.appendChild(input);
+			fixture.appendChild(form);
 
-                     assert.deepEqual(result.include, [form]);
+			var result = new Context(form);
 
-              });
+			assert.deepEqual([result.include[0].actualNode], [form]);
+		});
 
 		it('should accept an array of node references', function() {
 			fixture.innerHTML = '<div id="foo"><div id="bar"></div></div>';
 
 			var result = new Context([$id('foo'), $id('bar')]);
 
-			assert.deepEqual(result.include, [$id('foo'), $id('bar')]);
-
+			assert.deepEqual([result.include[0].actualNode, result.include[1].actualNode],
+				[$id('foo'), $id('bar')]);
 		});
 
 		it('should remove any non-matched reference', function() {
@@ -95,8 +94,8 @@ describe('Context', function() {
 				['#bar']
 			]);
 
-			assert.deepEqual(result.include, [$id('foo'), $id('bar')]);
-
+			assert.deepEqual(result.include.map(function (n) { return n.actualNode; }),
+				[$id('foo'), $id('bar')]);
 		});
 
 		it('should remove any null reference', function() {
@@ -104,7 +103,8 @@ describe('Context', function() {
 
 			var result = new Context([$id('foo'), $id('bar'), null]);
 
-			assert.deepEqual(result.include, [$id('foo'), $id('bar')]);
+			assert.deepEqual(result.include.map(function (n) { return n.actualNode; }),
+				[$id('foo'), $id('bar')]);
 
 		});
 
@@ -119,7 +119,8 @@ describe('Context', function() {
 				['#bar'], div
 			]);
 
-			assert.deepEqual(result.include, [$id('foo'), $id('bar'), $id('baz')]);
+			assert.deepEqual(result.include.map(function (n) { return n.actualNode; }),
+				[$id('foo'), $id('bar'), $id('baz')]);
 
 		});
 
@@ -134,7 +135,8 @@ describe('Context', function() {
 
 			var result = new Context($test);
 
-			assert.deepEqual(result.include, [$id('foo'), $id('bar'), $id('baz')]);
+			assert.deepEqual(result.include.map(function (n) { return n.actualNode; }),
+				[$id('foo'), $id('bar'), $id('baz')]);
 
 		});
 
@@ -333,8 +335,8 @@ describe('Context', function() {
 				include: ['#fixture'],
 				exclude: ['#mocha']
 			}), {
-				include: [document.getElementById('fixture')],
-				exclude: [document.getElementById('mocha')],
+				include: [axe.utils.getComposedTree(document.getElementById('fixture'))[0]],
+				exclude: [axe.utils.getComposedTree(document.getElementById('mocha'))[0]],
 				initiator: true,
 				page: false,
 				frames: []
@@ -347,7 +349,7 @@ describe('Context', function() {
 				include: ['#fixture', '#monkeys'],
 				exclude: ['#bananas']
 			}), {
-				include: [document.getElementById('fixture')],
+				include: [axe.utils.getComposedTree(document.getElementById('fixture'))[0]],
 				exclude: [],
 				initiator: true,
 				page: false,
@@ -359,7 +361,7 @@ describe('Context', function() {
 			var result = new Context();
 
 			assert.lengthOf(result.include, 1);
-			assert.equal(result.include[0], document);
+			assert.equal(result.include[0].actualNode, document.documentElement);
 
 			assert.lengthOf(result.exclude, 0);
 
@@ -372,10 +374,10 @@ describe('Context', function() {
 		it('should default include to document', function () {
 			var result = new Context({ exclude: ['#fixture'] });
 			assert.lengthOf(result.include, 1);
-			assert.equal(result.include[0], document);
+			assert.equal(result.include[0].actualNode, document.documentElement);
 
 			assert.lengthOf(result.exclude, 1);
-			assert.equal(result.exclude[0], $id('fixture'));
+			assert.equal(result.exclude[0].actualNode, $id('fixture'));
 
 			assert.isTrue(result.initiator);
 			assert.isTrue(result.page);
@@ -387,7 +389,7 @@ describe('Context', function() {
 		it('should default empty include to document', function () {
 			var result = new Context({ include: [], exclude: [] });
 			assert.lengthOf(result.include, 1);
-			assert.equal(result.include[0], document);
+			assert.equal(result.include[0].actualNode, document.documentElement);
 		});
 
 	});
@@ -399,7 +401,7 @@ describe('Context', function() {
 				initiator: false
 			});
 			assert.lengthOf(result.include, 1);
-			assert.equal(result.include[0], document);
+			assert.equal(result.include[0].actualNode, document.documentElement);
 
 			assert.lengthOf(result.exclude, 0);
 
@@ -418,7 +420,7 @@ describe('Context', function() {
 			var result = new Context(spec);
 
 			assert.lengthOf(result.include, 1);
-			assert.equal(result.include[0], spec);
+			assert.equal(result.include[0].actualNode, spec.documentElement);
 
 			assert.lengthOf(result.exclude, 0);
 
diff --git a/test/core/base/rule.js b/test/core/base/rule.js
index a4e1d6c828..56d2caafc7 100644
--- a/test/core/base/rule.js
+++ b/test/core/base/rule.js
@@ -31,17 +31,17 @@ describe('Rule', function() {
 						selector: '#monkeys'
 					}),
 					nodes = rule.gather({
-						include: [fixture],
+						include: [axe.utils.getComposedTree(fixture)[0]],
 						exclude: [],
 						frames: []
 					});
 
 				assert.lengthOf(nodes, 1);
-				assert.equal(nodes[0], node);
+				assert.equal(nodes[0].actualNode, node);
 
 				node.id = 'bananas';
 				nodes = rule.gather({
-					include: [fixture],
+					include: [axe.utils.getComposedTree(fixture)[0]],
 					exclude: [],
 					frames: []
 				});
@@ -54,7 +54,7 @@ describe('Rule', function() {
 						selector: 'div'
 					}),
 					result = rule.gather({
-						include: [fixture],
+						include: [axe.utils.getComposedTree(fixture)[0]],
 						exclude: [],
 						frames: []
 					});
@@ -70,10 +70,10 @@ describe('Rule', function() {
 						selector: 'div'
 					}),
 					nodes = rule.gather({
-						include: [document.getElementById('fixture').firstChild]
+						include: [axe.utils.getComposedTree(document.getElementById('fixture').firstChild)[0]]
 					});
 
-				assert.deepEqual(nodes, [node]);
+				assert.deepEqual(nodes.map(function (n) {return n.actualNode;}), [node]);
 			});
 
 			it('should default to all nodes if selector is not specified', function() {
@@ -90,18 +90,19 @@ describe('Rule', function() {
 
 				var rule = new Rule({}),
 					result = rule.gather({
-						include: [document.getElementById('fixture')]
+						include: [axe.utils.getComposedTree(document.getElementById('fixture'))[0]]
 					});
 
 				assert.lengthOf(result, 3);
-				assert.sameMembers(result, nodes);
+				assert.sameMembers(result.map(function (n) { return n.actualNode; }),
+					nodes);
 			});
 			it('should exclude hidden elements', function() {
 				fixture.innerHTML = '<div style="display: none"><span>HEHEHE</span></div>';
 
 				var rule = new Rule({}),
 					result = rule.gather({
-						include: [document.getElementById('fixture').firstChild]
+						include: [axe.utils.getComposedTree(document.getElementById('fixture').firstChild)[0]]
 					});
 
 				assert.lengthOf(result, 0);
@@ -113,10 +114,10 @@ describe('Rule', function() {
 						excludeHidden: false
 					}),
 					result = rule.gather({
-						include: [document.getElementById('fixture').firstChild]
+						include: [axe.utils.getComposedTree(document.getElementById('fixture').firstChild)[0]]
 					});
 
-				assert.deepEqual(result, [fixture.firstChild]);
+				assert.deepEqual(result.map(function (n) { return n.actualNode; }), [fixture.firstChild]);
 			});
 		});
 		describe('run', function() {
@@ -137,7 +138,7 @@ describe('Rule', function() {
 					});
 
 				rule.run({
-					include: [div]
+					include: [axe.utils.getComposedTree(div)[0]]
 				}, {}, function() {
 					assert.isTrue(success);
 					done();
@@ -157,7 +158,7 @@ describe('Rule', function() {
 					});
 
 				rule.run({
-					include: [div]
+					include: [axe.utils.getComposedTree(div)[0]]
 				}, {}, isNotCalled, function() {
 					assert.isFalse(success);
 					done();
@@ -181,7 +182,7 @@ describe('Rule', function() {
 				});
 
 				rule.run({
-					include: [fixture]
+					include: [axe.utils.getComposedTree(fixture)[0]]
 				}, {}, function() {
 					assert.isTrue(success);
 					done();
@@ -206,7 +207,7 @@ describe('Rule', function() {
 				});
 
 				rule.run({
-					include: [fixture]
+					include: [axe.utils.getComposedTree(fixture)[0]]
 				}, {}, function() {
 					assert.isTrue(success);
 					done();
@@ -231,7 +232,7 @@ describe('Rule', function() {
 				}, isNotCalled);
 
 				rule.run({
-					include: [fixture]
+					include: [axe.utils.getComposedTree(fixture)[0]]
 				}, {}, function() {
 					assert.isTrue(success);
 					done();
@@ -264,7 +265,7 @@ describe('Rule', function() {
 					}
 				});
 				rule.run({
-					include: [document]
+					include: [axe.utils.getComposedTree(document)[0]]
 				}, options, function() {
 					done();
 				}, isNotCalled);
@@ -309,7 +310,7 @@ describe('Rule', function() {
 					}
 				});
 				rule.run({
-					include: [document]
+					include: [axe.utils.getComposedTree(document)[0]]
 				}, options, function() {
 					done();
 				}, isNotCalled);
@@ -328,7 +329,7 @@ describe('Rule', function() {
 					}
 				});
 				rule.run({
-					include: [document]
+					include: [axe.utils.getComposedTree(document)[0]]
 				}, {}, function(r) {
 					assert.lengthOf(r.nodes, 0);
 				}, isNotCalled);
@@ -369,7 +370,7 @@ describe('Rule', function() {
 						}
 					});
 					rule.run({
-						include: [fixture]
+						include: [axe.utils.getComposedTree(fixture)[0]]
 					}, {}, function() {
 						assert.isTrue(isDqElementCalled);
 						done();
@@ -392,7 +393,7 @@ describe('Rule', function() {
 						}
 					});
 					rule.run({
-						include: [fixture]
+						include: [axe.utils.getComposedTree(fixture)[0]]
 					}, {}, function() {
 						assert.isFalse(isDqElementCalled);
 						done();
@@ -414,7 +415,7 @@ describe('Rule', function() {
 						}
 					});
 					rule.run({
-						include: [fixture]
+						include: [axe.utils.getComposedTree(fixture)[0]]
 					}, {}, function() {
 						assert.isTrue(isDqElementCalled);
 						done();
@@ -434,7 +435,7 @@ describe('Rule', function() {
 						}
 					});
 					rule.run({
-						include: [fixture]
+						include: [axe.utils.getComposedTree(fixture)[0]]
 					}, {}, function() {
 						assert.isFalse(isDqElementCalled);
 						done();
@@ -457,7 +458,7 @@ describe('Rule', function() {
 				});
 
 				rule.run({
-					include: [fixture]
+					include: [axe.utils.getComposedTree(fixture)[0]]
 				}, {}, noop, function(err) {
 					assert.equal(err.message, 'Holy hand grenade');
 					done();
@@ -479,7 +480,7 @@ describe('Rule', function() {
 				});
 
 				rule.run({
-					include: [fixture]
+					include: [axe.utils.getComposedTree(fixture)[0]]
 				}, {}, noop, function(err) {
 					assert.equal(err.message, 'your reality');
 					done();
@@ -503,7 +504,7 @@ describe('Rule', function() {
 						}]
 					});
 					rule.run({
-						include: document
+						include: axe.utils.getComposedTree(document)[0]
 					}, {}, noop, isNotCalled);
 					assert.isTrue(success);
 
@@ -520,7 +521,7 @@ describe('Rule', function() {
 						}]
 					});
 					rule.run({
-						include: document
+						include: axe.utils.getComposedTree(document)[0]
 					}, {}, function() {
 						success = true;
 					}, isNotCalled);
diff --git a/test/core/public/run-rules.js b/test/core/public/run-rules.js
index be68a729b6..bd147aa5d8 100644
--- a/test/core/public/run-rules.js
+++ b/test/core/public/run-rules.js
@@ -314,7 +314,7 @@ describe('runRules', function () {
 				any: ['has-target']
 			}, {
 				id: 'first-div',
-				selector: 'div:not([id=fixture])',
+				selector: 'div#fixture div',
 				any: ['first-div'],
 			}],
 			checks: [{
diff --git a/test/core/utils/contains.js b/test/core/utils/contains.js
index cb97255f85..c0e2bf8d67 100644
--- a/test/core/utils/contains.js
+++ b/test/core/utils/contains.js
@@ -9,16 +9,18 @@ describe('axe.utils.contains', function () {
 
 	it('should first check contains', function () {
 		var success = false,
-			node2 = 'not really a node but it doesnt matter',
+			node2 = { actualNode: 'not really a node but it doesnt matter' },
 			node1 = {
-				contains: function (n2) {
-					success = true;
-					assert.equal(n2, node2);
-				},
-				compareDocumentPosition: function () {
-					success = false;
-					assert.ok(false, 'should not be called');
+				actualNode: {
+					contains: function (n2) {
+						success = true;
+						assert.deepEqual(n2, node2.actualNode);
+					},
+					compareDocumentPosition: function () {
+						success = false;
+						assert.ok(false, 'should not be called');
 
+					}
 				}
 			};
 
@@ -28,11 +30,13 @@ describe('axe.utils.contains', function () {
 
 	it('should fallback to compareDocumentPosition', function () {
 		var success = false,
-			node2 = 'not really a node but it doesnt matter',
+			node2 = { actualNode: 'not really a node but it doesnt matter' },
 			node1 = {
-				compareDocumentPosition: function (n2) {
-					success = true;
-					assert.equal(n2, node2);
+				actualNode: {
+					compareDocumentPosition: function (n2) {
+						success = true;
+						assert.deepEqual(n2, node2.actualNode);
+					}
 				}
 			};
 
@@ -41,10 +45,12 @@ describe('axe.utils.contains', function () {
 	});
 
 	it('should compareDocumentPosition against bitwise & 16', function () {
-		var node2 = 'not really a node but it doesnt matter',
+		var node2 = { actualNode: 'not really a node but it doesnt matter' },
 			node1 = {
-				compareDocumentPosition: function () {
-					return 20;
+				actualNode: {
+					compareDocumentPosition: function () {
+						return 20;
+					}
 				}
 			};
 
@@ -53,8 +59,8 @@ describe('axe.utils.contains', function () {
 
 	it('should work', function () {
 		fixture.innerHTML = '<div id="outer"><div id="inner"></div></div>';
-		var inner = document.getElementById('inner');
-		var outer = document.getElementById('outer');
+		var inner = axe.utils.getComposedTree(document.getElementById('inner'))[0];
+		var outer = axe.utils.getComposedTree(document.getElementById('outer'))[0];
 
 		assert.isTrue(axe.utils.contains(outer, inner));
 		assert.isFalse(axe.utils.contains(inner, outer));
diff --git a/test/core/utils/node-sorter.js b/test/core/utils/node-sorter.js
index 1b50568e7c..9f4d9f557c 100644
--- a/test/core/utils/node-sorter.js
+++ b/test/core/utils/node-sorter.js
@@ -15,30 +15,30 @@ describe('axe.utils.nodeSorter', function () {
 	it('should return -1 if a comes before b', function () {
 		fixture.innerHTML = '<div id="a"></div><div id="b"></div>';
 
-		assert.equal(axe.utils.nodeSorter($id('a'), $id('b')), -1);
+		assert.equal(axe.utils.nodeSorter({ actualNode: $id('a') }, { actualNode: $id('b') }), -1);
 	});
 
 	it('should return -1 if a comes before b - nested', function () {
 		fixture.innerHTML = '<div id="a"><div id="b"></div></div>';
 
-		assert.equal(axe.utils.nodeSorter($id('a'), $id('b')), -1);
+		assert.equal(axe.utils.nodeSorter({ actualNode: $id('a') }, { actualNode: $id('b') }), -1);
 	});
 
 	it('should return 1 if b comes before a', function () {
 		fixture.innerHTML = '<div id="b"></div><div id="a"></div>';
 
-		assert.equal(axe.utils.nodeSorter($id('a'), $id('b')), 1);
+		assert.equal(axe.utils.nodeSorter({ actualNode: $id('a') }, { actualNode: $id('b') }), 1);
 	});
 
 	it('should return 1 if b comes before a - nested', function () {
 		fixture.innerHTML = '<div id="b"><div id="a"></div></div>';
 
-		assert.equal(axe.utils.nodeSorter($id('a'), $id('b')), 1);
+		assert.equal(axe.utils.nodeSorter({ actualNode: $id('a') }, { actualNode: $id('b') }), 1);
 	});
 
 	it('should return 0 if a === b', function () {
 		fixture.innerHTML = '<div id="a"></div>';
 
-		assert.equal(axe.utils.nodeSorter($id('a'), $id('a')), 0);
+		assert.equal(axe.utils.nodeSorter({ actualNode: $id('a') }, { actualNode: $id('a') }), 0);
 	});
 });
\ No newline at end of file
diff --git a/test/core/utils/qsa.js b/test/core/utils/qsa.js
index 3a7f4a1760..9d0338a604 100644
--- a/test/core/utils/qsa.js
+++ b/test/core/utils/qsa.js
@@ -4,6 +4,7 @@ function Vnode (nodeName, className, attributes, id) {
 	this.id = id;
 	this.attributes = attributes || [];
 	this.className = className;
+	this.nodeType = 1;
 }
 
 Vnode.prototype.getAttribute = function (att) {
@@ -11,7 +12,7 @@ Vnode.prototype.getAttribute = function (att) {
 	var attribute = this.attributes.find(function (item) {
 		return item.key === att;
 	});
-	return attribute ? attribute.value : '';
+	return attribute ? attribute.value : null;
 };
 
 describe('axe.utils.querySelectorAll', function () {
diff --git a/test/core/utils/select.js b/test/core/utils/select.js
index 57456931df..e7f8f8fb93 100644
--- a/test/core/utils/select.js
+++ b/test/core/utils/select.js
@@ -28,9 +28,9 @@ describe('axe.utils.select', function () {
 			div.id = 'monkeys';
 			fixture.appendChild(div);
 
-			var result = axe.utils.select('#monkeys', { include: [document] });
+			var result = axe.utils.select('#monkeys', { include: [axe.utils.getComposedTree(document)[0]] });
 
-			assert.equal(result[0], div);
+			assert.equal(result[0].actualNode, div);
 
 		});
 
@@ -41,10 +41,10 @@ describe('axe.utils.select', function () {
 			fixture.innerHTML = '<div id="monkeys"><div id="bananas" class="bananas"></div></div>';
 
 			var result = axe.utils.select('.bananas', {
-				include: [$id('monkeys')]
+				include: [axe.utils.getComposedTree($id('monkeys'))[0]]
 			});
 
-			assert.deepEqual(result, [$id('bananas')]);
+			assert.deepEqual([result[0].actualNode], [$id('bananas')]);
 
 		});
 
@@ -52,8 +52,8 @@ describe('axe.utils.select', function () {
 			fixture.innerHTML = '<div id="monkeys"><div id="bananas" class="bananas"></div></div>';
 
 			var result = axe.utils.select('.bananas', {
-				include: [$id('fixture')],
-				exclude: [$id('monkeys')]
+				include: [axe.utils.getComposedTree($id('fixture'))[0]],
+				exclude: [axe.utils.getComposedTree($id('monkeys'))[0]]
 			});
 
 			assert.deepEqual(result, []);
@@ -73,8 +73,10 @@ describe('axe.utils.select', function () {
 
 
 			var result = axe.utils.select('.bananas', {
-				include: [$id('include1'), $id('include2')],
-				exclude: [$id('exclude1'), $id('exclude2')]
+				include: [axe.utils.getComposedTree($id('include1'))[0],
+					axe.utils.getComposedTree($id('include2'))[0]],
+				exclude: [axe.utils.getComposedTree($id('exclude1'))[0],
+					axe.utils.getComposedTree($id('exclude2'))[0]]
 			});
 
 			assert.deepEqual(result, []);
@@ -96,11 +98,14 @@ describe('axe.utils.select', function () {
 
 
 			var result = axe.utils.select('.bananas', {
-				include: [$id('include3'), $id('include2'), $id('include1')],
-				exclude: [$id('exclude1'), $id('exclude2')]
+				include: [axe.utils.getComposedTree($id('include3'))[0],
+					axe.utils.getComposedTree($id('include2'))[0],
+					axe.utils.getComposedTree($id('include1'))[0]],
+				exclude: [axe.utils.getComposedTree($id('exclude1'))[0],
+					axe.utils.getComposedTree($id('exclude2'))[0]]
 			});
 
-			assert.deepEqual(result, [$id('bananas')]);
+			assert.deepEqual([result[0].actualNode], [$id('bananas')]);
 
 		});
 
@@ -109,10 +114,13 @@ describe('axe.utils.select', function () {
 	it('should only contain unique elements', function () {
 		fixture.innerHTML = '<div id="monkeys"><div id="bananas" class="bananas"></div></div>';
 
-		var result = axe.utils.select('.bananas', { include: [$id('fixture'), $id('monkeys')] });
+		var result = axe.utils.select('.bananas', {
+			include: [axe.utils.getComposedTree($id('fixture'))[0],
+					axe.utils.getComposedTree($id('monkeys'))[0]]
+		});
 
 		assert.lengthOf(result, 1);
-		assert.equal(result[0], $id('bananas'));
+		assert.equal(result[0].actualNode, $id('bananas'));
 
 	});
 
@@ -120,10 +128,11 @@ describe('axe.utils.select', function () {
 		fixture.innerHTML = '<div id="one"><div id="target1" class="bananas"></div></div>' +
 			'<div id="two"><div id="target2" class="bananas"></div></div>';
 
-		var result = axe.utils.select('.bananas', { include: [$id('two'), $id('one')] });
-
-		assert.deepEqual(result, [$id('target1'), $id('target2')]);
+		var result = axe.utils.select('.bananas', { include: [axe.utils.getComposedTree($id('two'))[0],
+			axe.utils.getComposedTree($id('one'))[0]] });
 
+		assert.deepEqual(result.map(function (n) { return n.actualNode; }),
+			[$id('target1'), $id('target2')]);
 
 	});
 

From 655eacba79e48783d6b2f46ed273850148e1e130 Mon Sep 17 00:00:00 2001
From: Dylan Barrell <dylan@barrell.com>
Date: Mon, 27 Mar 2017 18:40:57 -0400
Subject: [PATCH 008/142] implement :not

---
 Gruntfile.js                    |  14 +-
 lib/core/utils/css-parser.js    | 624 ++++++++++++++++++++++++++++++++
 lib/core/utils/merge-results.js |   3 +-
 lib/core/utils/qsa.js           | 173 ++++++++-
 lib/core/utils/slick-parser.js  | 219 -----------
 test/core/public/run-rules.js   |   2 +-
 test/core/utils/qsa.js          |  36 ++
 7 files changed, 834 insertions(+), 237 deletions(-)
 create mode 100644 lib/core/utils/css-parser.js
 delete mode 100644 lib/core/utils/slick-parser.js

diff --git a/Gruntfile.js b/Gruntfile.js
index 8eb2eeff27..600a23d31a 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -54,14 +54,14 @@ module.exports = function (grunt) {
 				]
 			}
 		},
-    retire: {
+		retire: {
 			options: {
 				/** list of files to ignore **/
 				ignorefile: '.retireignore.json' //or '.retireignore.json'
 			},
 			js: ['lib/*.js'], /** Which js-files to scan. **/
 			node: ['./'] /** Which node directories to scan (containing package.json). **/
-    },
+		},
 		clean: ['dist', 'tmp', 'axe.js', 'axe.*.js'],
 		babel: {
 			options: {
@@ -94,15 +94,15 @@ module.exports = function (grunt) {
 		},
 		concat: {
 			engine: {
+				options: {
+					process: true
+				},
 				coreFiles: [
 					'tmp/core/index.js',
 					'tmp/core/*/index.js',
 					'tmp/core/**/index.js',
 					'tmp/core/**/*.js'
 				],
-				options: {
-					process: true
-				},
 				files: langs.map(function (lang, i) {
 					return {
 						src: [
@@ -112,7 +112,7 @@ module.exports = function (grunt) {
 							'<%= configure.rules.files[' + i + '].dest.auto %>',
 							'lib/outro.stub'
 						],
-						dest: 'axe' + lang + '.js',
+						dest: 'axe' + lang + '.js'
 					};
 				})
 			},
@@ -193,7 +193,7 @@ module.exports = function (grunt) {
 						bracketize: true,
 						quote_style: 1
 					},
-					preserveComments: 'some'
+					preserveComments: 'all'
 				}
 			},
 			minify: {
diff --git a/lib/core/utils/css-parser.js b/lib/core/utils/css-parser.js
new file mode 100644
index 0000000000..2915734413
--- /dev/null
+++ b/lib/core/utils/css-parser.js
@@ -0,0 +1,624 @@
+/* jshint ignore:start */
+(function (axe) {
+/*!
+ * The copyright below covers the code within this function block only
+ *
+ * Copyright (c) 2013 Dulin Marat
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+	function CssSelectorParser() {
+	  this.pseudos = {};
+	  this.attrEqualityMods = {};
+	  this.ruleNestingOperators = {};
+	  this.substitutesEnabled = false;
+	}
+
+	CssSelectorParser.prototype.registerSelectorPseudos = function(name) {
+	  for (var j = 0, len = arguments.length; j < len; j++) {
+	    name = arguments[j];
+	    this.pseudos[name] = 'selector';
+	  }
+	  return this;
+	};
+
+	CssSelectorParser.prototype.unregisterSelectorPseudos = function(name) {
+	  for (var j = 0, len = arguments.length; j < len; j++) {
+	    name = arguments[j];
+	    delete this.pseudos[name];
+	  }
+	  return this;
+	};
+
+	CssSelectorParser.prototype.registerNumericPseudos = function(name) {
+	    for (var j = 0, len = arguments.length; j < len; j++) {
+	        name = arguments[j];
+	        this.pseudos[name] = 'numeric';
+	    }
+	    return this;
+	};
+
+	CssSelectorParser.prototype.unregisterNumericPseudos = function(name) {
+	    for (var j = 0, len = arguments.length; j < len; j++) {
+	        name = arguments[j];
+	        delete this.pseudos[name];
+	    }
+	    return this;
+	};
+
+	CssSelectorParser.prototype.registerNestingOperators = function(operator) {
+	  for (var j = 0, len = arguments.length; j < len; j++) {
+	    operator = arguments[j];
+	    this.ruleNestingOperators[operator] = true;
+	  }
+	  return this;
+	};
+
+	CssSelectorParser.prototype.unregisterNestingOperators = function(operator) {
+	  for (var j = 0, len = arguments.length; j < len; j++) {
+	    operator = arguments[j];
+	    delete this.ruleNestingOperators[operator];
+	  }
+	  return this;
+	};
+
+	CssSelectorParser.prototype.registerAttrEqualityMods = function(mod) {
+	  for (var j = 0, len = arguments.length; j < len; j++) {
+	    mod = arguments[j];
+	    this.attrEqualityMods[mod] = true;
+	  }
+	  return this;
+	};
+
+	CssSelectorParser.prototype.unregisterAttrEqualityMods = function(mod) {
+	  for (var j = 0, len = arguments.length; j < len; j++) {
+	    mod = arguments[j];
+	    delete this.attrEqualityMods[mod];
+	  }
+	  return this;
+	};
+
+	CssSelectorParser.prototype.enableSubstitutes = function() {
+	  this.substitutesEnabled = true;
+	  return this;
+	};
+
+	CssSelectorParser.prototype.disableSubstitutes = function() {
+	  this.substitutesEnabled = false;
+	  return this;
+	};
+
+	function isIdentStart(c) {
+	  return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || (c === '-') || (c === '_');
+	}
+
+	function isIdent(c) {
+	  return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || (c >= '0' && c <= '9') || c === '-' || c === '_';
+	}
+
+	function isHex(c) {
+	  return (c >= 'a' && c <= 'f') || (c >= 'A' && c <= 'F') || (c >= '0' && c <= '9');
+	}
+
+	function isDecimal(c) {
+	  return c >= '0' && c <= '9';
+	}
+
+	function isAttrMatchOperator(chr) {
+	  return chr === '=' || chr === '^' || chr === '$' || chr === '*' || chr === '~';
+	}
+
+	var identSpecialChars = {
+	  '!': true,
+	  '"': true,
+	  '#': true,
+	  '$': true,
+	  '%': true,
+	  '&': true,
+	  '\'': true,
+	  '(': true,
+	  ')': true,
+	  '*': true,
+	  '+': true,
+	  ',': true,
+	  '.': true,
+	  '/': true,
+	  ';': true,
+	  '<': true,
+	  '=': true,
+	  '>': true,
+	  '?': true,
+	  '@': true,
+	  '[': true,
+	  '\\': true,
+	  ']': true,
+	  '^': true,
+	  '`': true,
+	  '{': true,
+	  '|': true,
+	  '}': true,
+	  '~': true
+	};
+
+	var strReplacementsRev = {
+	  '\n': '\\n',
+	  '\r': '\\r',
+	  '\t': '\\t',
+	  '\f': '\\f',
+	  '\v': '\\v'
+	};
+
+	var singleQuoteEscapeChars = {
+	  n: '\n',
+	  r: '\r',
+	  t: '\t',
+	  f: '\f',
+	  '\\': '\\',
+	  '\'': '\''
+	};
+
+	var doubleQuotesEscapeChars = {
+	  n: '\n',
+	  r: '\r',
+	  t: '\t',
+	  f: '\f',
+	  '\\': '\\',
+	  '"': '"'
+	};
+
+	function ParseContext(str, pos, pseudos, attrEqualityMods, ruleNestingOperators, substitutesEnabled) {
+	  var chr, getIdent, getStr, l, skipWhitespace;
+	  l = str.length;
+	  chr = null;
+	  getStr = function(quote, escapeTable) {
+	    var esc, hex, result;
+	    result = '';
+	    pos++;
+	    chr = str.charAt(pos);
+	    while (pos < l) {
+	      if (chr === quote) {
+	        pos++;
+	        return result;
+	      } else if (chr === '\\') {
+	        pos++;
+	        chr = str.charAt(pos);
+	        if (chr === quote) {
+	          result += quote;
+	        } else if (esc = escapeTable[chr]) {
+	          result += esc;
+	        } else if (isHex(chr)) {
+	          hex = chr;
+	          pos++;
+	          chr = str.charAt(pos);
+	          while (isHex(chr)) {
+	            hex += chr;
+	            pos++;
+	            chr = str.charAt(pos);
+	          }
+	          if (chr === ' ') {
+	            pos++;
+	            chr = str.charAt(pos);
+	          }
+	          result += String.fromCharCode(parseInt(hex, 16));
+	          continue;
+	        } else {
+	          result += chr;
+	        }
+	      } else {
+	        result += chr;
+	      }
+	      pos++;
+	      chr = str.charAt(pos);
+	    }
+	    return result;
+	  };
+	  getIdent = function() {
+	    var result = '';
+	    chr = str.charAt(pos);
+	    while (pos < l) {
+	      if (isIdent(chr)) {
+	        result += chr;
+	      } else if (chr === '\\') {
+	        pos++;
+	        if (pos >= l) {
+	          throw Error('Expected symbol but end of file reached.');
+	        }
+	        chr = str.charAt(pos);
+	        if (identSpecialChars[chr]) {
+	          result += chr;
+	        } else if (isHex(chr)) {
+	          var hex = chr;
+	          pos++;
+	          chr = str.charAt(pos);
+	          while (isHex(chr)) {
+	            hex += chr;
+	            pos++;
+	            chr = str.charAt(pos);
+	          }
+	          if (chr === ' ') {
+	            pos++;
+	            chr = str.charAt(pos);
+	          }
+	          result += String.fromCharCode(parseInt(hex, 16));
+	          continue;
+	        } else {
+	          result += chr;
+	        }
+	      } else {
+	        return result;
+	      }
+	      pos++;
+	      chr = str.charAt(pos);
+	    }
+	    return result;
+	  };
+	  skipWhitespace = function() {
+	    chr = str.charAt(pos);
+	    var result = false;
+	    while (chr === ' ' || chr === "\t" || chr === "\n" || chr === "\r" || chr === "\f") {
+	      result = true;
+	      pos++;
+	      chr = str.charAt(pos);
+	    }
+	    return result;
+	  };
+	  this.parse = function() {
+	    var res = this.parseSelector();
+	    if (pos < l) {
+	      throw Error('Rule expected but "' + str.charAt(pos) + '" found.');
+	    }
+	    return res;
+	  };
+	  this.parseSelector = function() {
+	    var res;
+	    var selector = res = this.parseSingleSelector();
+	    chr = str.charAt(pos);
+	    while (chr === ',') {
+	      pos++;
+	      skipWhitespace();
+	      if (res.type !== 'selectors') {
+	        res = {
+	          type: 'selectors',
+	          selectors: [selector]
+	        };
+	      }
+	      selector = this.parseSingleSelector();
+	      if (!selector) {
+	        throw Error('Rule expected after ",".');
+	      }
+	      res.selectors.push(selector);
+	    }
+	    return res;
+	  };
+
+	  this.parseSingleSelector = function() {
+	    skipWhitespace();
+	    var selector = {
+	      type: 'ruleSet'
+	    };
+	    var rule = this.parseRule();
+	    if (!rule) {
+	      return null;
+	    }
+	    var currentRule = selector;
+	    while (rule) {
+	      rule.type = 'rule';
+	      currentRule.rule = rule;
+	      currentRule = rule;
+	      skipWhitespace();
+	      chr = str.charAt(pos);
+	      if (pos >= l || chr === ',' || chr === ')') {
+	        break;
+	      }
+	      if (ruleNestingOperators[chr]) {
+	        var op = chr;
+	        pos++;
+	        skipWhitespace();
+	        rule = this.parseRule();
+	        if (!rule) {
+	          throw Error('Rule expected after "' + op + '".');
+	        }
+	        rule.nestingOperator = op;
+	      } else {
+	        rule = this.parseRule();
+	        if (rule) {
+	          rule.nestingOperator = null;
+	        }
+	      }
+	    }
+	    return selector;
+	  };
+
+	  this.parseRule = function() {
+	    var rule = null;
+	    while (pos < l) {
+	      chr = str.charAt(pos);
+	      if (chr === '*') {
+	        pos++;
+	        (rule = rule || {}).tagName = '*';
+	      } else if (isIdentStart(chr) || chr === '\\') {
+	        (rule = rule || {}).tagName = getIdent();
+	      } else if (chr === '.') {
+	        pos++;
+	        rule = rule || {};
+	        (rule.classNames = rule.classNames || []).push(getIdent());
+	      } else if (chr === '#') {
+	        pos++;
+	        (rule = rule || {}).id = getIdent();
+	      } else if (chr === '[') {
+	        pos++;
+	        skipWhitespace();
+	        var attr = {
+	          name: getIdent()
+	        };
+	        skipWhitespace();
+	        if (chr === ']') {
+	          pos++;
+	        } else {
+	          var operator = '';
+	          if (attrEqualityMods[chr]) {
+	            operator = chr;
+	            pos++;
+	            chr = str.charAt(pos);
+	          }
+	          if (pos >= l) {
+	            throw Error('Expected "=" but end of file reached.');
+	          }
+	          if (chr !== '=') {
+	            throw Error('Expected "=" but "' + chr + '" found.');
+	          }
+	          attr.operator = operator + '=';
+	          pos++;
+	          skipWhitespace();
+	          var attrValue = '';
+	          attr.valueType = 'string';
+	          if (chr === '"') {
+	            attrValue = getStr('"', doubleQuotesEscapeChars);
+	          } else if (chr === '\'') {
+	            attrValue = getStr('\'', singleQuoteEscapeChars);
+	          } else if (substitutesEnabled && chr === '$') {
+	            pos++;
+	            attrValue = getIdent();
+	            attr.valueType = 'substitute';
+	          } else {
+	            while (pos < l) {
+	              if (chr === ']') {
+	                break;
+	              }
+	              attrValue += chr;
+	              pos++;
+	              chr = str.charAt(pos);
+	            }
+	            attrValue = attrValue.trim();
+	          }
+	          skipWhitespace();
+	          if (pos >= l) {
+	            throw Error('Expected "]" but end of file reached.');
+	          }
+	          if (chr !== ']') {
+	            throw Error('Expected "]" but "' + chr + '" found.');
+	          }
+	          pos++;
+	          attr.value = attrValue;
+	        }
+	        rule = rule || {};
+	        (rule.attrs = rule.attrs || []).push(attr);
+	      } else if (chr === ':') {
+	        pos++;
+	        var pseudoName = getIdent();
+	        var pseudo = {
+	          name: pseudoName
+	        };
+	        if (chr === '(') {
+	          pos++;
+	          var value = '';
+	          skipWhitespace();
+	          if (pseudos[pseudoName] === 'selector') {
+	            pseudo.valueType = 'selector';
+	            value = this.parseSelector();
+	          } else {
+	            pseudo.valueType = pseudos[pseudoName] || 'string';
+	            if (chr === '"') {
+	              value = getStr('"', doubleQuotesEscapeChars);
+	            } else if (chr === '\'') {
+	              value = getStr('\'', singleQuoteEscapeChars);
+	            } else if (substitutesEnabled && chr === '$') {
+	              pos++;
+	              value = getIdent();
+	              pseudo.valueType = 'substitute';
+	            } else {
+	              while (pos < l) {
+	                if (chr === ')') {
+	                  break;
+	                }
+	                value += chr;
+	                pos++;
+	                chr = str.charAt(pos);
+	              }
+	              value = value.trim();
+	            }
+	            skipWhitespace();
+	          }
+	          if (pos >= l) {
+	            throw Error('Expected ")" but end of file reached.');
+	          }
+	          if (chr !== ')') {
+	            throw Error('Expected ")" but "' + chr + '" found.');
+	          }
+	          pos++;
+	          pseudo.value = value;
+	        }
+	        rule = rule || {};
+	        (rule.pseudos = rule.pseudos || []).push(pseudo);
+	      } else {
+	        break;
+	      }
+	    }
+	    return rule;
+	  };
+	  return this;
+	}
+
+	CssSelectorParser.prototype.parse = function(str) {
+	  var context = new ParseContext(
+	      str,
+	      0,
+	      this.pseudos,
+	      this.attrEqualityMods,
+	      this.ruleNestingOperators,
+	      this.substitutesEnabled
+	  );
+	  return context.parse();
+	};
+
+	CssSelectorParser.prototype.escapeIdentifier = function(s) {
+	  var result = '';
+	  var i = 0;
+	  var len = s.length;
+	  while (i < len) {
+	    var chr = s.charAt(i);
+	    if (identSpecialChars[chr]) {
+	      result += '\\' + chr;
+	    } else {
+	      if (
+	          !(
+	              chr === '_' || chr === '-' ||
+	              (chr >= 'A' && chr <= 'Z') ||
+	              (chr >= 'a' && chr <= 'z') ||
+	              (i !== 0 && chr >= '0' && chr <= '9')
+	          )
+	      ) {
+	        var charCode = chr.charCodeAt(0);
+	        if ((charCode & 0xF800) === 0xD800) {
+	          var extraCharCode = s.charCodeAt(i++);
+	          if ((charCode & 0xFC00) !== 0xD800 || (extraCharCode & 0xFC00) !== 0xDC00) {
+	            throw Error('UCS-2(decode): illegal sequence');
+	          }
+	          charCode = ((charCode & 0x3FF) << 10) + (extraCharCode & 0x3FF) + 0x10000;
+	        }
+	        result += '\\' + charCode.toString(16) + ' ';
+	      } else {
+	        result += chr;
+	      }
+	    }
+	    i++;
+	  }
+	  return result;
+	};
+
+	CssSelectorParser.prototype.escapeStr = function(s) {
+	  var result = '';
+	  var i = 0;
+	  var len = s.length;
+	  var chr, replacement;
+	  while (i < len) {
+	    chr = s.charAt(i);
+	    if (chr === '"') {
+	      chr = '\\"';
+	    } else if (chr === '\\') {
+	      chr = '\\\\';
+	    } else if (replacement = strReplacementsRev[chr]) {
+	      chr = replacement;
+	    }
+	    result += chr;
+	    i++;
+	  }
+	  return "\"" + result + "\"";
+	};
+
+	CssSelectorParser.prototype.render = function(path) {
+	  return this._renderEntity(path).trim();
+	};
+
+	CssSelectorParser.prototype._renderEntity = function(entity) {
+	  var currentEntity, parts, res;
+	  res = '';
+	  switch (entity.type) {
+	    case 'ruleSet':
+	      currentEntity = entity.rule;
+	      parts = [];
+	      while (currentEntity) {
+	        if (currentEntity.nestingOperator) {
+	          parts.push(currentEntity.nestingOperator);
+	        }
+	        parts.push(this._renderEntity(currentEntity));
+	        currentEntity = currentEntity.rule;
+	      }
+	      res = parts.join(' ');
+	      break;
+	    case 'selectors':
+	      res = entity.selectors.map(this._renderEntity, this).join(', ');
+	      break;
+	    case 'rule':
+	      if (entity.tagName) {
+	        if (entity.tagName === '*') {
+	          res = '*';
+	        } else {
+	          res = this.escapeIdentifier(entity.tagName);
+	        }
+	      }
+	      if (entity.id) {
+	        res += "#" + this.escapeIdentifier(entity.id);
+	      }
+	      if (entity.classNames) {
+	        res += entity.classNames.map(function(cn) {
+	          return "." + (this.escapeIdentifier(cn));
+	        }, this).join('');
+	      }
+	      if (entity.attrs) {
+	        res += entity.attrs.map(function(attr) {
+	          if (attr.operator) {
+	            if (attr.valueType === 'substitute') {
+	              return "[" + this.escapeIdentifier(attr.name) + attr.operator + "$" + attr.value + "]";
+	            } else {
+	              return "[" + this.escapeIdentifier(attr.name) + attr.operator + this.escapeStr(attr.value) + "]";
+	            }
+	          } else {
+	            return "[" + this.escapeIdentifier(attr.name) + "]";
+	          }
+	        }, this).join('');
+	      }
+	      if (entity.pseudos) {
+	        res += entity.pseudos.map(function(pseudo) {
+	          if (pseudo.valueType) {
+	            if (pseudo.valueType === 'selector') {
+	              return ":" + this.escapeIdentifier(pseudo.name) + "(" + this._renderEntity(pseudo.value) + ")";
+	            } else if (pseudo.valueType === 'substitute') {
+	              return ":" + this.escapeIdentifier(pseudo.name) + "($" + pseudo.value + ")";
+	            } else if (pseudo.valueType === 'numeric') {
+	              return ":" + this.escapeIdentifier(pseudo.name) + "(" + pseudo.value + ")";
+	            } else {
+	              return ":" + this.escapeIdentifier(pseudo.name) + "(" + this.escapeIdentifier(pseudo.value) + ")";
+	            }
+	          } else {
+	            return ":" + this.escapeIdentifier(pseudo.name);
+	          }
+	        }, this).join('');
+	      }
+	      break;
+	    default:
+	      throw Error('Unknown entity type: "' + entity.type(+'".'));
+	  }
+	  return res;
+	};
+
+	var parser = new CssSelectorParser();
+	parser.registerNestingOperators('>');
+	axe.utils.cssParser = parser;
+})(axe);
diff --git a/lib/core/utils/merge-results.js b/lib/core/utils/merge-results.js
index 3651e6a4ed..fa498ca52a 100644
--- a/lib/core/utils/merge-results.js
+++ b/lib/core/utils/merge-results.js
@@ -43,7 +43,8 @@ function spliceNodes(target, to) {
   sorterResult, t;
   for (var i = 0, l = target.length; i < l; i++) {
     t = target[i].node;
-    sorterResult = axe.utils.nodeSorter(t.element, firstFromFrame.element);
+    sorterResult = axe.utils.nodeSorter({ actualNode: t.element },
+      { actualNode: firstFromFrame.element });
     if (sorterResult > 0 || (sorterResult === 0 && firstFromFrame.selector.length < t.selector.length)) {
       target.splice.apply(target, [i, 0].concat(to));
       return;
diff --git a/lib/core/utils/qsa.js b/lib/core/utils/qsa.js
index 3690e78216..780be20d6c 100644
--- a/lib/core/utils/qsa.js
+++ b/lib/core/utils/qsa.js
@@ -3,6 +3,10 @@
  * supports shadowDOM
  */
 
+// The lines below is because the latedef option does not work
+var convertExpressions = function () {};
+var matchExpressions = function () {};
+
 // todo: implement an option to follow aria-owns
 
 function matchesTag (node, exp) {
@@ -26,18 +30,29 @@ function matchesId (node, exp) {
 	return !exp.id || node.id === exp.id;
 }
 
+function matchesPseudos (target, exp) {
+
+	if (!exp.pseudos || exp.pseudos.reduce((result, pseudo) => {
+		if (pseudo.name === 'not') {
+			return result && !matchExpressions([target], pseudo.expressions, false).length;
+		}
+		throw new Error('the pseudo selector ' + pseudo.name + ' has not yet been implemented');
+	}, true)) {
+		return true;
+	}
+	return false;
+}
+
 function matchSelector (targets, exp, recurse) {
 	var result = [];
 
-	if (exp.pseudos) {
-		throw new Error('matchSelector does not support pseudo selector: ' + exp.pseudos[0].key);
-	}
 	targets = Array.isArray(targets) ? targets : [targets];
 	targets.forEach((target) => {
 		if (matchesTag(target.actualNode, exp) &&
 			matchesClasses(target.actualNode, exp) &&
 			matchesAttributes(target.actualNode, exp) &&
-			matchesId(target.actualNode, exp)) {
+			matchesId(target.actualNode, exp) &&
+			matchesPseudos(target, exp)) {
 			result.push(target);
 		}
 		if (recurse) {
@@ -49,21 +64,161 @@ function matchSelector (targets, exp, recurse) {
 	return result;
 }
 
-axe.utils.querySelectorAll = function (domTree, selector) {
-	domTree = Array.isArray(domTree) ? domTree : [domTree];
+var escapeRegExp = (function(){
+	/*! Credit: XRegExp 0.6.1 (c) 2007-2008 Steven Levithan <http://stevenlevithan.com/regex/xregexp/> MIT License */
+	var from = /(?=[\-\[\]{}()*+?.\\\^$|,#\s])/g;
+	var to = '\\';
+	return function(string) {
+		return string.replace(from, to);
+	};
+}());
+
+var reUnescape = /\\/g;
+
+function convertAttributes (atts) {
+	/*! Credit Mootools Copyright Mootools, MIT License */
+	if (!atts) {
+		return;
+	}
+	return atts.map((att) => {
+		// jshint maxcomplexity:12
+		var attributeKey = att.name.replace(reUnescape, '');
+		var attributeValue = (att.value || '').replace(reUnescape, '');
+		var test, regexp;
+
+		switch (att.operator){
+			case '^=' :
+				regexp = new RegExp('^'+ escapeRegExp(attributeValue));
+				break;
+			case '$=' :
+				regexp = new RegExp(escapeRegExp(attributeValue) +'$');
+				break;
+			case '~=' :
+				regexp = new RegExp('(^|\\s)'+ escapeRegExp(attributeValue) +'(\\s|$)');
+				break;
+			case '|=' :
+				regexp = new RegExp('^'+ escapeRegExp(attributeValue) +'(-|$)');
+				break;
+			case  '=' :
+				test = function(value){
+					return attributeValue === value;
+				};
+				break;
+			case '*=' :
+				test = function(value){
+					return value && value.indexOf(attributeValue) > -1;
+				};
+				break;
+			case '!=' :
+				test = function(value){
+					return attributeValue !== value;
+				};
+				break;
+			default   :
+				test = function(value){
+					return !!value;
+				};
+		}
+
+		if (attributeValue === '' && (/^[*$^]=$/).test(att.operator)) {
+			test = function(){
+				return false;
+			};
+		}
+
+		if (!test) {
+			test = function(value){
+				return value && regexp.test(value);
+			};
+		}
+		return {
+			key: attributeKey,
+			value: attributeValue,
+			test: test
+		};
+	});
+}
 
-	return axe.utils.cssParser(selector).expressions.reduce((collected, exprArr) => {
+function convertClasses (classes) {
+	if (!classes) {
+		return;
+	}
+	return classes.map((className) => {
+		className = className.replace(reUnescape, '');
+
+		return {
+			value: className,
+			regexp: new RegExp('(^|\\s)' + escapeRegExp(className) + '(\\s|$)')
+		};
+	});
+}
+
+function convertPseudos (pseudos) {
+	if (!pseudos) {
+		return;
+	}
+	return pseudos.map((p) => {
+		var expressions;
+
+		if (p.name === 'not') {
+			expressions = axe.utils.cssParser.parse(p.value);
+			expressions = expressions.selectors ? expressions.selectors : [expressions];
+			expressions = convertExpressions(expressions);
+		}
+		return {
+			name: p.name,
+			expressions: expressions,
+			value: p.value
+		};
+	});
+}
+
+/**
+ * convert the css-selector-parser format into the Slick format
+ *
+ * @param Array{Object} expressions
+ * @return Array{Object}
+ *
+ */
+convertExpressions = function (expressions) {
+	return expressions.map((exp) => {
+		var newExp = [];
+		var rule = exp.rule;
+		while(rule) {
+			newExp.push({
+				tag: rule.tagName ? rule.tagName.toLowerCase() : '*',
+				combinator: rule.nestingOperator ? rule.nestingOperator : ' ',
+				id: rule.id,
+				attributes: convertAttributes(rule.attrs),
+				classes: convertClasses(rule.classNames),
+				pseudos: convertPseudos(rule.pseudos)
+			});
+			rule = rule.rule;
+		}
+		return newExp;
+	});
+};
+
+matchExpressions = function  (domTree, expressions, recurse) {
+	return expressions.reduce((collected, exprArr) => {
 		var candidates = domTree;
 		exprArr.forEach((exp, index) => {
-			var recurse = exp.combinator === '>' ? false : true;
+			recurse = exp.combinator === '>' ? false : recurse;
 			if ([' ', '>'].indexOf(exp.combinator) === -1) {
 				throw new Error('axe.utils.querySelectorAll does not support the combinator: ' + exp.combinator);
 			}
-			exp.tag = exp.tag.toLowerCase(); // do this once
 			candidates = candidates.reduce((result, node) => {
 				return result.concat(matchSelector(index ? node.children : node, exp, recurse));
 			}, []);
 		});
 		return collected.concat(candidates);
 	}, []);
+};
+
+axe.utils.querySelectorAll = function (domTree, selector) {
+	domTree = Array.isArray(domTree) ? domTree : [domTree];
+	var expressions = axe.utils.cssParser.parse(selector);
+	expressions = expressions.selectors ? expressions.selectors : [expressions];
+	expressions = convertExpressions(expressions);
+	return matchExpressions(domTree, expressions, true);
 };
\ No newline at end of file
diff --git a/lib/core/utils/slick-parser.js b/lib/core/utils/slick-parser.js
deleted file mode 100644
index 188ad8fb18..0000000000
--- a/lib/core/utils/slick-parser.js
+++ /dev/null
@@ -1,219 +0,0 @@
-/* jshint ignore:start */
-/* Copyright Mootools Developers, licensed under the MIT license https://opensource.org/licenses/MIT */
-/*
----
-name: Slick.Parser
-description: Standalone CSS3 Selector parser
-provides: Slick.Parser
-...
-*/
-(function (axe) {
-	var parsed,
-		separatorIndex,
-		combinatorIndex,
-		reversed,
-		cache = {},
-		reverseCache = {},
-		reUnescape = /\\/g;
-
-	var parse = function(expression, isReversed){
-		if (expression == null) return null;
-		if (expression.Slick === true) return expression;
-		expression = ('' + expression).replace(/^\s+|\s+$/g, '');
-		reversed = !!isReversed;
-		var currentCache = (reversed) ? reverseCache : cache;
-		if (currentCache[expression]) return currentCache[expression];
-		parsed = {
-			Slick: true,
-			expressions: [],
-			raw: expression,
-			reverse: function(){
-				return parse(this.raw, true);
-			}
-		};
-		separatorIndex = -1;
-		while (expression != (expression = expression.replace(regexp, parser)));
-		parsed.length = parsed.expressions.length;
-		return currentCache[parsed.raw] = (reversed) ? reverse(parsed) : parsed;
-	};
-
-	var reverseCombinator = function(combinator){
-		if (combinator === '!') return ' ';
-		else if (combinator === ' ') return '!';
-		else if ((/^!/).test(combinator)) return combinator.replace(/^!/, '');
-		else return '!' + combinator;
-	};
-
-	var reverse = function(expression){
-		var expressions = expression.expressions;
-		for (var i = 0; i < expressions.length; i++){
-			var exp = expressions[i];
-			var last = {parts: [], tag: '*', combinator: reverseCombinator(exp[0].combinator)};
-
-			for (var j = 0; j < exp.length; j++){
-				var cexp = exp[j];
-				if (!cexp.reverseCombinator) cexp.reverseCombinator = ' ';
-				cexp.combinator = cexp.reverseCombinator;
-				delete cexp.reverseCombinator;
-			}
-
-			exp.reverse().push(last);
-		}
-		return expression;
-	};
-
-	var escapeRegExp = (function(){
-		// Credit: XRegExp 0.6.1 (c) 2007-2008 Steven Levithan <http://stevenlevithan.com/regex/xregexp/> MIT License
-		var from = /(?=[\-\[\]{}()*+?.\\\^$|,#\s])/g, to = '\\';
-		return function(string){ return string.replace(from, to) }
-	}())
-
-	var regexp = new RegExp(
-	/*
-	#!/usr/bin/env ruby
-	puts "\t\t" + DATA.read.gsub(/\(\?x\)|\s+#.*$|\s+|\\$|\\n/,'')
-	__END__
-		"(?x)^(?:\
-		  \\s* ( , ) \\s*               # Separator          \n\
-		| \\s* ( <combinator>+ ) \\s*   # Combinator         \n\
-		|      ( \\s+ )                 # CombinatorChildren \n\
-		|      ( <unicode>+ | \\* )     # Tag                \n\
-		| \\#  ( <unicode>+       )     # ID                 \n\
-		| \\.  ( <unicode>+       )     # ClassName          \n\
-		|                               # Attribute          \n\
-		\\[  \
-			\\s* (<unicode1>+)  (?:  \
-				\\s* ([*^$!~|]?=)  (?:  \
-					\\s* (?:\
-						([\"']?)(.*?)\\9 \
-					)\
-				)  \
-			)?  \\s*  \
-		\\](?!\\]) \n\
-		|   :+ ( <unicode>+ )(?:\
-		\\( (?:\
-			(?:([\"'])([^\\12]*)\\12)|((?:\\([^)]+\\)|[^()]*)+)\
-		) \\)\
-		)?\
-		)"
-	*/
-		"^(?:\\s*(,)\\s*|\\s*(<combinator>+)\\s*|(\\s+)|(<unicode>+|\\*)|\\#(<unicode>+)|\\.(<unicode>+)|\\[\\s*(<unicode1>+)(?:\\s*([*^$!~|]?=)(?:\\s*(?:([\"']?)(.*?)\\9)))?\\s*\\](?!\\])|(:+)(<unicode>+)(?:\\((?:(?:([\"'])([^\\13]*)\\13)|((?:\\([^)]+\\)|[^()]*)+))\\))?)"
-		.replace(/<combinator>/, '[' + escapeRegExp(">+~`!@$%^&={}\\;</") + ']')
-		.replace(/<unicode>/g, '(?:[\\w\\u00a1-\\uFFFF-]|\\\\[^\\s0-9a-f])')
-		.replace(/<unicode1>/g, '(?:[:\\w\\u00a1-\\uFFFF-]|\\\\[^\\s0-9a-f])')
-	);
-
-	function parser(
-		rawMatch,
-
-		separator,
-		combinator,
-		combinatorChildren,
-
-		tagName,
-		id,
-		className,
-
-		attributeKey,
-		attributeOperator,
-		attributeQuote,
-		attributeValue,
-
-		pseudoMarker,
-		pseudoClass,
-		pseudoQuote,
-		pseudoClassQuotedValue,
-		pseudoClassValue
-	){
-		if (separator || separatorIndex === -1){
-			parsed.expressions[++separatorIndex] = [];
-			combinatorIndex = -1;
-			if (separator) return '';
-		}
-
-		if (combinator || combinatorChildren || combinatorIndex === -1){
-			combinator = combinator || ' ';
-			var currentSeparator = parsed.expressions[separatorIndex];
-			if (reversed && currentSeparator[combinatorIndex])
-				currentSeparator[combinatorIndex].reverseCombinator = reverseCombinator(combinator);
-			currentSeparator[++combinatorIndex] = {combinator: combinator, tag: '*'};
-		}
-
-		var currentParsed = parsed.expressions[separatorIndex][combinatorIndex];
-
-		if (tagName){
-			currentParsed.tag = tagName.replace(reUnescape, '');
-
-		} else if (id){
-			currentParsed.id = id.replace(reUnescape, '');
-
-		} else if (className){
-			className = className.replace(reUnescape, '');
-
-			if (!currentParsed.classList) currentParsed.classList = [];
-			if (!currentParsed.classes) currentParsed.classes = [];
-			currentParsed.classList.push(className);
-			currentParsed.classes.push({
-				value: className,
-				regexp: new RegExp('(^|\\s)' + escapeRegExp(className) + '(\\s|$)')
-			});
-
-		} else if (pseudoClass){
-			pseudoClassValue = pseudoClassValue || pseudoClassQuotedValue;
-			pseudoClassValue = pseudoClassValue ? pseudoClassValue.replace(reUnescape, '') : null;
-
-			if (!currentParsed.pseudos) currentParsed.pseudos = [];
-			currentParsed.pseudos.push({
-				key: pseudoClass.replace(reUnescape, ''),
-				value: pseudoClassValue,
-				type: pseudoMarker.length == 1 ? 'class' : 'element'
-			});
-
-		} else if (attributeKey){
-			attributeKey = attributeKey.replace(reUnescape, '');
-			attributeValue = (attributeValue || '').replace(reUnescape, '');
-
-			var test, regexp;
-
-			switch (attributeOperator){
-				case '^=' : regexp = new RegExp(       '^'+ escapeRegExp(attributeValue)            ); break;
-				case '$=' : regexp = new RegExp(            escapeRegExp(attributeValue) +'$'       ); break;
-				case '~=' : regexp = new RegExp( '(^|\\s)'+ escapeRegExp(attributeValue) +'(\\s|$)' ); break;
-				case '|=' : regexp = new RegExp(       '^'+ escapeRegExp(attributeValue) +'(-|$)'   ); break;
-				case  '=' : test = function(value){
-					return attributeValue == value;
-				}; break;
-				case '*=' : test = function(value){
-					return value && value.indexOf(attributeValue) > -1;
-				}; break;
-				case '!=' : test = function(value){
-					return attributeValue != value;
-				}; break;
-				default   : test = function(value){
-					return !!value;
-				};
-			}
-
-			if (attributeValue == '' && (/^[*$^]=$/).test(attributeOperator)) test = function(){
-				return false;
-			};
-
-			if (!test) test = function(value){
-				return value && regexp.test(value);
-			};
-
-			if (!currentParsed.attributes) currentParsed.attributes = [];
-			currentParsed.attributes.push({
-				key: attributeKey,
-				operator: attributeOperator,
-				value: attributeValue,
-				test: test
-			});
-
-		}
-
-		return '';
-	};
-
-	axe.utils.cssParser = parse;	
-})(axe);
diff --git a/test/core/public/run-rules.js b/test/core/public/run-rules.js
index bd147aa5d8..c4175a554f 100644
--- a/test/core/public/run-rules.js
+++ b/test/core/public/run-rules.js
@@ -127,7 +127,7 @@ describe('runRules', function () {
 				any: ['has-target']
 			}, {
 				id: 'first-div',
-				selector: 'div:not([id=fixture])',
+				selector: 'div:not(#fixture)',
 				any: ['first-div']
 			}],
 			checks: [{
diff --git a/test/core/utils/qsa.js b/test/core/utils/qsa.js
index 9d0338a604..0ef699a605 100644
--- a/test/core/utils/qsa.js
+++ b/test/core/utils/qsa.js
@@ -133,6 +133,42 @@ describe('axe.utils.querySelectorAll', function () {
 		var result = axe.utils.querySelectorAll(dom, '[data-a11yhero="faulkner"] li');
 		assert.equal(result.length, 2);
 	});
+	it('should find nodes using :not selector with class', function () {
+		var result = axe.utils.querySelectorAll(dom, 'div:not(.first)');
+		assert.equal(result.length, 2);
+	});
+	it('should find nodes using :not selector with matching id', function () {
+		var result = axe.utils.querySelectorAll(dom, 'div:not(#one)');
+		assert.equal(result.length, 2);
+	});
+	it('should find nodes using :not selector with matching attribute selector', function () {
+		var result = axe.utils.querySelectorAll(dom, 'div:not([data-a11yhero])');
+		assert.equal(result.length, 2);
+	});
+	it('should find nodes using :not selector with matching attribute selector with value', function () {
+		var result = axe.utils.querySelectorAll(dom, 'div:not([data-a11yhero=faulkner])');
+		assert.equal(result.length, 2);
+	});
+	it('should find nodes using :not selector with bogus attribute selector with value', function () {
+		var result = axe.utils.querySelectorAll(dom, 'div:not([data-a11yhero=wilco])');
+		assert.equal(result.length, 3);
+	});
+	it('should find nodes using :not selector with bogus id', function () {
+		var result = axe.utils.querySelectorAll(dom, 'div:not(#thangy)');
+		assert.equal(result.length, 3);
+	});
+	it('should find nodes hierarchically using :not selector', function () {
+		var result = axe.utils.querySelectorAll(dom, 'div:not(.first) li');
+		assert.equal(result.length, 2);
+	});
+	it('should find same nodes hierarchically using more :not selector', function () {
+		var result = axe.utils.querySelectorAll(dom, 'div:not(.first) li:not(.breaking)');
+		assert.equal(result.length, 2);
+	});
+	it('should NOT find nodes hierarchically using :not selector', function () {
+		var result = axe.utils.querySelectorAll(dom, 'div:not(.second) li:not(.breaking)');
+		assert.equal(result.length, 0);
+	});
 	it('should put it all together', function () {
 		var result = axe.utils.querySelectorAll(dom,
 			'.first[data-a11yhero="faulkner"] > ul li.breaking');

From 16bbd0662a1bfa0c0ba1289cecf16d9ba7db9321 Mon Sep 17 00:00:00 2001
From: Dylan Barrell <dylan@barrell.com>
Date: Tue, 28 Mar 2017 08:16:10 -0400
Subject: [PATCH 009/142] update the acknowledgements

---
 README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index b2264214e7..408da79f3c 100644
--- a/README.md
+++ b/README.md
@@ -102,4 +102,6 @@ Read the [documentation on contributing](CONTRIBUTING.md)
 
 ## Acknowledgements
 
-Thanks to the [Slick Parser](https://github.com/mootools/slick/blob/master/Source/Slick.Parser.js) implementers for their contribution, we have used it in the shadowDOM support code.
+Thanks to Dulin Marat for his [css-selector-parser](https://www.npmjs.com/package/css-selector-parser) implementation which is included for shadow DOM support.
+
+Thanks to the [Slick Parser](https://github.com/mootools/slick/blob/master/Source/Slick.Parser.js) implementers for their contribution, we have used some of their algorithms in our shadow DOM support code.

From 5199775e927a44468b9cbe2f82f35bb172836b8b Mon Sep 17 00:00:00 2001
From: Dylan Barrell <dylan@barrell.com>
Date: Tue, 28 Mar 2017 08:43:54 -0400
Subject: [PATCH 010/142] update the API documentation to reflect the change in
 the target for a node

---
 doc/API.md | 29 +++++++++++++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/doc/API.md b/doc/API.md
index 4bee0fc006..34313d9697 100644
--- a/doc/API.md
+++ b/doc/API.md
@@ -415,7 +415,15 @@ This will either be null or an object which is an instance of Error. If you are
 
 #### Results Object
 
-The callback function passed in as the third parameter of `axe.a11yCheck` runs on the results object. This object has two components – a passes array and a violations array.  The passes array keeps track of all the passed tests, along with detailed information on each one. This leads to more efficient testing, especially when used in conjunction with manual testing, as the user can easily find out what tests have already been passed. Similarly, the violations array keeps track of all the failed tests, along with detailed information on each one.
+The callback function passed in as the third parameter of `axe.a11yCheck` runs on the results object. This object has four components – a `passes` array, a `violations` array, an `incomplete` array and an `inapplicable` array.
+
+The `passes` array keeps track of all the passed tests, along with detailed information on each one. This leads to more efficient testing, especially when used in conjunction with manual testing, as the user can easily find out what tests have already been passed.
+
+Similarly, the `violations` array keeps track of all the failed tests, along with detailed information on each one.
+
+The `incomplete` array (also referred to as the "review items") indicates which nodes could neither be determined to definitively pass or definitively fail. They are separated out in order that a user interface can display these to the user for manual review (hence the term "review items").
+
+The `inapplicable` array lists all the rules for which no matching elements were found on the page.
 
 ###### `url`
 
@@ -444,7 +452,7 @@ Each object returned in these arrays have the following properties:
 * `nodes` - Array of all elements the Rule tested
 	* `html` - Snippet of HTML of the Element
 	* `impact` - How serious the violation is. Can be one of "minor", "moderate", "serious", or "critical" if the test failed or `null` if the check passed
-	* `target` - Array of selectors that has each element correspond to one level of iframe or frame. If there is one iframe or frame, there should be two entries in `target`. If there are three iframe levels, there should be four entries in `target`.
+	* `target` - Array of either strings or Arrays of strings. If the item in the array is a string, then it is a CSS selector. If there are multiple items in the array each item corresponds to one level of iframe or frame. If there is one iframe or frame, there should be two entries in `target`. If there are three iframe levels, there should be four entries in `target`. If the item in the Array is an Array of strings, then it points to an element in a shadow DOM and each item (except the n-1th) in this array is a selector to a DOM element with a shadow DOM. The last element in the array points to the final shadow DOM node.
 	* `any` - Array of checks that were made where at least one must have passed. Each entry in the array contains:
 		* `id` - Unique identifier for this check. Check ids may be the same as Rule ids
 		* `impact` - How serious this particular check is. Can be one of "minor", "moderate", "serious", or "critical". Each check that is part of a rule can have different impacts. The highest impact of all the checks that fail is reported for the rule
@@ -527,6 +535,23 @@ axe.run(document, {
   console.log(results);
 });
 ```
+
+#### Example 4
+
+This example shows a result object that points to a shadow DOM element.
+
+* `violations[0]`
+  * `help` - `"Elements must have sufficient color contrast"`
+  * `helpUrl` - `"https://dequeuniversity.com/rules/axe/2.1/color-contrast?application=axeAPI"`
+  * `id` - `"color-contrast"`
+		* `nodes`
+			* `target[0][0]` - `"header > aria-menu"`
+			* `target[0][1]` - `"li.expanded"`
+
+* `violations[1]` ...
+
+As you can see the `target` array contains one item that is an array. This array contains two items, the first is a CSS selector string that finds the custom element `<aria-menu>` in the `<header>`. The second item in this array is the selector within that custom element's shadow DOM to find the `<li>` element with a class of `expanded`.
+
 ### API Name: axe.registerPlugin
 
 Register a plugin with the aXe plugin system. See [implementing a plugin](plugins.md) for more information on the plugin system

From 2aac29af075f2007fc6ec4fb118c4a5df0c03e34 Mon Sep 17 00:00:00 2001
From: Marcy Sutton <marcy.sutton@deque.com>
Date: Mon, 1 May 2017 16:46:24 -0500
Subject: [PATCH 011/142] fix: add copyright banner back in to axe.js

---
 Gruntfile.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index 600a23d31a..42dab3be14 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -193,7 +193,7 @@ module.exports = function (grunt) {
 						bracketize: true,
 						quote_style: 1
 					},
-					preserveComments: 'all'
+					preserveComments: /^!/
 				}
 			},
 			minify: {

From 1210321b3fc05f61dc64bc51c99a25371ddfd153 Mon Sep 17 00:00:00 2001
From: Jaime Iniesta <jaimeiniesta@gmail.com>
Date: Sun, 30 Apr 2017 19:54:47 +0200
Subject: [PATCH 012/142] Add Rocket Validator to doc/projects.md

---
 doc/projects.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/projects.md b/doc/projects.md
index 7f0f88d206..9795021530 100644
--- a/doc/projects.md
+++ b/doc/projects.md
@@ -24,3 +24,4 @@ Add your project/integration to this file and submit a pull request.
 20. [Storybook accessibility addon](https://github.com/jbovenschen/storybook-addon-a11y)
 21. [Intern](https://github.com/theintern/intern-a11y)
 22. [Protractor-axe-report Plugin](https://github.com/E1Edatatracker/protractor-axe-report-plugin)
+23. [Rocket Validator](https://rocketvalidator.com)

From cd3b1a5931515f7b3f575d176780ca72ba0295b0 Mon Sep 17 00:00:00 2001
From: Marcy Sutton <marcy.sutton@deque.com>
Date: Mon, 1 May 2017 17:11:56 -0500
Subject: [PATCH 013/142] chore: add worldspace to projects

---
 doc/projects.md | 47 +++++++++++++++++++++++++----------------------
 1 file changed, 25 insertions(+), 22 deletions(-)

diff --git a/doc/projects.md b/doc/projects.md
index 9795021530..4c66a14cc2 100644
--- a/doc/projects.md
+++ b/doc/projects.md
@@ -2,26 +2,29 @@
 
 Add your project/integration to this file and submit a pull request.
 
+1. [WorldSpace Attest](https://www.deque.com/products/worldspace-attest/)
+1. [WorldSpace Assure](https://www.deque.com/products/worldspace-assure/)
+1. [WorldSpace Comply](https://www.deque.com/products/worldspace-comply/)
 1. [aXe Chrome plugin](https://chrome.google.com/webstore/detail/axe/lhdoppojpmngadmnindnejefpokejbdd)
-2. [axe-webdriverjs](https://www.npmjs.com/package/axe-webdriverjs)
-3. [ember-a11y-testing](https://www.npmjs.com/package/ember-a11y-testing)
-4. [axe-firefox-devtools](https://github.com/dequelabs/axe-firefox-devtools) and on the [Firefox extension page](https://addons.mozilla.org/en-US/firefox/addon/axe-devtools/)
-5. [axe-selenium-java](https://github.com/dequelabs/axe-selenium-java)
-6. [a11yChromePlugin - not the official Chrome plugin source code](https://github.com/ptrstpp950/a11yChromePlugin)
-7. [grunt-axe-webdriver](https://www.npmjs.com/package/grunt-axe-webdriver)
-8. [R-Spec and Cucumber](https://github.com/dequelabs/axe-matchers)
-9. [aXe audit runner for CrawlKit](https://github.com/crawlkit/runner-axe)
-10. [Web Accessibility Checker for Visual Studio](https://visualstudiogallery.msdn.microsoft.com/3aabefab-1681-4fea-8f95-6a62e2f0f1ec)
-11. [ReactJS Accessibility Checker](https://github.com/dylanb/react-axe) (react-axe)
-12. [Vorlon.js Remote Debugger](https://github.com/MicrosoftDX/Vorlonjs)
-13. [Selenium IDE aXe Extension](https://github.com/bkardell/selenium-ide-axe)
-14. [gulp-axe-webdriver](https://github.com/felixzapata/gulp-axe-webdriver)
-15. [AccessLint](https://accesslint.com/)
-16. [Lighthouse](https://github.com/GoogleChrome/lighthouse)
-17. [Axegrinder](https://github.com/claflamme/axegrinder)
-18. [Ghost-Axe](https://www.npmjs.com/package/ghost-axe)
-19. [Protractor accessibility plugin](https://github.com/angular/protractor-accessibility-plugin)
-20. [Storybook accessibility addon](https://github.com/jbovenschen/storybook-addon-a11y)
-21. [Intern](https://github.com/theintern/intern-a11y)
-22. [Protractor-axe-report Plugin](https://github.com/E1Edatatracker/protractor-axe-report-plugin)
-23. [Rocket Validator](https://rocketvalidator.com)
+1. [axe-webdriverjs](https://www.npmjs.com/package/axe-webdriverjs)
+1. [ember-a11y-testing](https://www.npmjs.com/package/ember-a11y-testing)
+1. [axe-firefox-devtools](https://github.com/dequelabs/axe-firefox-devtools) and on the [Firefox extension page](https://addons.mozilla.org/en-US/firefox/addon/axe-devtools/)
+1. [axe-selenium-java](https://github.com/dequelabs/axe-selenium-java)
+1. [a11yChromePlugin - not the official Chrome plugin source code](https://github.com/ptrstpp950/a11yChromePlugin)
+1. [grunt-axe-webdriver](https://www.npmjs.com/package/grunt-axe-webdriver)
+1. [R-Spec and Cucumber](https://github.com/dequelabs/axe-matchers)
+1. [aXe audit runner for CrawlKit](https://github.com/crawlkit/runner-axe)
+1. [Web Accessibility Checker for Visual Studio](https://visualstudiogallery.msdn.microsoft.com/3aabefab-1681-4fea-8f95-6a62e2f0f1ec)
+1. [ReactJS Accessibility Checker](https://github.com/dylanb/react-axe) (react-axe)
+1. [Vorlon.js Remote Debugger](https://github.com/MicrosoftDX/Vorlonjs)
+1. [Selenium IDE aXe Extension](https://github.com/bkardell/selenium-ide-axe)
+1. [gulp-axe-webdriver](https://github.com/felixzapata/gulp-axe-webdriver)
+1. [AccessLint](https://accesslint.com/)
+1. [Lighthouse](https://github.com/GoogleChrome/lighthouse)
+1. [Axegrinder](https://github.com/claflamme/axegrinder)
+1. [Ghost-Axe](https://www.npmjs.com/package/ghost-axe)
+1. [Protractor accessibility plugin](https://github.com/angular/protractor-accessibility-plugin)
+1. [Storybook accessibility addon](https://github.com/jbovenschen/storybook-addon-a11y)
+1. [Intern](https://github.com/theintern/intern-a11y)
+1. [Protractor-axe-report Plugin](https://github.com/E1Edatatracker/protractor-axe-report-plugin)
+1. [Rocket Validator](https://rocketvalidator.com)

From 07ea17a868604359839dbf6c2b2176f1bf32ea4e Mon Sep 17 00:00:00 2001
From: Dylan Barrell <dylan@barrell.com>
Date: Sat, 20 May 2017 16:57:42 -0400
Subject: [PATCH 014/142] Add support for V1 fallback content

---
 lib/core/utils/composed-tree.js  | 15 +++++++++++++++
 test/core/utils/composed-tree.js | 10 +++++++++-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/lib/core/utils/composed-tree.js b/lib/core/utils/composed-tree.js
index 954f62227a..e0a8a141cd 100644
--- a/lib/core/utils/composed-tree.js
+++ b/lib/core/utils/composed-tree.js
@@ -43,6 +43,17 @@ function virtualDOMfromNode (node, shadowId) {
 	};
 }
 
+function getSlotChildren(node) {
+	var retVal = [];
+
+	node = node.firstChild;
+	while (node) {
+		retVal.push(node);
+		node = node.nextSibling;
+	}
+	return retVal;
+}
+
 /**
  * recursvely returns an array of the virtual DOM nodes at this level
  * excluding comment nodes and of course the shadow DOM nodes
@@ -82,6 +93,10 @@ axe.utils.getComposedTree = function (node, shadowId) {
 			return realArray.reduce(reduceShadowDOM, []);
 		} else if (nodeName === 'slot') {
 			realArray = Array.from(node.assignedNodes());
+			if (!realArray.length) {
+				// fallback content
+				realArray = getSlotChildren(node);
+			}
 			return realArray.reduce(reduceShadowDOM, []);
 		} else {
 			if (node.nodeType === 1) {
diff --git a/test/core/utils/composed-tree.js b/test/core/utils/composed-tree.js
index 5772daf92c..b4433e3485 100644
--- a/test/core/utils/composed-tree.js
+++ b/test/core/utils/composed-tree.js
@@ -111,7 +111,7 @@ if (document.body && typeof document.body.attachShadow === 'function') {
 				var group = document.createElement('div');
 				group.className = className;
 				// Empty string in slot name attribute or absence thereof work the same, so no need for special handling.
-				group.innerHTML = '<ul><slot name="' + slotName + '"></slot></ul>';
+				group.innerHTML = '<ul><slot name="' + slotName + '">fallback content<li>one</li></slot></ul>';
 				return group;
 			}
 
@@ -127,6 +127,7 @@ if (document.body && typeof document.body.attachShadow === 'function') {
 			str += '<div class="stories"><li>1</li>' +
 			'<li>2</li><li class="breaking" slot="breaking">3</li>' +
 			'<li>4</li><li>5</li><li class="breaking" slot="breaking">6</li></div>';
+			str += '<div class="stories"></div>';
 			fixture.innerHTML = str;
 
 			fixture.querySelectorAll('.stories').forEach(makeShadowTree);
@@ -139,6 +140,13 @@ if (document.body && typeof document.body.attachShadow === 'function') {
 		});
 		it('getComposedTree\'s virtual DOM should represent the composed tree', composedTreeAssertions);
 		it('getComposedTree\'s virtual DOM should give an ID to the shadow DOM', shadowIdAssertions);
+		it('getComposedTree\'s virtual DOM should have the fallback content', function () {
+			var virtualDOM = axe.utils.getComposedTree(fixture);
+			assert.isTrue(virtualDOM[0].children[7].children[0].children.length === 2);
+			assert.isTrue(virtualDOM[0].children[7].children[0].children[0].actualNode.nodeType === 3);
+			assert.isTrue(virtualDOM[0].children[7].children[0].children[0].actualNode.textContent === 'fallback content');
+			assert.isTrue(virtualDOM[0].children[7].children[0].children[1].actualNode.nodeName === 'LI');
+		});
 	});
 }
 

From 48b56685ee7f2b10d799d6bcb077c1b34e174e7f Mon Sep 17 00:00:00 2001
From: Dylan Barrell <dylan@barrell.com>
Date: Sat, 20 May 2017 17:35:56 -0400
Subject: [PATCH 015/142] fix some tests

---
 lib/commons/dom/is-offscreen.js          |  4 +++-
 test/core/utils/send-command-to-frame.js | 22 ++++++++++++----------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/lib/commons/dom/is-offscreen.js b/lib/commons/dom/is-offscreen.js
index a27cb9688c..2d4ef7c3be 100644
--- a/lib/commons/dom/is-offscreen.js
+++ b/lib/commons/dom/is-offscreen.js
@@ -18,12 +18,14 @@ dom.isOffscreen = function (element) {
 
 	var leftBoundary,
 		docElement = document.documentElement,
+		styl = window.getComputedStyle(element),
 		dir = window.getComputedStyle(document.body || docElement)
 			.getPropertyValue('direction'),
 		coords = dom.getElementCoordinates(element);
 
 	// bottom edge beyond
-	if (coords.bottom < 0 && noParentScrolled(element, coords.bottom)) {
+	if (coords.bottom < 0 && (noParentScrolled(element, coords.bottom) ||
+			styl.position === 'absolute')) {
 		return true;
 	}
 
diff --git a/test/core/utils/send-command-to-frame.js b/test/core/utils/send-command-to-frame.js
index e606bba534..b2f34e1d42 100644
--- a/test/core/utils/send-command-to-frame.js
+++ b/test/core/utils/send-command-to-frame.js
@@ -60,16 +60,18 @@ describe('axe.utils.sendCommandToFrame', function () {
     var called = 0;
     var frame = document.createElement('iframe');
     frame.addEventListener('load', function () {
-      axe.utils.sendCommandToFrame(frame, {
-        number: number,
-        keepalive: true
-      }, function () {
-        called += 1;
-        if (called === number) {
-          assert.isTrue(true);
-          done();
-        }
-      }, assertNotCalled);
+      setTimeout(function () {
+        axe.utils.sendCommandToFrame(frame, {
+          number: number,
+          keepalive: true
+        }, function () {
+          called += 1;
+          if (called === number) {
+            assert.isTrue(true);
+            done();
+          }
+        }, assertNotCalled);
+      }, 500);
     });
 
     frame.id = 'level0';

From 264651f368a56c798e84a1f7c4a0527e7e770962 Mon Sep 17 00:00:00 2001
From: Dylan Barrell <dylan@barrell.com>
Date: Wed, 24 May 2017 06:46:25 -0400
Subject: [PATCH 016/142] change the terminology to match the shadow DOM spec
 as integrated into the HTML spec

---
 lib/core/base/context.js                      |  6 +--
 .../{composed-tree.js => flattened-tree.js}   | 16 +++----
 test/core/base/audit.js                       |  8 ++--
 test/core/base/check.js                       |  2 +-
 test/core/base/context.js                     |  6 +--
 test/core/base/rule.js                        | 46 +++++++++----------
 test/core/utils/contains.js                   |  4 +-
 .../{composed-tree.js => flattened-tree.js}   | 32 ++++++-------
 test/core/utils/select.js                     | 34 +++++++-------
 9 files changed, 77 insertions(+), 77 deletions(-)
 rename lib/core/utils/{composed-tree.js => flattened-tree.js} (87%)
 rename test/core/utils/{composed-tree.js => flattened-tree.js} (81%)

diff --git a/lib/core/base/context.js b/lib/core/base/context.js
index cbb0c8aa1f..3224c88c45 100644
--- a/lib/core/base/context.js
+++ b/lib/core/base/context.js
@@ -129,7 +129,7 @@ function parseSelectorArray(context, type) {
 			nodeList = Array.from(document.querySelectorAll(item));
 			//jshint loopfunc:true
 			result = result.concat(nodeList.map((node) => {
-				return axe.utils.getComposedTree(node)[0];
+				return axe.utils.getFlattenedTree(node)[0];
 			}));
 			break;
 		} else if (item && item.length && !(item instanceof Node)) {
@@ -140,12 +140,12 @@ function parseSelectorArray(context, type) {
 				nodeList = Array.from(document.querySelectorAll(item[0]));
 				//jshint loopfunc:true
 				result = result.concat(nodeList.map((node) => {
-					return axe.utils.getComposedTree(node)[0];
+					return axe.utils.getFlattenedTree(node)[0];
 				}));
 			}
 		} else if (item instanceof Node) {
 
-			result.push(axe.utils.getComposedTree(item)[0]);
+			result.push(axe.utils.getFlattenedTree(item)[0]);
 		}
 	}
 
diff --git a/lib/core/utils/composed-tree.js b/lib/core/utils/flattened-tree.js
similarity index 87%
rename from lib/core/utils/composed-tree.js
rename to lib/core/utils/flattened-tree.js
index e0a8a141cd..af6be946a5 100644
--- a/lib/core/utils/composed-tree.js
+++ b/lib/core/utils/flattened-tree.js
@@ -1,14 +1,14 @@
 /* global console */
 var axe = axe || { utils: {} };
 /**
- * NOTE: level only increases on "real" nodes because others do not exist in the composed tree
+ * NOTE: level only increases on "real" nodes because others do not exist in the flattened tree
  */
-axe.utils.printComposedTree = function (node, level) {
+axe.utils.printFlattenedTree = function (node, level) {
 	var indent = '  '.repeat(level) + '\u2514> ';
 	var nodeName;
 	if (node.shadowRoot) {
 		node.shadowRoot.childNodes.forEach(function (child) {
-			axe.utils.printComposedTree(child, level);
+			axe.utils.printFlattenedTree(child, level);
 		});
 	} else {
 		nodeName = node.nodeName.toLowerCase();
@@ -17,17 +17,17 @@ axe.utils.printComposedTree = function (node, level) {
 		}
 		if (nodeName === 'content') {
 			node.getDistributedNodes().forEach(function (child) {
-				axe.utils.printComposedTree(child, level);
+				axe.utils.printFlattenedTree(child, level);
 			});
 		} else if (nodeName === 'slot') {
 			node.assignedNodes().forEach(function (child) {
-				axe.utils.printComposedTree(child, level);
+				axe.utils.printFlattenedTree(child, level);
 			});
 		} else {
 			if (node.nodeType === 1) {
 				console.log(indent, node);
 				node.childNodes.forEach(function (child) {
-					axe.utils.printComposedTree(child, level + 1);
+					axe.utils.printFlattenedTree(child, level + 1);
 				});
 			}
 		}
@@ -64,12 +64,12 @@ function getSlotChildren(node) {
  *                           ancestor of the node
  */
 
-axe.utils.getComposedTree = function (node, shadowId) {
+axe.utils.getFlattenedTree = function (node, shadowId) {
 	// using a closure here and therefore cannot easily refactor toreduce the statements
 	//jshint maxstatements: false
 	var retVal, realArray, nodeName;
 	function reduceShadowDOM (res, child) {
-		var replacements = axe.utils.getComposedTree(child, shadowId);
+		var replacements = axe.utils.getFlattenedTree(child, shadowId);
 		if (replacements) {
 			res = res.concat(replacements);
 		}
diff --git a/test/core/base/audit.js b/test/core/base/audit.js
index 08ca791c36..30e42e8384 100644
--- a/test/core/base/audit.js
+++ b/test/core/base/audit.js
@@ -368,7 +368,7 @@ describe('Audit', function () {
 				'<input aria-labelledby="monkeys">' +
 				'<blink>FAIL ME</blink>';
 
-			a.run({ include: [axe.utils.getComposedTree(fixture)[0]] }, {}, function (results) {
+			a.run({ include: [axe.utils.getFlattenedTree(fixture)[0]] }, {}, function (results) {
 				var expected = [{
 					id: 'positive1',
 					result: 'inapplicable',
@@ -510,7 +510,7 @@ describe('Audit', function () {
 				}
 			});
 
-			a.run({ include: [axe.utils.getComposedTree(fixture)[0]] }, {
+			a.run({ include: [axe.utils.getFlattenedTree(fixture)[0]] }, {
 				runOnly: {
 					'type': 'rule',
 					'values': ['throw1']
@@ -537,7 +537,7 @@ describe('Audit', function () {
 					throw new Error('Launch the super sheep!');
 				}
 			});
-			a.run({ include: [axe.utils.getComposedTree(fixture)[0]] }, {
+			a.run({ include: [axe.utils.getFlattenedTree(fixture)[0]] }, {
 				runOnly: {
 					'type': 'rule',
 					'values': ['throw1', 'positive1']
@@ -575,7 +575,7 @@ describe('Audit', function () {
 					throw new Error('Launch the super sheep!');
 				}
 			});
-			a.run({ include: [axe.utils.getComposedTree(fixture)[0]] }, {
+			a.run({ include: [axe.utils.getFlattenedTree(fixture)[0]] }, {
 				debug: true,
 				runOnly: {
 					'type': 'rule',
diff --git a/test/core/base/check.js b/test/core/base/check.js
index fde3d4d8ab..484eae5ced 100644
--- a/test/core/base/check.js
+++ b/test/core/base/check.js
@@ -128,7 +128,7 @@ describe('Check', function () {
 						assert.equal(node, fixture);
 						done();
 					}
-				}).run(axe.utils.getComposedTree(fixture)[0], {}, noop);
+				}).run(axe.utils.getFlattenedTree(fixture)[0], {}, noop);
 
 			});
 
diff --git a/test/core/base/context.js b/test/core/base/context.js
index a83914d41e..86f253616d 100644
--- a/test/core/base/context.js
+++ b/test/core/base/context.js
@@ -335,8 +335,8 @@ describe('Context', function() {
 				include: ['#fixture'],
 				exclude: ['#mocha']
 			}), {
-				include: [axe.utils.getComposedTree(document.getElementById('fixture'))[0]],
-				exclude: [axe.utils.getComposedTree(document.getElementById('mocha'))[0]],
+				include: [axe.utils.getFlattenedTree(document.getElementById('fixture'))[0]],
+				exclude: [axe.utils.getFlattenedTree(document.getElementById('mocha'))[0]],
 				initiator: true,
 				page: false,
 				frames: []
@@ -349,7 +349,7 @@ describe('Context', function() {
 				include: ['#fixture', '#monkeys'],
 				exclude: ['#bananas']
 			}), {
-				include: [axe.utils.getComposedTree(document.getElementById('fixture'))[0]],
+				include: [axe.utils.getFlattenedTree(document.getElementById('fixture'))[0]],
 				exclude: [],
 				initiator: true,
 				page: false,
diff --git a/test/core/base/rule.js b/test/core/base/rule.js
index 56d2caafc7..a371593ea9 100644
--- a/test/core/base/rule.js
+++ b/test/core/base/rule.js
@@ -31,7 +31,7 @@ describe('Rule', function() {
 						selector: '#monkeys'
 					}),
 					nodes = rule.gather({
-						include: [axe.utils.getComposedTree(fixture)[0]],
+						include: [axe.utils.getFlattenedTree(fixture)[0]],
 						exclude: [],
 						frames: []
 					});
@@ -41,7 +41,7 @@ describe('Rule', function() {
 
 				node.id = 'bananas';
 				nodes = rule.gather({
-					include: [axe.utils.getComposedTree(fixture)[0]],
+					include: [axe.utils.getFlattenedTree(fixture)[0]],
 					exclude: [],
 					frames: []
 				});
@@ -54,7 +54,7 @@ describe('Rule', function() {
 						selector: 'div'
 					}),
 					result = rule.gather({
-						include: [axe.utils.getComposedTree(fixture)[0]],
+						include: [axe.utils.getFlattenedTree(fixture)[0]],
 						exclude: [],
 						frames: []
 					});
@@ -70,7 +70,7 @@ describe('Rule', function() {
 						selector: 'div'
 					}),
 					nodes = rule.gather({
-						include: [axe.utils.getComposedTree(document.getElementById('fixture').firstChild)[0]]
+						include: [axe.utils.getFlattenedTree(document.getElementById('fixture').firstChild)[0]]
 					});
 
 				assert.deepEqual(nodes.map(function (n) {return n.actualNode;}), [node]);
@@ -90,7 +90,7 @@ describe('Rule', function() {
 
 				var rule = new Rule({}),
 					result = rule.gather({
-						include: [axe.utils.getComposedTree(document.getElementById('fixture'))[0]]
+						include: [axe.utils.getFlattenedTree(document.getElementById('fixture'))[0]]
 					});
 
 				assert.lengthOf(result, 3);
@@ -102,7 +102,7 @@ describe('Rule', function() {
 
 				var rule = new Rule({}),
 					result = rule.gather({
-						include: [axe.utils.getComposedTree(document.getElementById('fixture').firstChild)[0]]
+						include: [axe.utils.getFlattenedTree(document.getElementById('fixture').firstChild)[0]]
 					});
 
 				assert.lengthOf(result, 0);
@@ -114,7 +114,7 @@ describe('Rule', function() {
 						excludeHidden: false
 					}),
 					result = rule.gather({
-						include: [axe.utils.getComposedTree(document.getElementById('fixture').firstChild)[0]]
+						include: [axe.utils.getFlattenedTree(document.getElementById('fixture').firstChild)[0]]
 					});
 
 				assert.deepEqual(result.map(function (n) { return n.actualNode; }), [fixture.firstChild]);
@@ -138,7 +138,7 @@ describe('Rule', function() {
 					});
 
 				rule.run({
-					include: [axe.utils.getComposedTree(div)[0]]
+					include: [axe.utils.getFlattenedTree(div)[0]]
 				}, {}, function() {
 					assert.isTrue(success);
 					done();
@@ -158,7 +158,7 @@ describe('Rule', function() {
 					});
 
 				rule.run({
-					include: [axe.utils.getComposedTree(div)[0]]
+					include: [axe.utils.getFlattenedTree(div)[0]]
 				}, {}, isNotCalled, function() {
 					assert.isFalse(success);
 					done();
@@ -182,7 +182,7 @@ describe('Rule', function() {
 				});
 
 				rule.run({
-					include: [axe.utils.getComposedTree(fixture)[0]]
+					include: [axe.utils.getFlattenedTree(fixture)[0]]
 				}, {}, function() {
 					assert.isTrue(success);
 					done();
@@ -207,7 +207,7 @@ describe('Rule', function() {
 				});
 
 				rule.run({
-					include: [axe.utils.getComposedTree(fixture)[0]]
+					include: [axe.utils.getFlattenedTree(fixture)[0]]
 				}, {}, function() {
 					assert.isTrue(success);
 					done();
@@ -232,7 +232,7 @@ describe('Rule', function() {
 				}, isNotCalled);
 
 				rule.run({
-					include: [axe.utils.getComposedTree(fixture)[0]]
+					include: [axe.utils.getFlattenedTree(fixture)[0]]
 				}, {}, function() {
 					assert.isTrue(success);
 					done();
@@ -265,7 +265,7 @@ describe('Rule', function() {
 					}
 				});
 				rule.run({
-					include: [axe.utils.getComposedTree(document)[0]]
+					include: [axe.utils.getFlattenedTree(document)[0]]
 				}, options, function() {
 					done();
 				}, isNotCalled);
@@ -310,7 +310,7 @@ describe('Rule', function() {
 					}
 				});
 				rule.run({
-					include: [axe.utils.getComposedTree(document)[0]]
+					include: [axe.utils.getFlattenedTree(document)[0]]
 				}, options, function() {
 					done();
 				}, isNotCalled);
@@ -329,7 +329,7 @@ describe('Rule', function() {
 					}
 				});
 				rule.run({
-					include: [axe.utils.getComposedTree(document)[0]]
+					include: [axe.utils.getFlattenedTree(document)[0]]
 				}, {}, function(r) {
 					assert.lengthOf(r.nodes, 0);
 				}, isNotCalled);
@@ -370,7 +370,7 @@ describe('Rule', function() {
 						}
 					});
 					rule.run({
-						include: [axe.utils.getComposedTree(fixture)[0]]
+						include: [axe.utils.getFlattenedTree(fixture)[0]]
 					}, {}, function() {
 						assert.isTrue(isDqElementCalled);
 						done();
@@ -393,7 +393,7 @@ describe('Rule', function() {
 						}
 					});
 					rule.run({
-						include: [axe.utils.getComposedTree(fixture)[0]]
+						include: [axe.utils.getFlattenedTree(fixture)[0]]
 					}, {}, function() {
 						assert.isFalse(isDqElementCalled);
 						done();
@@ -415,7 +415,7 @@ describe('Rule', function() {
 						}
 					});
 					rule.run({
-						include: [axe.utils.getComposedTree(fixture)[0]]
+						include: [axe.utils.getFlattenedTree(fixture)[0]]
 					}, {}, function() {
 						assert.isTrue(isDqElementCalled);
 						done();
@@ -435,7 +435,7 @@ describe('Rule', function() {
 						}
 					});
 					rule.run({
-						include: [axe.utils.getComposedTree(fixture)[0]]
+						include: [axe.utils.getFlattenedTree(fixture)[0]]
 					}, {}, function() {
 						assert.isFalse(isDqElementCalled);
 						done();
@@ -458,7 +458,7 @@ describe('Rule', function() {
 				});
 
 				rule.run({
-					include: [axe.utils.getComposedTree(fixture)[0]]
+					include: [axe.utils.getFlattenedTree(fixture)[0]]
 				}, {}, noop, function(err) {
 					assert.equal(err.message, 'Holy hand grenade');
 					done();
@@ -480,7 +480,7 @@ describe('Rule', function() {
 				});
 
 				rule.run({
-					include: [axe.utils.getComposedTree(fixture)[0]]
+					include: [axe.utils.getFlattenedTree(fixture)[0]]
 				}, {}, noop, function(err) {
 					assert.equal(err.message, 'your reality');
 					done();
@@ -504,7 +504,7 @@ describe('Rule', function() {
 						}]
 					});
 					rule.run({
-						include: axe.utils.getComposedTree(document)[0]
+						include: axe.utils.getFlattenedTree(document)[0]
 					}, {}, noop, isNotCalled);
 					assert.isTrue(success);
 
@@ -521,7 +521,7 @@ describe('Rule', function() {
 						}]
 					});
 					rule.run({
-						include: axe.utils.getComposedTree(document)[0]
+						include: axe.utils.getFlattenedTree(document)[0]
 					}, {}, function() {
 						success = true;
 					}, isNotCalled);
diff --git a/test/core/utils/contains.js b/test/core/utils/contains.js
index c0e2bf8d67..7cbbefd754 100644
--- a/test/core/utils/contains.js
+++ b/test/core/utils/contains.js
@@ -59,8 +59,8 @@ describe('axe.utils.contains', function () {
 
 	it('should work', function () {
 		fixture.innerHTML = '<div id="outer"><div id="inner"></div></div>';
-		var inner = axe.utils.getComposedTree(document.getElementById('inner'))[0];
-		var outer = axe.utils.getComposedTree(document.getElementById('outer'))[0];
+		var inner = axe.utils.getFlattenedTree(document.getElementById('inner'))[0];
+		var outer = axe.utils.getFlattenedTree(document.getElementById('outer'))[0];
 
 		assert.isTrue(axe.utils.contains(outer, inner));
 		assert.isFalse(axe.utils.contains(inner, outer));
diff --git a/test/core/utils/composed-tree.js b/test/core/utils/flattened-tree.js
similarity index 81%
rename from test/core/utils/composed-tree.js
rename to test/core/utils/flattened-tree.js
index b4433e3485..f4b5e06dbe 100644
--- a/test/core/utils/composed-tree.js
+++ b/test/core/utils/flattened-tree.js
@@ -9,10 +9,10 @@ function createStyle () {
 	return style;
 }
 
-function composedTreeAssertions () {
+function flattenedTreeAssertions () {
 	'use strict';
 
-	var virtualDOM = axe.utils.getComposedTree(fixture.firstChild);
+	var virtualDOM = axe.utils.getFlattenedTree(fixture.firstChild);
 	assert.equal(virtualDOM.length, 3);
 	assert.equal(virtualDOM[0].actualNode.nodeName, 'STYLE');
 
@@ -42,7 +42,7 @@ function composedTreeAssertions () {
 function shadowIdAssertions () {
 	'use strict';
 
-	var virtualDOM = axe.utils.getComposedTree(fixture);
+	var virtualDOM = axe.utils.getFlattenedTree(fixture);
 	assert.isUndefined(virtualDOM[0].shadowId);
 	assert.isDefined(virtualDOM[0].children[0].shadowId);
 	assert.isDefined(virtualDOM[0].children[1].shadowId);
@@ -60,7 +60,7 @@ function shadowIdAssertions () {
 }
 
 if (document.body && typeof document.body.createShadowRoot === 'function') {
-	describe('composed-tree shadow DOM v0', function () {
+	describe('flattened-tree shadow DOM v0', function () {
 		'use strict';
 		afterEach(function () {
 			fixture.innerHTML = '';
@@ -92,16 +92,16 @@ if (document.body && typeof document.body.createShadowRoot === 'function') {
 		it('it should support shadow DOM v0', function () {
 			assert.isDefined(fixture.firstChild.shadowRoot);
 		});
-		it('getComposedTree should return an array of stuff', function () {
-			assert.isTrue(Array.isArray(axe.utils.getComposedTree(fixture.firstChild)));
+		it('getFlattenedTree should return an array of stuff', function () {
+			assert.isTrue(Array.isArray(axe.utils.getFlattenedTree(fixture.firstChild)));
 		});
-		it('getComposedTree\'s virtual DOM should represent the composed tree', composedTreeAssertions);
-		it('getComposedTree\'s virtual DOM should give an ID to the shadow DOM', shadowIdAssertions);
+		it('getFlattenedTree\'s virtual DOM should represent the flattened tree', flattenedTreeAssertions);
+		it('getFlattenedTree\'s virtual DOM should give an ID to the shadow DOM', shadowIdAssertions);
 	});
 }
 
 if (document.body && typeof document.body.attachShadow === 'function') {
-	describe('composed-tree shadow DOM v1', function () {
+	describe('flattened-tree shadow DOM v1', function () {
 		'use strict';
 		afterEach(function () {
 			fixture.innerHTML = '';
@@ -135,13 +135,13 @@ if (document.body && typeof document.body.attachShadow === 'function') {
 		it('should support shadow DOM v1', function () {
 			assert.isDefined(fixture.firstChild.shadowRoot);
 		});
-		it('getComposedTree should return an array of stuff', function () {
-			assert.isTrue(Array.isArray(axe.utils.getComposedTree(fixture.firstChild)));
+		it('getFlattenedTree should return an array of stuff', function () {
+			assert.isTrue(Array.isArray(axe.utils.getFlattenedTree(fixture.firstChild)));
 		});
-		it('getComposedTree\'s virtual DOM should represent the composed tree', composedTreeAssertions);
-		it('getComposedTree\'s virtual DOM should give an ID to the shadow DOM', shadowIdAssertions);
-		it('getComposedTree\'s virtual DOM should have the fallback content', function () {
-			var virtualDOM = axe.utils.getComposedTree(fixture);
+		it('getFlattenedTree\'s virtual DOM should represent the flattened tree', flattenedTreeAssertions);
+		it('getFlattenedTree\'s virtual DOM should give an ID to the shadow DOM', shadowIdAssertions);
+		it('getFlattenedTree\'s virtual DOM should have the fallback content', function () {
+			var virtualDOM = axe.utils.getFlattenedTree(fixture);
 			assert.isTrue(virtualDOM[0].children[7].children[0].children.length === 2);
 			assert.isTrue(virtualDOM[0].children[7].children[0].children[0].actualNode.nodeType === 3);
 			assert.isTrue(virtualDOM[0].children[7].children[0].children[0].actualNode.textContent === 'fallback content');
@@ -152,7 +152,7 @@ if (document.body && typeof document.body.attachShadow === 'function') {
 
 if (document.body && typeof document.body.attachShadow === 'undefined' &&
 	typeof document.body.createShadowRoot === 'undefined') {
-	describe('composed-tree', function () {
+	describe('flattened-tree', function () {
 		'use strict';
 		it('SHADOW DOM TESTS DEFERRED, NO SUPPORT');
 	});
diff --git a/test/core/utils/select.js b/test/core/utils/select.js
index e7f8f8fb93..9ca3fa5d11 100644
--- a/test/core/utils/select.js
+++ b/test/core/utils/select.js
@@ -28,7 +28,7 @@ describe('axe.utils.select', function () {
 			div.id = 'monkeys';
 			fixture.appendChild(div);
 
-			var result = axe.utils.select('#monkeys', { include: [axe.utils.getComposedTree(document)[0]] });
+			var result = axe.utils.select('#monkeys', { include: [axe.utils.getFlattenedTree(document)[0]] });
 
 			assert.equal(result[0].actualNode, div);
 
@@ -41,7 +41,7 @@ describe('axe.utils.select', function () {
 			fixture.innerHTML = '<div id="monkeys"><div id="bananas" class="bananas"></div></div>';
 
 			var result = axe.utils.select('.bananas', {
-				include: [axe.utils.getComposedTree($id('monkeys'))[0]]
+				include: [axe.utils.getFlattenedTree($id('monkeys'))[0]]
 			});
 
 			assert.deepEqual([result[0].actualNode], [$id('bananas')]);
@@ -52,8 +52,8 @@ describe('axe.utils.select', function () {
 			fixture.innerHTML = '<div id="monkeys"><div id="bananas" class="bananas"></div></div>';
 
 			var result = axe.utils.select('.bananas', {
-				include: [axe.utils.getComposedTree($id('fixture'))[0]],
-				exclude: [axe.utils.getComposedTree($id('monkeys'))[0]]
+				include: [axe.utils.getFlattenedTree($id('fixture'))[0]],
+				exclude: [axe.utils.getFlattenedTree($id('monkeys'))[0]]
 			});
 
 			assert.deepEqual(result, []);
@@ -73,10 +73,10 @@ describe('axe.utils.select', function () {
 
 
 			var result = axe.utils.select('.bananas', {
-				include: [axe.utils.getComposedTree($id('include1'))[0],
-					axe.utils.getComposedTree($id('include2'))[0]],
-				exclude: [axe.utils.getComposedTree($id('exclude1'))[0],
-					axe.utils.getComposedTree($id('exclude2'))[0]]
+				include: [axe.utils.getFlattenedTree($id('include1'))[0],
+					axe.utils.getFlattenedTree($id('include2'))[0]],
+				exclude: [axe.utils.getFlattenedTree($id('exclude1'))[0],
+					axe.utils.getFlattenedTree($id('exclude2'))[0]]
 			});
 
 			assert.deepEqual(result, []);
@@ -98,11 +98,11 @@ describe('axe.utils.select', function () {
 
 
 			var result = axe.utils.select('.bananas', {
-				include: [axe.utils.getComposedTree($id('include3'))[0],
-					axe.utils.getComposedTree($id('include2'))[0],
-					axe.utils.getComposedTree($id('include1'))[0]],
-				exclude: [axe.utils.getComposedTree($id('exclude1'))[0],
-					axe.utils.getComposedTree($id('exclude2'))[0]]
+				include: [axe.utils.getFlattenedTree($id('include3'))[0],
+					axe.utils.getFlattenedTree($id('include2'))[0],
+					axe.utils.getFlattenedTree($id('include1'))[0]],
+				exclude: [axe.utils.getFlattenedTree($id('exclude1'))[0],
+					axe.utils.getFlattenedTree($id('exclude2'))[0]]
 			});
 
 			assert.deepEqual([result[0].actualNode], [$id('bananas')]);
@@ -115,8 +115,8 @@ describe('axe.utils.select', function () {
 		fixture.innerHTML = '<div id="monkeys"><div id="bananas" class="bananas"></div></div>';
 
 		var result = axe.utils.select('.bananas', {
-			include: [axe.utils.getComposedTree($id('fixture'))[0],
-					axe.utils.getComposedTree($id('monkeys'))[0]]
+			include: [axe.utils.getFlattenedTree($id('fixture'))[0],
+					axe.utils.getFlattenedTree($id('monkeys'))[0]]
 		});
 
 		assert.lengthOf(result, 1);
@@ -128,8 +128,8 @@ describe('axe.utils.select', function () {
 		fixture.innerHTML = '<div id="one"><div id="target1" class="bananas"></div></div>' +
 			'<div id="two"><div id="target2" class="bananas"></div></div>';
 
-		var result = axe.utils.select('.bananas', { include: [axe.utils.getComposedTree($id('two'))[0],
-			axe.utils.getComposedTree($id('one'))[0]] });
+		var result = axe.utils.select('.bananas', { include: [axe.utils.getFlattenedTree($id('two'))[0],
+			axe.utils.getFlattenedTree($id('one'))[0]] });
 
 		assert.deepEqual(result.map(function (n) { return n.actualNode; }),
 			[$id('target1'), $id('target2')]);

From 8713b379163c6a46e83a02addcc17cdfbfaba4f2 Mon Sep 17 00:00:00 2001
From: Dylan Barrell <dylan@barrell.com>
Date: Thu, 25 May 2017 12:38:41 -0400
Subject: [PATCH 017/142] add support for including styled slot elements into
 the virtual DOM

---
 lib/core/utils/flattened-tree.js  | 73 ++++++++++++++++---------------
 test/core/utils/flattened-tree.js | 39 ++++++++++++++++-
 2 files changed, 76 insertions(+), 36 deletions(-)

diff --git a/lib/core/utils/flattened-tree.js b/lib/core/utils/flattened-tree.js
index af6be946a5..d8c1254a81 100644
--- a/lib/core/utils/flattened-tree.js
+++ b/lib/core/utils/flattened-tree.js
@@ -1,41 +1,29 @@
-/* global console */
 var axe = axe || { utils: {} };
+
 /**
- * NOTE: level only increases on "real" nodes because others do not exist in the flattened tree
+ * This implemnts the flatten-tree algorithm specified:
+ * Originally here https://drafts.csswg.org/css-scoping/#flat-tree
+ * Hopefully soon published here: https://www.w3.org/TR/css-scoping-1/#flat-tree
+ *
+ * Some notable information:
+ * 1. <slot> elements do not have boxes by default (i.e. they do not get rendered and
+ *    their CSS properties are ignored)
+ * 2. <slot> elements can be made to have a box by overriding the display property
+ *    which is 'contents' by default
+ * 3. Even boxed <slot> elements do not show up in the accessibility tree until
+ *    they have a tabindex applied to them OR they have a role applied to them AND
+ *    they have a box (this is observed behavior in Safari on OS X, I cannot find
+ *    the spec for this)
  */
-axe.utils.printFlattenedTree = function (node, level) {
-	var indent = '  '.repeat(level) + '\u2514> ';
-	var nodeName;
-	if (node.shadowRoot) {
-		node.shadowRoot.childNodes.forEach(function (child) {
-			axe.utils.printFlattenedTree(child, level);
-		});
-	} else {
-		nodeName = node.nodeName.toLowerCase();
-		if (['style', 'template', 'script'].indexOf(nodeName) !== -1) {
-			return;
-		}
-		if (nodeName === 'content') {
-			node.getDistributedNodes().forEach(function (child) {
-				axe.utils.printFlattenedTree(child, level);
-			});
-		} else if (nodeName === 'slot') {
-			node.assignedNodes().forEach(function (child) {
-				axe.utils.printFlattenedTree(child, level);
-			});
-		} else {
-			if (node.nodeType === 1) {
-				console.log(indent, node);
-				node.childNodes.forEach(function (child) {
-					axe.utils.printFlattenedTree(child, level + 1);
-				});
-			}
-		}
-	}
-};
 
+/**
+ * Wrap the real node and provide list of the flattened children
+ *
+ * @param node {Node} - the node in question
+ * @param shadowId {String} - the ID of the shadow DOM to which this node belongs
+ * @return {Object} - the wrapped node
+ */
 function virtualDOMfromNode (node, shadowId) {
-	// todo: attributes'n shit (maybe)
 	return {
 		shadowId: shadowId,
 		children: [],
@@ -43,6 +31,13 @@ function virtualDOMfromNode (node, shadowId) {
 	};
 }
 
+/**
+ * find all the fallback content for a <slot> and return these as an array
+ * this array will also include any #text nodes
+ *
+ * @param node {Node} - the slot Node
+ * @return Array{Nodes}
+ */
 function getSlotChildren(node) {
 	var retVal = [];
 
@@ -63,7 +58,6 @@ function getSlotChildren(node) {
  * @param {String} shadowId, optional ID of the shadow DOM that is the closest shadow
  *                           ancestor of the node
  */
-
 axe.utils.getFlattenedTree = function (node, shadowId) {
 	// using a closure here and therefore cannot easily refactor toreduce the statements
 	//jshint maxstatements: false
@@ -97,7 +91,16 @@ axe.utils.getFlattenedTree = function (node, shadowId) {
 				// fallback content
 				realArray = getSlotChildren(node);
 			}
-			return realArray.reduce(reduceShadowDOM, []);
+			var styl = window.getComputedStyle(node);
+			// check the display property
+			if (styl.display !== 'contents') {
+				// has a box
+				retVal = virtualDOMfromNode(node, shadowId);
+				retVal.children = realArray.reduce(reduceShadowDOM, []);
+				return [retVal];
+			} else {
+				return realArray.reduce(reduceShadowDOM, []);
+			}
 		} else {
 			if (node.nodeType === 1) {
 				retVal = virtualDOMfromNode(node, shadowId);
diff --git a/test/core/utils/flattened-tree.js b/test/core/utils/flattened-tree.js
index f4b5e06dbe..eb097f0952 100644
--- a/test/core/utils/flattened-tree.js
+++ b/test/core/utils/flattened-tree.js
@@ -1,10 +1,11 @@
 var fixture = document.getElementById('fixture');
 
-function createStyle () {
+function createStyle (box) {
 	'use strict';
 
 	var style = document.createElement('style');
 	style.textContent = 'div.breaking { color: Red;font-size: 20px; border: 1px dashed Purple; }' +
+		(box ? 'slot { display: block; }' : '') +
 		'div.other { padding: 2px 0 0 0; border: 1px solid Cyan; }';
 	return style;
 }
@@ -148,6 +149,42 @@ if (document.body && typeof document.body.attachShadow === 'function') {
 			assert.isTrue(virtualDOM[0].children[7].children[0].children[1].actualNode.nodeName === 'LI');
 		});
 	});
+	describe('flattened-tree shadow DOM v1: boxed slots', function () {
+		'use strict';
+		afterEach(function () {
+			fixture.innerHTML = '';
+		});
+		beforeEach(function () {
+			function createStoryGroup (className, slotName) {
+				var group = document.createElement('div');
+				group.className = className;
+				// Empty string in slot name attribute or absence thereof work the same, so no need for special handling.
+				group.innerHTML = '<ul><slot name="' + slotName + '">fallback content<li>one</li></slot></ul>';
+				return group;
+			}
+
+			function makeShadowTree (storyList) {
+				var root = storyList.attachShadow({mode: 'open'});
+				root.appendChild(createStyle(true));
+				root.appendChild(createStoryGroup('breaking', 'breaking'));
+				root.appendChild(createStoryGroup('other', ''));
+			}
+			var str = '<div class="stories"><li>1</li>' +
+			'<li>2</li><li class="breaking" slot="breaking">3</li>' +
+			'<li>4</li><li>5</li><li class="breaking" slot="breaking">6</li></div>';
+			str += '<div class="stories"><li>1</li>' +
+			'<li>2</li><li class="breaking" slot="breaking">3</li>' +
+			'<li>4</li><li>5</li><li class="breaking" slot="breaking">6</li></div>';
+			str += '<div class="stories"></div>';
+			fixture.innerHTML = str;
+
+			fixture.querySelectorAll('.stories').forEach(makeShadowTree);
+		});
+		it('getFlattenedTree\'s virtual DOM should have the <slot> elements', function () {
+			var virtualDOM = axe.utils.getFlattenedTree(fixture);
+			assert.isTrue(virtualDOM[0].children[1].children[0].children[0].actualNode.nodeName === 'SLOT');
+		});
+	});
 }
 
 if (document.body && typeof document.body.attachShadow === 'undefined' &&

From d489c43b59fef0a52b9c9f295c544e9b91124731 Mon Sep 17 00:00:00 2001
From: Dylan Barrell <dylan@barrell.com>
Date: Fri, 9 Jun 2017 17:58:51 -0400
Subject: [PATCH 018/142] disabling slot styling support until it is supported
 by Chrome

---
 lib/core/utils/flattened-tree.js  | 4 +++-
 test/core/utils/flattened-tree.js | 5 +++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/core/utils/flattened-tree.js b/lib/core/utils/flattened-tree.js
index d8c1254a81..ac5f3e3153 100644
--- a/lib/core/utils/flattened-tree.js
+++ b/lib/core/utils/flattened-tree.js
@@ -6,6 +6,8 @@ var axe = axe || { utils: {} };
  * Hopefully soon published here: https://www.w3.org/TR/css-scoping-1/#flat-tree
  *
  * Some notable information:
+ ******* NOTE: as of Chrome 59, this is broken in Chrome so that tests fail completely
+ ******* removed functionality for now
  * 1. <slot> elements do not have boxes by default (i.e. they do not get rendered and
  *    their CSS properties are ignored)
  * 2. <slot> elements can be made to have a box by overriding the display property
@@ -93,7 +95,7 @@ axe.utils.getFlattenedTree = function (node, shadowId) {
 			}
 			var styl = window.getComputedStyle(node);
 			// check the display property
-			if (styl.display !== 'contents') {
+			if (false && styl.display !== 'contents') { // intentionally commented out
 				// has a box
 				retVal = virtualDOMfromNode(node, shadowId);
 				retVal.children = realArray.reduce(reduceShadowDOM, []);
diff --git a/test/core/utils/flattened-tree.js b/test/core/utils/flattened-tree.js
index eb097f0952..2a9b4373ec 100644
--- a/test/core/utils/flattened-tree.js
+++ b/test/core/utils/flattened-tree.js
@@ -181,8 +181,9 @@ if (document.body && typeof document.body.attachShadow === 'function') {
 			fixture.querySelectorAll('.stories').forEach(makeShadowTree);
 		});
 		it('getFlattenedTree\'s virtual DOM should have the <slot> elements', function () {
-			var virtualDOM = axe.utils.getFlattenedTree(fixture);
-			assert.isTrue(virtualDOM[0].children[1].children[0].children[0].actualNode.nodeName === 'SLOT');
+			return; // Chrome's implementation of slot is broken
+			// var virtualDOM = axe.utils.getFlattenedTree(fixture);
+			// assert.isTrue(virtualDOM[0].children[1].children[0].children[0].actualNode.nodeName === 'SLOT');
 		});
 	});
 }

From 17d13b11d380c5027538a57efcd3e3633983e4da Mon Sep 17 00:00:00 2001
From: Dylan Barrell <dylan@barrell.com>
Date: Sat, 10 Jun 2017 18:21:15 -0400
Subject: [PATCH 019/142] make is-hidden and contains work with shadow DOM
 elements

---
 lib/core/utils/contains.js   | 13 +++++++++++
 lib/core/utils/is-hidden.js  |  5 +++++
 test/core/utils/contains.js  | 29 +++++++++++++++++++++++++
 test/core/utils/is-hidden.js | 42 ++++++++++++++++++++++++++++++++++++
 4 files changed, 89 insertions(+)

diff --git a/lib/core/utils/contains.js b/lib/core/utils/contains.js
index 04b68bc67c..59065c2aef 100644
--- a/lib/core/utils/contains.js
+++ b/lib/core/utils/contains.js
@@ -8,6 +8,19 @@
 axe.utils.contains = function (node, otherNode) {
 	//jshint bitwise: false
 	'use strict';
+	function containsShadowChild(node, otherNode) {
+		if (node.shadowId === otherNode.shadowId) {
+			return true;
+		}
+		return !!node.children.find((child) => {
+			return containsShadowChild(child, otherNode);
+		});
+	}
+
+	if ((node.shadowId || otherNode.shadowId) &&
+		node.shadowId !== otherNode.shadowId) {
+		return containsShadowChild(node, otherNode);
+	}
 
 	if (typeof node.actualNode.contains === 'function') {
 		return node.actualNode.contains(otherNode.actualNode);
diff --git a/lib/core/utils/is-hidden.js b/lib/core/utils/is-hidden.js
index 13e86f437c..68d0259011 100644
--- a/lib/core/utils/is-hidden.js
+++ b/lib/core/utils/is-hidden.js
@@ -14,6 +14,11 @@ axe.utils.isHidden = function isHidden(el, recursed) {
 		return false;
 	}
 
+	// 11 === Node.DOCUMENT_FRAGMENT_NODE
+	if (el.nodeType === 11) {
+		el = el.host; // grab the host Node
+	}
+
 	var style = window.getComputedStyle(el, null);
 
 	if (!style || (!el.parentNode || (style.getPropertyValue('display') === 'none' ||
diff --git a/test/core/utils/contains.js b/test/core/utils/contains.js
index 7cbbefd754..dbaa7d0366 100644
--- a/test/core/utils/contains.js
+++ b/test/core/utils/contains.js
@@ -57,6 +57,35 @@ describe('axe.utils.contains', function () {
 		assert.isTrue(axe.utils.contains(node1, node2));
 	});
 
+	it('should work when the child is inside shadow DOM', function () {
+		var tree, node1, node2;
+
+		function createContentContains() {
+			var group = document.createElement('div');
+			group.innerHTML = '<label id="mylabel">Label</label><input aria-labelledby="mylabel" type="text" />';
+			return group;
+		}
+
+		function makeShadowTreeContains(node)
+		{
+			var root = node.attachShadow({mode: 'open'});
+			var div = document.createElement('div');
+			div.className = 'parent';
+			root.appendChild(div);
+			div.appendChild(createContentContains());
+		}
+		if (document.body && typeof document.body.attachShadow === 'function') {
+			// shadow DOM v1 - note: v0 is compatible with this code, so no need
+			// to specifically test this
+			fixture.innerHTML = '<div></div>';
+			makeShadowTreeContains(fixture.firstChild);
+			tree = axe.utils.getFlattenedTree(fixture.firstChild);
+			node1 = axe.utils.querySelectorAll(tree, '.parent')[0];
+			node2 = axe.utils.querySelectorAll(tree, 'input')[0];
+			assert.isTrue(axe.utils.contains(node1, node2));
+		}
+	});
+
 	it('should work', function () {
 		fixture.innerHTML = '<div id="outer"><div id="inner"></div></div>';
 		var inner = axe.utils.getFlattenedTree(document.getElementById('inner'))[0];
diff --git a/test/core/utils/is-hidden.js b/test/core/utils/is-hidden.js
index 1fad1e0785..2fa915707d 100644
--- a/test/core/utils/is-hidden.js
+++ b/test/core/utils/is-hidden.js
@@ -1,3 +1,19 @@
+function createContentHidden() {
+	'use strict';
+	var group = document.createElement('div');
+	group.innerHTML = '<label id="mylabel">Label</label><input aria-labelledby="mylabel" type="text" />';
+	return group;
+}
+
+function makeShadowTreeHidden(node) {
+	'use strict';
+	var root = node.attachShadow({mode: 'open'});
+	var div = document.createElement('div');
+	div.className = 'parent';
+	root.appendChild(div);
+	div.appendChild(createContentHidden());
+}
+
 describe('axe.utils.isHidden', function () {
 	'use strict';
 
@@ -52,6 +68,32 @@ describe('axe.utils.isHidden', function () {
 		assert.isFalse(axe.utils.isHidden(el));
 	});
 
+	it('not hidden: should work when the element is inside shadow DOM', function () {
+		var tree, node;
+
+		if (document.body && typeof document.body.attachShadow === 'function') {
+			// shadow DOM v1 - note: v0 is compatible with this code, so no need
+			// to specifically test this
+			fixture.innerHTML = '<div></div>';
+			makeShadowTreeHidden(fixture.firstChild);
+			tree = axe.utils.getFlattenedTree(fixture.firstChild);
+			node = axe.utils.querySelectorAll(tree, 'input')[0];
+			assert.isFalse(axe.utils.isHidden(node.actualNode));
+		}
+	});
 
+	it('hidden: should work when the element is inside shadow DOM', function () {
+		var tree, node;
+
+		if (document.body && typeof document.body.attachShadow === 'function') {
+			// shadow DOM v1 - note: v0 is compatible with this code, so no need
+			// to specifically test this
+			fixture.innerHTML = '<div style="display:none"></div>';
+			makeShadowTreeHidden(fixture.firstChild);
+			tree = axe.utils.getFlattenedTree(fixture.firstChild);
+			node = axe.utils.querySelectorAll(tree, 'input')[0];
+			assert.isTrue(axe.utils.isHidden(node.actualNode));
+		}
+	});
 
 });
\ No newline at end of file

From b25117fff7c90460789bd4e2a24938f3124407ac Mon Sep 17 00:00:00 2001
From: Dylan Barrell <dylan@barrell.com>
Date: Sun, 11 Jun 2017 10:58:55 -0400
Subject: [PATCH 020/142] add shadow DOM support to getSelector

---
 lib/core/utils/get-selector.js  | 74 +++++++++++++++++++++------------
 test/core/utils/get-selector.js | 47 +++++++++++++++++++++
 2 files changed, 94 insertions(+), 27 deletions(-)

diff --git a/lib/core/utils/get-selector.js b/lib/core/utils/get-selector.js
index 465e4574d9..852aec3204 100644
--- a/lib/core/utils/get-selector.js
+++ b/lib/core/utils/get-selector.js
@@ -33,9 +33,9 @@ const commonNodes = [
 ];
 
 function getNthChildString (elm, selector) {
-	const siblings = elm.parentNode && Array.from(elm.parentNode.children || '') || [];
+  const siblings = elm.parentNode && Array.from(elm.parentNode.children || '') || [];
   const hasMatchingSiblings = siblings.find(sibling => (
-  	sibling !== elm &&
+    sibling !== elm &&
     axe.utils.matchesSelector(sibling, selector)
   ));
   if (hasMatchingSiblings) {
@@ -49,15 +49,16 @@ function getNthChildString (elm, selector) {
 const createSelector = {
   // Get ID properties
   getElmId (elm) {
-  	if (!elm.id) {
-  		return;
-  	}
-  	const id = '#' + escapeSelector(elm.id || '');
+    if (!elm.id) {
+      return;
+    }
+    let doc = (elm.getRootNode && elm.getRootNode()) || document;
+    const id = '#' + escapeSelector(elm.id || '');
     if (
-    	// Don't include youtube's uid values, they change  on reload
-    	!id.match(/player_uid_/) &&
-    	// Don't include IDs that occur more then once on the page
-    	document.querySelectorAll(id).length === 1
+      // Don't include youtube's uid values, they change  on reload
+      !id.match(/player_uid_/) &&
+      // Don't include IDs that occur more then once on the page
+      doc.querySelectorAll(id).length === 1
     ) {
       return id;
     }
@@ -78,7 +79,7 @@ const createSelector = {
   // Get uncommon node names
   getUncommonElm (elm, { isCommonElm, isCustomElm, nodeName })  {
     if (!isCommonElm && !isCustomElm) {
-    	nodeName = escapeSelector(nodeName);
+      nodeName = escapeSelector(nodeName);
       // Add [type] if nodeName is an input element
       if (nodeName === 'input' && elm.hasAttribute('type')) {
         nodeName += '[type="' + elm.type + '"]';
@@ -167,18 +168,8 @@ function getElmFeatures (elm, featureCount) {
   }, []);
 }
 
-/**
- * Gets a unique CSS selector
- * @param  {HTMLElement} node The element to get the selector for
- * @param {Object} optional options
- * @return {String}      Unique CSS selector for the node
- */
-axe.utils.getSelector = function createUniqueSelector (elm, options = {}) {
-  //todo: implement shadowDOM support
+function generateSelector (elm, options, doc) {
   //jshint maxstatements: 19
-  if (!elm) {
-    return '';
-  }
   let selector, addParent;
   let { isUnique = false } = options;
   const idSelector = createSelector.getElmId(elm);
@@ -196,25 +187,54 @@ axe.utils.getSelector = function createUniqueSelector (elm, options = {}) {
   } else {
     selector = getElmFeatures(elm, featureCount).join('');
     selector += getNthChildString(elm, selector);
-    isUnique = options.isUnique || document.querySelectorAll(selector).length === 1;
+    isUnique = options.isUnique || doc.querySelectorAll(selector).length === 1;
 
     // For the odd case that document doesn't have a unique selector
     if (!isUnique && elm === document.documentElement) {
-    	selector += ':root';
+      // todo: figure out what to do for shadow DOM
+      selector += ':root';
     }
     addParent = (minDepth !== 0 || !isUnique);
   }
 
   const selectorParts = [selector, ...childSelectors];
 
-  if (elm.parentElement && (toRoot || addParent)) {
-    return createUniqueSelector(elm.parentNode, {
+  if (elm.parentElement && elm.parentElement.nodeType !== 11 &&
+    (toRoot || addParent)) {
+    return generateSelector(elm.parentNode, {
       toRoot, isUnique,
       childSelectors: selectorParts,
       featureCount: 1,
       minDepth: minDepth -1
-    });
+    }, doc);
   } else {
     return selectorParts.join(' > ');
   }
+}
+
+/**
+ * Gets a unique CSS selector
+ * @param  {HTMLElement} node The element to get the selector for
+ * @param {Object} optional options
+ * @return {String | Array[String]}      Unique CSS selector for the node
+ */
+axe.utils.getSelector = function createUniqueSelector (elm, options = {}) {
+  if (!elm) {
+    return '';
+  }
+  let doc = (elm.getRootNode && elm.getRootNode()) || document;
+  if (doc.nodeType === 11) { // DOCUMENT_FRAGMENT
+    let stack = [];
+    while (doc.nodeType === 11) {
+      stack.push({elm: elm, doc: doc});
+      elm = doc.host;
+      doc = elm.getRootNode();
+    }
+    stack.push({elm: elm, doc: doc});
+    return stack.reverse().map((comp) => {
+      return generateSelector(comp.elm, options, comp.doc);
+    });
+  } else {
+    return generateSelector(elm, options, doc);
+  }
 };
diff --git a/test/core/utils/get-selector.js b/test/core/utils/get-selector.js
index 36f6805290..d5d24dddeb 100644
--- a/test/core/utils/get-selector.js
+++ b/test/core/utils/get-selector.js
@@ -1,3 +1,19 @@
+function createContentGetSelector() {
+	'use strict';
+	var group = document.createElement('div');
+	group.innerHTML = '<label id="mylabel">Label</label><input id="myinput" aria-labelledby="mylabel" type="text" />';
+	return group;
+}
+
+function makeShadowTreeGetSelector(node) {
+	'use strict';
+	var root = node.attachShadow({mode: 'open'});
+	var div = document.createElement('div');
+	div.className = 'parent';
+	root.appendChild(div);
+	div.appendChild(createContentGetSelector());
+}
+
 describe('axe.utils.getSelector', function () {
 	'use strict';
 
@@ -286,4 +302,35 @@ describe('axe.utils.getSelector', function () {
 		);
 	});
 
+	it('no options: should work with shadow DOM', function () {
+		var shadEl;
+
+		if (document.body && typeof document.body.attachShadow === 'function') {
+			// shadow DOM v1 - note: v0 is compatible with this code, so no need
+			// to specifically test this
+			fixture.innerHTML = '<div></div>';
+			makeShadowTreeGetSelector(fixture.firstChild);
+			shadEl = fixture.firstChild.shadowRoot.querySelector('input#myinput');
+			assert.deepEqual(axe.utils.getSelector(shadEl), [
+				'#fixture > div',
+				'#myinput'
+			]);
+		}
+	});
+	it('toRoot: should work with shadow DOM', function () {
+		var shadEl;
+
+		if (document.body && typeof document.body.attachShadow === 'function') {
+			// shadow DOM v1 - note: v0 is compatible with this code, so no need
+			// to specifically test this
+			fixture.innerHTML = '<div></div>';
+			makeShadowTreeGetSelector(fixture.firstChild);
+			shadEl = fixture.firstChild.shadowRoot.querySelector('input#myinput');
+			assert.deepEqual(axe.utils.getSelector(shadEl, { toRoot: true }), [
+				'html > body > #fixture > div',
+				'.parent > div > #myinput'
+			]);
+		}
+	});
+
 });

From 2c4c29dc11bb33615c4f3fd0e147a4003430b6a1 Mon Sep 17 00:00:00 2001
From: Dylan Barrell <dylan@barrell.com>
Date: Mon, 12 Jun 2017 18:36:54 -0400
Subject: [PATCH 021/142] get validateAttrValue to work in shadow DOM

---
 lib/commons/aria/attributes.js  |  9 +++++++--
 test/commons/aria/attributes.js | 33 ++++++++++++++++++++++++++++++++-
 2 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/lib/commons/aria/attributes.js b/lib/commons/aria/attributes.js
index 00481cc040..6b4f5b22d7 100644
--- a/lib/commons/aria/attributes.js
+++ b/lib/commons/aria/attributes.js
@@ -43,13 +43,18 @@ aria.validateAttr = function (att) {
  * @return {Boolean}
  */
 aria.validateAttrValue = function (node, attr) {
-	//jshint maxcomplexity: 12
+	//jshint maxcomplexity: 13
 	'use strict';
 	var matches, list,
-		doc = document,
 		value = node.getAttribute(attr),
 		attrInfo = lookupTables.attributes[attr];
 
+	var doc = (node.getRootNode && node.getRootNode()) || document; // this is for backwards compatibility
+	if (doc === node) {
+		// disconnected node
+		doc = document;
+	}
+
 	if (!attrInfo) {
 		return true;
 	}
diff --git a/test/commons/aria/attributes.js b/test/commons/aria/attributes.js
index 88f947b4b8..590ee850ff 100644
--- a/test/commons/aria/attributes.js
+++ b/test/commons/aria/attributes.js
@@ -1,4 +1,3 @@
-
 describe('aria.requiredAttr', function () {
 	'use strict';
 
@@ -113,6 +112,24 @@ describe('aria.validateAttr', function () {
 	});
 });
 
+function createContentVAV() {
+	'use strict';
+	var group = document.createElement('div');
+	group.innerHTML = '<label id="mylabel">Label</label>' +
+			'<input id="myinput" aria-labelledby="mylabel" type="text" />' +
+			'<input id="invalid" aria-labelledby="doesnotexist" type="text" />';
+	return group;
+}
+
+function makeShadowTreeVAV(node) {
+	'use strict';
+	var root = node.attachShadow({mode: 'open'});
+	var div = document.createElement('div');
+	div.className = 'parent';
+	root.appendChild(div);
+	div.appendChild(createContentVAV());
+}
+
 describe('aria.validateAttrValue', function () {
 	'use strict';
 
@@ -193,6 +210,20 @@ describe('aria.validateAttrValue', function () {
 				node.setAttribute('cats', 'invalid');
 				assert.isFalse(axe.commons.aria.validateAttrValue(node, 'cats'));
 			});
+			it('should work in shadow DOM', function () {
+				var shadEl;
+
+				if (document.body && typeof document.body.attachShadow === 'function') {
+					// shadow DOM v1 - note: v0 is compatible with this code, so no need
+					// to specifically test this
+					fixture.innerHTML = '<div></div>';
+					makeShadowTreeVAV(fixture.firstChild);
+					shadEl = fixture.firstChild.shadowRoot.querySelector('input#myinput');
+					assert.isTrue(axe.commons.aria.validateAttrValue(shadEl, 'aria-labelledby'));
+					shadEl = fixture.firstChild.shadowRoot.querySelector('input#invalid');
+					assert.isFalse(axe.commons.aria.validateAttrValue(shadEl, 'aria-labelledby'));
+				}
+			});
 		});
 		describe('idrefs', function () {
 

From 14cb707d6d1903d11ad7c52a29682b34304dc8dc Mon Sep 17 00:00:00 2001
From: Dylan Barrell <dylan@barrell.com>
Date: Tue, 13 Jun 2017 07:34:08 -0400
Subject: [PATCH 022/142] change the documentation to show an example of the
 JSON and fix other indentation problems with the lists

---
 doc/API.md | 33 +++++++++++++++++++--------------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/doc/API.md b/doc/API.md
index fe8c3bd8b0..e721f89732 100644
--- a/doc/API.md
+++ b/doc/API.md
@@ -495,8 +495,8 @@ axe.run(document, function(err, results) {
   * `help` - `"Elements must have sufficient color contrast"`
   * `helpUrl` - `"https://dequeuniversity.com/courses/html-css/visual-layout/color-contrast"`
   * `id` - `"color-contrast"`
-		* `nodes`
-			* `target[0]` - `"#js_off-canvas-wrap > .inner-wrap >.kinja-title.proxima.js_kinja-title-desktop"`
+    * `nodes`
+      * `target[0]` - `"#js_off-canvas-wrap > .inner-wrap >.kinja-title.proxima.js_kinja-title-desktop"`
 
 * `passes[1]`
    ...
@@ -507,9 +507,9 @@ axe.run(document, function(err, results) {
   * `help` - `"<button> elements must have alternate text"`
   * `helpUrl` - `"https://dequeuniversity.com/courses/html-css/forms/form-labels#id84_example_button"`
   * `id` - `"button-name"`
-		* `nodes`
-			* `target[0]` - `"post_5919997 > .row.content-wrapper > .column > span > iframe"`
-			* `target[1]` - `"#u_0_1 > .pluginConnectButton > .pluginButtonImage > button"`
+    * `nodes`
+      * `target[0]` - `"post_5919997 > .row.content-wrapper > .column > span > iframe"`
+      * `target[1]` - `"#u_0_1 > .pluginConnectButton > .pluginButtonImage > button"`
 
 * `violations[1]` ...
 
@@ -553,15 +553,20 @@ axe.run(document, {
 
 This example shows a result object that points to a shadow DOM element.
 
-* `violations[0]`
-  * `help` - `"Elements must have sufficient color contrast"`
-  * `helpUrl` - `"https://dequeuniversity.com/rules/axe/2.1/color-contrast?application=axeAPI"`
-  * `id` - `"color-contrast"`
-		* `nodes`
-			* `target[0][0]` - `"header > aria-menu"`
-			* `target[0][1]` - `"li.expanded"`
-
-* `violations[1]` ...
+##### `violations[0]`
+```
+{
+	help : "Elements must have sufficient color contrast",
+	helpUrl: "https://dequeuniversity.com/rules/axe/2.1/color-contrast?application=axeAPI",
+	id: "color-contrast",
+	nodes: [{
+		target: [[
+			"header > aria-menu",
+			"li.expanded"
+		]]
+	}]
+}
+```
 
 As you can see the `target` array contains one item that is an array. This array contains two items, the first is a CSS selector string that finds the custom element `<aria-menu>` in the `<header>`. The second item in this array is the selector within that custom element's shadow DOM to find the `<li>` element with a class of `expanded`.
 

From 3d44011df263777b77aa9f34b7b4e784e8571cd2 Mon Sep 17 00:00:00 2001
From: Nick Schonning <nschonni@gmail.com>
Date: Fri, 16 Jun 2017 04:24:14 -0400
Subject: [PATCH 023/142] chore: add help text for testconfig Grunt task (#365)

A message will be printed out explaining the task purpose when running
`grunt --help`

Related #364
---
 build/tasks/testconfig.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/build/tasks/testconfig.js b/build/tasks/testconfig.js
index 12040c45a9..306cfb2086 100644
--- a/build/tasks/testconfig.js
+++ b/build/tasks/testconfig.js
@@ -2,7 +2,9 @@
 'use strict';
 
 module.exports = function (grunt) {
-	grunt.registerMultiTask('testconfig', function () {
+	grunt.registerMultiTask('testconfig',
+	'This task creates a file with all the source test config and HTML fixutres in a single JS object "test"',
+	function () {
 
 		var result = {
 			tests: {},

From 1a777acc94959239176461669dc2a3bec8487f36 Mon Sep 17 00:00:00 2001
From: Marcy Sutton <holla@marcysutton.com>
Date: Fri, 16 Jun 2017 01:42:51 -0700
Subject: [PATCH 024/142] doc: add more info on testing hidden regions (#363)

* fix: correct filename for markdown format

* doc: add more info on testing hidden regions

Closes https://dequesrc.atlassian.net/browse/WWD-668
---
 doc/API.md                 | 7 +++++--
 doc/{rules-md => rules.md} | 0
 2 files changed, 5 insertions(+), 2 deletions(-)
 rename doc/{rules-md => rules.md} (100%)

diff --git a/doc/API.md b/doc/API.md
index 4043e758ba..da80e8773d 100644
--- a/doc/API.md
+++ b/doc/API.md
@@ -32,6 +32,7 @@ The aXe API is designed to be an improvement over the previous generation of acc
 * Runs locally, no connection to a third-party server is necessary
 * Performs violation checking on multiple levels of nested iframes
 * Provides list of rules and elements that passed accessibility checking, ensuring rules have been run against entire document
+* Only checks rendered content to minimize false positives (that includes visually-hidden content)
 
 ### Getting Started
 This section gives a quick description of how to use the aXe APIs to analyze web page content and return a JSON object that lists any accessibility violations found.
@@ -42,6 +43,7 @@ The aXe API can be used as part of a broader process that is performed on many,
 2. Optionally, set configuration options for the javascript API (`axe.configure`)
 3. Call analyze javascript API (`axe.run`)
 4. Either assert against results or save them for later processing
+5. Repeat for any inactive or non-rendered content after making it visible
 
 
 ## Section 2: API Reference
@@ -53,7 +55,8 @@ The aXe APIs are provided in the javascript file axe.js. It must be included in
 ### API Notes
 
 * A Rule test is made up of sub-tests. Each sub-test is returned in an array of 'checks'
-* The `"helpUrl"` in the results object is a link to a broader description of the accessibility issue and suggested remediation. All of links point to Deque University help pages and require a valid login to that system.
+* The `"helpUrl"` in the results object is a link to a broader description of the accessibility issue and suggested remediation. These links point to Deque University help pages, which do not require a login.
+* aXe does not test hidden regions, such as inactive menus or modal windows. To test those for accessibility, write tests that activate or render the regions visible and run the analysis again.
 
 ### API Name: axe.getRules
 
@@ -210,7 +213,7 @@ None
 
 #### Purpose
 
-Analyze currently loaded page
+Analyze rendered content on the currently loaded page
 
 #### Description
 
diff --git a/doc/rules-md b/doc/rules.md
similarity index 100%
rename from doc/rules-md
rename to doc/rules.md

From 528989d6f80e1d4c30b1d5c21d740d593966f69b Mon Sep 17 00:00:00 2001
From: Dylan Barrell <dylan@barrell.com>
Date: Fri, 16 Jun 2017 18:41:39 -0400
Subject: [PATCH 025/142] refactor the finding of the root node into a dom
 commons function

---
 lib/commons/aria/attributes.js    |  8 ++-----
 lib/commons/dom/get-root-node.js  | 17 +++++++++++++
 test/commons/dom/get-root-node.js | 40 +++++++++++++++++++++++++++++++
 3 files changed, 59 insertions(+), 6 deletions(-)
 create mode 100644 lib/commons/dom/get-root-node.js
 create mode 100644 test/commons/dom/get-root-node.js

diff --git a/lib/commons/aria/attributes.js b/lib/commons/aria/attributes.js
index 6b4f5b22d7..22adffb053 100644
--- a/lib/commons/aria/attributes.js
+++ b/lib/commons/aria/attributes.js
@@ -1,4 +1,4 @@
-/*global aria, axe, lookupTables */
+/*global aria, axe, lookupTables, dom */
 
 /**
  * Get required attributes for a given role
@@ -49,11 +49,7 @@ aria.validateAttrValue = function (node, attr) {
 		value = node.getAttribute(attr),
 		attrInfo = lookupTables.attributes[attr];
 
-	var doc = (node.getRootNode && node.getRootNode()) || document; // this is for backwards compatibility
-	if (doc === node) {
-		// disconnected node
-		doc = document;
-	}
+	var doc = dom.getRootNode(node);
 
 	if (!attrInfo) {
 		return true;
diff --git a/lib/commons/dom/get-root-node.js b/lib/commons/dom/get-root-node.js
new file mode 100644
index 0000000000..fb7fbffd54
--- /dev/null
+++ b/lib/commons/dom/get-root-node.js
@@ -0,0 +1,17 @@
+/* global dom */
+
+/**
+ * Return the document or document fragment (shadow DOM)
+ *
+ * @param {Element} node
+ * @returns {DocumentFragment|Document}
+ */
+
+dom.getRootNode = function (node) {
+	var doc = (node.getRootNode && node.getRootNode()) || document; // this is for backwards compatibility
+	if (doc === node) {
+		// disconnected node
+		doc = document;
+	}
+	return doc;	
+};
\ No newline at end of file
diff --git a/test/commons/dom/get-root-node.js b/test/commons/dom/get-root-node.js
new file mode 100644
index 0000000000..58ec94cb7b
--- /dev/null
+++ b/test/commons/dom/get-root-node.js
@@ -0,0 +1,40 @@
+function makeShadowTreeGRN(node) {
+	'use strict';
+	var root = node.attachShadow({mode: 'open'});
+	var div = document.createElement('div');
+	div.className = 'parent';
+	root.appendChild(div);
+}
+
+describe('dom.getRootNode', function () {
+	'use strict';
+
+	var fixture = document.getElementById('fixture');
+
+	afterEach(function () {
+		fixture.innerHTML = '';
+	});
+
+	it('should return the document when the node is just a normal node', function () {
+		fixture.innerHTML = '<div id="target"></div>';
+		var node = document.getElementById('target');
+		assert.isTrue(axe.commons.dom.getRootNode(node) === document);
+	});
+	it('should return the document when the node is disconnected', function () {
+		var node = document.createElement('div');
+		assert.isTrue(axe.commons.dom.getRootNode(node) === document);
+	});
+	it('should return the shadow root when it is inside the shadow DOM', function () {
+		var shadEl;
+
+		if (document.body && typeof document.body.attachShadow === 'function') {
+			// shadow DOM v1 - note: v0 is compatible with this code, so no need
+			// to specifically test this
+			fixture.innerHTML = '<div></div>';
+			makeShadowTreeGRN(fixture.firstChild);
+			shadEl = fixture.firstChild.shadowRoot.querySelector('div');
+			assert.isTrue(axe.commons.dom.getRootNode(shadEl) !== document);
+			assert.isTrue(axe.commons.dom.getRootNode(shadEl) === fixture.firstChild.shadowRoot);
+		}
+	});
+});
\ No newline at end of file

From ea7125e20504cf154f87f791aff0f470e0a3eb56 Mon Sep 17 00:00:00 2001
From: Dylan Barrell <dylan@barrell.com>
Date: Fri, 16 Jun 2017 19:03:01 -0400
Subject: [PATCH 026/142] change dom.idrefs to use dom.getRootNode

---
 lib/commons/dom/idrefs.js  |  2 +-
 test/commons/dom/idrefs.js | 45 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/lib/commons/dom/idrefs.js b/lib/commons/dom/idrefs.js
index be0ef6d6b7..b53979b72c 100644
--- a/lib/commons/dom/idrefs.js
+++ b/lib/commons/dom/idrefs.js
@@ -10,7 +10,7 @@ dom.idrefs = function (node, attr) {
 	'use strict';
 
 	var index, length,
-		doc = document,
+		doc = dom.getRootNode(node),
 		result = [],
 		idrefs = node.getAttribute(attr);
 
diff --git a/test/commons/dom/idrefs.js b/test/commons/dom/idrefs.js
index 12397ba966..0ddce41be6 100644
--- a/test/commons/dom/idrefs.js
+++ b/test/commons/dom/idrefs.js
@@ -1,3 +1,20 @@
+function createContentIDR() {
+	'use strict';
+	var group = document.createElement('div');
+	group.id = 'target';
+	return group;
+}
+
+function makeShadowTreeIDR(node) {
+	'use strict';
+	var root = node.attachShadow({mode: 'open'});
+	var div = document.createElement('div');
+	div.className = 'parent';
+	div.setAttribute('target', 'target');
+	root.appendChild(div);
+	div.appendChild(createContentIDR());
+}
+
 describe('dom.idrefs', function () {
 	'use strict';
 
@@ -19,6 +36,34 @@ describe('dom.idrefs', function () {
 
 	});
 
+	it('should find only referenced nodes within the current root: shadow DOM', function () {
+		if (document.body && typeof document.body.attachShadow === 'function') {
+			// shadow DOM v1 - note: v0 is compatible with this code, so no need
+			// to specifically test this
+			fixture.innerHTML = '<div target="target"><div id="target"></div></div>';
+			makeShadowTreeIDR(fixture.firstChild);
+			var start = fixture.firstChild.shadowRoot.querySelector('.parent');
+			var expected = [fixture.firstChild.shadowRoot.getElementById('target')];
+
+			assert.deepEqual(axe.commons.dom.idrefs(start, 'target'), expected,
+				'should only find stuff in the shadow DOM');
+		}
+	});
+
+	it('should find only referenced nodes within the current root: document', function () {
+		if (document.body && typeof document.body.attachShadow === 'function') {
+			// shadow DOM v1 - note: v0 is compatible with this code, so no need
+			// to specifically test this
+			fixture.innerHTML = '<div target="target" class="parent"><div id="target"></div></div>';
+			makeShadowTreeIDR(fixture.firstChild);
+			var start = fixture.querySelector('.parent');
+			var expected = [document.getElementById('target')];
+
+			assert.deepEqual(axe.commons.dom.idrefs(start, 'target'), expected,
+				'should only find stuff in the document');
+		}
+	});
+
 	it('should insert null if a reference is not found', function () {
 		fixture.innerHTML = '<div aria-cats="target1 target2 target3" id="start"></div>' +
 			'<div id="target1"></div><div id="target2"></div>';

From 28fe2ec90a6a1e9c7f82ce4c5c6085cfbb4e5f51 Mon Sep 17 00:00:00 2001
From: Dylan Barrell <dylan@barrell.com>
Date: Sat, 17 Jun 2017 14:27:28 -0400
Subject: [PATCH 027/142] contains now works with slotted elements

---
 lib/core/utils/contains.js  |  3 +--
 test/core/utils/contains.js | 29 +++++++++++++++++++++++++++--
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/lib/core/utils/contains.js b/lib/core/utils/contains.js
index 59065c2aef..777e96a52e 100644
--- a/lib/core/utils/contains.js
+++ b/lib/core/utils/contains.js
@@ -17,8 +17,7 @@ axe.utils.contains = function (node, otherNode) {
 		});
 	}
 
-	if ((node.shadowId || otherNode.shadowId) &&
-		node.shadowId !== otherNode.shadowId) {
+	if ((node.shadowId || otherNode.shadowId)) {
 		return containsShadowChild(node, otherNode);
 	}
 
diff --git a/test/core/utils/contains.js b/test/core/utils/contains.js
index dbaa7d0366..24e7f848d2 100644
--- a/test/core/utils/contains.js
+++ b/test/core/utils/contains.js
@@ -66,8 +66,7 @@ describe('axe.utils.contains', function () {
 			return group;
 		}
 
-		function makeShadowTreeContains(node)
-		{
+		function makeShadowTreeContains(node) {
 			var root = node.attachShadow({mode: 'open'});
 			var div = document.createElement('div');
 			div.className = 'parent';
@@ -86,6 +85,32 @@ describe('axe.utils.contains', function () {
 		}
 	});
 
+	it('should work with slotted elements inside shadow DOM', function () {
+		var tree, node1, node2;
+
+        function createContentSlotted() {
+            var group = document.createElement('div');
+            group.innerHTML = '<div id="target">Stuff<slot></slot></div>';
+            return group;
+        }
+		function makeShadowTree(node) {
+			var root = node.attachShadow({mode: 'open'});
+			var div = document.createElement('div');
+			var a = document.createElement('a');
+			div.appendChild(a);
+			root.appendChild(div);
+			div.appendChild(createContentSlotted());
+		}
+		if (document.body && typeof document.body.attachShadow === 'function') {
+			fixture.innerHTML = '<div></div>';
+			makeShadowTree(fixture.firstChild);
+			tree = axe.utils.getFlattenedTree(fixture.firstChild);
+			node1 = axe.utils.querySelectorAll(tree, '#target')[0];
+			node2 = axe.utils.querySelectorAll(tree, 'a')[0];
+			assert.isTrue(axe.utils.contains(node1, node2));
+		}
+	});
+
 	it('should work', function () {
 		fixture.innerHTML = '<div id="outer"><div id="inner"></div></div>';
 		var inner = axe.utils.getFlattenedTree(document.getElementById('inner'))[0];

From 8e72b3e84ec475364bccdb75cf1649a75473d497 Mon Sep 17 00:00:00 2001
From: Dylan Barrell <dylan@barrell.com>
Date: Sat, 17 Jun 2017 14:32:13 -0400
Subject: [PATCH 028/142] add documentation on why idrefs shadow DOM code is
 implemented in the way it is

---
 lib/commons/dom/idrefs.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/lib/commons/dom/idrefs.js b/lib/commons/dom/idrefs.js
index b53979b72c..7b000df9cf 100644
--- a/lib/commons/dom/idrefs.js
+++ b/lib/commons/dom/idrefs.js
@@ -1,10 +1,17 @@
 /*global dom, axe */
 
 /**
- * Get elements referenced via a space-separated token attribute; it will insert `null` for any Element that is not found
+ * Get elements referenced via a space-separated token attribute;
+ * it will insert `null` for any Element that is not found
  * @param  {HTMLElement} node
  * @param  {String} attr The name of attribute
  * @return {Array}      Array of elements (or `null` if not found)
+ *
+ * NOTE: When in a shadow DOM environment: ID refs (even for slotted content)
+ * refer to the document in which the element is considered to be in the
+ * "light DOM". Therefore, we use getElementById on the root node and not QSA
+ * on the flattened tree to dereference idrefs.
+ *
  */
 dom.idrefs = function (node, attr) {
 	'use strict';

From f909e95b1ae4101213124040cb2cd97e7fc5ad5a Mon Sep 17 00:00:00 2001
From: Dylan Barrell <dylan@barrell.com>
Date: Sat, 17 Jun 2017 16:27:39 -0400
Subject: [PATCH 029/142] add support for slotted elements to is-hidden. Add
 support for shadow DOM to is-visible. Add support for shadow DOM to
 text.visible

---
 lib/commons/dom/is-visible.js  | 14 +++++--
 lib/commons/text/visible.js    | 16 +++++---
 lib/core/utils/is-hidden.js    |  5 ++-
 test/commons/dom/is-visible.js | 40 +++++++++++++++++++
 test/commons/text/visible.js   | 71 +++++++++++++++++++++++++---------
 test/core/utils/is-hidden.js   | 20 ++++++++++
 6 files changed, 138 insertions(+), 28 deletions(-)

diff --git a/lib/commons/dom/is-visible.js b/lib/commons/dom/is-visible.js
index 91d1d332d3..60add9d77a 100644
--- a/lib/commons/dom/is-visible.js
+++ b/lib/commons/dom/is-visible.js
@@ -26,21 +26,27 @@ function isClipped(clip) {
  * @return {Boolean} The element's visibilty status
  */
 dom.isVisible = function (el, screenReader, recursed) {
+	//jshint maxcomplexity: 13
 	'use strict';
-	var style,
-		nodeName = el.nodeName.toUpperCase(),
-		parent = el.parentNode;
+	var style, nodeName, parent;
 
 	// 9 === Node.DOCUMENT
 	if (el.nodeType === 9) {
 		return true;
 	}
 
+	// 11 === Node.DOCUMENT_FRAGMENT_NODE
+	if (el.nodeType === 11) {
+		el = el.host; // grab the host Node
+	}
+
 	style = window.getComputedStyle(el, null);
 	if (style === null) {
 		return false;
 	}
 
+	nodeName = el.nodeName.toUpperCase();
+
 	if (style.getPropertyValue('display') === 'none' ||
 
 		nodeName.toUpperCase() === 'STYLE' || nodeName.toUpperCase() === 'SCRIPT' ||
@@ -58,6 +64,8 @@ dom.isVisible = function (el, screenReader, recursed) {
 		return false;
 	}
 
+	parent = (el.assignedSlot) ? el.assignedSlot : el.parentNode;
+
 	if (parent) {
 		return dom.isVisible(parent, screenReader, true);
 	}
diff --git a/lib/commons/text/visible.js b/lib/commons/text/visible.js
index cc9ae0e427..bffc50d8ca 100644
--- a/lib/commons/text/visible.js
+++ b/lib/commons/text/visible.js
@@ -1,20 +1,26 @@
 /*global text, dom */
 
+/**
+ * NOTE: when calculating the text or accessible text of a node that includes shadow
+ * roots attached to it or its children, the flattened tree must be considered
+ * rather than the "light DOM"
+ */
+
 text.visible = function (element, screenReader, noRecursing) {
 	'use strict';
 
 	var index, child, nodeValue,
-		childNodes = element.childNodes,
+		childNodes = element.children,
 		length = childNodes.length,
 		result = '';
 
 	for (index = 0; index < length; index++) {
 		child = childNodes[index];
 
-		if (child.nodeType === 3) {
-			nodeValue = child.nodeValue;
-			if (nodeValue && dom.isVisible(element, screenReader)) {
-				result += child.nodeValue;
+		if (child.actualNode.nodeType === 3) {
+			nodeValue = child.actualNode.nodeValue;
+			if (nodeValue && dom.isVisible(element.actualNode, screenReader)) {
+				result += nodeValue;
 			}
 		} else if (!noRecursing) {
 			result += text.visible(child, screenReader);
diff --git a/lib/core/utils/is-hidden.js b/lib/core/utils/is-hidden.js
index 68d0259011..e0e3554edc 100644
--- a/lib/core/utils/is-hidden.js
+++ b/lib/core/utils/is-hidden.js
@@ -8,6 +8,7 @@
  */
 axe.utils.isHidden = function isHidden(el, recursed) {
 	'use strict';
+	var parent;
 
 	// 9 === Node.DOCUMENT
 	if (el.nodeType === 9) {
@@ -32,6 +33,8 @@ axe.utils.isHidden = function isHidden(el, recursed) {
 		return true;
 	}
 
-	return axe.utils.isHidden(el.parentNode, true);
+	parent = (el.assignedSlot) ? el.assignedSlot : el.parentNode;
+
+	return axe.utils.isHidden(parent, true);
 
 };
diff --git a/test/commons/dom/is-visible.js b/test/commons/dom/is-visible.js
index 0cd1037e9c..d6adfaf3e9 100644
--- a/test/commons/dom/is-visible.js
+++ b/test/commons/dom/is-visible.js
@@ -155,6 +155,46 @@ describe('dom.isVisible', function () {
 			assert.isFalse(axe.commons.dom.isVisible(el));
 
 		});
+		it('should correctly handle visible slotted elements', function () {
+	        function createContentSlotted() {
+	            var group = document.createElement('div');
+	            group.innerHTML = '<div id="target">Stuff<slot></slot></div>';
+	            return group;
+	        }
+			function makeShadowTree(node) {
+				var root = node.attachShadow({mode: 'open'});
+				var div = document.createElement('div');
+				root.appendChild(div);
+				div.appendChild(createContentSlotted());
+			}
+			if (document.body && typeof document.body.attachShadow === 'function') {
+				fixture.innerHTML = '<div><a>hello</a></div>';
+				makeShadowTree(fixture.firstChild);
+				var tree = axe.utils.getFlattenedTree(fixture.firstChild);
+				var el = axe.utils.querySelectorAll(tree, 'a')[0];
+				assert.isTrue(axe.commons.dom.isVisible(el.actualNode));
+			}
+		});
+		it('should correctly handle hidden slotted elements', function () {
+	        function createContentSlotted() {
+	            var group = document.createElement('div');
+	            group.innerHTML = '<div id="target" style="display:none;">Stuff<slot></slot></div>';
+	            return group;
+	        }
+			function makeShadowTree(node) {
+				var root = node.attachShadow({mode: 'open'});
+				var div = document.createElement('div');
+				root.appendChild(div);
+				div.appendChild(createContentSlotted());
+			}
+			if (document.body && typeof document.body.attachShadow === 'function') {
+				fixture.innerHTML = '<div><p><a>hello</a></p></div>';
+				makeShadowTree(fixture.firstChild);
+				var tree = axe.utils.getFlattenedTree(fixture.firstChild);
+				var el = axe.utils.querySelectorAll(tree, 'a')[0];
+				assert.isFalse(axe.commons.dom.isVisible(el.actualNode));
+			}
+		});
 
 	});
 
diff --git a/test/commons/text/visible.js b/test/commons/text/visible.js
index 44e697b6f1..eb67142178 100644
--- a/test/commons/text/visible.js
+++ b/test/commons/text/visible.js
@@ -10,23 +10,26 @@ describe('text.visible', function () {
 	describe('non-screen-reader', function () {
 		it('should not return elements with visibility: hidden', function () {
 			fixture.innerHTML = 'Hello<span style="visibility: hidden;">Hi</span>';
-
-			assert.equal(axe.commons.text.visible(fixture), 'Hello');
+			var tree = axe.utils.getFlattenedTree(fixture);
+			assert.equal(axe.commons.text.visible(tree[0]), 'Hello');
 		});
 
 		it('should handle implicitly recursive calls', function () {
 			fixture.innerHTML = 'Hello<span><span>Hi</span></span>';
-			assert.equal(axe.commons.text.visible(fixture), 'HelloHi');
+			var tree = axe.utils.getFlattenedTree(fixture);
+			assert.equal(axe.commons.text.visible(tree[0]), 'HelloHi');
 		});
 
 		it('should handle explicitly recursive calls', function () {
 			fixture.innerHTML = 'Hello<span><span>Hi</span></span>';
-			assert.equal(axe.commons.text.visible(fixture, null, false), 'HelloHi');
+			var tree = axe.utils.getFlattenedTree(fixture);
+			assert.equal(axe.commons.text.visible(tree[0], null, false), 'HelloHi');
 		});
 
 		it('should handle non-recursive calls', function () {
 			fixture.innerHTML = 'Hello<span><span>Hi</span></span>';
-			assert.equal(axe.commons.text.visible(fixture, null, true), 'Hello');
+			var tree = axe.utils.getFlattenedTree(fixture);
+			assert.equal(axe.commons.text.visible(tree[0], null, true), 'Hello');
 		});
 
 		it('should know how visibility works', function () {
@@ -34,25 +37,29 @@ describe('text.visible', function () {
 					'<span style="visibility: visible;">Hi</span>' +
 				'</span>';
 
-			assert.equal(axe.commons.text.visible(fixture), 'Hello Hi');
+			var tree = axe.utils.getFlattenedTree(fixture);
+			assert.equal(axe.commons.text.visible(tree[0]), 'Hello Hi');
 		});
 
 		it('should not return elements with display: none', function () {
 			fixture.innerHTML = 'Hello<span style="display: none;"><span>Hi</span></span>';
 
-			assert.equal(axe.commons.text.visible(fixture), 'Hello');
+			var tree = axe.utils.getFlattenedTree(fixture);
+			assert.equal(axe.commons.text.visible(tree[0]), 'Hello');
 		});
 
 		it('should trim the result', function () {
 			fixture.innerHTML = '   &nbsp;\u00A0    Hello  &nbsp;\r\n   Hi     \n \n &nbsp; \n   ';
-			assert.equal(axe.commons.text.visible(fixture), 'Hello Hi');
+			var tree = axe.utils.getFlattenedTree(fixture);
+			assert.equal(axe.commons.text.visible(tree[0]), 'Hello Hi');
 		});
 
 		it('should ignore script and style tags', function () {
 			fixture.innerHTML = '<script> // hello </script><style> /*hello */</style>' +
 				'Hello';
 
-			assert.equal(axe.commons.text.visible(fixture), 'Hello');
+			var tree = axe.utils.getFlattenedTree(fixture);
+			assert.equal(axe.commons.text.visible(tree[0]), 'Hello');
 		});
 
 
@@ -61,17 +68,37 @@ describe('text.visible', function () {
 					'<div style="position: absolute; top: 10000px;">Hello</div>' +
 				'</div>';
 
-			assert.equal(axe.commons.text.visible(fixture), 'Hello');
-
+			var tree = axe.utils.getFlattenedTree(fixture);
+			assert.equal(axe.commons.text.visible(tree[0]), 'Hello');
+		});
+
+		it('should correctly handle slotted elements', function () {
+	        function createContentSlotted() {
+	            var group = document.createElement('div');
+	            group.innerHTML = '<div id="target">Stuff<slot></slot></div>';
+	            return group;
+	        }
+			function makeShadowTree(node) {
+				var root = node.attachShadow({mode: 'open'});
+				var div = document.createElement('div');
+				root.appendChild(div);
+				div.appendChild(createContentSlotted());
+			}
+			if (document.body && typeof document.body.attachShadow === 'function') {
+				fixture.innerHTML = '<div><a>hello</a></div>';
+				makeShadowTree(fixture.firstChild);
+				var tree = axe.utils.getFlattenedTree(fixture.firstChild);
+				assert.equal(axe.commons.text.visible(tree[0]), 'Stuffhello');
+			}
 		});
-
 	});
 
 	describe('screen reader', function () {
 		it('should not return elements with visibility: hidden', function () {
 			fixture.innerHTML = 'Hello<span style="visibility: hidden;">Hi</span>';
 
-			assert.equal(axe.commons.text.visible(fixture, true), 'Hello');
+			var tree = axe.utils.getFlattenedTree(fixture);
+			assert.equal(axe.commons.text.visible(tree[0], true), 'Hello');
 		});
 
 		it('should know how visibility works', function () {
@@ -79,26 +106,30 @@ describe('text.visible', function () {
 					'<span style="visibility: visible;">Hi</span>' +
 				'</span>';
 
-			assert.equal(axe.commons.text.visible(fixture, true), 'Hello Hi');
+			var tree = axe.utils.getFlattenedTree(fixture);
+			assert.equal(axe.commons.text.visible(tree[0], true), 'Hello Hi');
 		});
 
 
 		it('should not return elements with display: none', function () {
 			fixture.innerHTML = 'Hello<span style="display: none;"><span>Hi</span></span>';
 
-			assert.equal(axe.commons.text.visible(fixture, true), 'Hello');
+			var tree = axe.utils.getFlattenedTree(fixture);
+			assert.equal(axe.commons.text.visible(tree[0], true), 'Hello');
 		});
 
 		it('should trim the result', function () {
 			fixture.innerHTML = '   &nbsp;\u00A0    Hello  &nbsp;\r\n   Hi     \n \n &nbsp; \n   ';
-			assert.equal(axe.commons.text.visible(fixture, true), 'Hello Hi');
+			var tree = axe.utils.getFlattenedTree(fixture);
+			assert.equal(axe.commons.text.visible(tree[0], true), 'Hello Hi');
 		});
 
 		it('should ignore script and style tags', function () {
 			fixture.innerHTML = '<script> // hello </script><style> /*hello */</style>' +
 				'Hello';
 
-			assert.equal(axe.commons.text.visible(fixture, true), 'Hello');
+			var tree = axe.utils.getFlattenedTree(fixture);
+			assert.equal(axe.commons.text.visible(tree[0], true), 'Hello');
 		});
 
 
@@ -107,7 +138,8 @@ describe('text.visible', function () {
 					'<div>Hello</div>' +
 				'</div>';
 
-			assert.equal(axe.commons.text.visible(fixture, true), 'Hello');
+			var tree = axe.utils.getFlattenedTree(fixture);
+			assert.equal(axe.commons.text.visible(tree[0], true), 'Hello');
 
 		});
 
@@ -116,7 +148,8 @@ describe('text.visible', function () {
 			fixture.innerHTML = '<div style="text-indent: -9999px;">' +
 					'Hello</div>';
 
-			assert.equal(axe.commons.text.visible(fixture, true), 'Hello');
+			var tree = axe.utils.getFlattenedTree(fixture);
+			assert.equal(axe.commons.text.visible(tree[0], true), 'Hello');
 
 		});
 	});
diff --git a/test/core/utils/is-hidden.js b/test/core/utils/is-hidden.js
index 2fa915707d..bc12534d50 100644
--- a/test/core/utils/is-hidden.js
+++ b/test/core/utils/is-hidden.js
@@ -95,5 +95,25 @@ describe('axe.utils.isHidden', function () {
 			assert.isTrue(axe.utils.isHidden(node.actualNode));
 		}
 	});
+	it('should work with hiddent slotted elements', function () {
+		function createContentSlotted() {
+			var group = document.createElement('div');
+			group.innerHTML = '<div id="target" style="display:none;">Stuff<slot></slot></div>';
+			return group;
+		}
+		function makeShadowTree(node) {
+			var root = node.attachShadow({mode: 'open'});
+			var div = document.createElement('div');
+			root.appendChild(div);
+			div.appendChild(createContentSlotted());
+		}
+		if (document.body && typeof document.body.attachShadow === 'function') {
+			fixture.innerHTML = '<div><p><a>hello</a></p></div>';
+			makeShadowTree(fixture.firstChild);
+			var tree = axe.utils.getFlattenedTree(fixture.firstChild);
+			var el = axe.utils.querySelectorAll(tree, 'a')[0];
+			assert.isTrue(axe.utils.isHidden(el.actualNode));
+		}
+	});
 
 });
\ No newline at end of file

From 1986520cdca8ed0f208d2cbd918829b27266a374 Mon Sep 17 00:00:00 2001
From: Dylan Barrell <dylan@barrell.com>
Date: Sun, 18 Jun 2017 19:21:36 -0400
Subject: [PATCH 030/142] get core and commons functions working again.
 Includes mods to aria.label text.label hasContent findUp and the audit - to
 cache the flattened tree for lookups

---
 lib/commons/aria/label.js         | 13 ++++-----
 lib/commons/dom/find-up.js        | 28 +++++++++++++------
 lib/commons/dom/has-content.js    | 14 +++++-----
 lib/commons/text/label.js         | 13 +++++----
 lib/core/base/audit.js            |  2 ++
 lib/core/utils/flattened-tree.js  | 18 +++++++++++++
 test/commons/aria/label.js        | 19 ++++++++-----
 test/commons/dom/find-up.js       | 42 +++++++++++++++++++++++++++++
 test/commons/dom/has-content.js   | 19 ++++++++-----
 test/commons/text/label.js        | 45 ++++++++++++++++++++-----------
 test/core/base/audit.js           | 17 +++++++++++-
 test/core/utils/flattened-tree.js | 40 +++++++++++++++++++++++++++
 12 files changed, 215 insertions(+), 55 deletions(-)

diff --git a/lib/commons/aria/label.js b/lib/commons/aria/label.js
index 4fac7afe34..66f4005c27 100644
--- a/lib/commons/aria/label.js
+++ b/lib/commons/aria/label.js
@@ -1,18 +1,19 @@
-/*global aria, dom, text */
+/*global axe, aria, dom, text */
 /**
  * Gets the accessible ARIA label text of a given element
  * @see http://www.w3.org/WAI/PF/aria/roles#namecalculation
- * @param  {HTMLElement} node The element to test
+ * @param  {Object} node The virtual DOM node to test
  * @return {Mixed}      String of visible text, or `null` if no label is found
  */
 aria.label = function (node) {
 	var ref, candidate;
 
-	if (node.getAttribute('aria-labelledby')) {
+	if (node.actualNode.getAttribute('aria-labelledby')) {
 		// aria-labelledby
-		ref = dom.idrefs(node, 'aria-labelledby');
+		ref = dom.idrefs(node.actualNode, 'aria-labelledby');
 		candidate = ref.map(function (thing) {
-			return thing ? text.visible(thing, true) : '';
+			var vNode = axe.utils.getNodeFromTree(axe._tree[0], thing);
+			return vNode ? text.visible(vNode, true) : '';
 		}).join(' ').trim();
 
 		if (candidate) {
@@ -21,7 +22,7 @@ aria.label = function (node) {
 	}
 
 	// aria-label
-	candidate = node.getAttribute('aria-label');
+	candidate = node.actualNode.getAttribute('aria-label');
 	if (candidate) {
 		candidate = text.sanitize(candidate).trim();
 		if (candidate) {
diff --git a/lib/commons/dom/find-up.js b/lib/commons/dom/find-up.js
index db5c6b2ce1..0b0714cb3c 100644
--- a/lib/commons/dom/find-up.js
+++ b/lib/commons/dom/find-up.js
@@ -13,19 +13,31 @@ dom.findUp = function (element, target) {
 	/*jslint browser:true*/
 
 	var parent,
-		matches = document.querySelectorAll(target),
-		length = matches.length;
+		doc = axe.commons.dom.getRootNode(element),
+		matches;
 
-	if (!length) {
+	matches = doc.querySelectorAll(target);
+	matches = axe.utils.toArray(matches);
+	if (doc === document && !matches.length) {
 		return null;
 	}
 
-	matches = axe.utils.toArray(matches);
-
-	parent = element.parentNode;
-	// recrusively walk up the DOM, checking each parent node
+	parent = (element.assignedSlot) ? element.assignedSlot : element.parentNode;
+	if (parent.nodeType === 11) {
+		parent = parent.host;
+	}
+	// recursively walk up the DOM, checking each parent node
 	while (parent && matches.indexOf(parent) === -1) {
-		parent = parent.parentNode;
+		parent = (parent.assignedSlot) ? parent.assignedSlot : parent.parentNode;
+		if (parent && parent.nodeType === 11) {
+			parent = parent.host;
+			doc = axe.commons.dom.getRootNode(parent);
+			matches = doc.querySelectorAll(target);
+			matches = axe.utils.toArray(matches);
+			if (doc === document && !matches.length) {
+				return null;
+			}
+		}
 	}
 
 	return parent;
diff --git a/lib/commons/dom/has-content.js b/lib/commons/dom/has-content.js
index 0b1298112f..5581018d19 100644
--- a/lib/commons/dom/has-content.js
+++ b/lib/commons/dom/has-content.js
@@ -1,26 +1,24 @@
-/*global dom, aria */
+/*global dom, aria, axe */
 /**
  * Check that the element has visible content
  * in the form of either text, an aria-label or visual content such as image
  *
- * @param DOMElement
- * @param [DOMElement] (optional) Items to ignore as content
+ * @param {Object} virtual DOM node
  * @return boolean
  */
-dom.hasContent = function hasContent(elm, skipItems = []) {
+dom.hasContent = function hasContent(elm) {
   if (
-    elm.textContent.trim() ||
+    elm.actualNode.textContent.trim() ||
     aria.label(elm)
   ) {
     return true;
   }
 
-  const contentElms = elm.querySelectorAll('*');
+  const contentElms = axe.utils.querySelectorAll(elm, '*');
   for (let i = 0; i < contentElms.length; i++) {
     if (
-      skipItems.indexOf(contentElms[i]) === -1 &&
       aria.label(contentElms[i]) ||
-      dom.isVisualContent(contentElms[i])
+      dom.isVisualContent(contentElms[i].actualNode)
     ) {
       return true;
     }
diff --git a/lib/commons/text/label.js b/lib/commons/text/label.js
index 781d2bea1f..fe3593d250 100644
--- a/lib/commons/text/label.js
+++ b/lib/commons/text/label.js
@@ -2,11 +2,11 @@
 /**
  * Gets the visible text of a label for a given input
  * @see http://www.w3.org/WAI/PF/aria/roles#namecalculation
- * @param  {HTMLElement} node The input to test
+ * @param  {Object} node The virtual node mapping to the input to test
  * @return {Mixed}      String of visible text, or `null` if no label is found
  */
 text.label = function (node) {
-	var ref, candidate;
+	var ref, candidate, doc;
 
 	candidate = aria.label(node);
 	if (candidate) {
@@ -14,15 +14,18 @@ text.label = function (node) {
 	}
 
 	// explicit label
-	if (node.id) {
-		ref = document.querySelector('label[for="' + axe.utils.escapeSelector(node.id) + '"]');
+	if (node.actualNode.id) {
+		doc = axe.commons.dom.getRootNode(node.actualNode);
+		ref = doc.querySelector('label[for="' + axe.utils.escapeSelector(node.actualNode.id) + '"]');
+		ref = axe.utils.getNodeFromTree(axe._tree[0], ref);
 		candidate = ref && text.visible(ref, true);
 		if (candidate) {
 			return candidate;
 		}
 	}
 
-	ref = dom.findUp(node, 'label');
+	ref = dom.findUp(node.actualNode, 'label');
+	ref = axe.utils.getNodeFromTree(axe._tree[0], ref);
 	candidate = ref && text.visible(ref, true);
 	if (candidate) {
 		return candidate;
diff --git a/lib/core/base/audit.js b/lib/core/base/audit.js
index 1c6432eaf1..2d6140c2b3 100644
--- a/lib/core/base/audit.js
+++ b/lib/core/base/audit.js
@@ -144,6 +144,7 @@ Audit.prototype.run = function (context, options, resolve, reject) {
 	'use strict';
 	this.validateOptions(options);
 
+	axe._tree = axe.utils.getFlattenedTree(document.body); //cache the flattened tree
 	var q = axe.utils.queue();
 	this.rules.forEach(function (rule) {
 		if (axe.utils.ruleShouldRun(rule, context, options)) {
@@ -178,6 +179,7 @@ Audit.prototype.run = function (context, options, resolve, reject) {
 		}
 	});
 	q.then(function (results) {
+		axe._tree = undefined; // empty the tree
 		resolve(results.filter(function (result) { return !!result; }));
 	}).catch(reject);
 };
diff --git a/lib/core/utils/flattened-tree.js b/lib/core/utils/flattened-tree.js
index ac5f3e3153..010da0fc66 100644
--- a/lib/core/utils/flattened-tree.js
+++ b/lib/core/utils/flattened-tree.js
@@ -117,3 +117,21 @@ axe.utils.getFlattenedTree = function (node, shadowId) {
 		}
 	}
 };
+
+axe.utils.getNodeFromTree = function (vNode, node) {
+	var found;
+
+	vNode.children.forEach((candidate) => {
+		var retVal;
+
+		if (candidate.actualNode === node) {
+			found = candidate;
+		} else {
+			retVal = axe.utils.getNodeFromTree(candidate, node);
+			if (retVal) {
+				found = retVal;
+			}
+		}
+	});
+	return found;
+};
diff --git a/test/commons/aria/label.js b/test/commons/aria/label.js
index cad00f3b71..6aab989578 100644
--- a/test/commons/aria/label.js
+++ b/test/commons/aria/label.js
@@ -4,6 +4,7 @@ describe('aria.label', function() {
 	var fixture = document.getElementById('fixture');
 	afterEach(function() {
 		fixture.innerHTML = '';
+		axe._tree = undefined;
 	});
 
 	describe('aria-labelledby', function() {
@@ -11,7 +12,8 @@ describe('aria.label', function() {
 			fixture.innerHTML = '<div id="monkeys">monkeys</div><div id="bananas">bananas</div>' +
 				'<input id="target" aria-labelledby="monkeys bananas">';
 
-			var target = document.getElementById('target');
+			var tree = axe._tree = axe.utils.getFlattenedTree(document.body);
+			var target = axe.utils.querySelectorAll(tree, '#target')[0];
 			assert.equal(axe.commons.text.label(target), 'monkeys bananas');
 		});
 
@@ -19,7 +21,8 @@ describe('aria.label', function() {
 			fixture.innerHTML = '<div id="monkeys">monkeys</div><div id="bananas" style="display: none">bananas</div>' +
 				'<input id="target" aria-labelledby="monkeys bananas">';
 
-			var target = document.getElementById('target');
+			var tree = axe._tree = axe.utils.getFlattenedTree(document.body);
+			var target = axe.utils.querySelectorAll(tree, '#target')[0];
 			assert.equal(axe.commons.text.label(target), 'monkeys');
 		});
 
@@ -27,7 +30,8 @@ describe('aria.label', function() {
 			fixture.innerHTML = '<div id="monkeys">monkeys</div><div id="bananas">bananas</div>' +
 				'<input id="target" aria-labelledby="monkeys bananas" aria-label="nope">';
 
-			var target = document.getElementById('target');
+			var tree = axe._tree = axe.utils.getFlattenedTree(document.body);
+			var target = axe.utils.querySelectorAll(tree, '#target')[0];
 			assert.equal(axe.commons.text.label(target), 'monkeys bananas');
 		});
 
@@ -35,7 +39,8 @@ describe('aria.label', function() {
 			fixture.innerHTML = '<div id="monkeys">	\n  </div><div id="bananas"></div>' +
 				'<input id="target" aria-labelledby="monkeys bananas">';
 
-			var target = document.getElementById('target');
+			var tree = axe._tree = axe.utils.getFlattenedTree(document.body);
+			var target = axe.utils.querySelectorAll(tree, '#target')[0];
 			assert.isNull(axe.commons.text.label(target));
 		});
 	});
@@ -44,14 +49,16 @@ describe('aria.label', function() {
 		it('should detect it', function() {
 			fixture.innerHTML = '<input id="target" aria-label="monkeys">';
 
-			var target = document.getElementById('target');
+			var tree = axe._tree = axe.utils.getFlattenedTree(document.body);
+			var target = axe.utils.querySelectorAll(tree, '#target')[0];
 			assert.equal(axe.commons.text.label(target), 'monkeys');
 		});
 
 		it('should ignore whitespace only labels', function() {
 			fixture.innerHTML = '<input id="target" aria-label="   \n	">';
 
-			var target = document.getElementById('target');
+			var tree = axe._tree = axe.utils.getFlattenedTree(document.body);
+			var target = axe.utils.querySelectorAll(tree, '#target')[0];
 			assert.isNull(axe.commons.text.label(target));
 		});
 	});
diff --git a/test/commons/dom/find-up.js b/test/commons/dom/find-up.js
index dc8ca459de..21ada5602b 100644
--- a/test/commons/dom/find-up.js
+++ b/test/commons/dom/find-up.js
@@ -34,4 +34,46 @@ describe('dom.findUp', function () {
 		assert.isNull(axe.commons.dom.findUp(start, '.target'));
 
 	});
+
+	it('should walk up the assigned slot', function () {
+		function createContentSlotted() {
+			var group = document.createElement('div');
+			group.innerHTML = '<div id="target" style="display:none;">Stuff<slot></slot></div>';
+			return group;
+		}
+		function makeShadowTree(node) {
+			var root = node.attachShadow({mode: 'open'});
+			var div = document.createElement('div');
+			root.appendChild(div);
+			div.appendChild(createContentSlotted());
+		}
+		if (document.body && typeof document.body.attachShadow === 'function') {
+			fixture.innerHTML = '<label><div><p><a>hello</a></p></div></label>';
+			makeShadowTree(fixture.querySelector('div'));
+			var tree = axe.utils.getFlattenedTree(fixture.firstChild);
+			var el = axe.utils.querySelectorAll(tree, 'a')[0];
+			assert.equal(axe.commons.dom.findUp(el.actualNode, 'label'), fixture.firstChild);
+		}
+	});
+
+	it('should walk up the shadow DOM', function () {
+		function createContent() {
+			var group = document.createElement('div');
+			group.innerHTML = '<a>thing</a>';
+			return group;
+		}
+		function makeShadowTree(node) {
+			var root = node.attachShadow({mode: 'open'});
+			var div = document.createElement('div');
+			root.appendChild(div);
+			div.appendChild(createContent());
+		}
+		if (document.body && typeof document.body.attachShadow === 'function') {
+			fixture.innerHTML = '<label><div></div></label>';
+			makeShadowTree(fixture.querySelector('div'));
+			var tree = axe.utils.getFlattenedTree(fixture.firstChild);
+			var el = axe.utils.querySelectorAll(tree, 'a')[0];
+			assert.equal(axe.commons.dom.findUp(el.actualNode, 'label'), fixture.firstChild);
+		}
+	});
 });
\ No newline at end of file
diff --git a/test/commons/dom/has-content.js b/test/commons/dom/has-content.js
index 08e02ba769..6d9e20bcc9 100644
--- a/test/commons/dom/has-content.js
+++ b/test/commons/dom/has-content.js
@@ -2,46 +2,53 @@ describe('dom.hasContent', function () {
   'use strict';
   var hasContent = axe.commons.dom.hasContent;
   var fixture = document.getElementById('fixture');
+  var tree;
 
   it('returns false if there is no content', function () {
     fixture.innerHTML = '<div id="target">  </div>';
+    tree = axe.utils.getFlattenedTree(fixture);
     assert.isFalse(
-      hasContent(document.getElementById('target'))
+      hasContent(axe.utils.querySelectorAll(tree, '#target')[0])
     );
   });
 
   it('returns false if there are non-visual elements', function () {
     fixture.innerHTML = '<div id="target"> <span></span> </div>';
+    tree = axe.utils.getFlattenedTree(fixture);
     assert.isFalse(
-      hasContent(document.getElementById('target'))
+      hasContent(axe.utils.querySelectorAll(tree, '#target')[0])
     );
   });
 
   it('is true if the element has non-empty text', function () {
     fixture.innerHTML = '<div id="target"> text </div>';
+    tree = axe.utils.getFlattenedTree(fixture);
     assert.isTrue(
-      hasContent(document.getElementById('target'))
+      hasContent(axe.utils.querySelectorAll(tree, '#target')[0])
     );
   });
 
   it('is true if the element has an aria label', function () {
     fixture.innerHTML = '<div id="target" aria-label="my-label">  </div>';
+    tree = axe.utils.getFlattenedTree(fixture);
     assert.isTrue(
-      hasContent(document.getElementById('target'))
+      hasContent(axe.utils.querySelectorAll(tree, '#target')[0])
     );
   });
 
   it('is true if the element contains visual content', function () {
     fixture.innerHTML = '<div id="target"> <img src=""> </div>';
+    tree = axe.utils.getFlattenedTree(fixture);
     assert.isTrue(
-      hasContent(document.getElementById('target'))
+      hasContent(axe.utils.querySelectorAll(tree, '#target')[0])
     );
   });
 
   it('is true if the element contains a node with a aria-label', function () {
     fixture.innerHTML = '<div id="target"> <span aria-label="my-label"></span> </div>';
+    tree = axe.utils.getFlattenedTree(fixture);
     assert.isTrue(
-      hasContent(document.getElementById('target'))
+      hasContent(axe.utils.querySelectorAll(tree, '#target')[0])
     );
   });
 });
diff --git a/test/commons/text/label.js b/test/commons/text/label.js
index beb03f257c..66fec2895d 100644
--- a/test/commons/text/label.js
+++ b/test/commons/text/label.js
@@ -11,7 +11,8 @@ describe('text.label', function () {
 			fixture.innerHTML = '<div id="monkeys">monkeys</div><div id="bananas">bananas</div>' +
 				'<input id="target" aria-labelledby="monkeys bananas">';
 
-			var target = document.getElementById('target');
+			var tree = axe._tree = axe.utils.getFlattenedTree(document.body);
+			var target = axe.utils.querySelectorAll(tree, '#target')[0];
 			assert.equal(axe.commons.text.label(target), 'monkeys bananas');
 		});
 
@@ -19,7 +20,8 @@ describe('text.label', function () {
 			fixture.innerHTML = '<div id="monkeys">monkeys</div><div id="bananas" style="display: none">bananas</div>' +
 				'<input id="target" aria-labelledby="monkeys bananas">';
 
-			var target = document.getElementById('target');
+			var tree = axe._tree = axe.utils.getFlattenedTree(document.body);
+			var target = axe.utils.querySelectorAll(tree, '#target')[0];
 			assert.equal(axe.commons.text.label(target), 'monkeys');
 		});
 
@@ -27,7 +29,8 @@ describe('text.label', function () {
 			fixture.innerHTML = '<div id="monkeys">monkeys</div><div id="bananas">bananas</div>' +
 				'<input id="target" aria-labelledby="monkeys bananas" aria-label="nope">';
 
-			var target = document.getElementById('target');
+			var tree = axe._tree = axe.utils.getFlattenedTree(document.body);
+			var target = axe.utils.querySelectorAll(tree, '#target')[0];
 			assert.equal(axe.commons.text.label(target), 'monkeys bananas');
 		});
 
@@ -36,7 +39,8 @@ describe('text.label', function () {
 				'<label for="target">nope</label>' +
 				'<input id="target" aria-labelledby="monkeys bananas">';
 
-			var target = document.getElementById('target');
+			var tree = axe._tree = axe.utils.getFlattenedTree(document.body);
+			var target = axe.utils.querySelectorAll(tree, '#target')[0];
 			assert.equal(axe.commons.text.label(target), 'monkeys bananas');
 		});
 
@@ -45,7 +49,8 @@ describe('text.label', function () {
 				'<label>nope' +
 				'<input id="target" aria-labelledby="monkeys bananas"></label>';
 
-			var target = document.getElementById('target');
+			var tree = axe._tree = axe.utils.getFlattenedTree(document.body);
+			var target = axe.utils.querySelectorAll(tree, '#target')[0];
 			assert.equal(axe.commons.text.label(target), 'monkeys bananas');
 		});
 
@@ -53,7 +58,8 @@ describe('text.label', function () {
 			fixture.innerHTML = '<div id="monkeys">	\n  </div><div id="bananas"></div>' +
 				'<input id="target" aria-labelledby="monkeys bananas">';
 
-			var target = document.getElementById('target');
+			var tree = axe._tree = axe.utils.getFlattenedTree(document.body);
+			var target = axe.utils.querySelectorAll(tree, '#target')[0];
 			assert.isNull(axe.commons.text.label(target));
 		});
 	});
@@ -62,14 +68,16 @@ describe('text.label', function () {
 		it('should detect it', function () {
 			fixture.innerHTML = '<input id="target" aria-label="monkeys">';
 
-			var target = document.getElementById('target');
+			var tree = axe._tree = axe.utils.getFlattenedTree(document.body);
+			var target = axe.utils.querySelectorAll(tree, '#target')[0];
 			assert.equal(axe.commons.text.label(target), 'monkeys');
 		});
 
 		it('should ignore whitespace only labels', function () {
 			fixture.innerHTML = '<input id="target" aria-label="   \n	">';
 
-			var target = document.getElementById('target');
+			var tree = axe._tree = axe.utils.getFlattenedTree(document.body);
+			var target = axe.utils.querySelectorAll(tree, '#target')[0];
 			assert.isNull(axe.commons.text.label(target));
 		});
 
@@ -77,7 +85,8 @@ describe('text.label', function () {
 			fixture.innerHTML = '<label for="target">nope</label>' +
 				'<input id="target" aria-label="monkeys">';
 
-			var target = document.getElementById('target');
+			var tree = axe._tree = axe.utils.getFlattenedTree(document.body);
+			var target = axe.utils.querySelectorAll(tree, '#target')[0];
 			assert.equal(axe.commons.text.label(target), 'monkeys');
 		});
 
@@ -85,7 +94,8 @@ describe('text.label', function () {
 			fixture.innerHTML = '<label>nope' +
 				'<input id="target" aria-label="monkeys"></label>';
 
-			var target = document.getElementById('target');
+			var tree = axe._tree = axe.utils.getFlattenedTree(document.body);
+			var target = axe.utils.querySelectorAll(tree, '#target')[0];
 			assert.equal(axe.commons.text.label(target), 'monkeys');
 		});
 	});
@@ -95,7 +105,8 @@ describe('text.label', function () {
 			fixture.innerHTML = '<label for="target">monkeys</label>' +
 				'<input id="target">';
 
-			var target = document.getElementById('target');
+			var tree = axe._tree = axe.utils.getFlattenedTree(document.body);
+			var target = axe.utils.querySelectorAll(tree, '#target')[0];
 			assert.equal(axe.commons.text.label(target), 'monkeys');
 		});
 
@@ -103,7 +114,8 @@ describe('text.label', function () {
 			fixture.innerHTML = '<label for="target">	\n\r  </label>' +
 				'<input id="target">';
 
-			var target = document.getElementById('target');
+			var tree = axe._tree = axe.utils.getFlattenedTree(document.body);
+			var target = axe.utils.querySelectorAll(tree, '#target')[0];
 			assert.isNull(axe.commons.text.label(target));
 		});
 
@@ -112,7 +124,8 @@ describe('text.label', function () {
 				'<label>nope' +
 				'<input id="target"></label>';
 
-			var target = document.getElementById('target');
+			var tree = axe._tree = axe.utils.getFlattenedTree(document.body);
+			var target = axe.utils.querySelectorAll(tree, '#target')[0];
 			assert.equal(axe.commons.text.label(target), 'monkeys');
 
 		});
@@ -123,7 +136,8 @@ describe('text.label', function () {
 			fixture.innerHTML = '<label>monkeys' +
 				'<input id="target"><label>';
 
-			var target = document.getElementById('target');
+			var tree = axe._tree = axe.utils.getFlattenedTree(document.body);
+			var target = axe.utils.querySelectorAll(tree, '#target')[0];
 			assert.equal(axe.commons.text.label(target), 'monkeys');
 		});
 
@@ -131,7 +145,8 @@ describe('text.label', function () {
 			fixture.innerHTML = '<label> ' +
 				'<input id="target"><label>';
 
-			var target = document.getElementById('target');
+			var tree = axe._tree = axe.utils.getFlattenedTree(document.body);
+			var target = axe.utils.querySelectorAll(tree, '#target')[0];
 			assert.isNull(axe.commons.text.label(target));
 		});
 	});
diff --git a/test/core/base/audit.js b/test/core/base/audit.js
index 30e42e8384..c1da6123c3 100644
--- a/test/core/base/audit.js
+++ b/test/core/base/audit.js
@@ -1,7 +1,7 @@
 /*global Audit, Rule */
 describe('Audit', function () {
 	'use strict';
-	var a;
+	var a, getFlattenedTree;
 	var isNotCalled = function (err) {
 		throw err || new Error('Reject should not be called');
 	};
@@ -59,9 +59,12 @@ describe('Audit', function () {
 		mockChecks.forEach(function (c) {
 			a.addCheck(c);
 		});
+		getFlattenedTree = axe.utils.getFlattenedTree;
 	});
 	afterEach(function () {
 		fixture.innerHTML = '';
+		axe._tree = undefined;
+		axe.utils.getFlattenedTree = getFlattenedTree;
 	});
 
 	it('should be a function', function () {
@@ -419,6 +422,18 @@ describe('Audit', function () {
 				done();
 			}, isNotCalled);
 		});
+		it('should call axe.utils.getFlattenedTree', function (done) {
+			var called = false;
+			axe.utils.getFlattenedTree = function () {
+				called = true;
+			};
+			a.run({ include: [document] }, {
+				rules: {}
+			}, function () {
+				assert.isTrue(called);
+				done();
+			}, isNotCalled);
+		});
 		it('should not run rules disabled by the configuration', function (done) {
 			var a = new Audit();
 			var success = true;
diff --git a/test/core/utils/flattened-tree.js b/test/core/utils/flattened-tree.js
index 2a9b4373ec..c8c5acfac0 100644
--- a/test/core/utils/flattened-tree.js
+++ b/test/core/utils/flattened-tree.js
@@ -186,6 +186,46 @@ if (document.body && typeof document.body.attachShadow === 'function') {
 			// assert.isTrue(virtualDOM[0].children[1].children[0].children[0].actualNode.nodeName === 'SLOT');
 		});
 	});
+	describe('getNodeFromTree', function () {
+		'use strict';
+		afterEach(function () {
+			fixture.innerHTML = '';
+		});
+		beforeEach(function () {
+			function createStoryGroup (className, slotName) {
+				var group = document.createElement('div');
+				group.className = className;
+				// Empty string in slot name attribute or absence thereof work the same, so no need for special handling.
+				group.innerHTML = '<ul><slot name="' + slotName + '">fallback content<li>one</li></slot></ul>';
+				return group;
+			}
+
+			function makeShadowTree (storyList) {
+				var root = storyList.attachShadow({mode: 'open'});
+				root.appendChild(createStyle());
+				root.appendChild(createStoryGroup('breaking', 'breaking'));
+				root.appendChild(createStoryGroup('other', ''));
+			}
+			var str = '<div class="stories"><li>1</li>' +
+			'<li>2</li><li class="breaking" slot="breaking">3</li>' +
+			'<li>4</li><li>5</li><li class="breaking" slot="breaking">6</li></div>';
+			str += '<div class="stories"><li>1</li>' +
+			'<li>2</li><li class="breaking" slot="breaking">3</li>' +
+			'<li>4</li><li>5</li><li class="breaking" slot="breaking">6</li></div>';
+			str += '<div class="stories"></div>';
+			fixture.innerHTML = str;
+
+			fixture.querySelectorAll('.stories').forEach(makeShadowTree);
+		});
+		it('should find the virtual node that matches the real node passed in', function () {
+			var virtualDOM = axe.utils.getFlattenedTree(fixture);
+			var node = document.querySelector('.stories li');
+			var vNode = axe.utils.getNodeFromTree(virtualDOM[0], node);
+			assert.isDefined(vNode);
+			assert.equal(node, vNode.actualNode);
+			assert.equal(vNode.actualNode.textContent, '1');
+		});
+	});
 }
 
 if (document.body && typeof document.body.attachShadow === 'undefined' &&

From 34137e5eb3da1d0154ff2138a9888242c9e2bed7 Mon Sep 17 00:00:00 2001
From: Kolombiken <ida@kolombiken.com>
Date: Mon, 19 Jun 2017 10:08:28 +0200
Subject: [PATCH 031/142] docs: Add axe-testacafe to projects.md (#368)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Added aXe-Testcafe a TestCafé module that allows you to use the aXe accessibility engine in TestCafe tests. (More on TestCafé here: http://devexpress.github.io/testcafe/)
---
 doc/projects.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/projects.md b/doc/projects.md
index 615d31eae3..15b10c33a3 100644
--- a/doc/projects.md
+++ b/doc/projects.md
@@ -29,3 +29,4 @@ Add your project/integration to this file and submit a pull request.
 1. [Protractor-axe-report Plugin](https://github.com/E1Edatatracker/protractor-axe-report-plugin)
 1. [Rocket Validator](https://rocketvalidator.com)
 1. [aXe Reports](https://github.com/louis-reed/axe-reports)
+1. [aXe-TestCafe](https://github.com/helen-dikareva/axe-testcafe)

From d55f3cda4598320f8ee496684a01f8b9e1598f8d Mon Sep 17 00:00:00 2001
From: Wilco Fiers <wilco.fiers@deque.com>
Date: Mon, 19 Jun 2017 15:56:08 +0200
Subject: [PATCH 032/142] feat: Add option restoreScroll

---
 doc/API.md                      |   1 +
 lib/core/public/run-rules.js    |   9 +-
 lib/core/utils/scroll-state.js  |  69 ++++++++++++++
 test/core/public/run.js         |  43 +++++++++
 test/core/utils/scroll-state.js | 163 ++++++++++++++++++++++++++++++++
 test/playground.html            |  27 ++++--
 6 files changed, 303 insertions(+), 9 deletions(-)
 create mode 100644 lib/core/utils/scroll-state.js
 create mode 100644 test/core/utils/scroll-state.js

diff --git a/doc/API.md b/doc/API.md
index be76d43bbb..767cdd1f38 100644
--- a/doc/API.md
+++ b/doc/API.md
@@ -311,6 +311,7 @@ Additionally, there are a number or properties that allow configuration of diffe
 | `absolutePaths` | `false` | Use absolute paths when creating element selectors
 | `iframes`       | `true`  | Tell axe to run inside iframes
 | `elementRef`    | `false` | Return element references in addition to the target
+| `restoreScroll` | `false` | Scrolls elements back to before axe started
 
 
 ###### Options Parameter Examples
diff --git a/lib/core/public/run-rules.js b/lib/core/public/run-rules.js
index 4225e62aa8..a358afaa26 100644
--- a/lib/core/public/run-rules.js
+++ b/lib/core/public/run-rules.js
@@ -29,7 +29,14 @@ function runRules(context, options, resolve, reject) {
 		});
 	}
 	q.defer(function (res, rej) {
-		audit.run(context, options, res, rej);
+		if (options.restoreScroll) {
+			const scrollState = axe.utils.getScrollState();
+			audit.run(context, options, res, rej);
+			axe.utils.setScrollState(scrollState);
+
+		} else {
+			audit.run(context, options, res, rej);
+		}
 	});
 	q.then(function (data) {
 		try {
diff --git a/lib/core/utils/scroll-state.js b/lib/core/utils/scroll-state.js
new file mode 100644
index 0000000000..00df66fe6f
--- /dev/null
+++ b/lib/core/utils/scroll-state.js
@@ -0,0 +1,69 @@
+/**
+ * Return the scroll position of scrollable elements
+ */
+function getScroll (elm) {
+  const style = window.getComputedStyle(elm);
+  const visibleOverflowY = style.getPropertyValue('overflow-y') === 'visible';
+  const visibleOverflowX = style.getPropertyValue('overflow-x') === 'visible';
+
+  if (// See if the element hides overflowing content
+    (!visibleOverflowY && elm.scrollHeight > elm.clientHeight) ||
+    (!visibleOverflowX && elm.scrollWidth > elm.clientWidth)
+  ) {
+    return { elm, top: elm.scrollTop, left: elm.scrollLeft };
+  }
+}
+
+/**
+ * set the scroll position of an element
+ */
+function setScroll (elm, top, left) {
+  if (elm === window) {
+    return elm.scroll(top, left);
+  } else {
+    elm.scrollTop = top;
+    elm.scrollLeft = left;
+  }
+}
+
+/**
+ * Create an array scroll positions from descending elements
+ */
+function getElmScrollRecursive (root) {
+  return Array.from(root.children).reduce((scrolls, elm) => {
+    const scroll = getScroll(elm);
+    if (scroll) {
+      scrolls.push(scroll);
+    }
+    return scrolls.concat(getElmScrollRecursive(elm));
+  }, []);
+}
+
+/**
+ * Get the scroll position of all scrollable elements in a page
+ */
+axe.utils.getScrollState = function getScrollState (win = window) {
+  const root = win.document.documentElement;
+  const windowScroll = [(win.pageXOffset !== undefined ? {
+    elm: win,
+    top: win.pageYOffset,
+    left: win.pageXOffset
+  } : {
+    elm: root,
+    top: root.scrollTop,
+    left: root.scrollLeft
+  })];
+
+  return windowScroll.concat(
+    getElmScrollRecursive(document.body)
+  );
+};
+
+/**
+ * set the scroll position of all items in the scrollState array
+ */
+axe.utils.setScrollState = function setScrollState (scrollState) {
+  scrollState.forEach(
+    ({ elm, top, left }) => setScroll(elm, top, left)
+  );
+};
diff --git a/test/core/public/run.js b/test/core/public/run.js
index 4581a21394..e4a872d203 100644
--- a/test/core/public/run.js
+++ b/test/core/public/run.js
@@ -315,6 +315,49 @@ describe('axe.run', function () {
 			});
 		});
 	});
+
+	describe('option restoreScroll', function () {
+		it('does not change scroll when restoreScroll is not set', function (done) {
+			var calls = 0;
+			var _getSS = axe.utils.getScrollState;
+			var _setSS = axe.utils.setScrollState;
+			axe.utils.setScrollState = function () {
+				calls++;
+			};
+			axe.utils.getScrollState = axe.utils.setScrollState;
+
+			axe.run('#fixture', {}, function () {
+				assert.equal(calls, 0);
+				axe.utils.getScrollState = _getSS;
+				axe.utils.setScrollState = _setSS;
+				done();
+			});
+		});
+
+		it('resets scrolLState after running the audit', function (done) {
+			var scrollState = {};
+			var calls = 0;
+			var _getSS = axe.utils.getScrollState;
+			var _setSS = axe.utils.setScrollState;
+
+			axe.utils.setScrollState = function (arg) {
+				assert.equal(scrollState, arg);
+				calls++;
+			};
+			axe.utils.getScrollState = function () {
+				return scrollState;
+			};
+
+			axe.run('#fixture', {
+				restoreScroll: true
+			}, function () {
+				assert.equal(calls, 1);
+				axe.utils.getScrollState = _getSS;
+				axe.utils.setScrollState = _setSS;
+				done();
+			});
+		});
+	});
 });
 
 describe('axe.run iframes', function () {
diff --git a/test/core/utils/scroll-state.js b/test/core/utils/scroll-state.js
new file mode 100644
index 0000000000..85e01eb135
--- /dev/null
+++ b/test/core/utils/scroll-state.js
@@ -0,0 +1,163 @@
+describe('axe.utils.getScrollState', function () {
+  'use strict';
+  var mockWin;
+  var getScrollState = axe.utils.getScrollState;
+
+  var fixture = document.getElementById('fixture');
+
+  beforeEach(function () {
+    mockWin = {
+      pageXOffset: 1,
+      pageYOffset: 3,
+      document: {
+        documentElement: {
+          children: [],
+          scrollTop: 3,
+          scrollHeight: 4
+        }
+      },
+      body: { children: [] }
+    };
+    fixture.innerHTML = '';
+  });
+
+  it('should be a function', function () {
+    assert.isFunction(getScrollState);
+  });
+
+  it('takes the window object as an optional argument', function () {
+    assert.deepEqual(
+      getScrollState(),
+      getScrollState(window)
+    );
+  });
+
+  it('returns the window as the first item, if pageXOffset is supported', function () {
+    assert.deepEqual(
+      getScrollState(mockWin)[0],
+      {
+        elm: mockWin,
+        top: mockWin.pageYOffset,
+        left: mockWin.pageXOffset
+      }
+    );
+  });
+
+  it('returns the html as the first item, if pageXOffset is not supported', function () {
+    mockWin.pageYOffset = undefined;
+    mockWin.pageXOffset = undefined;
+    var html = mockWin.document.documentElement;
+
+    assert.deepEqual(
+      getScrollState(mockWin)[0],
+      {
+        elm: html,
+        top: html.scrollTop,
+        left: html.scrollLeft
+      }
+    );
+  });
+
+  it('grabs scrollTop and scrollLeft from all descendants of body', function () {
+    fixture.innerHTML = 
+      '<div style="overflow:auto; height: 50px" id="tgt1">' +
+        '<div style="height: 100px"> Han Solo </div>' +
+        '<div style="overflow: hidden; height: 50px" id="tgt2">' +
+          '<div style="height: 100px"> Chewbacca </div>' +
+        '</div>' +
+      '</div>';
+
+    var tgt1 = document.getElementById('tgt1');
+    var tgt2 = document.getElementById('tgt2');
+    tgt1.scrollTop = 10;
+    tgt2.scrollTop = 20;
+
+    var scrollState = getScrollState();
+
+    assert.deepEqual(
+      scrollState.find(function (scroll) { return scroll.elm === tgt1; }),
+      { elm: tgt1, top: 10, left: 0 }
+    );
+    assert.deepEqual(
+      scrollState.find(function (scroll) { return scroll.elm === tgt2; }),
+      { elm: tgt2, top: 20, left: 0 }
+    );
+  });
+
+  it('ignores elements with overflow visible', function () {
+    fixture.innerHTML = 
+      '<div style="overflow:visible; height: 50px" id="tgt1">' +
+        '<div style="height: 100px" id="tgt2"> Han Solo </div>' +
+      '</div>';
+
+    var tgt1 = document.getElementById('tgt1');
+    var tgt2 = document.getElementById('tgt2');
+    var scrollState = getScrollState();
+
+    assert.isUndefined(
+      scrollState.find(function (scroll) { return scroll.elm === tgt1; })
+    );
+    assert.isUndefined(
+      scrollState.find(function (scroll) { return scroll.elm === tgt2; })
+    );
+  });
+
+  it('ignores elements that do not overflow', function () {
+    fixture.innerHTML = 
+      '<div style="overflow:auto; height: 300px" id="tgt1">' +
+        '<div style="height: 100px"> Han Solo </div>' +
+        '<div style="overflow: hidden; height: 150px" id="tgt2">' +
+          '<div style="height: 100px"> Chewbacca </div>' +
+        '</div>' +
+      '</div>';
+
+    var tgt1 = document.getElementById('tgt1');
+    var tgt2 = document.getElementById('tgt2');
+    var scrollState = getScrollState();
+
+    assert.isUndefined(
+      scrollState.find(function (scroll) { return scroll.elm === tgt1; })
+    );
+    assert.isUndefined(
+      scrollState.find(function (scroll) { return scroll.elm === tgt2; })
+    );
+  });
+});
+
+describe('axe.utils.setScrollState', function () {
+  'use strict';
+  var setScrollState = axe.utils.setScrollState;
+
+  var fixture = document.getElementById('fixture');
+  afterEach(function () {
+    fixture.innerHTML = '';
+  });
+
+  it('should be a function', function () {
+    assert.isFunction(setScrollState);
+  });
+
+  it('sets scrollTop and scrollLeft for regular nodes', function () {
+    var elm1 = {}, elm2 = {};
+    setScrollState([
+      { elm: elm1, top: 10, left: 20 },
+      { elm: elm2, top: 30, left: 40 },
+    ]);
+
+    assert.deepEqual(elm1, { scrollTop: 10, scrollLeft: 20 });
+    assert.deepEqual(elm2, { scrollTop: 30, scrollLeft: 40 });
+  });
+
+  it('calls scroll() for the window element', function () {
+    var called;
+    var winScroll = window.scroll;
+    window.scroll = function (top, left) {
+      called = { top: top, left: left };
+    };
+    setScrollState([
+      { elm: window, top: 10, left: 20 }
+    ]);
+    assert.deepEqual(called, { top: 10, left: 20 });
+    window.scroll = winScroll;
+  });
+});
diff --git a/test/playground.html b/test/playground.html
index 2b0e239db4..94c489c015 100644
--- a/test/playground.html
+++ b/test/playground.html
@@ -1,14 +1,25 @@
 <!doctype html>
+<html lang="en">
 <title>O hai</title>
+
+<div style="
+  height: 50px;
+  width: 50px;
+  border: solid 1px black;
+  overflow: auto;
+">
+  <p>foofoofoofoofoofoo</p>
+  <p>foofoofoofoofoofoo</p>
+  <p>foofoofoofoofoofoo</p>
+  <p>foofoofoofoofoofoo</p>
+  <p>foofoofoofoofoofoo</p>
+</div>
+
 <script src="/axe.js"></script>
-<div id="dupe"></div>
-<div id="dupe"></div>
 <script>
-
 window.addEventListener('load' , function () {
-	axe.a11yCheck(document, {}, function (res) {
-		console.log(res);
-	});
+  axe.a11yCheck(document, { restoreScroll: true }, function (res) {
+    console.log(res);
+  });
 })
-
-</script>
\ No newline at end of file
+</script>

From 70728e6d5a1f119be494664d79ceac4bb9d2462e Mon Sep 17 00:00:00 2001
From: Dylan Barrell <dylan@barrell.com>
Date: Mon, 19 Jun 2017 13:50:31 -0400
Subject: [PATCH 033/142] feat: add S.C. 2.4.4 to link-name rule. Fixes #369

---
 doc/rule-descriptions.md | 2 +-
 lib/rules/link-name.json | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/doc/rule-descriptions.md b/doc/rule-descriptions.md
index 58cdc20e34..044af174d7 100644
--- a/doc/rule-descriptions.md
+++ b/doc/rule-descriptions.md
@@ -35,7 +35,7 @@
 | label | Ensures every form element has a label | cat.forms, wcag2a, wcag332, wcag131, section508, section508.22.n | true |
 | layout-table | Ensures presentational &lt;table&gt; elements do not use &lt;th&gt;, &lt;caption&gt; elements or the summary attribute | cat.semantics, wcag2a, wcag131 | true |
 | link-in-text-block | Links can be distinguished without relying on color | cat.color, experimental, wcag2a, wcag141 | true |
-| link-name | Ensures links have discernible text | cat.name-role-value, wcag2a, wcag111, wcag412, section508, section508.22.a | true |
+| link-name | Ensures links have discernible text | cat.name-role-value, wcag2a, wcag111, wcag412, wcag244, section508, section508.22.a | true |
 | list | Ensures that lists are structured correctly | cat.structure, wcag2a, wcag131 | true |
 | listitem | Ensures &lt;li&gt; elements are used semantically | cat.structure, wcag2a, wcag131 | true |
 | marquee | Ensures &lt;marquee&gt; elements are not used | cat.parsing, wcag2a, wcag222 | true |
diff --git a/lib/rules/link-name.json b/lib/rules/link-name.json
index c1d681cea9..1c18ce67c5 100644
--- a/lib/rules/link-name.json
+++ b/lib/rules/link-name.json
@@ -6,6 +6,7 @@
     "wcag2a",
     "wcag111",
     "wcag412",
+    "wcag244",
     "section508",
     "section508.22.a"
   ],

From 56f186736ec7d1ad3b6c36db76f07922feb715cb Mon Sep 17 00:00:00 2001
From: Wilco Fiers <wilco.fiers@deque.com>
Date: Thu, 22 Jun 2017 16:57:08 +0200
Subject: [PATCH 034/142] fix: Properly output error stack

---
 lib/core/base/audit.js  | 2 +-
 test/core/base/audit.js | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/core/base/audit.js b/lib/core/base/audit.js
index 1c6432eaf1..86df69b490 100644
--- a/lib/core/base/audit.js
+++ b/lib/core/base/audit.js
@@ -165,7 +165,7 @@ Audit.prototype.run = function (context, options, resolve, reject) {
 							result: axe.constants.CANTTELL,
 							description: 'An error occured while running this rule',
 							message: err.message,
-							help: err.stack || err.message,
+							stack: err.stack,
 							error: err
 						});
 						res(errResult);
diff --git a/test/core/base/audit.js b/test/core/base/audit.js
index af6a18c948..f5d8df59ee 100644
--- a/test/core/base/audit.js
+++ b/test/core/base/audit.js
@@ -496,6 +496,7 @@ describe('Audit', function () {
 		});
 
 		it('catches errors and passes them as a cantTell result', function (done) {
+			var err = new Error('Launch the super sheep!');
 			a.addRule({
 				id: 'throw1',
 				selector: '*',
@@ -506,7 +507,7 @@ describe('Audit', function () {
 			a.addCheck({
 				id: 'throw1-check1',
 				evaluate: function () {
-					throw new Error('Launch the super sheep!');
+					throw err;
 				}
 			});
 
@@ -518,7 +519,9 @@ describe('Audit', function () {
 			}, function (results) {
 				assert.lengthOf(results,1);
 				assert.equal(results[0].result, 'cantTell');
-				assert.equal(results[0].error.message, 'Launch the super sheep!');
+				assert.equal(results[0].message, err.message);
+				assert.equal(results[0].stack, err.stack);
+				assert.equal(results[0].error, err);
 				done();
 			}, isNotCalled);
 		});

From 632d3f6a1c2403439f0120d7832bb38823390e82 Mon Sep 17 00:00:00 2001
From: Wilco Fiers <wilco.fiers@deque.com>
Date: Fri, 23 Jun 2017 11:04:32 +0200
Subject: [PATCH 035/142] doc: Add 'on mobile' to viewport rule

---
 lib/checks/mobile/meta-viewport-large.json | 4 ++--
 lib/checks/mobile/meta-viewport.json       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/checks/mobile/meta-viewport-large.json b/lib/checks/mobile/meta-viewport-large.json
index 20c3b574d9..b093a5121c 100644
--- a/lib/checks/mobile/meta-viewport-large.json
+++ b/lib/checks/mobile/meta-viewport-large.json
@@ -8,8 +8,8 @@
   "metadata": {
     "impact": "minor",
     "messages": {
-      "pass": "<meta> tag does not prevent significant zooming",
-      "fail": "<meta> tag limits zooming"
+      "pass": "<meta> tag does not prevent significant zooming on mobile devices",
+      "fail": "<meta> tag limits zooming on mobile devices"
     }
   }
 }
diff --git a/lib/checks/mobile/meta-viewport.json b/lib/checks/mobile/meta-viewport.json
index 5a6a1b1624..162bb016dd 100644
--- a/lib/checks/mobile/meta-viewport.json
+++ b/lib/checks/mobile/meta-viewport.json
@@ -7,8 +7,8 @@
   "metadata": {
     "impact": "critical",
     "messages": {
-      "pass": "<meta> tag does not disable zooming",
-      "fail": "<meta> tag disables zooming"
+      "pass": "<meta> tag does not disable zooming on mobile devices",
+      "fail": "<meta> tag disables zooming on mobile devices"
     }
   }
 }

From 0b0240f9e861d65602e98a4a1aaecefed0285722 Mon Sep 17 00:00:00 2001
From: Wilco Fiers <wilco.fiers@deque.com>
Date: Tue, 20 Jun 2017 11:49:33 +0200
Subject: [PATCH 036/142] fix: Ensure all tests pass in Chrome

---
 build/tasks/test-webdriver.js              | 13 +++----
 test/commons/color/get-background-color.js |  1 +
 test/commons/color/get-foreground-color.js |  2 ++
 test/integration/full/options/options.js   | 40 +++++++++++-----------
 4 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/build/tasks/test-webdriver.js b/build/tasks/test-webdriver.js
index 04c73a1ff3..53c730ae1b 100644
--- a/build/tasks/test-webdriver.js
+++ b/build/tasks/test-webdriver.js
@@ -35,12 +35,12 @@ module.exports = function (grunt) {
 	/**
 	 * Test each URL
 	 */
-	function runTestUrls(driver, urls) {
+	function runTestUrls(driver, urls, errors) {
 		var url = urls.shift();
-		var errors = [];
+		errors = errors || [];
 
 		// Give each page enough time
-		driver.manage().timeouts().setScriptTimeout(600);
+		driver.manage().timeouts().setScriptTimeout(60000);
 
 		return driver.get(url)
 		// Get results
@@ -69,8 +69,9 @@ module.exports = function (grunt) {
 		}).then(function () {
 			// Start the next job, if any
 			if (urls.length > 0) {
-				return runTestUrls(driver, urls);
+				return runTestUrls(driver, urls, errors);
 			} else {
+				driver.quit();
 				return Promise.resolve(errors);
 			}
 		});
@@ -168,10 +169,6 @@ module.exports = function (grunt) {
 		}).catch(function (err) {
 			grunt.log.error(err);
 			done(false);
-
-		// Lastly, always close the browser
-		}).then(function () {
-			return driver.quit();
 		});
 
 	});
diff --git a/test/commons/color/get-background-color.js b/test/commons/color/get-background-color.js
index 6ebc85a531..dd542e974d 100644
--- a/test/commons/color/get-background-color.js
+++ b/test/commons/color/get-background-color.js
@@ -6,6 +6,7 @@ describe('color.getBackgroundColor', function () {
 	afterEach(function () {
 		document.getElementById('fixture').innerHTML = '';
 		axe.commons.color.incompleteData.clear();
+		document.body.scrollTop = 0;
 	});
 
 	it('should return the blended color if it has no background set', function () {
diff --git a/test/commons/color/get-foreground-color.js b/test/commons/color/get-foreground-color.js
index 93cb3e7a30..b215531572 100644
--- a/test/commons/color/get-foreground-color.js
+++ b/test/commons/color/get-foreground-color.js
@@ -5,6 +5,8 @@ describe('color.getForegroundColor', function () {
 
 	afterEach(function () {
 		document.getElementById('fixture').innerHTML = '';
+		axe.commons.color.incompleteData.clear();
+		document.body.scrollTop = 0;
 	});
 
 	it('should return the blended color if it has alpha set', function () {
diff --git a/test/integration/full/options/options.js b/test/integration/full/options/options.js
index 454d3a77b3..7e62278a4d 100644
--- a/test/integration/full/options/options.js
+++ b/test/integration/full/options/options.js
@@ -3,13 +3,13 @@ describe('Options', function() {
 
 	before(function (done) {
 		var frame = document.getElementById('myframe');
-		if (frame.contentWindow.document.readyState === 'complete') {
-			done();
-		} else {
-			frame.addEventListener('load', function () {
+		var interval = setInterval(function () {
+			var win = frame.contentWindow;
+			axe.utils.respondable(win, 'axe.ping', null, undefined, function() {
+				clearInterval(interval);
 				done();
 			});
-		}
+		}, 100);
 	});
 
 	function $id(id) {
@@ -17,19 +17,19 @@ describe('Options', function() {
 	}
 
 	describe('iframes', function() {
-		it('should include iframes by default', function(done) {
-			var config = {};
+		it('should include iframes if `iframes` is true', function(done) {
+			var config = { iframes: true };
 			axe.a11yCheck(document, config, function(results) {
 				try {
 					assert.lengthOf(results.violations, 0, 'violations');
 					assert.lengthOf(results.passes, 1, 'passes');
-					assert.lengthOf(results.passes[0].nodes, 2, 'results from main and iframe');
 					assert.isTrue(results.passes[0].nodes.some(function(node) {
 						if (node.target.length !== 2) {
 							return false;
 						}
 						return node.target[0] === '#myframe';
 					}), 'couldn\'t find iframe result');
+					assert.lengthOf(results.passes[0].nodes, 2, 'results from main and iframe');
 					done();
 				} catch (e) {
 					done(e);
@@ -37,19 +37,19 @@ describe('Options', function() {
 			});
 		});
 
-		it('should include iframes if `iframes` is true', function(done) {
-			var config = { iframes: true };
+		it('should exclude iframes if `iframes` is false', function(done) {
+			var config = { iframes: false };
 			axe.a11yCheck(document, config, function(results) {
 				try {
 					assert.lengthOf(results.violations, 0, 'violations');
 					assert.lengthOf(results.passes, 1, 'passes');
-					assert.lengthOf(results.passes[0].nodes, 2, 'results from main and iframe');
-					assert.isTrue(results.passes[0].nodes.some(function(node) {
+					assert.isFalse(results.passes[0].nodes.some(function(node) {
 						if (node.target.length !== 2) {
 							return false;
-						}
+						}	
 						return node.target[0] === '#myframe';
-					}), 'couldn\'t find iframe result');
+					}), 'unexpectedly found iframe result');
+					assert.lengthOf(results.passes[0].nodes, 1, 'results from main frame only');
 					done();
 				} catch (e) {
 					done(e);
@@ -57,19 +57,19 @@ describe('Options', function() {
 			});
 		});
 
-		it('should exclude iframes if `iframes` is false', function(done) {
-			var config = { iframes: false };
+		it('should include iframes by default', function(done) {
+			var config = {};
 			axe.a11yCheck(document, config, function(results) {
 				try {
 					assert.lengthOf(results.violations, 0, 'violations');
 					assert.lengthOf(results.passes, 1, 'passes');
-					assert.lengthOf(results.passes[0].nodes, 1, 'results from main frame only');
-					assert.isFalse(results.passes[0].nodes.some(function(node) {
+					assert.isTrue(results.passes[0].nodes.some(function(node) {
 						if (node.target.length !== 2) {
 							return false;
-						}	
+						}
 						return node.target[0] === '#myframe';
-					}), 'unexpectedly found iframe result');
+					}), 'couldn\'t find iframe result');
+					assert.lengthOf(results.passes[0].nodes, 2, 'results from main and iframe');
 					done();
 				} catch (e) {
 					done(e);

From f4551bb0254cd216d211d0b654f2d720e3c13e63 Mon Sep 17 00:00:00 2001
From: Wilco Fiers <wilco.fiers@deque.com>
Date: Thu, 29 Jun 2017 16:28:21 +0200
Subject: [PATCH 037/142] fix: Minimise scrolling in getBackgroundColor

---
 lib/commons/color/get-background-color.js  |  5 +++-
 test/commons/color/get-background-color.js | 27 ++++++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/lib/commons/color/get-background-color.js b/lib/commons/color/get-background-color.js
index 1896909538..2d35d95eea 100644
--- a/lib/commons/color/get-background-color.js
+++ b/lib/commons/color/get-background-color.js
@@ -211,7 +211,10 @@ color.getBackgroundStack = function(elm) {
 
 color.getBackgroundColor = function(elm, bgElms = [], noScroll = false) {
 	if(noScroll !== true) {
-		elm.scrollIntoView();
+		// Avoid scrolling overflow:hidden containers, by only aligning to top
+		// when not doing so would move the center point above the viewport top.
+		const alignToTop = elm.clientHeight - 2 >= window.innerHeight * 2;
+		elm.scrollIntoView(alignToTop);
 	}
 	let bgColors = [];
 	let elmStack = color.getBackgroundStack(elm);
diff --git a/test/commons/color/get-background-color.js b/test/commons/color/get-background-color.js
index dd542e974d..8a62a0264f 100644
--- a/test/commons/color/get-background-color.js
+++ b/test/commons/color/get-background-color.js
@@ -498,4 +498,31 @@ describe('color.getBackgroundColor', function () {
 		assert.closeTo(actual.alpha, expected.alpha, 0.1);
 
 	});
+
+	it('avoids scrolling elements with overflow:hidden', function () {
+		fixture.innerHTML =
+			'<div style="position:relative; color: yellow">' +
+			  '<div style="overflow: hidden">' +
+			    '<div style="background: black; height: 40px; padding-top: 20px;">' +
+			      '<div id="tgt1">Some text here</div>' +
+			      '<div style="height: 100px;"></div>' +
+			    '</div>' +
+			  '</div>' +
+			  '<div style="position: absolute; margin-top: -20px;" id="tgt2">R_20</div>' +
+			'</div>';
+
+		// This shouldn't cause a scroll
+		var target1 = document.getElementById('tgt1');
+		axe.commons.color.getBackgroundColor(target1, []);
+
+		// Otherwise this would not be on the black bg anymore:
+		var target2 = document.getElementById('tgt2');
+		var actual = axe.commons.color.getBackgroundColor(target2, []);
+
+		assert.closeTo(actual.red, 0, 0.5);
+		assert.closeTo(actual.green, 0, 0.5);
+		assert.closeTo(actual.blue, 0, 0.5);
+		assert.closeTo(actual.alpha, 1, 0.1);
+	});
+
 });

From 5f8c9c843e88ba2c924365e9a1e1e42bbb103617 Mon Sep 17 00:00:00 2001
From: Wilco Fiers <wilco.fiers@deque.com>
Date: Fri, 30 Jun 2017 12:43:46 +0200
Subject: [PATCH 038/142] feat: Add Japanese localisation

---
 locales/ja.json | 554 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 554 insertions(+)
 create mode 100644 locales/ja.json

diff --git a/locales/ja.json b/locales/ja.json
new file mode 100644
index 0000000000..ca6d7af253
--- /dev/null
+++ b/locales/ja.json
@@ -0,0 +1,554 @@
+{
+  "lang": "ja",
+  "rules": {
+    "accesskeys": {
+      "description": "すべてのアクセスキー属性値が一意であることを確認してください",
+      "help": "アクセスキー属性値は一意でなければなりません"
+    },
+    "area-alt": {
+      "description": "イメージマップの<area>要素に代替テキストが存在することを確認してください",
+      "help": "アクティブな<area>要素には代替テキストが存在しなければなりません"
+    },
+    "aria-allowed-attr": {
+      "description": "要素のロールにARIA属性が許可されていることを確認してください",
+      "help": "要素には許可されているARIA属性のみを使用します"
+    },
+    "aria-hidden-body": {
+      "description": "ドキュメント本体にaria-hidden='true'が存在していないことを確認してください。",
+      "help": "ドキュメント本体にaria-hidden='true'が存在してはなりません"
+    },
+    "aria-required-attr": {
+      "description": "ARIAロールのある要素に必要な全てのARIA属性が存在することを確認してください",
+      "help": "必要なARIA属性が提供されていなければなりません"
+    },
+    "aria-required-children": {
+      "description": "ARIAロールのある要素で子ロールが必要な物にそれが含まれていることを確認してください",
+      "help": "特定のARIAロールには特定の子が含まれていなければなりません"
+    },
+    "aria-required-parent": {
+      "description": "ARIAロールのある要素が親ロールを必要とする場合、それらに含まれていることを確認してください",
+      "help": "特定のARIAロールは特定の親に含まれていなければなりません"
+    },
+    "aria-roles": {
+      "description": "ロール属性のある全ての要素で有効な値が使用されていることを確認してください",
+      "help": "使用されているARIAのロールは有効な値に準拠していなければなりません"
+    },
+    "aria-valid-attr-value": {
+      "description": "全てのARIA属性に有効な値が存在することを確認してください",
+      "help": "ARIA属性は有効な値に準拠していなければなりません"
+    },
+    "aria-valid-attr": {
+      "description": "aria- で始まる属性が有効なARIA属性であることを確認してください",
+      "help": "ARIA属性は有効な名前に準拠していなければなりません"
+    },
+    "audio-caption": {
+      "description": "<audio>要素にキャプションが存在することを確認してください",
+      "help": "<audio>要素にはキャプショントラックが存在しなければなりません"
+    },
+    "blink": {
+      "description": "<blink>要素が使用されていないことを確認してください",
+      "help": "<blink>要素は廃止予定であり、使用するべきではありません"
+    },
+    "button-name": {
+      "description": "ボタンに認識可能なテキストが存在することを確認してください",
+      "help": "ボタンには認識可能なテキストが存在しなければなりません"
+    },
+    "bypass": {
+      "description": "ページには少なくとも一つ以上、ユーザーがナビゲーション部分をスキップして直接本文へ移動できるメカニズムが存在することを確認してください",
+      "help": "ページには繰り返されるブロックをスキップする手段が存在しなければなりません"
+    },
+    "checkboxgroup": {
+      "description": "関連する<input type=\"checkbox\">要素にグループがあり、そのグループ指定が一貫していることを確認してください",
+      "help": "同じ名前属性値を持つチェックボックス入力は、グループの一部でなければなりません"
+    },
+    "color-contrast": {
+      "description": "前景色と背景色のコントラストがWCAG 2のAAコントラスト比のしきい値を満たすことを確認してください",
+      "help": "要素には十分な色のコントラストがなければなりません"
+    },
+    "definition-list": {
+      "description": "<dl>要素の構造が正しいことを確認してください",
+      "help": "<dl>要素は、適切に順序付けされた<dt>および<dd>グループ、<script>要素または<template>要素のみを含んでいなければなりません"
+    },
+    "dlitem": {
+      "description": "<dt>及び<dd>要素が<dl>に含まれていることを確認してください",
+      "help": "<dt>及び<dd>要素は<dl>に含まれていなければなりません"
+    },
+    "document-title": {
+      "description": "各HTMLドキュメントに空でない<title>要素が含まれていることを確認してください",
+      "help": "ドキュメントにはナビゲーションを補助するために<title>要素がなければなりません"
+    },
+    "duplicate-id": {
+      "description": "全てのid属性値が一意であることを確認してください",
+      "help": "id属性値は一意でなければなりません"
+    },
+    "empty-heading": {
+      "description": "見出しに認識可能なテキストが存在することを確認してください",
+      "help": "見出しは空にしてはなりません"
+    },
+    "frame-title-unique": {
+      "description": "<iframe>及び<frame>要素に一意のタイトル属性が含まれていることを確認してください",
+      "help": "フレームには一意のタイトル属性がなければなりません"
+    },
+    "frame-title": {
+      "description": "<iframe>及び<frame>要素に空のタイトル属性が存在しないことを確認してください",
+      "help": "フレームにはタイトル属性がなければなりません"
+    },
+    "heading-order": {
+      "description": " 見出しの順序が意味的に正しいことを確認してください",
+      "help": "見出しのレベルは一つずつ増加させなければなりません"
+    },
+    "hidden-content": {
+      "description": "ユーザーに隠れているコンテンツについて通知します。",
+      "help": "ページ上の隠れているコンテンツは分析できません"
+    },
+    "href-no-hash": {
+      "description": "hrefの値が有効なリンクを参照しており、アンカーをリンクとしてのみ使用していることを確認してください",
+      "help": "アンカーは有効なURLもしくはURLフラグメントを持つリンクとしてのみ使用されなければなりません"
+    },
+    "html-has-lang": {
+      "description": "全てのHTMLドキュメントにlang属性が存在することを確認してください",
+      "help": "<html>要素にはlang属性がなければなりません"
+    },
+    "html-lang-valid": {
+      "description": "<html>要素のlang属性が有効な値であることを確認してください",
+      "help": "<html>要素のlang属性には有効な値がなければなりません"
+    },
+    "image-alt": {
+      "description": "<img>要素に代替テキストが存在する、またはnoneまたはpresentationのロールが存在することを確認してください",
+      "help": "画像には代替テキストがなければなりません"
+    },
+    "image-redundant-alt": {
+      "description": "ボタン及びリンクテキストが画像の代替として繰り返されていないことを確認してください",
+      "help": "ボタン及びリンクのテキストは画像の代替の中で繰り返されてはなりません"
+    },
+    "input-image-alt": {
+      "description": "<input type=\"image\">要素に代替テキストが存在することを確認してください",
+      "help": "画像ボタンには代替テキストがなければなりません"
+    },
+    "label-title-only": {
+      "description": "全てのフォーム要素がtitleまたはaria-describedby属性を使用して単独でラベル付けされていないことを確認してください",
+      "help": "フォーム要素には視覚的なラベルがなければなりません"
+    },
+    "label": {
+      "description": "全てのフォーム要素にラベルが存在することを確認してください",
+      "help": "フォーム要素にはラベルがなければなりません"
+    },
+    "layout-table": {
+      "description": "レイアウトのための<table>要素に<th>、<caption>要素またはsummary属性が使用されていないことを確認してください",
+      "help": "レイアウトテーブルにはデータテーブルの要素を使用してはなりません"
+    },
+    "link-in-text-block": {
+      "description": "色に頼ることなくリンクを区別できます",
+      "help": "リンクは色に頼らない方法で周囲のテキストと区別できなければなりません"
+    },
+    "link-name": {
+      "description": "リンクに認識可能なテキストが存在することを確認してください",
+      "help": "リンクには認識可能なテキストがなければなりません"
+    },
+    "list": {
+      "description": "リストが正しく構造化されていることを確認してください",
+      "help": "<ul>及び<ol>は直接<li>、<script>または<template>要素のみを含まなければなりません"
+    },
+    "listitem": {
+      "description": "<li>要素が意味に沿って使用されていることを確認してください",
+      "help": "<li>要素は<ul>または<ol>内に含まれていなければなりません"
+    },
+    "marquee": {
+      "description": "<marquee>要素が使用されていないことを確認してください",
+      "help": "<marquee>要素は非推奨のため、使用してはなりません"
+    },
+    "meta-refresh": {
+      "description": "<meta http-equiv=\"refresh\">が使用されていないことを確認してください",
+      "help": "制限時間のある更新が存在してはなりません"
+    },
+    "meta-viewport-large": {
+      "description": "<meta name=\"viewport\">で十分な拡大縮小ができることを確認してください",
+      "help": "ユーザーがズームをしてテキストを最大500％まで拡大できるようにしなければなりません"
+    },
+    "meta-viewport": {
+      "description": "<meta name=\"viewport\">がテキストの拡大縮小及びズーミングを無効化しないかをを確認してください",
+      "help": "ズーミングや拡大縮小は無効にしてはなりません"
+    },
+    "object-alt": {
+      "description": "<object>要素に代替テキストが存在することを確認してください",
+      "help": "<object>要素には代替テキストがなければなりません"
+    },
+    "p-as-heading": {
+      "description": "見出しのスタイル調整のためにp要素が使用されていないことを確認してください",
+      "help": "太字、イタリック体、およびフォントサイズは、p要素を見出しとしてスタイル付けするために使用してはなりません"
+    },
+    "radiogroup": {
+      "description": "関連している<input type=\"radio\">要素にグループがあり、そのグループの指定が一貫していることを確認してください",
+      "help": "同じname属性値のラジオインプットはグループの一部でなければなりません"
+    },
+    "region": {
+      "description": "全てのコンテンツがlandmarkのリージョンに含まれていることを確認してください",
+      "help": "コンテンツはlandmarkのリージョン内に含まれていなければなりません"
+    },
+    "scope-attr-valid": {
+      "description": "scope属性がテーブル上で正しく使用されていることを確認してください",
+      "help": "scope属性は正しく使用されなければなりません"
+    },
+    "server-side-image-map": {
+      "description": "サーバーサイドのイメージマップが使用されていないことを確認してください",
+      "help": "サーバーサイドのイメージマップを使用してはなりません"
+    },
+    "skip-link": {
+      "description": "ページの最初のリンクがスキップリンクであることを確認してください",
+      "help": "ページの最初のリンクはスキップリンクであるべきです"
+    },
+    "tabindex": {
+      "description": "tabindex属性値が0以上でないことを確認してください",
+      "help": "要素には0以上のtabindex属性が存在すべきではありません"
+    },
+    "table-duplicate-name": {
+      "description": "テーブルのサマリーとキャプションが同一ではないことを確認してください",
+      "help": "<caption>要素にsummary属性と同じテキストを含んではなりません"
+    },
+    "table-fake-caption": {
+      "description": "キャプション付きのテーブルが<caption>要素を用いていることを確認してください",
+      "help": "データテーブルにキャプションをつけるためにデータまたはヘッダーセルを用いるべきではありません"
+    },
+    "td-has-header": {
+      "description": "大きなテーブルの空ではないデータセルに1つかそれ以上のテーブルヘッダーが存在することを確認してください",
+      "help": "3×3以上のテーブルの空ではないtd要素はテーブルヘッダーと関連づいている必要があります"
+    },
+    "td-headers-attr": {
+      "description": "テーブル内の各セルがヘッダーを使用している場合、テーブル内の他のセルを参照していることを確認してください",
+      "help": "table要素内のheaders属性を使用するすべてのセルは同じ表内の他のセルのみを参照しなければなりません"
+    },
+    "th-has-data-cells": {
+      "description": "データテーブルのテーブルヘッダーがデータセルを参照していることを確認してください",
+      "help": "すべてのth要素およびrole=columnheader/rowheaderを持つ要素にはそれが説明するデータセルがなければなりません"
+    },
+    "valid-lang": {
+      "description": "lang属性に有効な値が存在することを確認してください",
+      "help": "lang属性には有効な値がなければなりません"
+    },
+    "video-caption": {
+      "description": "<video>要素にキャプションが存在することを確認してください",
+      "help": "<video>要素にはキャプションがなければなりません"
+    },
+    "video-description": {
+      "description": "<video>要素に音声解説が存在することを確認してください",
+      "help": "<video>要素には音声解説トラックがなければなりません"
+    }
+  },
+  "checks": {
+    "abstractrole": {
+      "pass": "抽象ロールが使用されていません",
+      "fail": "抽象ロールは直接使用できません"
+    },
+    "aria-allowed-attr": {
+      "pass": "ARIA属性が定義されたロールに対して正しく使用されています",
+      "fail": "ARIA属性は許可されていません:{{~it.data:value}} {{=value}}{{~}}"
+    },
+    "aria-hidden-body": {
+      "pass": "ドキュメント本体にaria-hidden属性は存在していません",
+      "fail": "aria-hidden=trueはドキュメント本体に存在してはなりません"
+    },
+    "invalidrole": {
+      "pass": "ARIAロールが有効です",
+      "fail": "ロールが有効なARIAロールのうちの1つでなければなりません"
+    },
+    "aria-required-attr": {
+      "pass": "すべての必須のARIA属性が存在しています",
+      "fail": "必須のARIA属性が提供されていません:{{~it.data:value}} {{=value}}{{~}}"
+    },
+    "aria-required-children": {
+      "pass": "必須のARIA子ロールが存在しています",
+      "fail": "必須のARIAロールが提供されていません:{{~it.data:value}} {{=value}}{{~}}"
+    },
+    "aria-required-parent": {
+      "pass": "必須のARIA親ロールが存在しています",
+      "fail": "必須のARIA親ロールが提供されていません:{{~it.data:value}} {{=value}}{{~}}"
+    },
+    "aria-valid-attr-value": {
+      "pass": "ARIA属性値が有効です",
+      "fail": "無効なARIA属性値です:{{~it.data:value}} {{=value}}{{~}}"
+    },
+    "aria-valid-attr": {
+      "pass": "ARIA属性名{{=it.data && it.data.length > 1 ? 's' : ''}}が有効です",
+      "fail": "ARIA属性名:{{~it.data:value}} {{=value}}{{~}}が無効です"
+    },
+    "color-contrast": {
+      "pass": "要素には{{=it.data.contrastRatio}}の十分なコントラスト比があります",
+      "fail": "要素のコントラスト比{{=it.data.contrastRatio}}は不十分です  (前景色: {{=it.data.fgColor}}, 背景色: {{=it.data.bgColor}}, フォントサイズ: {{=it.data.fontSize}}, フォントの太さ: {{=it.data.fontWeight}})",
+      "incomplete": {
+        "bgImage": "背景画像であるため、要素の背景色を判定できません",
+        "bgGradient": "背景グラデーションであるため、要素の背景色を判定できません",
+        "imgNode": "画像ノードが含まれるため、要素の背景色を判定できません",
+        "bgOverlap": "他の要素と重なっているため、要素の背景色を判定できません",
+        "fgAlpha": "アルファ透明度により、要素の前景色を判定できません",
+        "elmPartiallyObscured": "他の要素により部分的に不明瞭なため、要素の背景色を判定できません",
+        "equalRatio": "要素のコントラスト比が背景と1:1です",
+        "default": "コントラスト比を判定できません"
+      }
+    },
+    "link-in-text-block": {
+      "pass": "リンクは色に依存しない方法で周囲のテキストと区別できます",
+      "fail": "リンクは色に依存しない方法で周囲のテキストと区別できません",
+      "incomplete": {
+        "bgContrast": "要素のコントラスト比を判定できません。明確なホバー/フォーカススタイルを確認してください",
+        "bgImage": "背景画像のため、要素のコントラスト比を判定できません",
+        "bgGradient": "背景グラデーションのため、要素のコントラスト比を判定できません",
+        "imgNode": "画像ノードが含まれるため、要素のコントラスト比を判定できません",
+        "bgOverlap": "要素の重なりにより、要素のコントラスト比を判定できません",
+        "default": "コントラスト比を判定できません"
+      }
+    },
+    "fieldset": {
+      "pass": "フィールドセット内に要素が含まれています",
+      "fail": "{{var code = it.data && it.data.failureCode;}}{{? code === 'no-legend'}}フィールドセットの最初の子要素としてレジェンドが存在しません{{?? code === 'empty-legend'}}スクリーン・リーダーに認識可能なテキストがレジェンドに存在しません{{?? code === 'mixed-inputs'}}フィールドセットに関連性のないインプットが含まれています{{?? code === 'no-group-label'}}ARIAグループにaria-labelまたはaria-labelledbyが存在しません{{?? code === 'group-mixed-inputs'}}ARIAグループに関連性のないインプットが含まれています{{??}}要素がフィールドセットまたはARIAグループに含まれていません{{?}}"
+    },
+    "group-labelledby": {
+      "pass": "\"{{=it.data.name}}\"という名前のすべての要素が、aria-labelledbyで同じ要素を参照しています",
+      "fail": "\"{{=it.data.name}}\"という名前のすべての要素は、aria-labelledbyで同じ要素を参照しません"
+    },
+    "accesskeys": {
+      "pass": "アクセスキー属性値は一意です",
+      "fail": "ドキュメントに同じアクセスキーを持った複数の要素が存在しています"
+    },
+    "focusable-no-name": {
+      "pass": "要素がタブ順序にない、またはアクセシブルなテキストが存在しています",
+      "fail": "要素がタブ順序にあり、アクセシブルなテキストが存在していません"
+    },
+    "tabindex": {
+      "pass": "要素に0より大きいtabindexは存在していません",
+      "fail": "要素に0より大きいtabindexが存在しています"
+    },
+    "duplicate-img-label": {
+      "pass": "要素の既存のテキストと<img>の代替テキストは重複していません",
+      "fail": "要素が既存のテキストと重複した代替テキストの存在する<img>要素を含んでいます"
+    },
+    "explicit-label": {
+      "pass": "フォーム要素に明確な<label>が存在しています",
+      "fail": "フォーム要素に明確な<label>が存在していません"
+    },
+    "help-same-as-label": {
+      "pass": "ヘルプテキスト（titleまたはaria-describedby）はラベルテキストと重複していません",
+      "fail": "ヘルプテキスト（titleまたはaria-describedby）がラベルテキストと同じです"
+    },
+    "implicit-label": {
+      "pass": "フォーム要素に暗黙の（包含された）<label>が存在しています",
+      "fail": "フォーム要素に暗黙の（包含された）<label>が存在していません"
+    },
+    "multiple-label": {
+      "pass": "フォーム要素に複数の<label>要素は存在していません",
+      "fail": "フォーム要素に複数の<label>要素が存在しています"
+    },
+    "title-only": {
+      "pass": "フォーム要素はラベルにtitle属性だけを用いていません",
+      "fail": "フォーム要素のラベルにtitle属性だけを用いています"
+    },
+    "has-lang": {
+      "pass": "<html>要素にlang属性が存在しています",
+      "fail": "<html>要素にlang属性が存在していません"
+    },
+    "valid-lang": {
+      "pass": "lang属性の値が有効な言語の一覧に含まれています",
+      "fail": "lang属性の値が有効な言語の一覧に含まれていません"
+    },
+    "dlitem": {
+      "pass": "説明リスト項目に<dl>親要素が存在しています",
+      "fail": "説明リスト項目に<dl>親要素が存在していません"
+    },
+    "has-listitem": {
+      "pass": "リスト要素に<li>要素が含まれています",
+      "fail": "リスト要素に<li>要素が含まれていません"
+    },
+    "listitem": {
+      "pass": "リスト要素に<ul>、<ol>、またはrole=\"list\"親要素が存在しています",
+      "fail": "リスト要素に<ul>、<ol>、またはrole=\"list\"親要素が存在していません"
+    },
+    "only-dlitems": {
+      "pass": "リスト要素に<dt>または<dd>要素内で許可された直接の子要素のみが存在しています",
+      "fail": "リスト要素に<dt>または<dd>要素内で許可されていない直接の子要素が存在しています"
+    },
+    "only-listitems": {
+      "pass": "リスト要素に<li>要素内で許可された直接の子要素のみが存在しています",
+      "fail": "リスト要素に<li>要素内で許可されていない直接の子要素が存在しています"
+    },
+    "structured-dlitems": {
+      "pass": "空ではない場合、要素に<dt>および<dd>要素の両方が存在しています",
+      "fail": "空ではない場合、要素に少なくとも1つの<dt>要素に続く、少なくとも1つの<dd>要素が存在していません"
+    },
+    "caption": {
+      "pass": "マルチメディア要素にキャプショントラックが存在しています",
+      "fail": "マルチメディア要素にキャプショントラックが存在していません",
+      "incomplete": "この要素のキャプショントラックが見つかりません"
+    },
+    "description": {
+      "pass": "マルチメディア要素に音声解説トラックが存在しています",
+      "fail": "マルチメディア要素に音声解説トラックが存在していません",
+      "incomplete": "この要素の音声解説トラックが見つかりません"
+    },
+    "meta-viewport-large": {
+      "pass": "<meta>タグはモバイルデバイスでの拡大を阻止しません",
+      "fail": "<meta>タグはモバイルデバイスでの拡大を制限します"
+    },
+    "meta-viewport": {
+      "pass": "<meta>タグはモバイルデバイスでの拡大を無効にしません",
+      "fail": "<meta>タグはモバイルデバイスでの拡大を無効にします"
+    },
+    "header-present": {
+      "pass": "ページにheaderが存在しています",
+      "fail": "ページにheaderが存在していません"
+    },
+    "heading-order": {
+      "pass": "見出しの順序が有効です",
+      "fail": "見出しの順序が無効です"
+    },
+    "href-no-hash": {
+      "pass": "アンカーにhrefの値#が存在していません",
+      "fail": "アンカーにhrefの値#が存在しています"
+    },
+    "internal-link-present": {
+      "pass": "有効なスキップリンクが存在しています",
+      "fail": "有効なスキップリンクが存在していません"
+    },
+    "landmark": {
+      "pass": "ページにランドマーク領域が存在しています",
+      "fail": "ページにランドマーク領域が存在していません"
+    },
+    "meta-refresh": {
+      "pass": "<meta>タグがすぐにページを更新しません",
+      "fail": "<meta>タグは時限によるページの更新を強制します"
+    },
+    "p-as-heading": {
+      "pass": "<p>要素が見出しとしてスタイル付けされていません",
+      "fail": "スタイル付けされたp要素ではなく、見出し要素を使用すべきです"
+    },
+    "region": {
+      "pass": "コンテンツがARIAランドマークに含まれています",
+      "fail": "コンテンツがARIAランドマークに含まれていません"
+    },
+    "skip-link": {
+      "pass": "有効なスキップリンクが存在しています",
+      "fail": "有効なスキップリンクが存在していません"
+    },
+    "unique-frame-title": {
+      "pass": "要素のtitle属性が一意です",
+      "fail": "要素のtitle属性が一意ではありません"
+    },
+    "aria-label": {
+      "pass": "aria-label属性が存在し、空ではありません",
+      "fail": "aria-label属性が存在しない、または空です"
+    },
+    "aria-labelledby": {
+      "pass": "aria-labelledby属性が存在し、スクリーン・リーダーに認識可能な要素を参照しています",
+      "fail": "aria-labelledby属性が存在しない、存在しない要素を参照している、または空の要素を参照しているか認識できません"
+    },
+    "button-has-visible-text": {
+      "pass": "要素にスクリーン・リーダーが認識可能な内部テキストが存在しています",
+      "fail": "要素にスクリーン・リーダーが認識可能な内部テキストが存在していません"
+    },
+    "doc-has-title": {
+      "pass": "ドキュメントに空ではない<title>要素が存在しています",
+      "fail": "ドキュメントに空ではない<title>要素が存在していません"
+    },
+    "duplicate-id": {
+      "pass": "ドキュメントに同じid属性を持つ要素は存在していません",
+      "fail": "ドキュメントに同じid属性を持つ要素が複数存在しています: {{=it.data}}"
+    },
+    "exists": {
+      "pass": "要素は存在していません",
+      "fail": "要素が存在しています"
+    },
+    "has-alt": {
+      "pass": "要素にalt属性が存在しています",
+      "fail": "要素にalt属性が存在していません"
+    },
+    "has-visible-text": {
+      "pass": "要素にスクリーン・リーダーが認識可能なテキストが存在しています",
+      "fail": "要素にスクリーン・リーダーが認識可能なテキストが存在していません"
+    },
+    "is-on-screen": {
+      "pass": "要素が表示されていません",
+      "fail": "要素が表示されています"
+    },
+    "non-empty-alt": {
+      "pass": "要素に空ではないalt属性が存在しています",
+      "fail": "要素にalt属性が存在していない、またはalt属性が空です"
+    },
+    "non-empty-if-present": {
+      "pass": "要素 {{?it.data}}に空ではないvalue属性が存在しています{{??}}value属性が存在していません{{?}}",
+      "fail": "要素にvalue属性が存在し、value属性が空です"
+    },
+    "non-empty-title": {
+      "pass": "要素にtitle属性が存在しています",
+      "fail": "要素にtitle属性が存在していない、またはtitle属性が空です"
+    },
+    "non-empty-value": {
+      "pass": "要素に空ではないvalue要素が存在しています",
+      "fail": "要素にvalue属性が存在していない、またはvalue属性が空です"
+    },
+    "role-none": {
+      "pass": "要素のデフォルトのセマンティクスがrole=\"none\"で上書きされました",
+      "fail": "要素のデフォルトのセマンティクスはrole=\"none\"で上書きされていません"
+    },
+    "role-presentation": {
+      "pass": "要素のデフォルトのセマンティクスがrole=\"presentation\"で上書きされました",
+      "fail": "要素のデフォルトのセマンティクスはrole=\"presentation\"で上書きされていません"
+    },
+    "caption-faked": {
+      "pass": "テーブルの一行目がキャプションとして使用されていません",
+      "fail": "テーブルの一行目はテーブルセルではなく、キャプションにするべきです"
+    },
+    "has-caption": {
+      "pass": "レイアウトテーブルに<caption>要素を使用していません",
+      "fail": "レイアウトテーブルに<caption>要素を使用しています"
+    },
+    "has-summary": {
+      "pass": "レイアウトテーブルにsummary属性を使用していません",
+      "fail": "レイアウトテーブルにsummary属性を使用しています"
+    },
+    "has-th": {
+      "pass": "レイアウトテーブルに<th>要素を使用していません",
+      "fail": "レイアウトテーブルに<th>要素を使用しています"
+    },
+    "html5-scope": {
+      "pass": "scope属性がテーブルヘッダー要素（<th>）にのみ使用されています",
+      "fail": "HTML 5では、scope属性はテーブルヘッダー要素（<th>）にのみ使用できます"
+    },
+    "same-caption-summary": {
+      "pass": "summary属性および<caption>のコンテンツは重複していません",
+      "fail": "summary属性および<caption>のコンテンツが同一です"
+    },
+    "scope-value": {
+      "pass": "scope属性は正しく使用されています",
+      "fail": "scope属性の値は'row'または'col'のみです"
+    },
+    "td-has-header": {
+      "pass": "すべての空ではないデータセルにテーブルヘッダーが存在しています",
+      "fail": "いくつかの空ではないデータセルにテーブルヘッダーが存在していません"
+    },
+    "td-headers-attr": {
+      "pass": "headers属性はテーブル内の他のセルを参照するためだけに使用されています",
+      "fail": "headers属性がテーブル内の他のセルを参照するためだけに使用されていません"
+    },
+    "th-has-data-cells": {
+      "pass": "すべてのテーブルヘッダーセルがデータセルを参照しています",
+      "fail": "一部のテーブルヘッダーセルがデータセルを参照していません",
+      "incomplete": "テーブルデータセルが存在しないまたは空です"
+    },
+    "hidden-content": {
+      "pass": "ページ内のすべてのコンテンツが分析されました。",
+      "fail": "このページのコンテンツを分析中に問題が発生しました。",
+      "incomplete": "ページ内に分析されなかった非表示のコンテンツが存在します。分析するには、そのコンテンツを表示させる必要があります。"
+    }
+  },
+  "failureSummaries": {
+    "any": {
+      "failureMessage": "次のいずれかを修正します:{{~it:value}}\n  {{=value.split('\\n').join('\\n  ')}}{{~}}"
+    },
+    "none": {
+      "failureMessage": "次のすべてを修正します:{{~it:value}}\n  {{=value.split('\\n').join('\\n  ')}}{{~}}"
+    }
+  },
+  "incompleteFallbackMessage": {
+    "undefined": {
+      "failureMessage": "次のすべてを修正します:{{~it:value}}\n  {{=value.split('\\n').join('\\n  ')}}{{~}}"
+    }
+  }
+}

From e64adbcd442852c710e08eb0866bb375aa0fff22 Mon Sep 17 00:00:00 2001
From: Dylan Barrell <dylan@barrell.com>
Date: Fri, 30 Jun 2017 09:38:22 -0400
Subject: [PATCH 039/142] bump version to 3.0.0-alpha-1 in prep for publishing
 first alpha when appropriate

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 001ef488e2..274f2d793a 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "axe-core",
   "description": "Accessibility engine for automated Web UI testing",
-  "version": "2.3.1",
+  "version": "3.0.0-alpha-1",
   "license": "MPL-2.0",
   "contributors": [
     {

From dbbc5442a07b795578f42e282d735e38adfc31dd Mon Sep 17 00:00:00 2001
From: Dylan Barrell <dylan@barrell.com>
Date: Fri, 30 Jun 2017 11:00:27 -0400
Subject: [PATCH 040/142] fix: help-same-as-label for shadow DOM

---
 build/templates.js                      |  4 ++--
 lib/checks/.jshintrc                    |  1 +
 lib/checks/label/help-same-as-label.js  |  2 +-
 lib/commons/text/accessible-text.js     |  1 +
 test/checks/label/help-same-as-label.js | 14 +++++++++-----
 5 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/build/templates.js b/build/templates.js
index 4a431b36da..dffc44ada6 100644
--- a/build/templates.js
+++ b/build/templates.js
@@ -1,8 +1,8 @@
 module.exports = {
-	evaluate: 'function (node, options) {\n<%=source%>\n}',
+	evaluate: 'function (node, options, virtualNode) {\n<%=source%>\n}',
 	after: 'function (results, options) {\n<%=source%>\n}',
 	gather: 'function (context) {\n<%=source%>\n}',
-	matches: 'function (node) {\n<%=source%>\n}',
+	matches: 'function (node, virtualNode) {\n<%=source%>\n}',
 	source: '(function () {\n<%=source%>\n}())',
 	commons: '<%=source%>'
 };
diff --git a/lib/checks/.jshintrc b/lib/checks/.jshintrc
index 0b147d2658..6df1bda954 100644
--- a/lib/checks/.jshintrc
+++ b/lib/checks/.jshintrc
@@ -3,6 +3,7 @@
 		"results": true,
 		"node": true,
 		"options": true,
+		"virtualNode": true,
 		"axe": true,
 		"document": true,
 		"window": true
diff --git a/lib/checks/label/help-same-as-label.js b/lib/checks/label/help-same-as-label.js
index 4933e977b6..c35b4b9cc4 100644
--- a/lib/checks/label/help-same-as-label.js
+++ b/lib/checks/label/help-same-as-label.js
@@ -1,5 +1,5 @@
 
-var labelText = axe.commons.text.label(node),
+var labelText = axe.commons.text.label(virtualNode),
 	check = node.getAttribute('title');
 
 if (!labelText) {
diff --git a/lib/commons/text/accessible-text.js b/lib/commons/text/accessible-text.js
index 7723d239e8..6c6eb3dcf9 100644
--- a/lib/commons/text/accessible-text.js
+++ b/lib/commons/text/accessible-text.js
@@ -137,6 +137,7 @@ function nonEmptyText(t) {
  * @return {string}
  */
 text.accessibleText = function(element, inLabelledByContext) {
+	//todo: implement shadowDOM
 	var accessibleNameComputation;
 	var encounteredNodes = [];
 
diff --git a/test/checks/label/help-same-as-label.js b/test/checks/label/help-same-as-label.js
index 19d290ee05..4e45cf736f 100644
--- a/test/checks/label/help-same-as-label.js
+++ b/test/checks/label/help-same-as-label.js
@@ -5,6 +5,7 @@ describe('help-same-as-label', function () {
 
 	afterEach(function () {
 		fixture.innerHTML = '';
+		axe._tree = undefined;
 	});
 
 	it('should return true if an element has a label and a title with the same text', function () {
@@ -14,8 +15,8 @@ describe('help-same-as-label', function () {
 		node.setAttribute('aria-label', 'Duplicate');
 
 		fixture.appendChild(node);
-
-		assert.isTrue(checks['help-same-as-label'].evaluate(node));
+		var tree = axe._tree = axe.utils.getFlattenedTree(fixture);
+		assert.isTrue(checks['help-same-as-label'].evaluate(node, undefined, axe.utils.getNodeFromTree(tree[0], node)));
 	});
 
 	it('should return true if an element has a label and aria-describedby with the same text', function () {
@@ -30,7 +31,8 @@ describe('help-same-as-label', function () {
 		fixture.appendChild(node);
 		fixture.appendChild(dby);
 
-		assert.isTrue(checks['help-same-as-label'].evaluate(node));
+		var tree = axe._tree = axe.utils.getFlattenedTree(fixture);
+		assert.isTrue(checks['help-same-as-label'].evaluate(node, undefined, axe.utils.getNodeFromTree(tree[0], node)));
 	});
 
 
@@ -41,7 +43,8 @@ describe('help-same-as-label', function () {
 
 		fixture.appendChild(node);
 
-		assert.isFalse(checks['help-same-as-label'].evaluate(node));
+		var tree = axe._tree = axe.utils.getFlattenedTree(fixture);
+		assert.isFalse(checks['help-same-as-label'].evaluate(node, undefined, axe.utils.getNodeFromTree(tree[0], node)));
 
 	});
 
@@ -56,7 +59,8 @@ describe('help-same-as-label', function () {
 		fixture.appendChild(node);
 		fixture.appendChild(dby);
 
-		assert.isFalse(checks['help-same-as-label'].evaluate(node));
+		var tree = axe._tree = axe.utils.getFlattenedTree(fixture);
+		assert.isFalse(checks['help-same-as-label'].evaluate(node, undefined, axe.utils.getNodeFromTree(tree[0], node)));
 	});
 
 });
\ No newline at end of file

From 82e51bc38f6eca33944b4b8006a9140067b44c5a Mon Sep 17 00:00:00 2001
From: Marcy Sutton <marcy.sutton@deque.com>
Date: Fri, 30 Jun 2017 12:22:11 -0700
Subject: [PATCH 041/142] fix: use virtualNode in duplicate-img-label

Closes https://github.com/dequelabs/axe-core/issues/386
---
 lib/checks/label/duplicate-img-label.js  |  2 +-
 test/checks/label/duplicate-img-label.js | 26 ++++++++++++++++--------
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/lib/checks/label/duplicate-img-label.js b/lib/checks/label/duplicate-img-label.js
index 7e1062553e..d184c572c2 100644
--- a/lib/checks/label/duplicate-img-label.js
+++ b/lib/checks/label/duplicate-img-label.js
@@ -1,5 +1,5 @@
 var imgs = node.querySelectorAll('img');
-var text = axe.commons.text.visible(node, true).toLowerCase();
+var text = axe.commons.text.visible(virtualNode, true).toLowerCase();
 
 if (text === '') {
 	return false;
diff --git a/test/checks/label/duplicate-img-label.js b/test/checks/label/duplicate-img-label.js
index 9ef3b50d4d..737bdc0122 100644
--- a/test/checks/label/duplicate-img-label.js
+++ b/test/checks/label/duplicate-img-label.js
@@ -5,53 +5,63 @@ describe('duplicate-img-label', function () {
 
 	afterEach(function () {
 		fixture.innerHTML = '';
+		axe._tree = undefined;
 	});
 
 	it('should return false if no img is present', function () {
 		fixture.innerHTML = '<button id="target">Plain text</button>';
 		var node = fixture.querySelector('#target');
-		assert.isFalse(checks['duplicate-img-label'].evaluate(node));
+		var tree = axe._tree = axe.utils.getFlattenedTree(fixture);
+		assert.isFalse(checks['duplicate-img-label'].evaluate(node, undefined, axe.utils.getNodeFromTree(tree[0], node)));
 	});
 
 	it('should return false if no text is present', function () {
 		fixture.innerHTML = '<button id="target"><img alt="Plain text"></button>';
 		var node = fixture.querySelector('#target');
-		assert.isFalse(checks['duplicate-img-label'].evaluate(node));
+		var tree = axe._tree = axe.utils.getFlattenedTree(fixture);
+		var result = checks['duplicate-img-label'].evaluate(node, undefined, axe.utils.getNodeFromTree(tree[0], node));
+		assert.isFalse(result);
 	});
 
 	it('should return false if aria-label duplicates img alt', function () {
 		fixture.innerHTML = '<button id="target" aria-label="Plain text"><img alt="Plain text"></button>';
 		var node = fixture.querySelector('#target');
-		assert.isFalse(checks['duplicate-img-label'].evaluate(node));
+		var tree = axe._tree = axe.utils.getFlattenedTree(fixture);
+		assert.isFalse(checks['duplicate-img-label'].evaluate(node, undefined, axe.utils.getNodeFromTree(tree[0], node)));
 	});
 
 	it('should return false if img and text have different text', function () {
 		fixture.innerHTML = '<button id="target"><img alt="Alt text">Plain text</button>';
 		var node = fixture.querySelector('#target');
-		assert.isFalse(checks['duplicate-img-label'].evaluate(node));
+		var tree = axe._tree = axe.utils.getFlattenedTree(fixture);
+		assert.isFalse(checks['duplicate-img-label'].evaluate(node, undefined, axe.utils.getNodeFromTree(tree[0], node)));
 	});
 
 	it('should return true if img and text have the same text', function () {
 		fixture.innerHTML = '<button id="target"><img alt="Plain text">Plain text</button>';
 		var node = fixture.querySelector('#target');
-		assert.isTrue(checks['duplicate-img-label'].evaluate(node));
+		var tree = axe._tree = axe.utils.getFlattenedTree(fixture);
+		assert.isTrue(checks['duplicate-img-label'].evaluate(node, undefined, axe.utils.getNodeFromTree(tree[0], node)));
 	});
 
 	it('should return true if img has ARIA label with the same text', function () {
 		fixture.innerHTML = '<button id="target"><img aria-label="Plain text">Plain text</button>';
 		var node = fixture.querySelector('#target');
-		assert.isTrue(checks['duplicate-img-label'].evaluate(node));
+		var tree = axe._tree = axe.utils.getFlattenedTree(fixture);
+		assert.isTrue(checks['duplicate-img-label'].evaluate(node, undefined, axe.utils.getNodeFromTree(tree[0], node)));
 	});
 
 	it('should return false if img and text are both blank', function () {
 		fixture.innerHTML = '<button id="target"><img alt=""></button>';
 		var node = fixture.querySelector('#target');
-		assert.isFalse(checks['duplicate-img-label'].evaluate(node));
+		var tree = axe._tree = axe.utils.getFlattenedTree(fixture);
+		assert.isFalse(checks['duplicate-img-label'].evaluate(node, undefined, axe.utils.getNodeFromTree(tree[0], node)));
 	});
 
 	it('should return false if img and text have superset/subset text', function () {
 		fixture.innerHTML = '<button id="target"><img alt="Plain text and more">Plain text</button>';
 		var node = fixture.querySelector('#target');
-		assert.isFalse(checks['duplicate-img-label'].evaluate(node));
+		var tree = axe._tree = axe.utils.getFlattenedTree(fixture);
+		assert.isFalse(checks['duplicate-img-label'].evaluate(node, undefined, axe.utils.getNodeFromTree(tree[0], node)));
 	});
 });

From 5fb06e3a4e0e1e1506e6aa4b0857910e45624f4c Mon Sep 17 00:00:00 2001
From: Marcy Sutton <marcy.sutton@deque.com>
Date: Fri, 30 Jun 2017 12:37:30 -0700
Subject: [PATCH 042/142] fix: use virtualNode in title-only check

Closes https://github.com/dequelabs/axe-core/issues/388
---
 lib/checks/label/title-only.js  |  2 +-
 test/checks/label/title-only.js | 13 +++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/lib/checks/label/title-only.js b/lib/checks/label/title-only.js
index 64251d46fd..8d92a917d0 100644
--- a/lib/checks/label/title-only.js
+++ b/lib/checks/label/title-only.js
@@ -1,2 +1,2 @@
-var labelText = axe.commons.text.label(node);
+var labelText = axe.commons.text.label(virtualNode);
 return !labelText && !!(node.getAttribute('title') || node.getAttribute('aria-describedby'));
\ No newline at end of file
diff --git a/test/checks/label/title-only.js b/test/checks/label/title-only.js
index 7918883d4f..c934be7d15 100644
--- a/test/checks/label/title-only.js
+++ b/test/checks/label/title-only.js
@@ -5,6 +5,7 @@ describe('title-only', function () {
 
 	afterEach(function () {
 		fixture.innerHTML = '';
+		axe._tree = undefined;
 	});
 
 	it('should return true if an element only has a title', function () {
@@ -14,9 +15,11 @@ describe('title-only', function () {
 
 		fixture.appendChild(node);
 
-		assert.isTrue(checks['title-only'].evaluate(node));
+		var tree = axe._tree = axe.utils.getFlattenedTree(fixture);
+
+		assert.isTrue(checks['title-only'].evaluate(node, undefined, axe.utils.getNodeFromTree(tree[0], node)));
 		node.setAttribute('aria-label', 'woop');
-		assert.isFalse(checks['title-only'].evaluate(node));
+		assert.isFalse(checks['title-only'].evaluate(node, undefined, axe.utils.getNodeFromTree(tree[0], node)));
 	});
 
 	it('should return true if an element only has aria-describedby', function () {
@@ -30,9 +33,11 @@ describe('title-only', function () {
 		fixture.appendChild(node);
 		fixture.appendChild(dby);
 
-		assert.isTrue(checks['title-only'].evaluate(node));
+		var tree = axe._tree = axe.utils.getFlattenedTree(fixture);
+
+		assert.isTrue(checks['title-only'].evaluate(node, undefined, axe.utils.getNodeFromTree(tree[0], node)));
 		node.setAttribute('aria-label', 'woop');
-		assert.isFalse(checks['title-only'].evaluate(node));
+		assert.isFalse(checks['title-only'].evaluate(node, undefined, axe.utils.getNodeFromTree(tree[0], node)));
 	});
 
 });
\ No newline at end of file

From 2beede6e02885333debde9763d62e194dc49944b Mon Sep 17 00:00:00 2001
From: Wilco Fiers <wilco.fiers@deque.com>
Date: Mon, 3 Jul 2017 14:51:46 +0200
Subject: [PATCH 043/142] Fix: Use virtualNode in hidden-content rule

---
 lib/checks/visibility/hidden-content.js  |  2 +-
 test/checks/visibility/hidden-content.js | 33 ++++++++++++++----------
 2 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/lib/checks/visibility/hidden-content.js b/lib/checks/visibility/hidden-content.js
index 516267f70f..3daef0a360 100644
--- a/lib/checks/visibility/hidden-content.js
+++ b/lib/checks/visibility/hidden-content.js
@@ -1,7 +1,7 @@
 let styles = window.getComputedStyle(node);
 
 let whitelist = ['SCRIPT', 'HEAD', 'TITLE', 'NOSCRIPT', 'STYLE', 'TEMPLATE'];
-if (!whitelist.includes(node.tagName.toUpperCase()) && axe.commons.dom.hasContent(node)) {
+if (!whitelist.includes(node.tagName.toUpperCase()) && axe.commons.dom.hasContent(virtualNode)) {
   if (styles.getPropertyValue('display') === 'none') {
     return undefined;
   } else if (styles.getPropertyValue('visibility') === 'hidden') {
diff --git a/test/checks/visibility/hidden-content.js b/test/checks/visibility/hidden-content.js
index ed836ac66e..32e10e5203 100644
--- a/test/checks/visibility/hidden-content.js
+++ b/test/checks/visibility/hidden-content.js
@@ -10,37 +10,44 @@ describe('hidden content', function () {
 		}
 	};
 
+	function checkSetup (html, options, target) {
+		fixture.innerHTML = html;
+    axe._tree = axe.utils.getFlattenedTree(fixture);
+		var node = fixture.querySelector(target || '#target');
+		var virtualNode = axe.utils.getNodeFromTree(axe._tree[0], node);
+		return [node, options, virtualNode];
+	}
+
 	afterEach(function () {
 		fixture.innerHTML = '';
 		checkContext._data = null;
+		axe._tree = undefined;
 	});
 
 	it('should return undefined with display:none and children', function () {
-    fixture.innerHTML = '<div id="target" style="display: none;"><p>Some paragraph text.</p></div>';
-		var node = fixture.querySelector('#target');
-		assert.isUndefined(checks['hidden-content'].evaluate.call(checkContext, node));
+    var params = checkSetup('<div id="target" style="display: none;"><p>Some paragraph text.</p></div>');
+		assert.isUndefined(checks['hidden-content'].evaluate.apply(checkContext, params));
 	});
 
 	it('should return undefined with visibility:hidden and children', function () {
-    fixture.innerHTML = '<div id="target" style="visibility: hidden;"><p>Some paragraph text.</p></div>';
-		var node = fixture.querySelector('#target');
-		assert.isUndefined(checks['hidden-content'].evaluate.call(checkContext, node));
+    var params = checkSetup('<div id="target" style="visibility: hidden;"><p>Some paragraph text.</p></div>');
+		assert.isUndefined(checks['hidden-content'].evaluate.apply(checkContext, params));
 	});
 
 	it('should return true with visibility:hidden and parent with visibility:hidden', function () {
-    fixture.innerHTML = '<div style="visibility: hidden;"><p id="target" style="visibility: hidden;">Some paragraph text.</p></div>';
-		var node = fixture.querySelector('#target');
-		assert.isTrue(checks['hidden-content'].evaluate.call(checkContext, node));
+    var params = checkSetup('<div style="visibility: hidden;"><p id="target" style="visibility: hidden;">Some paragraph text.</p></div>');
+		assert.isTrue(checks['hidden-content'].evaluate.apply(checkContext, params));
 	});
 
 	it('should return true with aria-hidden and no content', function () {
-		fixture.innerHTML = '<span id="target" class="icon" aria-hidden="true"></span>';
-		var node = fixture.querySelector('#target');
-		assert.isTrue(checks['hidden-content'].evaluate.call(checkContext, node));
+		var params = checkSetup('<span id="target" class="icon" aria-hidden="true"></span>');
+		assert.isTrue(checks['hidden-content'].evaluate.apply(checkContext, params));
 	});
 
 	it('should skip whitelisted elements', function () {
 		var node = document.querySelector('head');
-		assert.isTrue(checks['hidden-content'].evaluate.call(checkContext, node));
+    axe._tree = axe.utils.getFlattenedTree(document.documentElement);
+		var virtualNode = axe.utils.getNodeFromTree(axe._tree[0], node);
+		assert.isTrue(checks['hidden-content'].evaluate.call(checkContext, node, undefined, virtualNode));
 	});
 });

From 99e8b737f679395692d5572ce79ccb64c9321d82 Mon Sep 17 00:00:00 2001
From: Wilco Fiers <wilco.fiers@deque.com>
Date: Tue, 4 Jul 2017 13:51:32 +0200
Subject: [PATCH 044/142] fix: whitespace in hidden-content test

---
 test/checks/visibility/hidden-content.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/test/checks/visibility/hidden-content.js b/test/checks/visibility/hidden-content.js
index 32e10e5203..89c04d7070 100644
--- a/test/checks/visibility/hidden-content.js
+++ b/test/checks/visibility/hidden-content.js
@@ -1,7 +1,7 @@
 describe('hidden content', function () {
 	'use strict';
 
-  var fixture = document.getElementById('fixture');
+	var fixture = document.getElementById('fixture');
 
 	var checkContext = {
 		_data: null,
@@ -12,7 +12,7 @@ describe('hidden content', function () {
 
 	function checkSetup (html, options, target) {
 		fixture.innerHTML = html;
-    axe._tree = axe.utils.getFlattenedTree(fixture);
+		axe._tree = axe.utils.getFlattenedTree(fixture);
 		var node = fixture.querySelector(target || '#target');
 		var virtualNode = axe.utils.getNodeFromTree(axe._tree[0], node);
 		return [node, options, virtualNode];
@@ -25,17 +25,17 @@ describe('hidden content', function () {
 	});
 
 	it('should return undefined with display:none and children', function () {
-    var params = checkSetup('<div id="target" style="display: none;"><p>Some paragraph text.</p></div>');
+		var params = checkSetup('<div id="target" style="display: none;"><p>Some paragraph text.</p></div>');
 		assert.isUndefined(checks['hidden-content'].evaluate.apply(checkContext, params));
 	});
 
 	it('should return undefined with visibility:hidden and children', function () {
-    var params = checkSetup('<div id="target" style="visibility: hidden;"><p>Some paragraph text.</p></div>');
+		var params = checkSetup('<div id="target" style="visibility: hidden;"><p>Some paragraph text.</p></div>');
 		assert.isUndefined(checks['hidden-content'].evaluate.apply(checkContext, params));
 	});
 
 	it('should return true with visibility:hidden and parent with visibility:hidden', function () {
-    var params = checkSetup('<div style="visibility: hidden;"><p id="target" style="visibility: hidden;">Some paragraph text.</p></div>');
+		var params = checkSetup('<div style="visibility: hidden;"><p id="target" style="visibility: hidden;">Some paragraph text.</p></div>');
 		assert.isTrue(checks['hidden-content'].evaluate.apply(checkContext, params));
 	});
 
@@ -46,7 +46,7 @@ describe('hidden content', function () {
 
 	it('should skip whitelisted elements', function () {
 		var node = document.querySelector('head');
-    axe._tree = axe.utils.getFlattenedTree(document.documentElement);
+		axe._tree = axe.utils.getFlattenedTree(document.documentElement);
 		var virtualNode = axe.utils.getNodeFromTree(axe._tree[0], node);
 		assert.isTrue(checks['hidden-content'].evaluate.call(checkContext, node, undefined, virtualNode));
 	});

From aac57c0378a87282385bb6227b03ea164549327a Mon Sep 17 00:00:00 2001
From: Wilco Fiers <wilco.fiers@deque.com>
Date: Tue, 4 Jul 2017 17:03:35 +0200
Subject: [PATCH 045/142] feat: Add dom.getComposedParent function

---
 lib/commons/dom/find-up.js              |  5 +-
 lib/commons/dom/get-composed-parent.js  | 19 +++++++
 lib/commons/dom/is-visible.js           |  3 +-
 test/commons/dom/get-composed-parent.js | 72 +++++++++++++++++++++++++
 4 files changed, 93 insertions(+), 6 deletions(-)
 create mode 100644 lib/commons/dom/get-composed-parent.js
 create mode 100644 test/commons/dom/get-composed-parent.js

diff --git a/lib/commons/dom/find-up.js b/lib/commons/dom/find-up.js
index 0b0714cb3c..06e20ffe05 100644
--- a/lib/commons/dom/find-up.js
+++ b/lib/commons/dom/find-up.js
@@ -22,11 +22,8 @@ dom.findUp = function (element, target) {
 		return null;
 	}
 
-	parent = (element.assignedSlot) ? element.assignedSlot : element.parentNode;
-	if (parent.nodeType === 11) {
-		parent = parent.host;
-	}
 	// recursively walk up the DOM, checking each parent node
+	parent = dom.getComposedParent(element);
 	while (parent && matches.indexOf(parent) === -1) {
 		parent = (parent.assignedSlot) ? parent.assignedSlot : parent.parentNode;
 		if (parent && parent.nodeType === 11) {
diff --git a/lib/commons/dom/get-composed-parent.js b/lib/commons/dom/get-composed-parent.js
new file mode 100644
index 0000000000..c5cfc74339
--- /dev/null
+++ b/lib/commons/dom/get-composed-parent.js
@@ -0,0 +1,19 @@
+/*global dom */
+/**
+ * Get an element's parent in the composed tree
+ * @param   DOMNode   Element
+ * @return  DOMNode   Parent element
+ */
+dom.getComposedParent = function getComposedParent (element)  {
+  if (element.assignedSlot) {
+    return element.assignedSlot; // content of a shadow DOM slot
+  } else if (element.parentNode) {
+    var parentNode = element.parentNode;
+    if (parentNode.nodeType === 1) {
+      return parentNode; // Regular node
+    } else if (parentNode.host) {
+      return parentNode.host; // Shadow root
+    }
+  }
+  return null; // Root node
+};
diff --git a/lib/commons/dom/is-visible.js b/lib/commons/dom/is-visible.js
index 60add9d77a..433fdc25b3 100644
--- a/lib/commons/dom/is-visible.js
+++ b/lib/commons/dom/is-visible.js
@@ -64,8 +64,7 @@ dom.isVisible = function (el, screenReader, recursed) {
 		return false;
 	}
 
-	parent = (el.assignedSlot) ? el.assignedSlot : el.parentNode;
-
+	parent = dom.getComposedParent(el);
 	if (parent) {
 		return dom.isVisible(parent, screenReader, true);
 	}
diff --git a/test/commons/dom/get-composed-parent.js b/test/commons/dom/get-composed-parent.js
new file mode 100644
index 0000000000..4dfd41a230
--- /dev/null
+++ b/test/commons/dom/get-composed-parent.js
@@ -0,0 +1,72 @@
+/* global xit */
+describe('dom.getComposedParent', function () {
+  'use strict';
+  var getComposedParent = axe.commons.dom.getComposedParent;
+  var fixture = document.getElementById('fixture');
+  var shadowSupport = document.body && typeof document.body.attachShadow === 'function';
+
+  afterEach(function () {
+    fixture.innerHTML = '';
+  });
+
+  it('returns the parentNode normally', function () {
+    fixture.innerHTML = '<div id="parent"><div id="target"></div></div>';
+
+    var actual = getComposedParent(document.getElementById('target'));
+    assert.instanceOf(actual, Node);
+    assert.equal(actual, document.getElementById('parent'));
+  });
+
+  it('returns null from the documentElement', function () {
+    assert.isNull(
+      getComposedParent(document.documentElement)
+    );
+  });
+
+  (shadowSupport ? it : xit)('returns the slot node for slotted content', function () {
+    fixture.innerHTML = '<div id="shadow"><div id="target"></div></div>';
+    var shadowRoot = document.getElementById('shadow').attachShadow({ mode: 'open' });
+    shadowRoot.innerHTML = '<div id="grand-parent">' +
+      '<slot id="parent"></slot>' +
+    '</div>';
+
+    var actual = getComposedParent(fixture.querySelector('#target'));
+    assert.instanceOf(actual, Node);
+    assert.equal(actual, shadowRoot.querySelector('#parent'));
+  });
+
+  (shadowSupport ? it : xit)('returns explicitly slotted nodes', function () {
+    fixture.innerHTML = '<div id="shadow"><div id="target" slot="bar"></div></div>';
+    var shadowRoot = document.getElementById('shadow').attachShadow({ mode: 'open' });
+    shadowRoot.innerHTML = '<div id="grand-parent">' +
+      '<slot name="foo"></slot>' +
+      '<slot id="parent" name="bar"></slot>' +
+    '</div>';
+
+    var actual = getComposedParent(fixture.querySelector('#target'));
+    assert.instanceOf(actual, Node);
+    assert.equal(actual, shadowRoot.querySelector('#parent'));
+  });
+
+  (shadowSupport ? it : xit)('returns elements within a shadow tree', function () {
+    fixture.innerHTML = '<div id="shadow"> content </div>';
+    var shadowRoot = document.getElementById('shadow').attachShadow({ mode: 'open' });
+    shadowRoot.innerHTML = '<div id="parent">' +
+      '<slot id="target"></slot>' +
+    '</div>';
+
+    var actual = getComposedParent(shadowRoot.querySelector('#target'));
+    assert.instanceOf(actual, Node);
+    assert.equal(actual, shadowRoot.querySelector('#parent'));
+  });
+
+  (shadowSupport ? it : xit)('returns the host when it reaches the shadow root', function () {
+    fixture.innerHTML = '<div id="parent"> content </div>';
+    var shadowRoot = document.getElementById('parent').attachShadow({ mode: 'open' });
+    shadowRoot.innerHTML = '<div id="target"> <slot></slot> </div>';
+
+    var actual = getComposedParent(shadowRoot.querySelector('#target'));
+    assert.instanceOf(actual, Node);
+    assert.equal(actual, fixture.querySelector('#parent'));
+  });
+});

From 70985b0a5a66f05d19ccd3f2ba5fc0028e15ee58 Mon Sep 17 00:00:00 2001
From: Dylan Barrell <dylan@barrell.com>
Date: Wed, 5 Jul 2017 04:31:43 -0400
Subject: [PATCH 046/142] fix: Correct flattened tree algorithm to include the
 shadow host (#405)

---
 lib/core/utils/flattened-tree.js  |  4 +++-
 test/core/utils/contains.js       |  2 +-
 test/core/utils/flattened-tree.js | 33 ++++++++++++++++++-------------
 3 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/lib/core/utils/flattened-tree.js b/lib/core/utils/flattened-tree.js
index 010da0fc66..8d7aabb38a 100644
--- a/lib/core/utils/flattened-tree.js
+++ b/lib/core/utils/flattened-tree.js
@@ -80,9 +80,11 @@ axe.utils.getFlattenedTree = function (node, shadowId) {
 	if (node.shadowRoot && nodeName !== 'marquee') {
 		// generate an ID for this shadow root and overwrite the current
 		// closure shadowId with this value so that it cascades down the tree
+		retVal = virtualDOMfromNode(node, shadowId);
 		shadowId = 'a' + Math.random().toString().substring(2);
 		realArray = Array.from(node.shadowRoot.childNodes);
-		return realArray.reduce(reduceShadowDOM, []);
+		retVal.children = realArray.reduce(reduceShadowDOM, []);
+		return [retVal];
 	} else {
 		if (nodeName === 'content') {
 			realArray = Array.from(node.getDistributedNodes());
diff --git a/test/core/utils/contains.js b/test/core/utils/contains.js
index 24e7f848d2..c82cd24638 100644
--- a/test/core/utils/contains.js
+++ b/test/core/utils/contains.js
@@ -104,7 +104,7 @@ describe('axe.utils.contains', function () {
 		if (document.body && typeof document.body.attachShadow === 'function') {
 			fixture.innerHTML = '<div></div>';
 			makeShadowTree(fixture.firstChild);
-			tree = axe.utils.getFlattenedTree(fixture.firstChild);
+			tree = axe.utils.getFlattenedTree(fixture.firstChild)[0].children;
 			node1 = axe.utils.querySelectorAll(tree, '#target')[0];
 			node2 = axe.utils.querySelectorAll(tree, 'a')[0];
 			assert.isTrue(axe.utils.contains(node1, node2));
diff --git a/test/core/utils/flattened-tree.js b/test/core/utils/flattened-tree.js
index c8c5acfac0..0ebba613d3 100644
--- a/test/core/utils/flattened-tree.js
+++ b/test/core/utils/flattened-tree.js
@@ -14,6 +14,10 @@ function flattenedTreeAssertions () {
 	'use strict';
 
 	var virtualDOM = axe.utils.getFlattenedTree(fixture.firstChild);
+	assert.equal(virtualDOM.length, 1); // host
+	assert.equal(virtualDOM[0].actualNode.nodeName, 'DIV');
+
+	virtualDOM = virtualDOM[0].children;
 	assert.equal(virtualDOM.length, 3);
 	assert.equal(virtualDOM[0].actualNode.nodeName, 'STYLE');
 
@@ -44,19 +48,20 @@ function shadowIdAssertions () {
 	'use strict';
 
 	var virtualDOM = axe.utils.getFlattenedTree(fixture);
-	assert.isUndefined(virtualDOM[0].shadowId);
-	assert.isDefined(virtualDOM[0].children[0].shadowId);
-	assert.isDefined(virtualDOM[0].children[1].shadowId);
-	assert.isDefined(virtualDOM[0].children[4].shadowId);
+	assert.isUndefined(virtualDOM[0].shadowId); //fixture
+	assert.isUndefined(virtualDOM[0].children[0].shadowId); //host
+	assert.isDefined(virtualDOM[0].children[0].children[0].shadowId);
+	assert.isDefined(virtualDOM[0].children[0].children[1].shadowId);
+	assert.isDefined(virtualDOM[0].children[1].children[0].shadowId);
 	// shadow IDs in the same shadowRoot must be the same
-	assert.equal(virtualDOM[0].children[0].shadowId,
-		virtualDOM[0].children[1].shadowId);
+	assert.equal(virtualDOM[0].children[0].children[0].shadowId,
+		virtualDOM[0].children[0].children[1].shadowId);
 	// should cascade
-	assert.equal(virtualDOM[0].children[1].shadowId,
-		virtualDOM[0].children[1].children[0].shadowId);
+	assert.equal(virtualDOM[0].children[0].children[1].shadowId,
+		virtualDOM[0].children[0].children[1].children[0].shadowId);
 	// shadow IDs in different shadowRoots must be different
-	assert.notEqual(virtualDOM[0].children[0].shadowId,
-		virtualDOM[0].children[4].shadowId);
+	assert.notEqual(virtualDOM[0].children[0].children[0].shadowId,
+		virtualDOM[0].children[1].children[0].shadowId);
 
 }
 
@@ -143,10 +148,10 @@ if (document.body && typeof document.body.attachShadow === 'function') {
 		it('getFlattenedTree\'s virtual DOM should give an ID to the shadow DOM', shadowIdAssertions);
 		it('getFlattenedTree\'s virtual DOM should have the fallback content', function () {
 			var virtualDOM = axe.utils.getFlattenedTree(fixture);
-			assert.isTrue(virtualDOM[0].children[7].children[0].children.length === 2);
-			assert.isTrue(virtualDOM[0].children[7].children[0].children[0].actualNode.nodeType === 3);
-			assert.isTrue(virtualDOM[0].children[7].children[0].children[0].actualNode.textContent === 'fallback content');
-			assert.isTrue(virtualDOM[0].children[7].children[0].children[1].actualNode.nodeName === 'LI');
+			assert.isTrue(virtualDOM[0].children[2].children[1].children[0].children.length === 2);
+			assert.isTrue(virtualDOM[0].children[2].children[1].children[0].children[0].actualNode.nodeType === 3);
+			assert.isTrue(virtualDOM[0].children[2].children[1].children[0].children[0].actualNode.textContent === 'fallback content');
+			assert.isTrue(virtualDOM[0].children[2].children[1].children[0].children[1].actualNode.nodeName === 'LI');
 		});
 	});
 	describe('flattened-tree shadow DOM v1: boxed slots', function () {

From 789d62e64dc296009294c45d9e16d5bb0d749b15 Mon Sep 17 00:00:00 2001
From: Wilco Fiers <wilco.fiers@deque.com>
Date: Wed, 5 Jul 2017 18:26:50 +0200
Subject: [PATCH 047/142] feat: Allow hidden-content to work through shadow DOM
 bounds

---
 lib/checks/visibility/hidden-content.js  | 15 ++++---
 lib/commons/dom/has-content.js           | 51 +++++++++++++++---------
 lib/commons/dom/is-visible.js            |  3 +-
 test/checks/visibility/hidden-content.js | 35 +++++++++++++++-
 test/commons/dom/has-content.js          | 34 ++++++++++++++++
 5 files changed, 110 insertions(+), 28 deletions(-)

diff --git a/lib/checks/visibility/hidden-content.js b/lib/checks/visibility/hidden-content.js
index 3daef0a360..13358e3aa0 100644
--- a/lib/checks/visibility/hidden-content.js
+++ b/lib/checks/visibility/hidden-content.js
@@ -1,13 +1,16 @@
-let styles = window.getComputedStyle(node);
+const whitelist = ['SCRIPT', 'HEAD', 'TITLE', 'NOSCRIPT', 'STYLE', 'TEMPLATE'];
+if (
+  !whitelist.includes(node.tagName.toUpperCase()) &&
+  axe.commons.dom.hasContent(virtualNode)
+) {
 
-let whitelist = ['SCRIPT', 'HEAD', 'TITLE', 'NOSCRIPT', 'STYLE', 'TEMPLATE'];
-if (!whitelist.includes(node.tagName.toUpperCase()) && axe.commons.dom.hasContent(virtualNode)) {
+  const styles = window.getComputedStyle(node);
   if (styles.getPropertyValue('display') === 'none') {
     return undefined;
   } else if (styles.getPropertyValue('visibility') === 'hidden') {
-    if (node.parentNode) {
-      var parentStyle = window.getComputedStyle(node.parentNode);
-    }
+    // Check if visibility isn't inherited
+    const parent = axe.commons.dom.getComposedParent(node);
+    const parentStyle = parent && window.getComputedStyle(parent);
     if (!parentStyle || parentStyle.getPropertyValue('visibility') !== 'hidden') {
       return undefined;
     }
diff --git a/lib/commons/dom/has-content.js b/lib/commons/dom/has-content.js
index 5581018d19..b70fee41dc 100644
--- a/lib/commons/dom/has-content.js
+++ b/lib/commons/dom/has-content.js
@@ -1,4 +1,17 @@
-/*global dom, aria, axe */
+/*global dom, aria */
+const hiddenTextElms = [
+  'HEAD', 'TITLE', 'TEMPLATE', 'SCRIPT','STYLE',
+  'IFRAME', 'OBJECT', 'VIDEO', 'AUDIO', 'NOSCRIPT'
+];
+
+function hasChildTextNodes (elm) {
+  if (!hiddenTextElms.includes(elm.actualNode.nodeName.toUpperCase())) {
+    return elm.children.some(({ actualNode }) => (
+      actualNode.nodeType === 3 && actualNode.nodeValue.trim()
+    ));
+  }
+}
+
 /**
  * Check that the element has visible content
  * in the form of either text, an aria-label or visual content such as image
@@ -6,22 +19,24 @@
  * @param {Object} virtual DOM node
  * @return boolean
  */
-dom.hasContent = function hasContent(elm) {
-  if (
-    elm.actualNode.textContent.trim() ||
+dom.hasContent = function hasContent (elm) {
+  /* global console */
+  console.log(
+    elm.actualNode,
+    hasChildTextNodes(elm),
+    dom.isVisualContent(elm.actualNode),
     aria.label(elm)
-  ) {
-    return true;
-  }
-
-  const contentElms = axe.utils.querySelectorAll(elm, '*');
-  for (let i = 0; i < contentElms.length; i++) {
-    if (
-      aria.label(contentElms[i]) ||
-      dom.isVisualContent(contentElms[i].actualNode)
-    ) {
-      return true;
-    }
-  }
-  return false;
+  );
+  return (
+    // It has text
+    hasChildTextNodes(elm) ||
+     // It is a graphical element
+    dom.isVisualContent(elm.actualNode) ||
+     // It has an ARIA label
+    !!aria.label(elm) ||
+    // or one of it's descendants does
+    elm.children.some(child => (
+      child.actualNode.nodeType === 1 && dom.hasContent(child)
+    ))
+  );
 };
diff --git a/lib/commons/dom/is-visible.js b/lib/commons/dom/is-visible.js
index 433fdc25b3..6318e2b8e8 100644
--- a/lib/commons/dom/is-visible.js
+++ b/lib/commons/dom/is-visible.js
@@ -64,11 +64,10 @@ dom.isVisible = function (el, screenReader, recursed) {
 		return false;
 	}
 
-	parent = dom.getComposedParent(el);
+	parent = (el.assignedSlot) ? el.assignedSlot : el.parentNode;
 	if (parent) {
 		return dom.isVisible(parent, screenReader, true);
 	}
 
 	return false;
-
 };
diff --git a/test/checks/visibility/hidden-content.js b/test/checks/visibility/hidden-content.js
index 89c04d7070..22fde18476 100644
--- a/test/checks/visibility/hidden-content.js
+++ b/test/checks/visibility/hidden-content.js
@@ -1,8 +1,9 @@
+/* global xit */
 describe('hidden content', function () {
 	'use strict';
 
 	var fixture = document.getElementById('fixture');
-
+	var shadowSupport = document.body && typeof document.body.attachShadow === 'function';
 	var checkContext = {
 		_data: null,
 		data: function (d) {
@@ -48,6 +49,36 @@ describe('hidden content', function () {
 		var node = document.querySelector('head');
 		axe._tree = axe.utils.getFlattenedTree(document.documentElement);
 		var virtualNode = axe.utils.getNodeFromTree(axe._tree[0], node);
-		assert.isTrue(checks['hidden-content'].evaluate.call(checkContext, node, undefined, virtualNode));
+		assert.isTrue(checks['hidden-content'].evaluate(node, undefined, virtualNode));
+	});
+
+	(shadowSupport ? it : xit)('works on elements in a shadow DOM', function () {
+		/* global console */
+		fixture.innerHTML = '<div id="shadow"> <div id="content">text</div> </div>';
+		var shadowRoot = document.getElementById('shadow').attachShadow({ mode: 'open' });
+		shadowRoot.innerHTML = '<div id="target" style="display:none">' +
+			'<slot></slot>' +
+		'</div>';
+		axe._tree = axe.utils.getFlattenedTree(fixture);
+		console.log(axe._tree);
+
+		var shadow = document.querySelector('#shadow');
+		var virtualShadow = axe.utils.getNodeFromTree(axe._tree[0], shadow);
+		console.log(virtualShadow, shadow);
+		assert.isTrue(
+			checks['hidden-content'].evaluate(shadow, undefined, virtualShadow)
+		);
+
+		var target = shadowRoot.querySelector('#target');
+		var virtualTarget = axe.utils.getNodeFromTree(axe._tree[0], target);
+		assert.isUndefined(
+			checks['hidden-content'].evaluate(target, undefined, virtualTarget)
+		);
+
+		var content = document.querySelector('#content');
+		var virtualContent = axe.utils.getNodeFromTree(axe._tree[0], content);
+		assert.isTrue(
+			checks['hidden-content'].evaluate(content, undefined, virtualContent)
+		);
 	});
 });
diff --git a/test/commons/dom/has-content.js b/test/commons/dom/has-content.js
index 6d9e20bcc9..315956bafd 100644
--- a/test/commons/dom/has-content.js
+++ b/test/commons/dom/has-content.js
@@ -1,7 +1,9 @@
+/* global xit */
 describe('dom.hasContent', function () {
   'use strict';
   var hasContent = axe.commons.dom.hasContent;
   var fixture = document.getElementById('fixture');
+  var shadowSupport = document.body && typeof document.body.attachShadow === 'function';
   var tree;
 
   it('returns false if there is no content', function () {
@@ -51,4 +53,36 @@ describe('dom.hasContent', function () {
       hasContent(axe.utils.querySelectorAll(tree, '#target')[0])
     );
   });
+
+  it('is false if the element does not show text', function () {
+    fixture.innerHTML = '<style id="target"> #foo { color: green } </style>';
+    tree = axe.utils.getFlattenedTree(fixture);
+    assert.isFalse(
+      hasContent(axe.utils.querySelectorAll(tree, '#target')[0])
+    );
+  });
+
+  (shadowSupport ? it : xit)('looks at content of shadow dom elements', function () {
+    fixture.innerHTML = '<div id="target"></div>';
+    var shadow = fixture.querySelector('#target').attachShadow({ mode: 'open' });
+    shadow.innerHTML = 'Some text';
+    tree = axe.utils.getFlattenedTree(fixture);
+
+    assert.isTrue(
+      hasContent(axe.utils.querySelectorAll(tree, '#target')[0])
+    );
+  });
+
+  (shadowSupport ? it : xit)('looks at the slots in a shadow tree', function () {
+    fixture.innerHTML = '<div id="shadow">some text</div>';
+    var shadow = fixture.querySelector('#shadow').attachShadow({ mode: 'open' });
+    shadow.innerHTML = '<div class="target"><slot></slot></div>';
+    tree = axe.utils.getFlattenedTree(fixture);
+    var node = axe.utils.querySelectorAll(tree, '.target');
+
+    axe.log(tree, node);
+    assert.isTrue(
+      hasContent(axe.utils.querySelectorAll(tree, '.target')[0])
+    );
+  });
 });

From 6a6bd736dfd90dfb41acf0f71f7897bb43116251 Mon Sep 17 00:00:00 2001
From: Wilco Fiers <wilco.fiers@deque.com>
Date: Thu, 6 Jul 2017 12:49:40 +0200
Subject: [PATCH 048/142] fix: Remove log statements

---
 lib/commons/dom/has-content.js           | 7 -------
 test/checks/visibility/hidden-content.js | 3 ---
 2 files changed, 10 deletions(-)

diff --git a/lib/commons/dom/has-content.js b/lib/commons/dom/has-content.js
index b70fee41dc..415c9ff3ab 100644
--- a/lib/commons/dom/has-content.js
+++ b/lib/commons/dom/has-content.js
@@ -20,13 +20,6 @@ function hasChildTextNodes (elm) {
  * @return boolean
  */
 dom.hasContent = function hasContent (elm) {
-  /* global console */
-  console.log(
-    elm.actualNode,
-    hasChildTextNodes(elm),
-    dom.isVisualContent(elm.actualNode),
-    aria.label(elm)
-  );
   return (
     // It has text
     hasChildTextNodes(elm) ||
diff --git a/test/checks/visibility/hidden-content.js b/test/checks/visibility/hidden-content.js
index 22fde18476..f563f57ed2 100644
--- a/test/checks/visibility/hidden-content.js
+++ b/test/checks/visibility/hidden-content.js
@@ -53,18 +53,15 @@ describe('hidden content', function () {
 	});
 
 	(shadowSupport ? it : xit)('works on elements in a shadow DOM', function () {
-		/* global console */
 		fixture.innerHTML = '<div id="shadow"> <div id="content">text</div> </div>';
 		var shadowRoot = document.getElementById('shadow').attachShadow({ mode: 'open' });
 		shadowRoot.innerHTML = '<div id="target" style="display:none">' +
 			'<slot></slot>' +
 		'</div>';
 		axe._tree = axe.utils.getFlattenedTree(fixture);
-		console.log(axe._tree);
 
 		var shadow = document.querySelector('#shadow');
 		var virtualShadow = axe.utils.getNodeFromTree(axe._tree[0], shadow);
-		console.log(virtualShadow, shadow);
 		assert.isTrue(
 			checks['hidden-content'].evaluate(shadow, undefined, virtualShadow)
 		);

From 00399776f8355eb1d49fc6809b87b8a538c10ca1 Mon Sep 17 00:00:00 2001
From: Nick Schonning <nschonni@gmail.com>
Date: Thu, 6 Jul 2017 07:47:45 -0400
Subject: [PATCH 049/142] Minor build chores for whitespace and lockfile (#366)

* chore: convert spaces to tabs in Gruntfile

Align the file with the EditorConfig setting

* chore: ignore package-lock.json

This file is produced by NPM 5, but this repo didn't use the old
shrinkwrap version so this should be excluded
---
 .gitignore   | 3 ++-
 Gruntfile.js | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0c3d4d4fce..e06651b9f6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,4 +8,5 @@ axe.*.js
 *.tgz
 npm-shrinkwrap.json
 typings/axe-core/axe-core-tests.js
-doc/rule-descriptions.*.md
\ No newline at end of file
+doc/rule-descriptions.*.md
+package-lock.json
\ No newline at end of file
diff --git a/Gruntfile.js b/Gruntfile.js
index 5d282d57aa..e11d461614 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -54,14 +54,14 @@ module.exports = function (grunt) {
 				]
 			}
 		},
-    retire: {
+	retire: {
 			options: {
 				/** list of files to ignore **/
 				ignorefile: '.retireignore.json' //or '.retireignore.json'
 			},
 			js: ['lib/*.js'], /** Which js-files to scan. **/
 			node: ['./'] /** Which node directories to scan (containing package.json). **/
-    },
+	},
 		clean: ['dist', 'tmp', 'axe.js', 'axe.*.js'],
 		babel: {
 			options: {

From 28f44779c6e6d809cff243937651cb97462fe327 Mon Sep 17 00:00:00 2001
From: Wilco Fiers <wilco.fiers@deque.com>
Date: Thu, 6 Jul 2017 15:33:03 +0200
Subject: [PATCH 050/142] fix: Align impact levels with Deque Way

---
 lib/checks/color/link-in-text-block.json         | 2 +-
 lib/checks/keyboard/accesskeys.json              | 2 +-
 lib/checks/lists/listitem.json                   | 2 +-
 lib/checks/media/description.json                | 2 +-
 lib/checks/navigation/header-present.json        | 2 +-
 lib/checks/navigation/heading-order.json         | 2 +-
 lib/checks/navigation/internal-link-present.json | 2 +-
 lib/checks/navigation/p-as-heading.json          | 2 +-
 lib/checks/navigation/skip-link.json             | 2 +-
 lib/checks/shared/aria-label.json                | 2 +-
 lib/checks/shared/aria-labelledby.json           | 2 +-
 lib/checks/shared/doc-has-title.json             | 2 +-
 lib/checks/shared/has-visible-text.json          | 2 +-
 lib/checks/shared/is-on-screen.json              | 2 +-
 lib/checks/shared/non-empty-title.json           | 2 +-
 lib/checks/shared/role-none.json                 | 2 +-
 lib/checks/shared/role-presentation.json         | 2 +-
 lib/checks/tables/caption-faked.json             | 2 +-
 lib/checks/tables/html5-scope.json               | 2 +-
 lib/checks/tables/same-caption-summary.json      | 2 +-
 lib/checks/tables/th-has-data-cells.json         | 2 +-
 21 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/lib/checks/color/link-in-text-block.json b/lib/checks/color/link-in-text-block.json
index add008b132..bcfd359747 100644
--- a/lib/checks/color/link-in-text-block.json
+++ b/lib/checks/color/link-in-text-block.json
@@ -2,7 +2,7 @@
   "id": "link-in-text-block",
   "evaluate": "link-in-text-block.js",
   "metadata": {
-    "impact": "critical",
+    "impact": "serious",
     "messages": {
       "pass": "Links can be distinguished from surrounding text in a way that does not rely on color",
       "fail": "Links can not be distinguished from surrounding text in a way that does not rely on color",
diff --git a/lib/checks/keyboard/accesskeys.json b/lib/checks/keyboard/accesskeys.json
index ed313c8f0e..d0c7328053 100644
--- a/lib/checks/keyboard/accesskeys.json
+++ b/lib/checks/keyboard/accesskeys.json
@@ -3,7 +3,7 @@
   "evaluate": "accesskeys.js",
   "after": "accesskeys-after.js",
   "metadata": {
-    "impact": "critical",
+    "impact": "serious",
     "messages": {
       "pass": "Accesskey attribute value is unique",
       "fail": "Document has multiple elements with the same accesskey"
diff --git a/lib/checks/lists/listitem.json b/lib/checks/lists/listitem.json
index 0e6daecd85..0b0512ad1c 100644
--- a/lib/checks/lists/listitem.json
+++ b/lib/checks/lists/listitem.json
@@ -2,7 +2,7 @@
   "id": "listitem",
   "evaluate": "listitem.js",
   "metadata": {
-    "impact": "critical",
+    "impact": "serious",
     "messages": {
       "pass": "List item has a <ul>, <ol> or role=\"list\" parent element",
       "fail": "List item does not have a <ul>, <ol> or role=\"list\" parent element"
diff --git a/lib/checks/media/description.json b/lib/checks/media/description.json
index 49d3ae5795..c81782e9bd 100644
--- a/lib/checks/media/description.json
+++ b/lib/checks/media/description.json
@@ -2,7 +2,7 @@
   "id": "description",
   "evaluate": "description.js",
   "metadata": {
-    "impact": "serious",
+    "impact": "critical",
     "messages": {
       "pass": "The multimedia element has an audio description track",
       "fail": "The multimedia element does not have an audio description track",
diff --git a/lib/checks/navigation/header-present.json b/lib/checks/navigation/header-present.json
index 2401ffdd09..7582b39fef 100644
--- a/lib/checks/navigation/header-present.json
+++ b/lib/checks/navigation/header-present.json
@@ -2,7 +2,7 @@
   "id": "header-present",
   "evaluate": "header-present.js",
   "metadata": {
-    "impact": "moderate",
+    "impact": "serious",
     "messages": {
       "pass": "Page has a header",
       "fail": "Page does not have a header"
diff --git a/lib/checks/navigation/heading-order.json b/lib/checks/navigation/heading-order.json
index 502f70bf3e..c5580c4b10 100644
--- a/lib/checks/navigation/heading-order.json
+++ b/lib/checks/navigation/heading-order.json
@@ -3,7 +3,7 @@
   "evaluate": "heading-order.js",
   "after": "heading-order-after.js",
   "metadata": {
-    "impact": "minor",
+    "impact": "moderate",
     "messages": {
       "pass": "Heading order valid",
       "fail": "Heading order invalid"
diff --git a/lib/checks/navigation/internal-link-present.json b/lib/checks/navigation/internal-link-present.json
index 6fbb6a52e9..3076d60807 100644
--- a/lib/checks/navigation/internal-link-present.json
+++ b/lib/checks/navigation/internal-link-present.json
@@ -2,7 +2,7 @@
   "id": "internal-link-present",
   "evaluate": "internal-link-present.js",
   "metadata": {
-    "impact": "critical",
+    "impact": "serious",
     "messages": {
       "pass": "Valid skip link found",
       "fail": "No valid skip link found"
diff --git a/lib/checks/navigation/p-as-heading.json b/lib/checks/navigation/p-as-heading.json
index 3c810573fa..e2e3153070 100644
--- a/lib/checks/navigation/p-as-heading.json
+++ b/lib/checks/navigation/p-as-heading.json
@@ -16,7 +16,7 @@
     }]
   },
   "metadata": {
-    "impact": "critical",
+    "impact": "serious",
     "messages": {
       "pass": "<p> elements are not styled as headings",
       "fail": "Heading elements should be used instead of styled p elements"
diff --git a/lib/checks/navigation/skip-link.json b/lib/checks/navigation/skip-link.json
index 87e8d38fdc..8e4f9baff2 100644
--- a/lib/checks/navigation/skip-link.json
+++ b/lib/checks/navigation/skip-link.json
@@ -3,7 +3,7 @@
   "evaluate": "skip-link.js",
   "after": "skip-link-after.js",
   "metadata": {
-    "impact": "critical",
+    "impact": "moderate",
     "messages": {
       "pass": "Valid skip link found",
       "fail": "No valid skip link found"
diff --git a/lib/checks/shared/aria-label.json b/lib/checks/shared/aria-label.json
index a9368f2769..9ca97a5eb7 100644
--- a/lib/checks/shared/aria-label.json
+++ b/lib/checks/shared/aria-label.json
@@ -2,7 +2,7 @@
   "id": "aria-label",
   "evaluate": "aria-label.js",
   "metadata": {
-    "impact": "critical",
+    "impact": "serious",
     "messages": {
       "pass": "aria-label attribute exists and is not empty",
       "fail": "aria-label attribute does not exist or is empty"
diff --git a/lib/checks/shared/aria-labelledby.json b/lib/checks/shared/aria-labelledby.json
index ed56ef0881..3ebbf1bcae 100644
--- a/lib/checks/shared/aria-labelledby.json
+++ b/lib/checks/shared/aria-labelledby.json
@@ -2,7 +2,7 @@
   "id": "aria-labelledby",
   "evaluate": "aria-labelledby.js",
   "metadata": {
-    "impact": "critical",
+    "impact": "serious",
     "messages": {
       "pass": "aria-labelledby attribute exists and references elements that are visible to screen readers",
       "fail": "aria-labelledby attribute does not exist, references elements that do not exist or references elements that are empty or not visible"
diff --git a/lib/checks/shared/doc-has-title.json b/lib/checks/shared/doc-has-title.json
index d6b8e31da7..dc90cf0291 100644
--- a/lib/checks/shared/doc-has-title.json
+++ b/lib/checks/shared/doc-has-title.json
@@ -2,7 +2,7 @@
   "id": "doc-has-title",
   "evaluate": "doc-has-title.js",
   "metadata": {
-    "impact": "moderate",
+    "impact": "serious",
     "messages": {
       "pass": "Document has a non-empty <title> element",
       "fail": "Document does not have a non-empty <title> element"
diff --git a/lib/checks/shared/has-visible-text.json b/lib/checks/shared/has-visible-text.json
index dcce372115..27138ae349 100644
--- a/lib/checks/shared/has-visible-text.json
+++ b/lib/checks/shared/has-visible-text.json
@@ -2,7 +2,7 @@
   "id": "has-visible-text",
   "evaluate": "has-visible-text.js",
   "metadata": {
-    "impact": "moderate",
+    "impact": "minor",
     "messages": {
       "pass": "Element has text that is visible to screen readers",
       "fail": "Element does not have text that is visible to screen readers"
diff --git a/lib/checks/shared/is-on-screen.json b/lib/checks/shared/is-on-screen.json
index 1ae053ac21..6fc7a4f8bc 100644
--- a/lib/checks/shared/is-on-screen.json
+++ b/lib/checks/shared/is-on-screen.json
@@ -2,7 +2,7 @@
   "id": "is-on-screen",
   "evaluate": "is-on-screen.js",
   "metadata": {
-    "impact": "minor",
+    "impact": "serious",
     "messages": {
       "pass": "Element is not visible",
       "fail": "Element is visible"
diff --git a/lib/checks/shared/non-empty-title.json b/lib/checks/shared/non-empty-title.json
index e23dcb7d63..2abd6e58db 100644
--- a/lib/checks/shared/non-empty-title.json
+++ b/lib/checks/shared/non-empty-title.json
@@ -2,7 +2,7 @@
   "id": "non-empty-title",
   "evaluate": "non-empty-title.js",
   "metadata": {
-    "impact": "critical",
+    "impact": "serious",
     "messages": {
       "pass": "Element has a title attribute",
       "fail": "Element has no title attribute or the title attribute is empty"
diff --git a/lib/checks/shared/role-none.json b/lib/checks/shared/role-none.json
index 410aa453f4..a306f3ede9 100644
--- a/lib/checks/shared/role-none.json
+++ b/lib/checks/shared/role-none.json
@@ -2,7 +2,7 @@
   "id": "role-none",
   "evaluate": "role-none.js",
   "metadata": {
-    "impact": "moderate",
+    "impact": "minor",
     "messages": {
       "pass": "Element's default semantics were overriden with role=\"none\"",
       "fail": "Element's default semantics were not overridden with role=\"none\""
diff --git a/lib/checks/shared/role-presentation.json b/lib/checks/shared/role-presentation.json
index e5097a9dc4..cb88e8a891 100644
--- a/lib/checks/shared/role-presentation.json
+++ b/lib/checks/shared/role-presentation.json
@@ -2,7 +2,7 @@
   "id": "role-presentation",
   "evaluate": "role-presentation.js",
   "metadata": {
-    "impact": "moderate",
+    "impact": "minor",
     "messages": {
       "pass": "Element's default semantics were overriden with role=\"presentation\"",
       "fail": "Element's default semantics were not overridden with role=\"presentation\""
diff --git a/lib/checks/tables/caption-faked.json b/lib/checks/tables/caption-faked.json
index 0f9ab0de76..803c6cf9f8 100644
--- a/lib/checks/tables/caption-faked.json
+++ b/lib/checks/tables/caption-faked.json
@@ -2,7 +2,7 @@
   "id": "caption-faked",
   "evaluate": "caption-faked.js",
   "metadata": {
-    "impact": "critical",
+    "impact": "serious",
     "messages": {
       "pass": "The first row of a table is not used as a caption",
       "fail": "The first row of the table should be a caption instead of a table cell"
diff --git a/lib/checks/tables/html5-scope.json b/lib/checks/tables/html5-scope.json
index c1497e5bc2..b7b5d917c8 100644
--- a/lib/checks/tables/html5-scope.json
+++ b/lib/checks/tables/html5-scope.json
@@ -2,7 +2,7 @@
   "id": "html5-scope",
   "evaluate": "html5-scope.js",
   "metadata": {
-    "impact": "serious",
+    "impact": "moderate",
     "messages": {
       "pass": "Scope attribute is only used on table header elements (<th>)",
       "fail": "In HTML 5, scope attributes may only be used on table header elements (<th>)"
diff --git a/lib/checks/tables/same-caption-summary.json b/lib/checks/tables/same-caption-summary.json
index a3b0c2aca1..a13fac2284 100644
--- a/lib/checks/tables/same-caption-summary.json
+++ b/lib/checks/tables/same-caption-summary.json
@@ -2,7 +2,7 @@
   "id": "same-caption-summary",
   "evaluate": "same-caption-summary.js",
   "metadata": {
-    "impact": "moderate",
+    "impact": "minor",
     "messages": {
       "pass": "Content of summary attribute and <caption> are not duplicated",
       "fail": "Content of summary attribute and <caption> element are identical"
diff --git a/lib/checks/tables/th-has-data-cells.json b/lib/checks/tables/th-has-data-cells.json
index fd1aaee7a8..5678fa9d95 100644
--- a/lib/checks/tables/th-has-data-cells.json
+++ b/lib/checks/tables/th-has-data-cells.json
@@ -2,7 +2,7 @@
   "id": "th-has-data-cells",
   "evaluate": "th-has-data-cells.js",
   "metadata": {
-    "impact": "critical",
+    "impact": "serious",
     "messages": {
       "pass": "All table header cells refer to data cells",
       "fail": "Not all table header cells refer to data cells",

From 453be1b584195f27a2a04f34f509faf27d61e239 Mon Sep 17 00:00:00 2001
From: Wilco Fiers <wilco.fiers@deque.com>
Date: Thu, 6 Jul 2017 17:01:10 +0200
Subject: [PATCH 051/142] fix: Have table rules use shadow DOM

---
 lib/commons/aria/label.js               |  3 +++
 lib/commons/dom/has-content.js          |  3 +++
 test/checks/tables/td-has-header.js     | 14 ++++++++++++++
 test/checks/tables/th-has-data-cells.js |  9 +++++++++
 test/commons/aria/label.js              | 17 +++++++++++++++++
 test/commons/dom/has-content.js         | 15 +++++++++++++++
 6 files changed, 61 insertions(+)

diff --git a/lib/commons/aria/label.js b/lib/commons/aria/label.js
index 66f4005c27..f9d14849e1 100644
--- a/lib/commons/aria/label.js
+++ b/lib/commons/aria/label.js
@@ -7,6 +7,9 @@
  */
 aria.label = function (node) {
 	var ref, candidate;
+	if (node.actualNode instanceof Node === false) {
+    node = axe.utils.getNodeFromTree(axe._tree[0], node);
+  }
 
 	if (node.actualNode.getAttribute('aria-labelledby')) {
 		// aria-labelledby
diff --git a/lib/commons/dom/has-content.js b/lib/commons/dom/has-content.js
index 5581018d19..0ea09e8666 100644
--- a/lib/commons/dom/has-content.js
+++ b/lib/commons/dom/has-content.js
@@ -7,6 +7,9 @@
  * @return boolean
  */
 dom.hasContent = function hasContent(elm) {
+  if (elm.actualNode instanceof Node === false) {
+    elm = axe.utils.getNodeFromTree(axe._tree[0], elm);
+  }
   if (
     elm.actualNode.textContent.trim() ||
     aria.label(elm)
diff --git a/test/checks/tables/td-has-header.js b/test/checks/tables/td-has-header.js
index 94a12d8e5a..363e4072d7 100644
--- a/test/checks/tables/td-has-header.js
+++ b/test/checks/tables/td-has-header.js
@@ -17,6 +17,7 @@ describe('td-has-header', function () {
 		fixture.innerHTML = '';
 		checkContext._relatedNodes = [];
 		checkContext._data = null;
+		axe._tree = null;
 	});
 
 	it('should not be fooled by rowspan and colspan', function () {
@@ -44,6 +45,7 @@ describe('td-has-header', function () {
 			'    </tr>' +
 			'  </tbody>' +
 			'</table>';
+		axe._tree = axe.utils.getFlattenedTree(fixture);
 		var node = fixture.querySelector('table');
 		var result = checks['td-has-header'].evaluate.call(checkContext, node);
 
@@ -57,6 +59,7 @@ describe('td-has-header', function () {
 			'  <tr> <th>hi</th> <td>hello</td> </tr>' +
 			'</table>';
 
+		axe._tree = axe.utils.getFlattenedTree(fixture);
 		var node = fixture.querySelector('table');
 		assert.isTrue(checks['td-has-header'].evaluate.call(checkContext, node));
 	});
@@ -68,6 +71,7 @@ describe('td-has-header', function () {
 			'  <tr> <td>hi</td> <td>hello</td> </tr>' +
 			'</table>';
 
+		axe._tree = axe.utils.getFlattenedTree(fixture);
 		var node = fixture.querySelector('table');
 		assert.isTrue(checks['td-has-header'].evaluate.call(checkContext, node));
 	});
@@ -79,6 +83,7 @@ describe('td-has-header', function () {
 			'  <tr> <td aria-label="one">hi</td> <td aria-label="two">hello</td> </tr>' +
 			'</table>';
 
+		axe._tree = axe.utils.getFlattenedTree(fixture);
 		var node = fixture.querySelector('table');
 		assert.isTrue(checks['td-has-header'].evaluate.call(checkContext, node));
 	});
@@ -90,6 +95,7 @@ describe('td-has-header', function () {
 			'  <tr> <td aria-labelledby="one">hi</td> <td aria-labelledby="two">hello</td> </tr>' +
 			'</table>';
 
+		axe._tree = axe.utils.getFlattenedTree(fixture);
 		var node = fixture.querySelector('table');
 		assert.isTrue(checks['td-has-header'].evaluate.call(checkContext, node));
 	});
@@ -102,6 +108,7 @@ describe('td-has-header', function () {
 			'  <tr> <td headers="one">hi</td> <td headers="two">hello</td> </tr>' +
 			'</table>';
 
+		axe._tree = axe.utils.getFlattenedTree(fixture);
 		var node = fixture.querySelector('table');
 		assert.isTrue(checks['td-has-header'].evaluate.call(checkContext, node));
 	});
@@ -113,6 +120,7 @@ describe('td-has-header', function () {
 			'  <tr> <th></th> <td>hello</td> </tr>' +
 			'</table>';
 
+		axe._tree = axe.utils.getFlattenedTree(fixture);
 		var node = fixture.querySelector('table');
 		assert.isTrue(checks['td-has-header'].evaluate.call(checkContext, node));
 	});
@@ -123,6 +131,7 @@ describe('td-has-header', function () {
 			'  <tr> <td></td> <td></td> </tr>' +
 			'</table>';
 
+		axe._tree = axe.utils.getFlattenedTree(fixture);
 		var node = fixture.querySelector('table');
 		assert.isTrue(checks['td-has-header'].evaluate.call(checkContext, node));
 	});
@@ -133,6 +142,7 @@ describe('td-has-header', function () {
 			'  <tr> <td>hi</td> <td>hello</td> </tr>' +
 			'</table>';
 
+		axe._tree = axe.utils.getFlattenedTree(fixture);
 		var node = fixture.querySelector('table');
 
 		assert.isFalse(checks['td-has-header'].evaluate.call(checkContext, node));
@@ -148,6 +158,7 @@ describe('td-has-header', function () {
 			'  <tr> <td>hi</td> <td>hello</td> <td>Ok</td> </tr>' +
 			'</table>';
 
+		axe._tree = axe.utils.getFlattenedTree(fixture);
 		var node = fixture.querySelector('table');
 
 		assert.isFalse(checks['td-has-header'].evaluate.call(checkContext, node));
@@ -162,6 +173,7 @@ describe('td-has-header', function () {
 			'  <tr> <th>Hello</th> <td headers="">goodbye</td> </tr>' +
 			'</table>';
 
+		axe._tree = axe.utils.getFlattenedTree(fixture);
 		var node = fixture.querySelector('table');
 
 		assert.isFalse(checks['td-has-header'].evaluate.call(checkContext, node));
@@ -174,6 +186,7 @@ describe('td-has-header', function () {
 			'  <tr> <th>Hello</th> <td headers="beatles">goodbye</td> </tr>' +
 			'</table>';
 
+		axe._tree = axe.utils.getFlattenedTree(fixture);
 		var node = fixture.querySelector('table');
 
 		assert.isFalse(checks['td-has-header'].evaluate.call(checkContext, node));
@@ -186,6 +199,7 @@ describe('td-has-header', function () {
 			'  <tr> <td>hi</td> <td>hello</td> </tr>' +
 			'</table>';
 
+		axe._tree = axe.utils.getFlattenedTree(fixture);
 		var node = fixture.querySelector('table');
 		assert.isFalse(checks['td-has-header'].evaluate.call(checkContext, node));
 	});
diff --git a/test/checks/tables/th-has-data-cells.js b/test/checks/tables/th-has-data-cells.js
index 90106b47d4..4bab98d144 100644
--- a/test/checks/tables/th-has-data-cells.js
+++ b/test/checks/tables/th-has-data-cells.js
@@ -26,6 +26,7 @@ describe('th-has-data-cells', function () {
 			'  <tr> <th>hi</th> <td>hello</td> </tr>' +
 			'</table>';
 
+		axe._tree = axe.utils.getFlattenedTree(fixture);
 		var node = fixture.querySelector('table');
 		assert.isTrue(checks['th-has-data-cells'].evaluate.call(checkContext, node));
 	});
@@ -37,6 +38,7 @@ describe('th-has-data-cells', function () {
 			'  <tr> <td>hi</td> <td>hello</td></tr>' +
 			'</table>';
 
+		axe._tree = axe.utils.getFlattenedTree(fixture);
 		var node = fixture.querySelector('table');
 		assert.isTrue(checks['th-has-data-cells'].evaluate.call(checkContext, node));
 	});
@@ -48,6 +50,7 @@ describe('th-has-data-cells', function () {
 			'  <tr> <th id="a">H</th> <th id="b">H</th> </tr>' +
 			'</table>';
 
+		axe._tree = axe.utils.getFlattenedTree(fixture);
 		var node = fixture.querySelector('table');
 		assert.isTrue(checks['th-has-data-cells'].evaluate.call(checkContext, node));
 	});
@@ -59,6 +62,7 @@ describe('th-has-data-cells', function () {
 			'  <tr> <th id="a">H</th> <th id="b">H</th> </tr>' +
 			'</table>';
 
+		axe._tree = axe.utils.getFlattenedTree(fixture);
 		var node = fixture.querySelector('table');
 		assert.isTrue(checks['th-has-data-cells'].evaluate.call(checkContext, node));
 	});
@@ -69,6 +73,7 @@ describe('th-has-data-cells', function () {
 			'  <tr> <th></th> <th></th> </tr>' +
 			'  <tr> <th></th> <th></th> </tr>' +
 			'</table>';
+		axe._tree = axe.utils.getFlattenedTree(fixture);
 		var node = fixture.querySelector('table');
 		assert.isTrue(checks['th-has-data-cells'].evaluate.call(checkContext, node));
 	});
@@ -85,6 +90,7 @@ describe('th-has-data-cells', function () {
 			'  <tr> <th>hi</th> <td><span role="img"></span></td> </tr>' +
 			'</table>';
 
+		axe._tree = axe.utils.getFlattenedTree(fixture);
 		var node = fixture.querySelector('table');
 		assert.isTrue(checks['th-has-data-cells'].evaluate.call(checkContext, node));
 	});
@@ -96,6 +102,7 @@ describe('th-has-data-cells', function () {
 			'  <tr> <th>hi</th> </tr>' +
 			'</table>';
 
+		axe._tree = axe.utils.getFlattenedTree(fixture);
 		var node = fixture.querySelector('table');
 		assert.isUndefined(checks['th-has-data-cells'].evaluate.call(checkContext, node));
 	});
@@ -107,6 +114,7 @@ describe('th-has-data-cells', function () {
 			'  <tr> <th>hi</th> <td></td> </tr>' +
 			'</table>';
 
+		axe._tree = axe.utils.getFlattenedTree(fixture);
 		var node = fixture.querySelector('table');
 		assert.isUndefined(checks['th-has-data-cells'].evaluate.call(checkContext, node));
 	});
@@ -117,6 +125,7 @@ describe('th-has-data-cells', function () {
 			'  <tr> <td>aXe</td> <td role="columnheader">AXE</th> </tr>' +
 			'</table>';
 
+		axe._tree = axe.utils.getFlattenedTree(fixture);
 		var node = fixture.querySelector('table');
 		assert.isUndefined(checks['th-has-data-cells'].evaluate.call(checkContext, node));
 	});
diff --git a/test/commons/aria/label.js b/test/commons/aria/label.js
index 6aab989578..ce368daf43 100644
--- a/test/commons/aria/label.js
+++ b/test/commons/aria/label.js
@@ -7,6 +7,23 @@ describe('aria.label', function() {
 		axe._tree = undefined;
 	});
 
+	it('accepts DOM Nodes and virtual nodes', function () {
+		it('should join text with a single space', function() {
+			fixture.innerHTML = '<div id="monkeys">monkeys</div><div id="bananas">bananas</div>' +
+				'<input id="target" aria-labelledby="monkeys bananas">';
+			var tree = axe._tree = axe.utils.getFlattenedTree(document.body);
+
+			// Virtual node
+			assert.equal(axe.commons.text.label(
+				axe.utils.querySelectorAll(tree, '#target')[0]
+			), 'monkeys bananas');
+			// DOM Node
+			assert.equal(axe.commons.text.label(
+				fixture.querySelector('#target')
+			), 'monkeys bananas');
+		});
+  });
+
 	describe('aria-labelledby', function() {
 		it('should join text with a single space', function() {
 			fixture.innerHTML = '<div id="monkeys">monkeys</div><div id="bananas">bananas</div>' +
diff --git a/test/commons/dom/has-content.js b/test/commons/dom/has-content.js
index 6d9e20bcc9..583054c6fb 100644
--- a/test/commons/dom/has-content.js
+++ b/test/commons/dom/has-content.js
@@ -51,4 +51,19 @@ describe('dom.hasContent', function () {
       hasContent(axe.utils.querySelectorAll(tree, '#target')[0])
     );
   });
+
+  it('accepts DOM Nodes and virtual nodes', function () {
+    fixture.innerHTML = '<div id="target"> text </div>';
+    axe._tree = axe.utils.getFlattenedTree(fixture);
+
+    // Virtual node
+    assert.isTrue(
+      hasContent(axe.utils.querySelectorAll(axe._tree, '#target')[0])
+    );
+    // DOM node
+    assert.isTrue(
+      hasContent(fixture.querySelector('#target'))
+    );
+    axe._tree = null;
+  });
 });

From 2211d78c52267845dc7f2b2d003c1a246669cdb0 Mon Sep 17 00:00:00 2001
From: Wilco Fiers <wilco.fiers@deque.com>
Date: Fri, 7 Jul 2017 11:48:28 +0200
Subject: [PATCH 052/142] fix: Adjust if formatting

---
 lib/checks/visibility/hidden-content.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/lib/checks/visibility/hidden-content.js b/lib/checks/visibility/hidden-content.js
index 13358e3aa0..37ebcdbe48 100644
--- a/lib/checks/visibility/hidden-content.js
+++ b/lib/checks/visibility/hidden-content.js
@@ -1,8 +1,6 @@
 const whitelist = ['SCRIPT', 'HEAD', 'TITLE', 'NOSCRIPT', 'STYLE', 'TEMPLATE'];
-if (
-  !whitelist.includes(node.tagName.toUpperCase()) &&
-  axe.commons.dom.hasContent(virtualNode)
-) {
+if (!whitelist.includes(node.tagName.toUpperCase()) &&
+    axe.commons.dom.hasContent(virtualNode)) {
 
   const styles = window.getComputedStyle(node);
   if (styles.getPropertyValue('display') === 'none') {

From 7fde0fe8ae690bf1756788a28da203fb14413988 Mon Sep 17 00:00:00 2001
From: Wilco Fiers <WilcoFiers@users.noreply.github.com>
Date: Fri, 7 Jul 2017 12:00:25 +0200
Subject: [PATCH 053/142] fix: Set relatedNodes on color/link-in-block rules
 (#407)

---
 lib/checks/color/color-contrast.js      |  8 ++++----
 lib/checks/color/link-in-text-block.js  |  2 ++
 test/checks/color/color-contrast.js     | 19 +++++++++++++++++++
 test/checks/color/link-in-text-block.js | 17 +++++++++++++----
 4 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/lib/checks/color/color-contrast.js b/lib/checks/color/color-contrast.js
index b59a49103d..349eb8e0b1 100644
--- a/lib/checks/color/color-contrast.js
+++ b/lib/checks/color/color-contrast.js
@@ -41,14 +41,14 @@ var data = {
 
 this.data(data);
 
-if (!cr.isValid || equalRatio) {
-	this.relatedNodes(bgNodes);
-}
-
 //We don't know, so we'll put it into Can't Tell
 if (fgColor === null || bgColor === null || equalRatio) {
 	missing = null;
 	axe.commons.color.incompleteData.clear();
+	this.relatedNodes(bgNodes);
 	return undefined;
+
+} else if (!cr.isValid) {
+	this.relatedNodes(bgNodes);
 }
 return cr.isValid;
diff --git a/lib/checks/color/link-in-text-block.js b/lib/checks/color/link-in-text-block.js
index f91a49c485..8bcf7eddae 100644
--- a/lib/checks/color/link-in-text-block.js
+++ b/lib/checks/color/link-in-text-block.js
@@ -24,6 +24,8 @@ while (parentBlock.nodeType === 1 && !isBlock(parentBlock)) {
 	parentBlock = parentBlock.parentNode;
 }
 
+this.relatedNodes([ parentBlock ]);
+
 // TODO: Check the :visited state of the link
 if (color.elementIsDistinct(node, parentBlock)) {
 	return true;
diff --git a/test/checks/color/color-contrast.js b/test/checks/color/color-contrast.js
index 82b9ab56e2..340dd3c2f6 100644
--- a/test/checks/color/color-contrast.js
+++ b/test/checks/color/color-contrast.js
@@ -212,4 +212,23 @@ describe('color-contrast', function () {
 		assert.equal(checkContext._data.missingData, 'equalRatio');
 		assert.equal(checkContext._data.contrastRatio, 1);
 	});
+
+	it('returns relatedNodes with undefined', function () {
+		var dataURI = 'data:image/gif;base64,R0lGODlhEAAQAMQAAORHHOVSKudfOulrSOp3WOyDZu6QdvCchPGolfO0o/' +
+		'XBs/fNwfjZ0frl3/zy7////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAkA' +
+		'ABAALAAAAAAQABAAAAVVICSOZGlCQAosJ6mu7fiyZeKqNKToQGDsM8hBADgUXoGAiqhSvp5QAnQKGIgUhwFUYLCVDFCrKU' +
+		'E1lBavAViFIDlTImbKC5Gm2hB0SlBCBMQiB0UjIQA7';
+
+		fixture.innerHTML = '<div id="background" style="background:url('+ dataURI +') no-repeat left center; padding: 5px 0 5px 25px;">' +
+			'<p id="target">Text 1</p>' +
+			'</div>';
+
+		var target = fixture.querySelector('#target');
+		assert.isUndefined(checks['color-contrast'].evaluate.call(checkContext, target));
+
+		assert.equal(
+			checkContext._relatedNodes[0],
+			document.querySelector('#background')
+		);
+	});
 });
diff --git a/test/checks/color/link-in-text-block.js b/test/checks/color/link-in-text-block.js
index 9c8d5584f3..d37444f631 100644
--- a/test/checks/color/link-in-text-block.js
+++ b/test/checks/color/link-in-text-block.js
@@ -207,8 +207,17 @@ describe('link-in-text-block', function () {
 
 	});
 
-	it('looks at the :visited state');
-
-	it('looks at selectors using :link');
-
+	it('returns relatedNodes with undefined', function () {
+			var linkElm = getLinkElm({ }, {
+				color: '#000010',
+				backgroundImage: 'url(data:image/gif;base64,R0lGODlhEAAQAMQAAORHHOVSKudfOulrSOp3WOyDZu6QdvCchPGolfO0o/XBs/fNwfjZ0frl3/zy7////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAkAABAALAAAAAAQABAAAAVVICSOZGlCQAosJ6mu7fiyZeKqNKToQGDsM8hBADgUXoGAiqhSvp5QAnQKGIgUhwFUYLCVDFCrKUE1lBavAViFIDlTImbKC5Gm2hB0SlBCBMQiB0UjIQA7)'
+			}, {
+				color: '#000000'
+			});
+			assert.isUndefined(checks['link-in-text-block'].evaluate.call(checkContext, linkElm));
+			assert.equal(
+				checkContext._relatedNodes[0],
+				linkElm.parentNode
+			);
+		});
 });
\ No newline at end of file

From 480141b5cc9645f49576571eb8b659b2a78cccd7 Mon Sep 17 00:00:00 2001
From: Wilco Fiers <wilco.fiers@deque.com>
Date: Fri, 7 Jul 2017 15:32:34 +0200
Subject: [PATCH 054/142] test: Shadow DOM tests for table rules

---
 lib/commons/dom/has-content.js          | 46 +++++++++++++++----------
 test/checks/.jshintrc                   |  1 +
 test/checks/tables/td-has-header.js     | 15 ++++++++
 test/checks/tables/th-has-data-cells.js | 17 ++++++++-
 4 files changed, 59 insertions(+), 20 deletions(-)

diff --git a/lib/commons/dom/has-content.js b/lib/commons/dom/has-content.js
index 0ea09e8666..72bcfb449f 100644
--- a/lib/commons/dom/has-content.js
+++ b/lib/commons/dom/has-content.js
@@ -1,4 +1,17 @@
 /*global dom, aria, axe */
+const hiddenTextElms = [
+  'HEAD', 'TITLE', 'TEMPLATE', 'SCRIPT','STYLE',
+  'IFRAME', 'OBJECT', 'VIDEO', 'AUDIO', 'NOSCRIPT'
+];
+
+function hasChildTextNodes (elm) {
+  if (!hiddenTextElms.includes(elm.actualNode.nodeName.toUpperCase())) {
+    return elm.children.some(({ actualNode }) => (
+      actualNode.nodeType === 3 && actualNode.nodeValue.trim()
+    ));
+  }
+}
+
 /**
  * Check that the element has visible content
  * in the form of either text, an aria-label or visual content such as image
@@ -6,25 +19,20 @@
  * @param {Object} virtual DOM node
  * @return boolean
  */
-dom.hasContent = function hasContent(elm) {
-  if (elm.actualNode instanceof Node === false) {
+dom.hasContent = function hasContent (elm) {
+  if (!elm.actualNode) {
     elm = axe.utils.getNodeFromTree(axe._tree[0], elm);
   }
-  if (
-    elm.actualNode.textContent.trim() ||
-    aria.label(elm)
-  ) {
-    return true;
-  }
-
-  const contentElms = axe.utils.querySelectorAll(elm, '*');
-  for (let i = 0; i < contentElms.length; i++) {
-    if (
-      aria.label(contentElms[i]) ||
-      dom.isVisualContent(contentElms[i].actualNode)
-    ) {
-      return true;
-    }
-  }
-  return false;
+  return (
+    // It has text
+    hasChildTextNodes(elm) ||
+     // It is a graphical element
+    dom.isVisualContent(elm.actualNode) ||
+     // It has an ARIA label
+    !!aria.label(elm) ||
+    // or one of it's descendants does
+    elm.children.some(child => (
+      child.actualNode.nodeType === 1 && dom.hasContent(child)
+    ))
+  );
 };
diff --git a/test/checks/.jshintrc b/test/checks/.jshintrc
index 83f8eee74e..01fad568db 100644
--- a/test/checks/.jshintrc
+++ b/test/checks/.jshintrc
@@ -3,6 +3,7 @@
 	"globals": {
 		"describe": true,
 		"it": true,
+		"xit": true,
 		"before": true,
 		"beforeEach": true,
 		"after": true,
diff --git a/test/checks/tables/td-has-header.js b/test/checks/tables/td-has-header.js
index 363e4072d7..df245d2af8 100644
--- a/test/checks/tables/td-has-header.js
+++ b/test/checks/tables/td-has-header.js
@@ -2,6 +2,7 @@ describe('td-has-header', function () {
 	'use strict';
 
 	var fixture = document.getElementById('fixture');
+	var shadowSupport = (document.body && typeof document.body.attachShadow === 'function');
 	var checkContext = {
 		_relatedNodes: [],
 		_data: null,
@@ -203,4 +204,18 @@ describe('td-has-header', function () {
 		var node = fixture.querySelector('table');
 		assert.isFalse(checks['td-has-header'].evaluate.call(checkContext, node));
 	});
+
+	(shadowSupport ? it : xit)('recognizes shadow tree content', function () {
+		fixture.innerHTML = '<div id="shadow"> <b>header</b> </div>';
+		var shadow = fixture.querySelector('#shadow').attachShadow({ mode: 'open' });
+		shadow.innerHTML =
+			'<table>' +
+			'  <tr> <th><slot></slot> </tr>' +
+			'  <tr> <td> data </td> </tr>' +
+			'</table>';
+
+		axe._tree = axe.utils.getFlattenedTree(fixture);
+		var node = axe.utils.querySelectorAll(axe._tree, 'table')[0].actualNode;
+		assert.isTrue(checks['td-has-header'].evaluate.call(checkContext, node));
+	});
 });
diff --git a/test/checks/tables/th-has-data-cells.js b/test/checks/tables/th-has-data-cells.js
index 4bab98d144..8ffe5e9b32 100644
--- a/test/checks/tables/th-has-data-cells.js
+++ b/test/checks/tables/th-has-data-cells.js
@@ -2,6 +2,7 @@ describe('th-has-data-cells', function () {
 	'use strict';
 
 	var fixture = document.getElementById('fixture');
+	var shadowSupport = (document.body && typeof document.body.attachShadow === 'function');
 	var checkContext = {
 		_relatedNodes: [],
 		_data: null,
@@ -129,4 +130,18 @@ describe('th-has-data-cells', function () {
 		var node = fixture.querySelector('table');
 		assert.isUndefined(checks['th-has-data-cells'].evaluate.call(checkContext, node));
 	});
-});
\ No newline at end of file
+
+	(shadowSupport ? it : xit)('recognizes shadow tree content', function () {
+		fixture.innerHTML = '<div id="shadow"> <b>data</b> </div>';
+		var shadow = fixture.querySelector('#shadow').attachShadow({ mode: 'open' });
+		shadow.innerHTML =
+			'<table>' +
+			'  <tr> <th> header </th> </tr>' +
+			'  <tr> <td><slot></slot></td> </tr>' +
+			'</table>';
+
+		axe._tree = axe.utils.getFlattenedTree(fixture);
+		var node = axe.utils.querySelectorAll(axe._tree, 'table')[0].actualNode;
+		assert.isTrue(checks['th-has-data-cells'].evaluate.call(checkContext, node));
+	});
+});

From 56c3d3bbade4a69bf5a5ff3b12edb4991bc76db1 Mon Sep 17 00:00:00 2001
From: Marcy Sutton <marcy.sutton@deque.com>
Date: Fri, 7 Jul 2017 14:57:01 -0700
Subject: [PATCH 055/142] chore: ignore growl in retire

---
 .retireignore.json | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.retireignore.json b/.retireignore.json
index 9f1b632d10..9629ca5eed 100644
--- a/.retireignore.json
+++ b/.retireignore.json
@@ -22,5 +22,13 @@
 	{
 		"path": "node_modules/request",
 		"justification" : "Used only for testing"
+	},
+	{
+		"path": "node_modules/mocha",
+		"justification": "Used only for testing"
+	},
+	{
+		"path": "node_modules/growl",
+		"justification": "Temporary disabling until vuln is fixed"
 	}
 ]
\ No newline at end of file

From 3b0f419f10b1dedaf0fa3a7b4200af846f390086 Mon Sep 17 00:00:00 2001
From: Dylan Barrell <dylan@barrell.com>
Date: Sat, 24 Jun 2017 11:23:52 -0400
Subject: [PATCH 056/142] Add instructions on debugging on CircleCI

---
 CONTRIBUTING.md | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 52ec07bd5b..0fd3b4b33e 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -136,3 +136,43 @@ describe('Module', () => {
 	});
 });
 ```
+## Debugging tests that only fail on CircleCI
+
+First install an X-Windows client on your machine. XQuartz is a good one.
+
+Then follow the [instructions here to connect the X-Windows on CircleCI to XQuartz](https://circleci.com/docs/1.0/browser-debugging/#x11-forwarding-over-ssh)
+
+Start the build using the "Retry the build with SSH enabled" option in the CircleCI interface
+
+Copy the SSH command and add the -X flag to it for example
+
+```
+ssh -X -p 64605 ubuntu@13.58.157.61
+```
+
+When you login, set up the environment and start the chrome browser
+
+```
+export DISPLAY=localhost:10.0
+/opt/google/chrome/chrome
+```
+
+### .Xauthority does not exist
+
+Edit the ~/.Xauthority file and just save it with the following commands
+
+```
+vi ~/.Xauthority
+:wq
+```
+
+### Starting the web server
+
+Log into a second ssh terminal (without -X) and execute the following commands
+
+```
+cd axe-core
+grunt connect watch
+```
+
+Load your test file URL in the Chrome browser opened in XQuartz

From 27489f36ac731e6fca8e6398119527bc6e22eaf2 Mon Sep 17 00:00:00 2001
From: Marcy Sutton <marcy.sutton@deque.com>
Date: Mon, 10 Jul 2017 16:56:18 -0700
Subject: [PATCH 057/142] test: add shadowDOM test utility

---
 test/checks/visibility/hidden-content.js |  2 +-
 test/commons/aria/attributes.js          |  4 +++-
 test/commons/dom/find-up.js              |  5 +++--
 test/commons/dom/get-composed-parent.js  |  2 +-
 test/commons/dom/get-root-node.js        |  3 ++-
 test/commons/dom/has-content.js          |  2 +-
 test/commons/dom/idrefs.js               |  5 +++--
 test/commons/dom/is-visible.js           |  5 +++--
 test/commons/text/visible.js             |  3 ++-
 test/core/utils/contains.js              |  5 +++--
 test/core/utils/flattened-tree.js        |  8 ++++----
 test/core/utils/get-selector.js          |  5 +++--
 test/core/utils/is-hidden.js             |  7 ++++---
 test/runner.tmpl                         |  1 +
 test/testutils.js                        | 19 +++++++++++++++++++
 15 files changed, 53 insertions(+), 23 deletions(-)
 create mode 100644 test/testutils.js

diff --git a/test/checks/visibility/hidden-content.js b/test/checks/visibility/hidden-content.js
index f563f57ed2..0b5fa6bda8 100644
--- a/test/checks/visibility/hidden-content.js
+++ b/test/checks/visibility/hidden-content.js
@@ -3,7 +3,7 @@ describe('hidden content', function () {
 	'use strict';
 
 	var fixture = document.getElementById('fixture');
-	var shadowSupport = document.body && typeof document.body.attachShadow === 'function';
+	var shadowSupport = axe.testUtils.shadowSupport.v1;
 	var checkContext = {
 		_data: null,
 		data: function (d) {
diff --git a/test/commons/aria/attributes.js b/test/commons/aria/attributes.js
index 590ee850ff..0c98a465b0 100644
--- a/test/commons/aria/attributes.js
+++ b/test/commons/aria/attributes.js
@@ -136,6 +136,8 @@ describe('aria.validateAttrValue', function () {
 	var orig = axe.commons.aria._lut.attributes,
 		fixture = document.getElementById('fixture');
 
+	var shadowSupport = axe.testUtils.shadowSupport;
+
 	afterEach(function () {
 		axe.commons.aria._lut.attributes = orig;
 		fixture.innerHTML = '';
@@ -213,7 +215,7 @@ describe('aria.validateAttrValue', function () {
 			it('should work in shadow DOM', function () {
 				var shadEl;
 
-				if (document.body && typeof document.body.attachShadow === 'function') {
+				if (shadowSupport.v1) {
 					// shadow DOM v1 - note: v0 is compatible with this code, so no need
 					// to specifically test this
 					fixture.innerHTML = '<div></div>';
diff --git a/test/commons/dom/find-up.js b/test/commons/dom/find-up.js
index 21ada5602b..2b253b6377 100644
--- a/test/commons/dom/find-up.js
+++ b/test/commons/dom/find-up.js
@@ -2,6 +2,7 @@ describe('dom.findUp', function () {
 	'use strict';
 
 	var fixture = document.getElementById('fixture');
+	var shadowSupport = axe.testUtils.shadowSupport;
 
 	afterEach(function () {
 		fixture.innerHTML = '';
@@ -47,7 +48,7 @@ describe('dom.findUp', function () {
 			root.appendChild(div);
 			div.appendChild(createContentSlotted());
 		}
-		if (document.body && typeof document.body.attachShadow === 'function') {
+		if (shadowSupport.v1) {
 			fixture.innerHTML = '<label><div><p><a>hello</a></p></div></label>';
 			makeShadowTree(fixture.querySelector('div'));
 			var tree = axe.utils.getFlattenedTree(fixture.firstChild);
@@ -68,7 +69,7 @@ describe('dom.findUp', function () {
 			root.appendChild(div);
 			div.appendChild(createContent());
 		}
-		if (document.body && typeof document.body.attachShadow === 'function') {
+		if (shadowSupport.v1) {
 			fixture.innerHTML = '<label><div></div></label>';
 			makeShadowTree(fixture.querySelector('div'));
 			var tree = axe.utils.getFlattenedTree(fixture.firstChild);
diff --git a/test/commons/dom/get-composed-parent.js b/test/commons/dom/get-composed-parent.js
index 4dfd41a230..f7c5138b4a 100644
--- a/test/commons/dom/get-composed-parent.js
+++ b/test/commons/dom/get-composed-parent.js
@@ -3,7 +3,7 @@ describe('dom.getComposedParent', function () {
   'use strict';
   var getComposedParent = axe.commons.dom.getComposedParent;
   var fixture = document.getElementById('fixture');
-  var shadowSupport = document.body && typeof document.body.attachShadow === 'function';
+  var shadowSupport = axe.testUtils.shadowSupport.v1;
 
   afterEach(function () {
     fixture.innerHTML = '';
diff --git a/test/commons/dom/get-root-node.js b/test/commons/dom/get-root-node.js
index 58ec94cb7b..ca36c4cfa6 100644
--- a/test/commons/dom/get-root-node.js
+++ b/test/commons/dom/get-root-node.js
@@ -10,6 +10,7 @@ describe('dom.getRootNode', function () {
 	'use strict';
 
 	var fixture = document.getElementById('fixture');
+	var shadowSupported = axe.testUtils.shadowSupport.v1;
 
 	afterEach(function () {
 		fixture.innerHTML = '';
@@ -27,7 +28,7 @@ describe('dom.getRootNode', function () {
 	it('should return the shadow root when it is inside the shadow DOM', function () {
 		var shadEl;
 
-		if (document.body && typeof document.body.attachShadow === 'function') {
+		if (shadowSupported) {
 			// shadow DOM v1 - note: v0 is compatible with this code, so no need
 			// to specifically test this
 			fixture.innerHTML = '<div></div>';
diff --git a/test/commons/dom/has-content.js b/test/commons/dom/has-content.js
index 315956bafd..48a46916d2 100644
--- a/test/commons/dom/has-content.js
+++ b/test/commons/dom/has-content.js
@@ -3,7 +3,7 @@ describe('dom.hasContent', function () {
   'use strict';
   var hasContent = axe.commons.dom.hasContent;
   var fixture = document.getElementById('fixture');
-  var shadowSupport = document.body && typeof document.body.attachShadow === 'function';
+  var shadowSupport = axe.testUtils.shadowSupport.v1;
   var tree;
 
   it('returns false if there is no content', function () {
diff --git a/test/commons/dom/idrefs.js b/test/commons/dom/idrefs.js
index 0ddce41be6..6a578be584 100644
--- a/test/commons/dom/idrefs.js
+++ b/test/commons/dom/idrefs.js
@@ -19,6 +19,7 @@ describe('dom.idrefs', function () {
 	'use strict';
 
 	var fixture = document.getElementById('fixture');
+	var shadowSupported = axe.testUtils.shadowSupport.v1;
 
 	afterEach(function () {
 		fixture.innerHTML = '';
@@ -37,7 +38,7 @@ describe('dom.idrefs', function () {
 	});
 
 	it('should find only referenced nodes within the current root: shadow DOM', function () {
-		if (document.body && typeof document.body.attachShadow === 'function') {
+		if (shadowSupported) {
 			// shadow DOM v1 - note: v0 is compatible with this code, so no need
 			// to specifically test this
 			fixture.innerHTML = '<div target="target"><div id="target"></div></div>';
@@ -51,7 +52,7 @@ describe('dom.idrefs', function () {
 	});
 
 	it('should find only referenced nodes within the current root: document', function () {
-		if (document.body && typeof document.body.attachShadow === 'function') {
+		if (shadowSupported) {
 			// shadow DOM v1 - note: v0 is compatible with this code, so no need
 			// to specifically test this
 			fixture.innerHTML = '<div target="target" class="parent"><div id="target"></div></div>';
diff --git a/test/commons/dom/is-visible.js b/test/commons/dom/is-visible.js
index d6adfaf3e9..9448da5bbe 100644
--- a/test/commons/dom/is-visible.js
+++ b/test/commons/dom/is-visible.js
@@ -1,6 +1,7 @@
 describe('dom.isVisible', function () {
 	'use strict';
 	var fixture = document.getElementById('fixture');
+	var shadowSupported = axe.testUtils.shadowSupport.v1;
 	var fakeNode = {
 		nodeType: Node.ELEMENT_NODE,
 		nodeName: 'div'
@@ -167,7 +168,7 @@ describe('dom.isVisible', function () {
 				root.appendChild(div);
 				div.appendChild(createContentSlotted());
 			}
-			if (document.body && typeof document.body.attachShadow === 'function') {
+			if (shadowSupported) {
 				fixture.innerHTML = '<div><a>hello</a></div>';
 				makeShadowTree(fixture.firstChild);
 				var tree = axe.utils.getFlattenedTree(fixture.firstChild);
@@ -187,7 +188,7 @@ describe('dom.isVisible', function () {
 				root.appendChild(div);
 				div.appendChild(createContentSlotted());
 			}
-			if (document.body && typeof document.body.attachShadow === 'function') {
+			if (shadowSupported) {
 				fixture.innerHTML = '<div><p><a>hello</a></p></div>';
 				makeShadowTree(fixture.firstChild);
 				var tree = axe.utils.getFlattenedTree(fixture.firstChild);
diff --git a/test/commons/text/visible.js b/test/commons/text/visible.js
index eb67142178..11b46d79bb 100644
--- a/test/commons/text/visible.js
+++ b/test/commons/text/visible.js
@@ -2,6 +2,7 @@ describe('text.visible', function () {
 	'use strict';
 
 	var fixture = document.getElementById('fixture');
+	var shadowSupported = axe.testUtils.shadowSupport.v1;
 
 	afterEach(function () {
 		document.getElementById('fixture').innerHTML = '';
@@ -84,7 +85,7 @@ describe('text.visible', function () {
 				root.appendChild(div);
 				div.appendChild(createContentSlotted());
 			}
-			if (document.body && typeof document.body.attachShadow === 'function') {
+			if (shadowSupported) {
 				fixture.innerHTML = '<div><a>hello</a></div>';
 				makeShadowTree(fixture.firstChild);
 				var tree = axe.utils.getFlattenedTree(fixture.firstChild);
diff --git a/test/core/utils/contains.js b/test/core/utils/contains.js
index c82cd24638..e7cf49174e 100644
--- a/test/core/utils/contains.js
+++ b/test/core/utils/contains.js
@@ -2,6 +2,7 @@ describe('axe.utils.contains', function () {
 	'use strict';
 
 	var fixture = document.getElementById('fixture');
+	var shadowSupported = axe.testUtils.shadowSupport.v1;
 
 	afterEach(function () {
 		fixture.innerHTML = '';
@@ -73,7 +74,7 @@ describe('axe.utils.contains', function () {
 			root.appendChild(div);
 			div.appendChild(createContentContains());
 		}
-		if (document.body && typeof document.body.attachShadow === 'function') {
+		if (shadowSupported) {
 			// shadow DOM v1 - note: v0 is compatible with this code, so no need
 			// to specifically test this
 			fixture.innerHTML = '<div></div>';
@@ -101,7 +102,7 @@ describe('axe.utils.contains', function () {
 			root.appendChild(div);
 			div.appendChild(createContentSlotted());
 		}
-		if (document.body && typeof document.body.attachShadow === 'function') {
+		if (shadowSupported) {
 			fixture.innerHTML = '<div></div>';
 			makeShadowTree(fixture.firstChild);
 			tree = axe.utils.getFlattenedTree(fixture.firstChild)[0].children;
diff --git a/test/core/utils/flattened-tree.js b/test/core/utils/flattened-tree.js
index 0ebba613d3..f8121c219e 100644
--- a/test/core/utils/flattened-tree.js
+++ b/test/core/utils/flattened-tree.js
@@ -1,4 +1,5 @@
 var fixture = document.getElementById('fixture');
+var shadowSupport = axe.testUtils.shadowSupport;
 
 function createStyle (box) {
 	'use strict';
@@ -65,7 +66,7 @@ function shadowIdAssertions () {
 
 }
 
-if (document.body && typeof document.body.createShadowRoot === 'function') {
+if (shadowSupport.v0) {
 	describe('flattened-tree shadow DOM v0', function () {
 		'use strict';
 		afterEach(function () {
@@ -106,7 +107,7 @@ if (document.body && typeof document.body.createShadowRoot === 'function') {
 	});
 }
 
-if (document.body && typeof document.body.attachShadow === 'function') {
+if (shadowSupport.v1) {
 	describe('flattened-tree shadow DOM v1', function () {
 		'use strict';
 		afterEach(function () {
@@ -233,8 +234,7 @@ if (document.body && typeof document.body.attachShadow === 'function') {
 	});
 }
 
-if (document.body && typeof document.body.attachShadow === 'undefined' &&
-	typeof document.body.createShadowRoot === 'undefined') {
+if (shadowSupport.undefined) {
 	describe('flattened-tree', function () {
 		'use strict';
 		it('SHADOW DOM TESTS DEFERRED, NO SUPPORT');
diff --git a/test/core/utils/get-selector.js b/test/core/utils/get-selector.js
index d5d24dddeb..cd186f57b5 100644
--- a/test/core/utils/get-selector.js
+++ b/test/core/utils/get-selector.js
@@ -18,6 +18,7 @@ describe('axe.utils.getSelector', function () {
 	'use strict';
 
 	var fixture = document.getElementById('fixture');
+	var shadowSupported = axe.testUtils.shadowSupport.v1;
 
 	afterEach(function () {
 		fixture.innerHTML = '';
@@ -305,7 +306,7 @@ describe('axe.utils.getSelector', function () {
 	it('no options: should work with shadow DOM', function () {
 		var shadEl;
 
-		if (document.body && typeof document.body.attachShadow === 'function') {
+		if (shadowSupported) {
 			// shadow DOM v1 - note: v0 is compatible with this code, so no need
 			// to specifically test this
 			fixture.innerHTML = '<div></div>';
@@ -320,7 +321,7 @@ describe('axe.utils.getSelector', function () {
 	it('toRoot: should work with shadow DOM', function () {
 		var shadEl;
 
-		if (document.body && typeof document.body.attachShadow === 'function') {
+		if (shadowSupported) {
 			// shadow DOM v1 - note: v0 is compatible with this code, so no need
 			// to specifically test this
 			fixture.innerHTML = '<div></div>';
diff --git a/test/core/utils/is-hidden.js b/test/core/utils/is-hidden.js
index bc12534d50..70c4b2beaa 100644
--- a/test/core/utils/is-hidden.js
+++ b/test/core/utils/is-hidden.js
@@ -18,6 +18,7 @@ describe('axe.utils.isHidden', function () {
 	'use strict';
 
 	var fixture = document.getElementById('fixture');
+	var shadowSupported = axe.testUtils.shadowSupport.v1;
 
 	afterEach(function () {
 		fixture.innerHTML = '';
@@ -71,7 +72,7 @@ describe('axe.utils.isHidden', function () {
 	it('not hidden: should work when the element is inside shadow DOM', function () {
 		var tree, node;
 
-		if (document.body && typeof document.body.attachShadow === 'function') {
+		if (shadowSupported) {
 			// shadow DOM v1 - note: v0 is compatible with this code, so no need
 			// to specifically test this
 			fixture.innerHTML = '<div></div>';
@@ -85,7 +86,7 @@ describe('axe.utils.isHidden', function () {
 	it('hidden: should work when the element is inside shadow DOM', function () {
 		var tree, node;
 
-		if (document.body && typeof document.body.attachShadow === 'function') {
+		if (shadowSupported) {
 			// shadow DOM v1 - note: v0 is compatible with this code, so no need
 			// to specifically test this
 			fixture.innerHTML = '<div style="display:none"></div>';
@@ -107,7 +108,7 @@ describe('axe.utils.isHidden', function () {
 			root.appendChild(div);
 			div.appendChild(createContentSlotted());
 		}
-		if (document.body && typeof document.body.attachShadow === 'function') {
+		if (shadowSupported) {
 			fixture.innerHTML = '<div><p><a>hello</a></p></div>';
 			makeShadowTree(fixture.firstChild);
 			var tree = axe.utils.getFlattenedTree(fixture.firstChild);
diff --git a/test/runner.tmpl b/test/runner.tmpl
index 31351dc027..d53be6d1b6 100644
--- a/test/runner.tmpl
+++ b/test/runner.tmpl
@@ -25,6 +25,7 @@
 	<body>
 		<div id="mocha"></div>
 		<div id="fixture"></div>
+		<script src="/test/testutils.js"></script>
 		<% tests.forEach(function (file) { %>
 			<script src="<%=file%>"></script>
 		<%  }); %>
diff --git a/test/testutils.js b/test/testutils.js
new file mode 100644
index 0000000000..d7cab92b85
--- /dev/null
+++ b/test/testutils.js
@@ -0,0 +1,19 @@
+var testUtils = {};
+
+testUtils.shadowSupport = (function(document) {
+	'use strict';
+	var v0 = document.body && typeof document.body.createShadowRoot === 'function',
+			v1 = document.body && typeof document.body.attachShadow === 'function';
+
+	return {
+		v0: (v0 === true),
+		v1: (v1 === true),
+		undefined: (
+			document.body && typeof document.body.attachShadow === 'undefined' &&
+			typeof document.body.createShadowRoot === 'undefined'
+		)
+	};
+
+})(document);
+
+axe.testUtils = testUtils;
\ No newline at end of file

From ca3a0471940df4d8f939b2557478a2ae173145ae Mon Sep 17 00:00:00 2001
From: Marcy Sutton <marcy.sutton@deque.com>
Date: Mon, 10 Jul 2017 17:04:36 -0700
Subject: [PATCH 058/142] chore: ignore growl in retire

---
 .retireignore.json | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.retireignore.json b/.retireignore.json
index 9f1b632d10..9629ca5eed 100644
--- a/.retireignore.json
+++ b/.retireignore.json
@@ -22,5 +22,13 @@
 	{
 		"path": "node_modules/request",
 		"justification" : "Used only for testing"
+	},
+	{
+		"path": "node_modules/mocha",
+		"justification": "Used only for testing"
+	},
+	{
+		"path": "node_modules/growl",
+		"justification": "Temporary disabling until vuln is fixed"
 	}
 ]
\ No newline at end of file

From 364d5cd0e27e44955e4756270bce5699ba4b1b71 Mon Sep 17 00:00:00 2001
From: Wilco Fiers <wilco.fiers@deque.com>
Date: Tue, 11 Jul 2017 13:03:34 +0200
Subject: [PATCH 059/142] fix: Use testUtils in table tests

---
 lib/commons/aria/label.js               | 4 ++--
 test/checks/tables/td-has-header.js     | 2 +-
 test/checks/tables/th-has-data-cells.js | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/commons/aria/label.js b/lib/commons/aria/label.js
index f9d14849e1..a3bbbfb655 100644
--- a/lib/commons/aria/label.js
+++ b/lib/commons/aria/label.js
@@ -8,8 +8,8 @@
 aria.label = function (node) {
 	var ref, candidate;
 	if (node.actualNode instanceof Node === false) {
-    node = axe.utils.getNodeFromTree(axe._tree[0], node);
-  }
+		node = axe.utils.getNodeFromTree(axe._tree[0], node);
+	}
 
 	if (node.actualNode.getAttribute('aria-labelledby')) {
 		// aria-labelledby
diff --git a/test/checks/tables/td-has-header.js b/test/checks/tables/td-has-header.js
index df245d2af8..92accbdaff 100644
--- a/test/checks/tables/td-has-header.js
+++ b/test/checks/tables/td-has-header.js
@@ -2,7 +2,7 @@ describe('td-has-header', function () {
 	'use strict';
 
 	var fixture = document.getElementById('fixture');
-	var shadowSupport = (document.body && typeof document.body.attachShadow === 'function');
+	var shadowSupport = axe.testUtils.shadowSupport.v1;
 	var checkContext = {
 		_relatedNodes: [],
 		_data: null,
diff --git a/test/checks/tables/th-has-data-cells.js b/test/checks/tables/th-has-data-cells.js
index 8ffe5e9b32..8f0703cfaf 100644
--- a/test/checks/tables/th-has-data-cells.js
+++ b/test/checks/tables/th-has-data-cells.js
@@ -2,7 +2,7 @@ describe('th-has-data-cells', function () {
 	'use strict';
 
 	var fixture = document.getElementById('fixture');
-	var shadowSupport = (document.body && typeof document.body.attachShadow === 'function');
+	var shadowSupport = axe.testUtils.shadowSupport.v1;
 	var checkContext = {
 		_relatedNodes: [],
 		_data: null,

From c52514a4faf8f2a4d47c2d832dbbde9e01a4b719 Mon Sep 17 00:00:00 2001
From: Wilco Fiers <wilco.fiers@deque.com>
Date: Tue, 11 Jul 2017 13:28:29 +0200
Subject: [PATCH 060/142] test: add shadow DOM v0 tests for dom.findUp

---
 test/commons/dom/find-up.js | 42 +++++++++++++++++++++++++++++++++++--
 1 file changed, 40 insertions(+), 2 deletions(-)

diff --git a/test/commons/dom/find-up.js b/test/commons/dom/find-up.js
index 2b253b6377..e96f4983ed 100644
--- a/test/commons/dom/find-up.js
+++ b/test/commons/dom/find-up.js
@@ -1,3 +1,4 @@
+/* global xit */
 describe('dom.findUp', function () {
 	'use strict';
 
@@ -16,8 +17,6 @@ describe('dom.findUp', function () {
 			target = document.getElementById('target');
 
 		assert.equal(axe.commons.dom.findUp(start, '.target'), target, 'Should find it!');
-
-
 	});
 
 	it('should return null if it cant find a match anywhere in the document', function () {
@@ -33,7 +32,46 @@ describe('dom.findUp', function () {
 		var start = document.getElementById('start');
 
 		assert.isNull(axe.commons.dom.findUp(start, '.target'));
+	});
+
+	(shadowSupport.v0 ? it : xit)('should walk up the assigned content (v0)', function () {
+		function createContentSlotted() {
+			var group = document.createElement('div');
+			group.innerHTML = '<div id="target" style="display:none;">Stuff<content></content></div>';
+			return group;
+		}
+		function makeShadowTree(node) {
+			var root = node.createShadowRoot();
+			var div = document.createElement('div');
+			root.appendChild(div);
+			div.appendChild(createContentSlotted());
+		}
+
+		fixture.innerHTML = '<label><div><p><a>hello</a></p></div></label>';
+		makeShadowTree(fixture.querySelector('div'));
+		var tree = axe.utils.getFlattenedTree(fixture.firstChild);
+		var el = axe.utils.querySelectorAll(tree, 'a')[0];
+		assert.equal(axe.commons.dom.findUp(el.actualNode, 'label'), fixture.firstChild);
+	});
+
+	(shadowSupport.v0 ? it : xit)('should walk down the shadow DOM v0', function () {
+		function createContent() {
+			var group = document.createElement('div');
+			group.innerHTML = '<a>thing</a>';
+			return group;
+		}
+		function makeShadowTree(node) {
+			var root = node.createShadowRoot();
+			var div = document.createElement('div');
+			div.appendChild(createContent());
+			root.appendChild(div);
+		}
 
+		fixture.innerHTML = '<label><div></div></label>';
+		makeShadowTree(fixture.querySelector('div'));
+		var tree = axe.utils.getFlattenedTree(fixture.firstChild);
+		var el = axe.utils.querySelectorAll(tree, 'a')[0];
+		assert.equal(axe.commons.dom.findUp(el.actualNode, 'label'), fixture.firstChild);
 	});
 
 	it('should walk up the assigned slot', function () {

From 353b53f67b44ed62b83da6c1e64331b2d4d5ae5c Mon Sep 17 00:00:00 2001
From: Wilco Fiers <WilcoFiers@users.noreply.github.com>
Date: Thu, 13 Jul 2017 12:26:35 +0200
Subject: [PATCH 061/142] fix: Use getAttribute(id) over .id (#374)

* fix implicit attribute us in duplicate-id

* fix: Only access node id's through getAttribute

* Minor build chores for whitespace and lockfile (#366)

* chore: convert spaces to tabs in Gruntfile

Align the file with the EditorConfig setting

* chore: ignore package-lock.json

This file is produced by NPM 5, but this repo didn't use the old
shrinkwrap version so this should be excluded

* fix: Set relatedNodes on color/link-in-block rules (#407)

* chore: ignore growl in retire

* Add instructions on debugging on CircleCI

* chore: Fix spacing issues

* fix implicit attribute us in duplicate-id

* fix: Only access node id's through getAttribute

* chore: Fix spacing issues

* fix: JSHint issue
---
 lib/checks/aria/required-parent.js     |  7 ++++---
 lib/checks/label/explicit.js           |  6 ++++--
 lib/checks/label/multiple-label.js     |  6 +++---
 lib/checks/shared/duplicate-id.js      |  6 ++++--
 lib/checks/tables/td-headers-attr.js   |  8 ++++----
 lib/checks/tables/th-has-data-cells.js |  3 ++-
 lib/commons/table/is-header.js         |  5 +++--
 lib/commons/text/accessible-text.js    |  5 +++--
 lib/commons/text/label.js              |  5 +++--
 lib/core/utils/get-selector.js         |  6 +++---
 lib/core/utils/get-xpath.js            |  9 ++++-----
 lib/rules/color-contrast-matches.js    |  7 ++++---
 test/checks/shared/duplicate-id.js     |  9 +++++++++
 test/commons/table/is-header.js        | 10 ++++++----
 test/core/utils/get-selector.js        |  2 ++
 15 files changed, 58 insertions(+), 36 deletions(-)

diff --git a/lib/checks/aria/required-parent.js b/lib/checks/aria/required-parent.js
index 87235a548f..d227f0635d 100644
--- a/lib/checks/aria/required-parent.js
+++ b/lib/checks/aria/required-parent.js
@@ -34,11 +34,12 @@ function getAriaOwners(element) {
 		o = null;
 
 	while (element) {
-		if (element.id) {
-			o = document.querySelector('[aria-owns~=' + axe.commons.utils.escapeSelector(element.id) + ']');
+		if (element.getAttribute('id')) {
+			const id = axe.commons.utils.escapeSelector(element.getAttribute('id'));
+			o = document.querySelector(`[aria-owns~=${id}]`);
 			if (o) { owners.push(o); }
 		}
-		element = element.parentNode;
+		element = element.parentElement;
 	}
 
 	return owners.length ? owners : null;
diff --git a/lib/checks/label/explicit.js b/lib/checks/label/explicit.js
index 4bc5bdf082..bff93e1482 100644
--- a/lib/checks/label/explicit.js
+++ b/lib/checks/label/explicit.js
@@ -1,5 +1,7 @@
-if (node.id) {
-	var label = document.querySelector('label[for="' + axe.commons.utils.escapeSelector(node.id) + '"]');
+if (node.getAttribute('id')) {
+	const id = axe.commons.utils.escapeSelector(node.getAttribute('id'));
+	const label = document.querySelector(`label[for="${id}"]`);
+
 	if (label) {
 		return !!axe.commons.text.accessibleText(label);
 	}
diff --git a/lib/checks/label/multiple-label.js b/lib/checks/label/multiple-label.js
index ec10b2f192..add50dc237 100644
--- a/lib/checks/label/multiple-label.js
+++ b/lib/checks/label/multiple-label.js
@@ -1,6 +1,6 @@
-var labels = [].slice.call(document.querySelectorAll('label[for="' +
-	axe.commons.utils.escapeSelector(node.id) + '"]')),
-	parent = node.parentNode;
+const id = axe.commons.utils.escapeSelector(node.getAttribute('id'));
+let labels = Array.from(document.querySelectorAll(`label[for="${id}"]`));
+let parent = node.parentNode;
 
 if (labels.length) {
 	// filter out hidden labels because they're fine
diff --git a/lib/checks/shared/duplicate-id.js b/lib/checks/shared/duplicate-id.js
index 1d53a480a0..70b5ae79b3 100644
--- a/lib/checks/shared/duplicate-id.js
+++ b/lib/checks/shared/duplicate-id.js
@@ -1,11 +1,13 @@
 // Since empty ID's are not meaningful and are ignored by Edge, we'll
 // let those pass.
-if (!node.id.trim()) {
+if (!node.getAttribute('id').trim()) {
 	return true;
 }
 
-var matchingNodes = document.querySelectorAll('[id="' + axe.commons.utils.escapeSelector(node.id) + '"]');
+const id = axe.commons.utils.escapeSelector(node.getAttribute('id'));
+var matchingNodes = document.querySelectorAll(`[id="${id}"]`);
 var related = [];
+
 for (var i = 0; i < matchingNodes.length; i++) {
 	if (matchingNodes[i] !== node) {
 		related.push(matchingNodes[i]);
diff --git a/lib/checks/tables/td-headers-attr.js b/lib/checks/tables/td-headers-attr.js
index e60e3992f1..52f828f95a 100644
--- a/lib/checks/tables/td-headers-attr.js
+++ b/lib/checks/tables/td-headers-attr.js
@@ -8,8 +8,8 @@ for (var rowIndex = 0, rowLength = node.rows.length; rowIndex < rowLength; rowIn
 }
 
 var ids = cells.reduce(function (ids, cell) {
-	if (cell.id) {
-		ids.push(cell.id);
+	if (cell.getAttribute('id')) {
+		ids.push(cell.getAttribute('id'));
 	}
 	return ids;
 }, []);
@@ -30,8 +30,8 @@ var badCells = cells.reduce(function (badCells, cell) {
 
 	if (headers.length !== 0) {
 		// Check if the cell's id is in this list
-		if (cell.id) {
-			isSelf = (headers.indexOf(cell.id.trim()) !== -1);
+		if (cell.getAttribute('id')) {
+			isSelf = (headers.indexOf(cell.getAttribute('id').trim()) !== -1);
 		}
 
 		// Check if the headers are of cells inside the table
diff --git a/lib/checks/tables/th-has-data-cells.js b/lib/checks/tables/th-has-data-cells.js
index 81f966c28a..4b86b932b5 100644
--- a/lib/checks/tables/th-has-data-cells.js
+++ b/lib/checks/tables/th-has-data-cells.js
@@ -30,7 +30,8 @@ var tableGrid = tableUtils.toGrid(node);
 
 // Look for all the bad headers
 var out = headers.reduce(function (res, header) {
-	if (header.id && reffedHeaders.indexOf(header.id) !== -1) {
+	if (header.getAttribute('id') &&
+			reffedHeaders.includes(header.getAttribute('id'))) {
 		return (!res ? res : true);
 	}
 
diff --git a/lib/commons/table/is-header.js b/lib/commons/table/is-header.js
index 906a9da254..5edcb8df77 100644
--- a/lib/commons/table/is-header.js
+++ b/lib/commons/table/is-header.js
@@ -10,8 +10,9 @@ table.isHeader = function (cell) {
 		return true;
 	}
 
-	if (cell.id) {
-		return !!document.querySelector('[headers~="' + axe.utils.escapeSelector(cell.id) + '"]');
+	if (cell.getAttribute('id')) {
+		const id = axe.utils.escapeSelector(cell.getAttribute('id'));
+		return !!document.querySelector(`[headers~="${id}"]`);
 	}
 
 	return false;
diff --git a/lib/commons/text/accessible-text.js b/lib/commons/text/accessible-text.js
index 7723d239e8..ff71a146e7 100644
--- a/lib/commons/text/accessible-text.js
+++ b/lib/commons/text/accessible-text.js
@@ -21,8 +21,9 @@ var phrasingElements = ['A', 'EM', 'STRONG', 'SMALL', 'MARK', 'ABBR', 'DFN', 'I'
  */
 function findLabel(element) {
 	var ref = null;
-	if (element.id) {
-		ref = document.querySelector('label[for="' + axe.utils.escapeSelector(element.id) + '"]');
+	if (element.getAttribute('id')) {
+		const id = axe.utils.escapeSelector(element.getAttribute('id'));
+		ref = document.querySelector(`label[for="${id}"]`);
 		if (ref) {
 			return ref;
 		}
diff --git a/lib/commons/text/label.js b/lib/commons/text/label.js
index 781d2bea1f..40c4eedeee 100644
--- a/lib/commons/text/label.js
+++ b/lib/commons/text/label.js
@@ -14,8 +14,9 @@ text.label = function (node) {
 	}
 
 	// explicit label
-	if (node.id) {
-		ref = document.querySelector('label[for="' + axe.utils.escapeSelector(node.id) + '"]');
+	if (node.getAttribute('id')) {
+		const id = axe.commons.utils.escapeSelector(node.getAttribute('id'));
+		ref = document.querySelector(`label[for="${id}"]`);
 		candidate = ref && text.visible(ref, true);
 		if (candidate) {
 			return candidate;
diff --git a/lib/core/utils/get-selector.js b/lib/core/utils/get-selector.js
index 667a8d61d7..261c7b6530 100644
--- a/lib/core/utils/get-selector.js
+++ b/lib/core/utils/get-selector.js
@@ -49,10 +49,10 @@ function getNthChildString (elm, selector) {
 const createSelector = {
   // Get ID properties
   getElmId (elm) {
-  	if (!elm.id) {
+  	if (!elm.getAttribute('id')) {
   		return;
   	}
-  	const id = '#' + escapeSelector(elm.id || '');
+  	const id = '#' + escapeSelector(elm.getAttribute('id') || '');
     if (
     	// Don't include youtube's uid values, they change  on reload
     	!id.match(/player_uid_/) &&
@@ -88,7 +88,7 @@ const createSelector = {
   },
   // Has a name property, but no ID (Think input fields)
   getElmNameProp (elm) {
-    if (!elm.id && elm.name) {
+    if (!elm.hasAttribute('id') && elm.name) {
       return '[name="' + escapeSelector(elm.name) + '"]';
     }
   },
diff --git a/lib/core/utils/get-xpath.js b/lib/core/utils/get-xpath.js
index 3308df1b16..8ae0f59c28 100644
--- a/lib/core/utils/get-xpath.js
+++ b/lib/core/utils/get-xpath.js
@@ -46,16 +46,15 @@ function getXPathArray(node, path) {
 		} while (sibling);
 	}
 
-	if(node.nodeType === 1) {
+	if (node.nodeType === 1) {
 		var element = {};
 		element.str = node.nodeName.toLowerCase();
 		// add the id and the count so we can construct robust versions of the xpath
-		if(node.getAttribute && node.getAttribute('id') &&
-			node.ownerDocument.querySelectorAll('#' + axe.utils.escapeSelector(node.id)).length === 1) {
-
+		var id = node.getAttribute && axe.utils.escapeSelector(node.getAttribute('id'));
+		if (id && node.ownerDocument.querySelectorAll('#' + id).length === 1) {
 			element.id = node.getAttribute('id');
 		}
-		if(count > 1) {
+		if (count > 1) {
 			element.count = count;
 		}
 		path.push(element);
diff --git a/lib/rules/color-contrast-matches.js b/lib/rules/color-contrast-matches.js
index 9622773fb4..43a3617aa0 100644
--- a/lib/rules/color-contrast-matches.js
+++ b/lib/rules/color-contrast-matches.js
@@ -54,9 +54,10 @@ if (nodeName === 'LABEL' || nodeParentLabel) {
 }
 
 // label of disabled control associated w/ aria-labelledby
-if (node.id) {
-	var candidate = doc.querySelector('[aria-labelledby~=' + axe.commons.utils.escapeSelector(node.id) + ']');
-	if (candidate && candidate.disabled) {
+if (node.getAttribute('id')) {
+	const id = axe.commons.utils.escapeSelector(node.getAttribute('id'));
+	const candidate = doc.querySelector(`[aria-labelledby~="${id}"]`);
+	if (candidate && candidate.hasAttribute('disabled')) {
 		return false;
 	}
 }
diff --git a/test/checks/shared/duplicate-id.js b/test/checks/shared/duplicate-id.js
index 967e5ca6ce..93d8d41991 100644
--- a/test/checks/shared/duplicate-id.js
+++ b/test/checks/shared/duplicate-id.js
@@ -49,4 +49,13 @@ describe('duplicate-id', function () {
 		assert.isTrue(checks['duplicate-id'].evaluate.call(checkContext, node));
 	});
 
+	it('should allow overwrote ids', function () {
+		fixture.innerHTML = '<form data-testelm="1" id="target"><label>mylabel' + 
+			'<input name="id">' +
+		'</label></form>';
+		var node = fixture.querySelector('[data-testelm="1"]');
+
+		assert.isTrue(checks['duplicate-id'].evaluate.call(checkContext, node));
+	});
+
 });
diff --git a/test/commons/table/is-header.js b/test/commons/table/is-header.js
index ca6d7d10c4..878afc73e0 100644
--- a/test/commons/table/is-header.js
+++ b/test/commons/table/is-header.js
@@ -5,9 +5,11 @@ describe('table.isHeader', function () {
 	}
 
 	var fixture = $id('fixture');
+	var cell;
 
 	afterEach(function () {
-		fixture.innerHTML = '';
+		fixture.innerHTML = '<table><tr><th id="cell"></th></tr></table>';
+		cell = $id('cell');
 	});
 
 	it('should return true if table.isColumnHeader return true', function () {
@@ -19,7 +21,7 @@ describe('table.isHeader', function () {
 		axe.commons.table.isRowHeader = function () {
 			return false;
 		};
-		assert.isTrue(axe.commons.table.isHeader({}));
+		assert.isTrue(axe.commons.table.isHeader(cell));
 
 		axe.commons.table.isColumnHeader = orig;
 		axe.commons.table.isRowHeader = orig2;
@@ -34,7 +36,7 @@ describe('table.isHeader', function () {
 		axe.commons.table.isColumnHeader = function () {
 			return false;
 		};
-		assert.isTrue(axe.commons.table.isHeader({}));
+		assert.isTrue(axe.commons.table.isHeader(cell));
 
 		axe.commons.table.isRowHeader = orig;
 		axe.commons.table.isColumnHeader = orig2;
@@ -49,7 +51,7 @@ describe('table.isHeader', function () {
 		axe.commons.table.isColumnHeader = function () {
 			return false;
 		};
-		assert.isFalse(axe.commons.table.isHeader({}));
+		assert.isFalse(axe.commons.table.isHeader(cell));
 
 		axe.commons.table.isRowHeader = orig;
 		axe.commons.table.isColumnHeader = orig2;
diff --git a/test/core/utils/get-selector.js b/test/core/utils/get-selector.js
index 36f6805290..4ef9e0b570 100644
--- a/test/core/utils/get-selector.js
+++ b/test/core/utils/get-selector.js
@@ -181,9 +181,11 @@ describe('axe.utils.getSelector', function () {
 		var sel = axe.utils.getSelector({
 			nodeName: 'a',
 			classList: [],
+			getAttribute: function () { },
 			hasAttribute: function () { return false; },
 			parentNode: {
 				nodeName: 'b',
+				getAttribute: function () { },
 				hasAttribute: function () { return false; },
 				classList: []
 			}

From b595b421f296b1355c27cbd90347e5c1ddbd9fd3 Mon Sep 17 00:00:00 2001
From: Marcy Sutton <marcy.sutton@deque.com>
Date: Fri, 7 Jul 2017 14:34:03 -0700
Subject: [PATCH 062/142] feat: add SD support to color-contrast-matches

---
 lib/rules/color-contrast-matches.js         |  2 +-
 test/rule-matches/color-contrast-matches.js | 22 ++++++++++++++-------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/lib/rules/color-contrast-matches.js b/lib/rules/color-contrast-matches.js
index 9622773fb4..053b78fc14 100644
--- a/lib/rules/color-contrast-matches.js
+++ b/lib/rules/color-contrast-matches.js
@@ -61,7 +61,7 @@ if (node.id) {
 	}
 }
 
-if (axe.commons.text.visible(node, false, true) === '') {
+if (axe.commons.text.visible(virtualNode, false, true) === '') {
 	return false;
 }
 
diff --git a/test/rule-matches/color-contrast-matches.js b/test/rule-matches/color-contrast-matches.js
index 307cd717cd..0a485a6b67 100644
--- a/test/rule-matches/color-contrast-matches.js
+++ b/test/rule-matches/color-contrast-matches.js
@@ -12,6 +12,7 @@ describe('color-contrast-matches', function () {
 
 	afterEach(function () {
 		fixture.innerHTML = '';
+		axe._tree = undefined;
 	});
 
 	it('is a function', function () {
@@ -22,42 +23,48 @@ describe('color-contrast-matches', function () {
 		fixture.innerHTML = '<div style="color: yellow; background-color: white;" id="target">' +
 			' </div>';
 		var target = fixture.querySelector('#target');
-		assert.isFalse(rule.matches(target));
+		var tree = axe._tree = axe.utils.getFlattenedTree(fixture);
+		assert.isFalse(rule.matches(target, axe.utils.getNodeFromTree(tree[0], target)));
 	});
 
 	it('should match when there is text', function () {
 		fixture.innerHTML = '<div style="color: yellow; background-color: white;" id="target">' +
 			'My text</div>';
 		var target = fixture.querySelector('#target');
-		assert.isTrue(rule.matches(target));
+		var tree = axe._tree = axe.utils.getFlattenedTree(fixture);
+		assert.isTrue(rule.matches(target, axe.utils.getNodeFromTree(tree[0], target)));
 	});
 
 	it('should not match when there is text that is out of the container', function () {
 		fixture.innerHTML = '<div style="color: yellow; text-indent: -9999px; background-color: white;" id="target">' +
 			'My text</div>';
 		var target = fixture.querySelector('#target');
-		assert.isFalse(rule.matches(target));
+		var tree = axe._tree = axe.utils.getFlattenedTree(fixture);
+		assert.isFalse(rule.matches(target, axe.utils.getNodeFromTree(tree[0], target)));
 	});
 
 	it('should not match when there is text that is out of the container with overflow hidden', function () {
 		fixture.innerHTML = '<div style="color: yellow; width: 100px; overflow: hidden; text-indent: 200px; background-color: white;" id="target">' +
 			'text</div>';
 		var target = fixture.querySelector('#target');
-		assert.isFalse(rule.matches(target));
+		var tree = axe._tree = axe.utils.getFlattenedTree(fixture);
+		assert.isFalse(rule.matches(target, axe.utils.getNodeFromTree(tree[0], target)));
 	});
 
 	it('should match when there is text that is in the scroll reach of container', function () {
 		fixture.innerHTML = '<div style="color: yellow; width: 100px; overflow: scroll; text-indent: 200px; background-color: white;" id="target">' +
 			'text</div>';
 		var target = fixture.querySelector('#target');
-		assert.isTrue(rule.matches(target));
+		var tree = axe._tree = axe.utils.getFlattenedTree(fixture);
+		assert.isTrue(rule.matches(target, axe.utils.getNodeFromTree(tree[0], target)));
 	});
 
 	it('should match when there is text that is only partially out of the container', function () {
 		fixture.innerHTML = '<div style="color: yellow; text-indent: -20px; background-color: white;" id="target">' +
 			'My text</div>';
 		var target = fixture.querySelector('#target');
-		assert.isTrue(rule.matches(target));
+		var tree = axe._tree = axe.utils.getFlattenedTree(fixture);
+		assert.isTrue(rule.matches(target, axe.utils.getNodeFromTree(tree[0], target)));
 	});
 
 	it('should match <input type="text">', function () {
@@ -148,7 +155,8 @@ describe('color-contrast-matches', function () {
 	it('should match <button>', function () {
 		fixture.innerHTML = '<button>hi</button>';
 		var target = fixture.querySelector('button');
-		assert.isTrue(rule.matches(target));
+		var tree = axe._tree = axe.utils.getFlattenedTree(fixture);
+		assert.isTrue(rule.matches(target, axe.utils.getNodeFromTree(tree[0], target)));
 	});
 
 	it('should not match <button disabled>', function () {

From 15a34575a1930faf5f33b340cd77b0dd2906d7e7 Mon Sep 17 00:00:00 2001
From: Marcy Sutton <marcy.sutton@deque.com>
Date: Fri, 7 Jul 2017 14:34:32 -0700
Subject: [PATCH 063/142] chore: tell jshint virtualNode is ok for matches

---
 lib/rules/.jshintrc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/rules/.jshintrc b/lib/rules/.jshintrc
index ce525e86d4..1f764cf3fb 100644
--- a/lib/rules/.jshintrc
+++ b/lib/rules/.jshintrc
@@ -2,6 +2,7 @@
 	"globals": {
 		"results": true,
 		"node": true,
+		"virtualNode": true,
 		"options": true,
 		"axe": true
 	},

From a0636a84e3de4e412938ae29a4af0de37a7b9530 Mon Sep 17 00:00:00 2001
From: Marcy Sutton <marcy.sutton@deque.com>
Date: Fri, 7 Jul 2017 15:40:20 -0700
Subject: [PATCH 064/142] test: add coverage for shadowDOM

---
 test/rule-matches/color-contrast-matches.js | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/test/rule-matches/color-contrast-matches.js b/test/rule-matches/color-contrast-matches.js
index 0a485a6b67..e911d2d868 100644
--- a/test/rule-matches/color-contrast-matches.js
+++ b/test/rule-matches/color-contrast-matches.js
@@ -1,7 +1,9 @@
+/* global xit */
 describe('color-contrast-matches', function () {
 	'use strict';
 
 	var fixture = document.getElementById('fixture');
+	var shadowSupport = document.body && typeof document.body.attachShadow === 'function';
 	var rule;
 
 	beforeEach(function () {
@@ -242,4 +244,17 @@ describe('color-contrast-matches', function () {
 		var target = fixture.querySelector('span');
 		assert.isFalse(rule.matches(target));
 	});
+
+  (shadowSupport ? it : xit)
+  ('should match a descendant of an element across a shadow boundary', function () {
+		fixture.innerHTML = '<div id="parent" style="background-color: #000;">' +
+			'</div>';
+
+		var shadowRoot = document.getElementById('parent').attachShadow({ mode: 'open' });
+		shadowRoot.innerHTML = '<div id="shadowTarget" style="color: #333">Text</div>';
+
+		var shadowTarget = fixture.firstChild.shadowRoot.querySelector('#shadowTarget');
+		var tree = axe._tree = axe.utils.getFlattenedTree(fixture);
+		assert.isTrue(rule.matches(shadowTarget, axe.utils.getNodeFromTree(tree[0], shadowTarget)));
+	});
 });
\ No newline at end of file

From 70f597e4824cc2699151f29a2ca69bc3a55283e7 Mon Sep 17 00:00:00 2001
From: Marcy Sutton <marcy.sutton@deque.com>
Date: Fri, 7 Jul 2017 15:40:41 -0700
Subject: [PATCH 065/142] chore: add a comment about text nodes in .visible

---
 lib/commons/text/visible.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/commons/text/visible.js b/lib/commons/text/visible.js
index bffc50d8ca..954c10fec3 100644
--- a/lib/commons/text/visible.js
+++ b/lib/commons/text/visible.js
@@ -17,7 +17,7 @@ text.visible = function (element, screenReader, noRecursing) {
 	for (index = 0; index < length; index++) {
 		child = childNodes[index];
 
-		if (child.actualNode.nodeType === 3) {
+		if (child.actualNode.nodeType === 3) { // filter on text nodes
 			nodeValue = child.actualNode.nodeValue;
 			if (nodeValue && dom.isVisible(element.actualNode, screenReader)) {
 				result += nodeValue;

From 6a5f3f17f6dcae4b42ee92b021ae55b4adb5393d Mon Sep 17 00:00:00 2001
From: Marcy Sutton <marcy.sutton@deque.com>
Date: Fri, 7 Jul 2017 15:45:35 -0700
Subject: [PATCH 066/142] chore: fix indentation

---
 test/rule-matches/color-contrast-matches.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/rule-matches/color-contrast-matches.js b/test/rule-matches/color-contrast-matches.js
index e911d2d868..c13d485f04 100644
--- a/test/rule-matches/color-contrast-matches.js
+++ b/test/rule-matches/color-contrast-matches.js
@@ -245,8 +245,8 @@ describe('color-contrast-matches', function () {
 		assert.isFalse(rule.matches(target));
 	});
 
-  (shadowSupport ? it : xit)
-  ('should match a descendant of an element across a shadow boundary', function () {
+	(shadowSupport ? it : xit)
+	('should match a descendant of an element across a shadow boundary', function () {
 		fixture.innerHTML = '<div id="parent" style="background-color: #000;">' +
 			'</div>';
 
@@ -257,4 +257,4 @@ describe('color-contrast-matches', function () {
 		var tree = axe._tree = axe.utils.getFlattenedTree(fixture);
 		assert.isTrue(rule.matches(shadowTarget, axe.utils.getNodeFromTree(tree[0], shadowTarget)));
 	});
-});
\ No newline at end of file
+});

From f0fe5512950ec6c5aa1a2c226a7c80985878778e Mon Sep 17 00:00:00 2001
From: Marcy Sutton <marcy.sutton@deque.com>
Date: Tue, 11 Jul 2017 14:03:34 -0700
Subject: [PATCH 067/142] fix: complete shadow support for color matches

---
 lib/rules/color-contrast-matches.js         |  12 +-
 test/rule-matches/color-contrast-matches.js | 163 +++++++++++++++-----
 2 files changed, 132 insertions(+), 43 deletions(-)

diff --git a/lib/rules/color-contrast-matches.js b/lib/rules/color-contrast-matches.js
index 053b78fc14..04ee5fdebf 100644
--- a/lib/rules/color-contrast-matches.js
+++ b/lib/rules/color-contrast-matches.js
@@ -2,7 +2,7 @@
 
 var nodeName = node.nodeName.toUpperCase(),
 	nodeType = node.type,
-	doc = document;
+	doc = axe.commons.dom.getRootNode(node);
 
 if (node.getAttribute('aria-disabled') === 'true' || axe.commons.dom.findUp(node, '[aria-disabled="true"]')) {
 	return false;
@@ -45,9 +45,9 @@ if (nodeName === 'LABEL' || nodeParentLabel) {
 		return false;
 	}
 
-	var candidate = node.querySelector('input:not([type="hidden"]):not([type="image"])' +
+	var candidate = axe.utils.querySelectorAll(virtualNode, 'input:not([type="hidden"]):not([type="image"])' +
 		':not([type="button"]):not([type="submit"]):not([type="reset"]), select, textarea');
-	if (candidate && candidate.disabled) {
+	if (candidate.length && candidate[0].actualNode.disabled) {
 		return false;
 	}
 
@@ -66,15 +66,15 @@ if (axe.commons.text.visible(virtualNode, false, true) === '') {
 }
 
 var range = document.createRange(),
-	childNodes = node.childNodes,
+	childNodes = virtualNode.children,
 	length = childNodes.length,
 	child, index;
 
 for (index = 0; index < length; index++) {
 	child = childNodes[index];
 
-	if (child.nodeType === 3 && axe.commons.text.sanitize(child.nodeValue) !== '') {
-		range.selectNodeContents(child);
+	if (child.actualNode.nodeType === 3 && axe.commons.text.sanitize(child.actualNode.nodeValue) !== '') {
+		range.selectNodeContents(child.actualNode);
 	}
 }
 
diff --git a/test/rule-matches/color-contrast-matches.js b/test/rule-matches/color-contrast-matches.js
index c13d485f04..c3f0e4a10e 100644
--- a/test/rule-matches/color-contrast-matches.js
+++ b/test/rule-matches/color-contrast-matches.js
@@ -1,4 +1,3 @@
-/* global xit */
 describe('color-contrast-matches', function () {
 	'use strict';
 
@@ -72,86 +71,99 @@ describe('color-contrast-matches', function () {
 	it('should match <input type="text">', function () {
 		fixture.innerHTML = '<input type="text">';
 		var target = fixture.querySelector('input');
-		assert.isTrue(rule.matches(target));
+		var tree = axe._tree = axe.utils.getFlattenedTree(fixture);
+		assert.isTrue(rule.matches(target, axe.utils.getNodeFromTree(tree[0], target)));
 	});
 
 	it('should not match <input type="hidden">', function () {
 		fixture.innerHTML = '<input type="hidden">';
 		var target = fixture.querySelector('input');
-		assert.isFalse(rule.matches(target));
+		var tree = axe._tree = axe.utils.getFlattenedTree(fixture);
+		assert.isFalse(rule.matches(target, axe.utils.getNodeFromTree(tree[0], target)));
 	});
 
 	it('should not match <input type="checkbox">', function () {
 		fixture.innerHTML = '<input type="checkbox">';
 		var target = fixture.querySelector('input');
-		assert.isFalse(rule.matches(target));
+		var tree = axe._tree = axe.utils.getFlattenedTree(fixture);
+		assert.isFalse(rule.matches(target, axe.utils.getNodeFromTree(tree[0], target)));
 	});
 
 	it('should not match <input type="radio">', function () {
 		fixture.innerHTML = '<input type="radio">';
 		var target = fixture.querySelector('input');
-		assert.isFalse(rule.matches(target));
+		var tree = axe._tree = axe.utils.getFlattenedTree(fixture);
+		assert.isFalse(rule.matches(target, axe.utils.getNodeFromTree(tree[0], target)));
 	});
 
 	it('should not match <input type="color">', function () {
 		fixture.innerHTML = '<input type="color">';
 		var target = fixture.querySelector('input');
+		var tree = axe._tree = axe.utils.getFlattenedTree(fixture);
 		// Some browsers will fallback to type=text for unknown input types (looking at you IE)
 		if (target.type === 'color') {
-			assert.isFalse(rule.matches(target));
+			assert.isFalse(rule.matches(target, axe.utils.getNodeFromTree(tree[0], target)));
 		}
 	});
 
 	it('should not match <input type="range">', function () {
 		fixture.innerHTML = '<input type="range">';
 		var target = fixture.querySelector('input');
+		var tree = axe._tree = axe.utils.getFlattenedTree(fixture);
 		// Some browsers will fallback to type=text for unknown input types (looking at you IE)
 		if (target.type === 'range') {
-			assert.isFalse(rule.matches(target));
+			assert.isFalse(rule.matches(target, axe.utils.getNodeFromTree(tree[0], target)));
 		}
 	});
 
 	it('should match <select> with options', function () {
 		fixture.innerHTML = '<select><option>Hello</option></select>';
 		var target = fixture.querySelector('select');
-		assert.isTrue(rule.matches(target));
+		var tree = axe._tree = axe.utils.getFlattenedTree(fixture);
+		assert.isTrue(rule.matches(target, axe.utils.getNodeFromTree(tree[0], target)));
 	});
 
 	it('should not match <select> with no options', function () {
 		fixture.innerHTML = '<select></select>';
 		var target = fixture.querySelector('select');
-		assert.isFalse(rule.matches(target));
+		var tree = axe._tree = axe.utils.getFlattenedTree(fixture);
+		assert.isFalse(rule.matches(target, axe.utils.getNodeFromTree(tree[0], target)));
 	});
 
 	it('should match <textarea>', function () {
 		fixture.innerHTML = '<textarea></textarea>';
 		var target = fixture.querySelector('textarea');
-		assert.isTrue(rule.matches(target));
+		var tree = axe._tree = axe.utils.getFlattenedTree(fixture);
+		assert.isTrue(rule.matches(target, axe.utils.getNodeFromTree(tree[0], target)));
 	});
 
 	it('should not match <option>', function () {
 		fixture.innerHTML = '<select><option>hi</option></select>';
 		var target = fixture.querySelector('option');
-		assert.isFalse(rule.matches(target));
+		var tree = axe._tree = axe.utils.getFlattenedTree(fixture);
+		assert.isFalse(rule.matches(target, axe.utils.getNodeFromTree(tree[0], target)));
 	});
 
 	it('should not match inputs that are disabled', function () {
 		fixture.innerHTML = '<input type="text" disabled>';
 		var target = fixture.querySelector('input');
-		assert.isFalse(rule.matches(target));
+		var tree = axe._tree = axe.utils.getFlattenedTree(fixture);
+		assert.isFalse(rule.matches(target, axe.utils.getNodeFromTree(tree[0], target)));
 
 	});
 
 	it('should not match <textarea disabled>', function () {
 		fixture.innerHTML = '<textarea disabled></textarea>';
 		var target = fixture.querySelector('textarea');
-		assert.isFalse(rule.matches(target));
+		var tree = axe._tree = axe.utils.getFlattenedTree(fixture);
+		assert.isFalse(rule.matches(target, axe.utils.getNodeFromTree(tree[0], target)));
 	});
 
 	it('should not match <select> with options', function () {
 		fixture.innerHTML = '<select disabled><option>Hello</option></select>';
 		var target = fixture.querySelector('select');
-		assert.isFalse(rule.matches(target));
+		var tree = axe._tree = axe.utils.getFlattenedTree(fixture);
+		assert.isFalse(rule.matches(target, axe.utils.getNodeFromTree(tree[0], target)));
 	});
 
 	it('should match <button>', function () {
@@ -164,97 +176,174 @@ describe('color-contrast-matches', function () {
 	it('should not match <button disabled>', function () {
 		fixture.innerHTML = '<button disabled>hi</button>';
 		var target = fixture.querySelector('button');
-		assert.isFalse(rule.matches(target));
+		var tree = axe._tree = axe.utils.getFlattenedTree(fixture);
+		assert.isFalse(rule.matches(target, axe.utils.getNodeFromTree(tree[0], target)));
 	});
 
 	it('should not match <button disabled><span></span></button>', function () {
 		fixture.innerHTML = '<button disabled><span>Hi</span></button>';
 		var target = fixture.querySelector('button');
-		assert.isFalse(rule.matches(target.querySelector('span')));
+		var tree = axe._tree = axe.utils.getFlattenedTree(fixture);
+		assert.isFalse(rule.matches(target.querySelector('span'), axe.utils.getNodeFromTree(tree[0], target.querySelector('span'))));
 	});
 
 	it('should not match <button disabled><span><i></i></span></button>', function () {
 		fixture.innerHTML = '<button disabled><span><i>Hi</i></span></button>';
 		var target = fixture.querySelector('button');
-		assert.isFalse(rule.matches(target.querySelector('i')));
+		var tree = axe._tree = axe.utils.getFlattenedTree(fixture);
+		assert.isFalse(rule.matches(target.querySelector('i'), axe.utils.getNodeFromTree(tree[0], target.querySelector('i'))));
 	});
 
 	it('should not match <input type=image>', function () {
 		fixture.innerHTML = '<input type="image">';
 		var target = fixture.querySelector('input');
-		assert.isFalse(rule.matches(target));
+		var tree = axe._tree = axe.utils.getFlattenedTree(fixture);
+		assert.isFalse(rule.matches(target, axe.utils.getNodeFromTree(tree[0], target)));
 	});
 
 	it('should not match a disabled input\'s label - explicit label', function () {
 		fixture.innerHTML = '<label for="t1">Test</label><input type="text" id="t1" disabled>';
 		var target = fixture.querySelector('label');
-		assert.isFalse(rule.matches(target));
+		var tree = axe._tree = axe.utils.getFlattenedTree(fixture);
+		assert.isFalse(rule.matches(target, axe.utils.getNodeFromTree(tree[0], target)));
 	});
 
 	it('should not match a disabled input\'s label - implicit label (input)', function () {
 		fixture.innerHTML = '<label>Test<input type="text" disabled></label>';
 		var target = fixture.querySelector('label');
-		assert.isFalse(rule.matches(target));
+		var tree = axe._tree = axe.utils.getFlattenedTree(fixture);
+		assert.isFalse(rule.matches(target, axe.utils.getNodeFromTree(tree[0], target)));
 	});
 
 	it('should not match a disabled input\'s label - implicit label (textarea)', function () {
 		fixture.innerHTML = '<label>Test<textarea disabled>Hi</textarea></label>';
 		var target = fixture.querySelector('label');
-		assert.isFalse(rule.matches(target));
+		var tree = axe._tree = axe.utils.getFlattenedTree(fixture);
+		assert.isFalse(rule.matches(target, axe.utils.getNodeFromTree(tree[0], target)));
 	});
 
 	it('should not match a disabled input\'s label - implicit label (select)', function () {
 		fixture.innerHTML = '<label>Test<select disabled><option>Test</option></select></label>';
 		var target = fixture.querySelector('label');
-		assert.isFalse(rule.matches(target));
+		var tree = axe._tree = axe.utils.getFlattenedTree(fixture);
+		assert.isFalse(rule.matches(target, axe.utils.getNodeFromTree(tree[0], target)));
 	});
 
 	it('should not match a disabled input\'s label - aria-labelledby', function () {
 		fixture.innerHTML = '<div id="t1">Test</div><input type="text" aria-labelledby="bob t1 fred" disabled>';
 		var target = fixture.querySelector('div');
-		assert.isFalse(rule.matches(target));
+		var tree = axe._tree = axe.utils.getFlattenedTree(fixture);
+		assert.isFalse(rule.matches(target, axe.utils.getNodeFromTree(tree[0], target)));
 	});
 
 	it('should not match aria-disabled=true', function () {
 		fixture.innerHTML = '<div aria-disabled="true">hi</div>';
 		var target = fixture.querySelector('div');
-		assert.isFalse(rule.matches(target));
+		var tree = axe._tree = axe.utils.getFlattenedTree(fixture);
+		assert.isFalse(rule.matches(target, axe.utils.getNodeFromTree(tree[0], target)));
 	});
 
 	it('should not match a descendant of aria-disabled=true', function () {
 		fixture.innerHTML = '<div aria-disabled="true"><span>hi</span></div>';
 		var target = fixture.querySelector('span');
-		assert.isFalse(rule.matches(target));
+		var tree = axe._tree = axe.utils.getFlattenedTree(fixture);
+		assert.isFalse(rule.matches(target, axe.utils.getNodeFromTree(tree[0], target)));
 	});
 
 	it('should not match a descendant of a disabled fieldset', function () {
 		fixture.innerHTML = '<fieldset disabled><label>hi <input type="checkbox"></label></fieldset>';
 		var target = fixture.querySelector('label');
-		assert.isFalse(rule.matches(target));
+		var tree = axe._tree = axe.utils.getFlattenedTree(fixture);
+		assert.isFalse(rule.matches(target, axe.utils.getNodeFromTree(tree[0], target)));
 	});
 
 	it('should not match a descendant of an explicit label for a disabled input', function () {
 		fixture.innerHTML = '<input id="input" type="checkbox" disabled><label for="input"><span>hi</span></label>';
 		var target = fixture.querySelector('span');
-		assert.isFalse(rule.matches(target));
+		var tree = axe._tree = axe.utils.getFlattenedTree(fixture);
+		assert.isFalse(rule.matches(target, axe.utils.getNodeFromTree(tree[0], target)));
 	});
 
 	it('should not match a descendant of an implicit label for a disabled input', function () {
 		fixture.innerHTML = '<label for="input"><span>hi</span><input id="input" type="checkbox" disabled></label>';
 		var target = fixture.querySelector('span');
-		assert.isFalse(rule.matches(target));
+		var tree = axe._tree = axe.utils.getFlattenedTree(fixture);
+		assert.isFalse(rule.matches(target, axe.utils.getNodeFromTree(tree[0], target)));
 	});
 
-	(shadowSupport ? it : xit)
-	('should match a descendant of an element across a shadow boundary', function () {
-		fixture.innerHTML = '<div id="parent" style="background-color: #000;">' +
+	if (shadowSupport) {
+		it('should match a descendant of an element across a shadow boundary', function () {
+			fixture.innerHTML = '<div id="parent" style="background-color: #000;">' +
+				'</div>';
+
+			var shadowRoot = document.getElementById('parent').attachShadow({ mode: 'open' });
+			shadowRoot.innerHTML = '<div id="shadowTarget" style="color: #333">Text</div>';
+
+			var shadowTarget = fixture.firstChild.shadowRoot.querySelector('#shadowTarget');
+			var tree = axe._tree = axe.utils.getFlattenedTree(fixture);
+			assert.isTrue(rule.matches(shadowTarget, axe.utils.getNodeFromTree(tree[0], shadowTarget)));
+		});
+
+		it('should look at the correct root node when looking up an explicit label and disabled input', function () {
+			fixture.innerHTML = '<div id="parent">'+
+				'<input id="input">' +
 			'</div>';
 
-		var shadowRoot = document.getElementById('parent').attachShadow({ mode: 'open' });
-		shadowRoot.innerHTML = '<div id="shadowTarget" style="color: #333">Text</div>';
+			var shadowRoot = document.getElementById('parent').attachShadow({ mode: 'open' });
+			shadowRoot.innerHTML = '<div id="shadowParent">' +
+					'<label for="input" id="shadowLabel">Label</label>' +
+					'<input id="input" disabled>' +
+				'</div>';
 
-		var shadowTarget = fixture.firstChild.shadowRoot.querySelector('#shadowTarget');
-		var tree = axe._tree = axe.utils.getFlattenedTree(fixture);
-		assert.isTrue(rule.matches(shadowTarget, axe.utils.getNodeFromTree(tree[0], shadowTarget)));
-	});
+			var shadowLabel = fixture.firstChild.shadowRoot.querySelector('#shadowLabel');
+			var tree = axe._tree = axe.utils.getFlattenedTree(fixture);
+			assert.isFalse(rule.matches(shadowLabel, axe.utils.getNodeFromTree(tree[0], shadowLabel)));
+		});
+
+		it('should look at the correct root node when looking up implicit label and disabled input', function () {
+			fixture.innerHTML = '<div id="parent">'+
+				'<input id="input">' +
+			'</div>';
+
+			var shadowRoot = document.getElementById('parent').attachShadow({ mode: 'open' });
+			shadowRoot.innerHTML = '<div id="shadowParent">' +
+					'<label for="input" id="shadowLabel">Label' +
+					'<input id="input" disabled></label>' +
+				'</div>';
+
+			var shadowLabel = fixture.firstChild.shadowRoot.querySelector('#shadowLabel');
+			var tree = axe._tree = axe.utils.getFlattenedTree(fixture);
+			assert.isFalse(rule.matches(shadowLabel, axe.utils.getNodeFromTree(tree[0], shadowLabel)));
+		});
+
+		it('should look at the correct root node for a disabled control\'s label associated w/ aria-labelledby', function () {
+			fixture.innerHTML = '<div id="parent">'+
+				'<input id="input">' +
+			'</div>';
+
+			var shadowRoot = document.getElementById('parent').attachShadow({ mode: 'open' });
+			shadowRoot.innerHTML = '<div id="shadowParent">' +
+					'<label id="shadowLabel">Label</label>' +
+					'<input aria-labelledby="shadowLabel" disabled>' +
+				'</div>';
+
+			var shadowLabel = fixture.firstChild.shadowRoot.querySelector('#shadowLabel');
+			var tree = axe._tree = axe.utils.getFlattenedTree(fixture);
+			assert.isFalse(rule.matches(shadowLabel, axe.utils.getNodeFromTree(tree[0], shadowLabel)));
+		});
+
+		it('should look at the children of a virtual node for overlap', function () {
+			fixture.innerHTML = '<div id="parent">'+
+				 '<div id="firstChild" style="background-color: #ccc; color: #fff;"></div>' +
+			'</div>';
+
+			var shadowRoot = document.getElementById('firstChild').attachShadow({ mode: 'open' });
+			shadowRoot.innerHTML = 'Some text' +
+					'<p style="color: #fff;" id="shadowTarget">Other text</p>';
+
+			var firstChild = fixture.querySelector('#firstChild');
+			var tree = axe._tree = axe.utils.getFlattenedTree(fixture);
+			assert.isTrue(rule.matches(firstChild, axe.utils.getNodeFromTree(tree[0], firstChild)));
+		});
+	}
 });

From b28597c4ea5b035fcd2900e48eddcea691e9b945 Mon Sep 17 00:00:00 2001
From: Marcy Sutton <marcy.sutton@deque.com>
Date: Tue, 11 Jul 2017 15:15:23 -0700
Subject: [PATCH 068/142] fix: ensure document is fetched from correct node

---
 lib/rules/color-contrast-matches.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/rules/color-contrast-matches.js b/lib/rules/color-contrast-matches.js
index 04ee5fdebf..522d0e589e 100644
--- a/lib/rules/color-contrast-matches.js
+++ b/lib/rules/color-contrast-matches.js
@@ -1,8 +1,7 @@
 /* global document */
 
 var nodeName = node.nodeName.toUpperCase(),
-	nodeType = node.type,
-	doc = axe.commons.dom.getRootNode(node);
+	nodeType = node.type;
 
 if (node.getAttribute('aria-disabled') === 'true' || axe.commons.dom.findUp(node, '[aria-disabled="true"]')) {
 	return false;
@@ -40,6 +39,7 @@ if (nodeName === 'LABEL' || nodeParentLabel) {
 		relevantNode = nodeParentLabel;
 	}
 	// explicit label of disabled input
+	let doc = axe.commons.dom.getRootNode(relevantNode);
 	var candidate = relevantNode.htmlFor && doc.getElementById(relevantNode.htmlFor);
 	if (candidate && candidate.disabled) {
 		return false;
@@ -55,6 +55,7 @@ if (nodeName === 'LABEL' || nodeParentLabel) {
 
 // label of disabled control associated w/ aria-labelledby
 if (node.id) {
+	let doc = axe.commons.dom.getRootNode(node);
 	var candidate = doc.querySelector('[aria-labelledby~=' + axe.commons.utils.escapeSelector(node.id) + ']');
 	if (candidate && candidate.disabled) {
 		return false;

From 615170eda9566aa5f29f530440b97d3c6139a50c Mon Sep 17 00:00:00 2001
From: Marcy Sutton <marcy.sutton@deque.com>
Date: Tue, 11 Jul 2017 15:44:26 -0700
Subject: [PATCH 069/142] test: add test for shadow boundary, fix implicit

---
 test/rule-matches/color-contrast-matches.js | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/test/rule-matches/color-contrast-matches.js b/test/rule-matches/color-contrast-matches.js
index c3f0e4a10e..4488c5805f 100644
--- a/test/rule-matches/color-contrast-matches.js
+++ b/test/rule-matches/color-contrast-matches.js
@@ -302,13 +302,12 @@ describe('color-contrast-matches', function () {
 
 		it('should look at the correct root node when looking up implicit label and disabled input', function () {
 			fixture.innerHTML = '<div id="parent">'+
-				'<input id="input">' +
+				'<input>' +
 			'</div>';
 
 			var shadowRoot = document.getElementById('parent').attachShadow({ mode: 'open' });
 			shadowRoot.innerHTML = '<div id="shadowParent">' +
-					'<label for="input" id="shadowLabel">Label' +
-					'<input id="input" disabled></label>' +
+					'<label id="shadowLabel">Label <input disabled></label>' +
 				'</div>';
 
 			var shadowLabel = fixture.firstChild.shadowRoot.querySelector('#shadowLabel');
@@ -332,6 +331,18 @@ describe('color-contrast-matches', function () {
 			assert.isFalse(rule.matches(shadowLabel, axe.utils.getNodeFromTree(tree[0], shadowLabel)));
 		});
 
+		it('should handle input/label spread across the shadow boundary', function () {
+			fixture.innerHTML = '<label>Text <div id="firstChild"></div></label>';
+
+			var container = document.getElementById('firstChild');
+			var shadowRoot = container.attachShadow({ mode: 'open' });
+			shadowRoot.innerHTML = '<input id="shadowTarget" type="text" />';
+
+			var shadowTarget = container.shadowRoot.querySelector('#shadowTarget');
+			var tree = axe._tree = axe.utils.getFlattenedTree(fixture);
+			assert.isTrue(rule.matches(shadowTarget, axe.utils.getNodeFromTree(tree[0], shadowTarget)));
+		});
+
 		it('should look at the children of a virtual node for overlap', function () {
 			fixture.innerHTML = '<div id="parent">'+
 				 '<div id="firstChild" style="background-color: #ccc; color: #fff;"></div>' +

From 3a5be921000ef21475798d2a93957c1366811b56 Mon Sep 17 00:00:00 2001
From: Marcy Sutton <marcy.sutton@deque.com>
Date: Thu, 13 Jul 2017 10:01:14 -0700
Subject: [PATCH 070/142] test: make input disabled, add slotted example

---
 test/rule-matches/color-contrast-matches.js | 26 ++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/test/rule-matches/color-contrast-matches.js b/test/rule-matches/color-contrast-matches.js
index 4488c5805f..77979cad30 100644
--- a/test/rule-matches/color-contrast-matches.js
+++ b/test/rule-matches/color-contrast-matches.js
@@ -336,11 +336,11 @@ describe('color-contrast-matches', function () {
 
 			var container = document.getElementById('firstChild');
 			var shadowRoot = container.attachShadow({ mode: 'open' });
-			shadowRoot.innerHTML = '<input id="shadowTarget" type="text" />';
+			shadowRoot.innerHTML = '<input type="text" id="input" disabled />';
 
-			var shadowTarget = container.shadowRoot.querySelector('#shadowTarget');
+			var shadowTarget = container.shadowRoot.querySelector('#input');
 			var tree = axe._tree = axe.utils.getFlattenedTree(fixture);
-			assert.isTrue(rule.matches(shadowTarget, axe.utils.getNodeFromTree(tree[0], shadowTarget)));
+			assert.isFalse(rule.matches(shadowTarget, axe.utils.getNodeFromTree(tree[0], shadowTarget)));
 		});
 
 		it('should look at the children of a virtual node for overlap', function () {
@@ -356,5 +356,25 @@ describe('color-contrast-matches', function () {
 			var tree = axe._tree = axe.utils.getFlattenedTree(fixture);
 			assert.isTrue(rule.matches(firstChild, axe.utils.getNodeFromTree(tree[0], firstChild)));
 		});
+
+		it('should handle an input added through slotted content', function () {
+			fixture.innerHTML = '<label>Option 1 <span class="slotted">' +
+				'<input type="text" name="slottedLabel" />' +
+			'</span></label>';
+
+			function createContentSlotted() {
+				var group = document.createElement('span');
+				group.innerHTML = '<slot></slot>';
+				return group;
+			}
+
+			var slotted = fixture.querySelector('.slotted');
+			var shadowRoot = slotted.attachShadow({mode: 'open'});
+			shadowRoot.appendChild(createContentSlotted());
+
+			var input = slotted.querySelector('input');
+			var tree = axe._tree = axe.utils.getFlattenedTree(fixture);
+			assert.isTrue(rule.matches(input, axe.utils.getNodeFromTree(tree[0], input)));
+		});
 	}
 });

From 4534e86f622be594f6b3379efff11dee0b2474d8 Mon Sep 17 00:00:00 2001
From: Marcy Sutton <marcy.sutton@deque.com>
Date: Mon, 10 Jul 2017 14:57:24 -0700
Subject: [PATCH 071/142] fix: pass virtualNode to Rule.run

Closes https://github.com/dequelabs/axe-core/issues/394
---
 lib/core/base/rule.js  |  2 +-
 test/core/base/rule.js | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/lib/core/base/rule.js b/lib/core/base/rule.js
index 35168a8cec..44ed7e4e3c 100644
--- a/lib/core/base/rule.js
+++ b/lib/core/base/rule.js
@@ -134,7 +134,7 @@ Rule.prototype.run = function (context, options, resolve, reject) {
 	try {
 		// Matches throws an error when it lacks support for document methods
 		nodes = this.gather(context)
-					.filter(node => this.matches(node.actualNode));
+					.filter(node => this.matches(node.actualNode, node));
 	} catch (error) {
 		// Exit the rule execution if matches fails
 		reject(new SupportError({cause: error, ruleId: this.id}));
diff --git a/test/core/base/rule.js b/test/core/base/rule.js
index 92138cc004..d1b58b4fa2 100644
--- a/test/core/base/rule.js
+++ b/test/core/base/rule.js
@@ -143,7 +143,26 @@ describe('Rule', function() {
 					assert.isTrue(success);
 					done();
 				}, isNotCalled);
+			});
+
+			it('should pass a virtualNode to #matches', function(done) {
+				var div = document.createElement('div');
+				fixture.appendChild(div);
+				var success = false,
+					rule = new Rule({
+						matches: function(node, virtualNode) {
+							assert.equal(virtualNode.actualNode, div);
+							success = true;
+							return [];
+						}
+					});
 
+				rule.run({
+					include: [axe.utils.getFlattenedTree(div)[0]]
+				}, {}, function() {
+					assert.isTrue(success);
+					done();
+				}, isNotCalled);
 			});
 
 			it('should handle an error in #matches', function(done) {

From d02dba3223fefe525438330e40b5da5de81eeeb5 Mon Sep 17 00:00:00 2001
From: Marcy Sutton <holla@marcysutton.com>
Date: Fri, 14 Jul 2017 03:01:09 -0700
Subject: [PATCH 072/142] test: add unit tests for button-has-visible-text
 (#434)

Closes https://github.com/dequelabs/axe-core/issues/419
---
 test/checks/shared/button-has-visible-text.js | 47 +++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 test/checks/shared/button-has-visible-text.js

diff --git a/test/checks/shared/button-has-visible-text.js b/test/checks/shared/button-has-visible-text.js
new file mode 100644
index 0000000000..fb3d0fa565
--- /dev/null
+++ b/test/checks/shared/button-has-visible-text.js
@@ -0,0 +1,47 @@
+describe('button-has-visible-text', function () {
+	'use strict';
+
+	var fixture = document.getElementById('fixture');
+
+	var checkContext = {
+		_data: null,
+		data: function (d) {
+			this._data = d;
+		}
+	};
+
+	afterEach(function () {
+		fixture.innerHTML = '';
+		checkContext._data = null;
+	});
+
+	it('should return false if button element is empty', function () {
+		fixture.innerHTML = '<button></button>';
+
+		var node = fixture.querySelector('button');
+		assert.isFalse(checks['button-has-visible-text'].evaluate.call(checkContext, node));
+	});
+
+	it('should return true if a button element has text', function () {
+		fixture.innerHTML = '<button>Name</button>';
+
+		var node = fixture.querySelector('button');
+		assert.isTrue(checks['button-has-visible-text'].evaluate.call(checkContext, node));
+		assert.deepEqual(checkContext._data, 'Name');
+	});
+
+	it('should return true if ARIA button has text', function () {
+		fixture.innerHTML = '<div role="button">Text</div>';
+
+		var node = fixture.querySelector('div');
+		assert.isTrue(checks['button-has-visible-text'].evaluate.call(checkContext, node));
+		assert.deepEqual(checkContext._data, 'Text');
+	});
+
+	it('should return false if ARIA button has no text', function () {
+		fixture.innerHTML = '<div role="button"></div>';
+
+		var node = fixture.querySelector('div');
+		assert.isFalse(checks['button-has-visible-text'].evaluate.call(checkContext, node));
+	});
+});
\ No newline at end of file

From 6f5327918ca40a4eebfd45533d51129ae72f8d0f Mon Sep 17 00:00:00 2001
From: Wilco Fiers <wilco.fiers@deque.com>
Date: Fri, 14 Jul 2017 13:52:33 +0200
Subject: [PATCH 073/142] feat: add check testUtils

---
 test/.jshintrc    |  1 +
 test/testutils.js | 31 +++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+)

diff --git a/test/.jshintrc b/test/.jshintrc
index dce6c75bef..d8372a2fbc 100644
--- a/test/.jshintrc
+++ b/test/.jshintrc
@@ -3,6 +3,7 @@
 	"globals": {
 		"describe": true,
 		"it": true,
+		"xit": true,
 		"before": true,
 		"beforeEach": true,
 		"after": true,
diff --git a/test/testutils.js b/test/testutils.js
index d7cab92b85..07508a5b33 100644
--- a/test/testutils.js
+++ b/test/testutils.js
@@ -16,4 +16,35 @@ testUtils.shadowSupport = (function(document) {
 
 })(document);
 
+testUtils.fixtureSetup = function (content) {
+	'use strict';
+	var fixture = document.querySelector('#fixture');
+	if (typeof content === 'string') {
+		fixture.innerHTML = content;
+	} else if (content instanceof Node) {
+		fixture.appendChild(content);
+	}
+	axe._tree = axe.utils.getFlattenedTree(fixture);
+	return fixture;
+};
+
+/**
+ * Create check arguments
+ *
+ * @param Node|String 	Stuff to go into the fixture (html or node)
+ * @param Object  			Options argument for the check (optional, default: {})
+ * @param String  			Target for the check, CSS selector (default: '#target')
+ */
+testUtils.checkSetup = function (content, options, target) {
+	'use strict';
+	// Normalize the params
+	if (typeof options !== 'object') {
+		target = options;
+		options = {};
+	}
+	testUtils.fixtureSetup(content);
+	var node = axe.utils.querySelectorAll(axe._tree[0], target || '#target')[0];
+	return [node.actualNode, options, node];
+};
+
 axe.testUtils = testUtils;
\ No newline at end of file

From 0f215746cd98b9a7280c6e22d65689a6a04cf133 Mon Sep 17 00:00:00 2001
From: Wilco Fiers <wilco.fiers@deque.com>
Date: Fri, 14 Jul 2017 13:53:29 +0200
Subject: [PATCH 074/142] feat: ShadowDOM support for media checks

---
 lib/checks/media/caption.js      | 17 +++++++---------
 lib/checks/media/description.js  | 18 ++++++++--------
 test/checks/media/caption.js     | 28 +++++++++++++++----------
 test/checks/media/description.js | 35 +++++++++++++++++++-------------
 4 files changed, 54 insertions(+), 44 deletions(-)

diff --git a/lib/checks/media/caption.js b/lib/checks/media/caption.js
index 65bd8c8871..80b6af6372 100644
--- a/lib/checks/media/caption.js
+++ b/lib/checks/media/caption.js
@@ -1,13 +1,10 @@
-var tracks = node.querySelectorAll('track');
+var tracks = axe.utils.querySelectorAll(virtualNode, 'track');
+
 if (tracks.length) {
-	for (var i=0; i<tracks.length; i++) {
-		var kind = tracks[i].getAttribute('kind');
-		if (kind && kind === 'captions') {
-			// only return for matching track, in case there are multiple
-			return false;
-		}
-	}
-	return true;
+  // return false if any track has kind === 'caption'
+  return !tracks.some(({ actualNode }) => (
+    actualNode.getAttribute('kind').toLowerCase() === 'captions'
+  ));
 }
-// for multiple track elements, return the first one that matches
+// Undefined if there are no tracks - media may be decorative
 return undefined;
diff --git a/lib/checks/media/description.js b/lib/checks/media/description.js
index 8f57000b94..65e29cd3b2 100644
--- a/lib/checks/media/description.js
+++ b/lib/checks/media/description.js
@@ -1,12 +1,12 @@
-var tracks = node.querySelectorAll('track');
+var tracks = axe.utils.querySelectorAll(virtualNode, 'track');
+
 if (tracks.length) {
-	for (var i=0; i<tracks.length; i++) {
-		var kind = tracks[i].getAttribute('kind');
-		if (kind && kind === 'descriptions') {
-			// only return for matching track, in case there are multiple
-			return false;
-		}
-	}
-	return true;
+  // return false if any track has kind === 'description'
+  var out = !tracks.some(({ actualNode }) => (
+    actualNode.getAttribute('kind').toLowerCase() === 'descriptions'
+  ));
+  axe.log(tracks.map(t => t.actualNode.getAttribute('kind')), out);
+  return out;
 }
+// Undefined if there are no tracks - media may be decorative
 return undefined;
diff --git a/test/checks/media/caption.js b/test/checks/media/caption.js
index c6e49af73a..3c313ed72c 100644
--- a/test/checks/media/caption.js
+++ b/test/checks/media/caption.js
@@ -2,29 +2,35 @@ describe('caption', function () {
 	'use strict';
 
 	var fixture = document.getElementById('fixture');
+	var shadowSupport = axe.testUtils.shadowSupport;
+	var checkSetup = axe.testUtils.checkSetup;
 
 	afterEach(function () {
 		fixture.innerHTML = '';
 	});
 
 	it('should return undefined if there is no track element', function () {
-		fixture.innerHTML = '<audio></audio>';
-		var node = fixture.querySelector('audio');
-
-		assert.isUndefined(checks.caption.evaluate(node));
+		var checkArgs = checkSetup('<audio></audio>', 'audio');
+		assert.isUndefined(checks.caption.evaluate.apply(null, checkArgs));
 	});
 
 	it('should fail if there is no kind=captions attribute', function () {
-		fixture.innerHTML = '<audio><track kind=descriptions></audio>';
-		var node = fixture.querySelector('audio');
-
-		assert.isTrue(checks.caption.evaluate(node));
+		var checkArgs = checkSetup('<audio><track kind=descriptions></audio>', 'audio');
+		assert.isTrue(checks.caption.evaluate.apply(null, checkArgs));
 	});
 
 	it('should pass if there is a kind=captions attribute', function () {
-		fixture.innerHTML = '<audio><track kind=captions></audio>';
-		var node = fixture.querySelector('audio');
+		var checkArgs = checkSetup('<audio><track kind=captions></audio>', 'audio');
+		assert.isFalse(checks.caption.evaluate.apply(null, checkArgs));
+	});
+
+	(shadowSupport.v1 ? it : xit)('should get track from composed tree', function () {
+		var node = document.createElement('div');
+		node.innerHTML = '<track kind=descriptions>';
+		var shadow = node.attachShadow({ mode: 'open' });
+		shadow.innerHTML = '<audio><slot></slot></audio>';
 
-		assert.isFalse(checks.caption.evaluate(node));
+		var checkArgs = checkSetup(node, {}, 'audio');
+		assert.isTrue(checks.caption.evaluate.apply(null, checkArgs));
 	});
 });
diff --git a/test/checks/media/description.js b/test/checks/media/description.js
index 168b1120f7..a423e1f98b 100644
--- a/test/checks/media/description.js
+++ b/test/checks/media/description.js
@@ -1,30 +1,37 @@
 describe('description', function () {
 	'use strict';
 
-	var fixture = document.getElementById('fixture');
+	var shadowSupport = axe.testUtils.shadowSupport;
+	var checkSetup = axe.testUtils.checkSetup;
 
 	afterEach(function () {
-		fixture.innerHTML = '';
+		document.getElementById('fixture').innerHTML = '';
 	});
 
 	it('should return undefined if there is no track element', function () {
-		fixture.innerHTML = '<video></video>';
-		var node = fixture.querySelector('video');
-
-		assert.isUndefined(checks.description.evaluate(node));
+		var checkArgs = checkSetup('<video></video>', 'video');
+		assert.isUndefined(checks.description.evaluate.apply(null, checkArgs));
 	});
 
-	it('should fail if there is no kind=descriptions attribute', function () {
-		fixture.innerHTML = '<video><track kind=captions></video>';
-		var node = fixture.querySelector('video');
-
-		assert.isTrue(checks.description.evaluate(node));
+	it('should fail if there is no kind=captions attribute', function () {
+		var checkArgs = checkSetup('<video><track kind=captions></video>', 'video');
+		assert.isTrue(checks.description.evaluate.apply(null, checkArgs));
 	});
 
 	it('should pass if there is a kind=descriptions attribute', function () {
-		fixture.innerHTML = '<video><track kind=descriptions></video>';
-		var node = fixture.querySelector('video');
+		var checkArgs = checkSetup('<video><track kind=descriptions></video>', 'video');
+		assert.isFalse(checks.description.evaluate.apply(null, checkArgs));
+	});
 
-		assert.isFalse(checks.description.evaluate(node));
+	(shadowSupport.v1 ? it : xit)('should get track from composed tree', function () {
+		var node = document.createElement('div');
+		node.innerHTML = '<track kind=descriptions>';
+		var shadow = node.attachShadow({ mode: 'open' });
+		shadow.innerHTML = '<video><slot></slot></video>';
+
+		var checkArgs = checkSetup(node, {}, 'video');
+		axe.log(checkArgs);
+		assert.isFalse(checks.description.evaluate.apply(null, checkArgs));
 	});
+
 });

From f996d0f1b77ca2e03b4b0d384d911adc7bec48a7 Mon Sep 17 00:00:00 2001
From: Wilco Fiers <wilco.fiers@deque.com>
Date: Fri, 14 Jul 2017 22:03:06 +0200
Subject: [PATCH 075/142] fix: Allow <track> to have no kind attribute

---
 lib/checks/media/caption.js      | 2 +-
 lib/checks/media/description.js  | 2 +-
 test/checks/media/caption.js     | 5 +++++
 test/checks/media/description.js | 5 +++++
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/lib/checks/media/caption.js b/lib/checks/media/caption.js
index 80b6af6372..d7d6090521 100644
--- a/lib/checks/media/caption.js
+++ b/lib/checks/media/caption.js
@@ -3,7 +3,7 @@ var tracks = axe.utils.querySelectorAll(virtualNode, 'track');
 if (tracks.length) {
   // return false if any track has kind === 'caption'
   return !tracks.some(({ actualNode }) => (
-    actualNode.getAttribute('kind').toLowerCase() === 'captions'
+    (actualNode.getAttribute('kind') || '').toLowerCase() === 'captions'
   ));
 }
 // Undefined if there are no tracks - media may be decorative
diff --git a/lib/checks/media/description.js b/lib/checks/media/description.js
index 65e29cd3b2..f6bb01a5fb 100644
--- a/lib/checks/media/description.js
+++ b/lib/checks/media/description.js
@@ -3,7 +3,7 @@ var tracks = axe.utils.querySelectorAll(virtualNode, 'track');
 if (tracks.length) {
   // return false if any track has kind === 'description'
   var out = !tracks.some(({ actualNode }) => (
-    actualNode.getAttribute('kind').toLowerCase() === 'descriptions'
+    (actualNode.getAttribute('kind') || '').toLowerCase() === 'descriptions'
   ));
   axe.log(tracks.map(t => t.actualNode.getAttribute('kind')), out);
   return out;
diff --git a/test/checks/media/caption.js b/test/checks/media/caption.js
index 3c313ed72c..3d7606a644 100644
--- a/test/checks/media/caption.js
+++ b/test/checks/media/caption.js
@@ -19,6 +19,11 @@ describe('caption', function () {
 		assert.isTrue(checks.caption.evaluate.apply(null, checkArgs));
 	});
 
+	it('should fail if there is no kind attribute', function () {
+		var checkArgs = checkSetup('<video><track></video>', 'video');
+		assert.isTrue(checks.description.evaluate.apply(null, checkArgs));
+	});
+
 	it('should pass if there is a kind=captions attribute', function () {
 		var checkArgs = checkSetup('<audio><track kind=captions></audio>', 'audio');
 		assert.isFalse(checks.caption.evaluate.apply(null, checkArgs));
diff --git a/test/checks/media/description.js b/test/checks/media/description.js
index a423e1f98b..46512a2e5a 100644
--- a/test/checks/media/description.js
+++ b/test/checks/media/description.js
@@ -18,6 +18,11 @@ describe('description', function () {
 		assert.isTrue(checks.description.evaluate.apply(null, checkArgs));
 	});
 
+	it('should fail if there is no kind attribute', function () {
+		var checkArgs = checkSetup('<video><track></video>', 'video');
+		assert.isTrue(checks.description.evaluate.apply(null, checkArgs));
+	});
+
 	it('should pass if there is a kind=descriptions attribute', function () {
 		var checkArgs = checkSetup('<video><track kind=descriptions></video>', 'video');
 		assert.isFalse(checks.description.evaluate.apply(null, checkArgs));

From d92c1a14379ff6592115fb7085fb788bbe00c397 Mon Sep 17 00:00:00 2001
From: Wilco Fiers <WilcoFiers@users.noreply.github.com>
Date: Sun, 16 Jul 2017 15:49:55 +0200
Subject: [PATCH 076/142] feat: Add shadow DOM support to list checks (#439)

* feat: add check testUtils

* fix: getComposedParent should not return slot nodes

* feat: Add shadow DOM support to list checks

* test: Add shadow DOM list check fails
---
 lib/checks/lists/dlitem.js              |   4 +-
 lib/checks/lists/has-listitem.js        |  11 +--
 lib/checks/lists/listitem.js            |  10 +-
 lib/checks/lists/only-dlitems.js        |  19 ++--
 lib/checks/lists/only-listitems.js      |  19 ++--
 lib/checks/lists/structured-dlitems.js  |   4 +-
 lib/commons/dom/get-composed-parent.js  |   5 +-
 test/checks/lists/dlitem.js             |  30 ++++--
 test/checks/lists/has-listitem.js       |  44 +++++----
 test/checks/lists/listitem.js           |  44 ++++++---
 test/checks/lists/only-dlitems.js       | 118 ++++++++++++------------
 test/checks/lists/only-listitems.js     | 108 +++++++++++-----------
 test/checks/lists/structured-dlitems.js |  67 +++++++-------
 test/commons/dom/get-composed-parent.js |   8 +-
 14 files changed, 258 insertions(+), 233 deletions(-)

diff --git a/lib/checks/lists/dlitem.js b/lib/checks/lists/dlitem.js
index 96ec9e65b1..80a6608fc7 100644
--- a/lib/checks/lists/dlitem.js
+++ b/lib/checks/lists/dlitem.js
@@ -1,2 +1,2 @@
-return node.parentNode.tagName === 'DL';
-
+var parent = axe.commons.dom.getComposedParent(node);
+return parent.nodeName.toUpperCase() === 'DL';
diff --git a/lib/checks/lists/has-listitem.js b/lib/checks/lists/has-listitem.js
index d38f7bd805..05aff66304 100644
--- a/lib/checks/lists/has-listitem.js
+++ b/lib/checks/lists/has-listitem.js
@@ -1,9 +1,2 @@
-var children = node.children;
-if (children.length === 0) { return true; }
-
-for (var i = 0; i < children.length; i++) {
-	if (children[i].nodeName.toUpperCase() === 'LI') { return false; }
-}
-
-return true;
-
+return virtualNode.children.every(({ actualNode }) => 
+    actualNode.nodeName.toUpperCase() !== 'LI');
diff --git a/lib/checks/lists/listitem.js b/lib/checks/lists/listitem.js
index 16e396b878..1a7abcb40d 100644
--- a/lib/checks/lists/listitem.js
+++ b/lib/checks/lists/listitem.js
@@ -1,6 +1,4 @@
-
-if (['UL', 'OL'].indexOf(node.parentNode.nodeName.toUpperCase()) !== -1) {
-	return true;
-}
-
-return node.parentNode.getAttribute('role') === 'list';
+var parent = axe.commons.dom.getComposedParent(node);
+return (['UL', 'OL'].includes(parent.nodeName.toUpperCase()) ||
+    (parent.getAttribute('role') || '').toLowerCase() === 'list');
+  
\ No newline at end of file
diff --git a/lib/checks/lists/only-dlitems.js b/lib/checks/lists/only-dlitems.js
index a003f8dbee..ff3a20d62d 100644
--- a/lib/checks/lists/only-dlitems.js
+++ b/lib/checks/lists/only-dlitems.js
@@ -1,19 +1,16 @@
-var child,
-	nodeName,
-	bad = [],
-	children = node.childNodes,
+var bad = [],
 	permitted = ['STYLE', 'META', 'LINK', 'MAP', 'AREA', 'SCRIPT', 'DATALIST', 'TEMPLATE'],
 	hasNonEmptyTextNode = false;
 
-for (var i = 0; i < children.length; i++) {
-	child = children[i];
-	var nodeName = child.nodeName.toUpperCase();
-	if (child.nodeType === 1 && nodeName !== 'DT' && nodeName !== 'DD' && permitted.indexOf(nodeName) === -1) {
-		bad.push(child);
-	} else if (child.nodeType === 3 && child.nodeValue.trim() !== '') {
+virtualNode.children.forEach(({ actualNode }) => {
+	var nodeName = actualNode.nodeName.toUpperCase();
+	if (actualNode.nodeType === 1 && nodeName !== 'DT' && nodeName !== 'DD' && permitted.indexOf(nodeName) === -1) {
+		bad.push(actualNode);
+	} else if (actualNode.nodeType === 3 && actualNode.nodeValue.trim() !== '') {
 		hasNonEmptyTextNode = true;
 	}
-}
+});
+
 if (bad.length) {
 	this.relatedNodes(bad);
 }
diff --git a/lib/checks/lists/only-listitems.js b/lib/checks/lists/only-listitems.js
index 547fe79652..bdb53064e5 100644
--- a/lib/checks/lists/only-listitems.js
+++ b/lib/checks/lists/only-listitems.js
@@ -1,19 +1,16 @@
-var child,
-	nodeName,
-	bad = [],
-	children = node.childNodes,
+var bad = [],
 	permitted = ['STYLE', 'META', 'LINK', 'MAP', 'AREA', 'SCRIPT', 'DATALIST', 'TEMPLATE'],
 	hasNonEmptyTextNode = false;
 
-for (var i = 0; i < children.length; i++) {
-	child = children[i];
-	nodeName = child.nodeName.toUpperCase();
-	if (child.nodeType === 1 && nodeName !== 'LI' && permitted.indexOf(nodeName) === -1) {
-		bad.push(child);
-	} else if (child.nodeType === 3 && child.nodeValue.trim() !== '') {
+virtualNode.children.forEach(({ actualNode }) => {
+	var nodeName = actualNode.nodeName.toUpperCase();
+	if (actualNode.nodeType === 1 && nodeName !== 'LI' && permitted.indexOf(nodeName) === -1) {
+		bad.push(actualNode);
+	} else if (actualNode.nodeType === 3 && actualNode.nodeValue.trim() !== '') {
 		hasNonEmptyTextNode = true;
 	}
-}
+});
+
 if (bad.length) {
 	this.relatedNodes(bad);
 }
diff --git a/lib/checks/lists/structured-dlitems.js b/lib/checks/lists/structured-dlitems.js
index b8578dffb1..7654da061d 100644
--- a/lib/checks/lists/structured-dlitems.js
+++ b/lib/checks/lists/structured-dlitems.js
@@ -1,9 +1,9 @@
-var children = node.children;
+var children = virtualNode.children;
 if ( !children || !children.length) { return false; }
 
 var hasDt = false, hasDd = false, nodeName;
 for (var i = 0; i < children.length; i++) {
-	nodeName = children[i].nodeName.toUpperCase();
+	nodeName = children[i].actualNode.nodeName.toUpperCase();
 	if (nodeName === 'DT') { hasDt = true; }
 	if (hasDt && nodeName === 'DD') { return false; }
 	if (nodeName === 'DD') { hasDd = true; }
diff --git a/lib/commons/dom/get-composed-parent.js b/lib/commons/dom/get-composed-parent.js
index c5cfc74339..fdec0a4b18 100644
--- a/lib/commons/dom/get-composed-parent.js
+++ b/lib/commons/dom/get-composed-parent.js
@@ -6,7 +6,10 @@
  */
 dom.getComposedParent = function getComposedParent (element)  {
   if (element.assignedSlot) {
-    return element.assignedSlot; // content of a shadow DOM slot
+    // NOTE: If the display of a slot element isn't 'contents',
+    // the slot shouldn't be ignored. Chrome does not support this (yet) so,
+    // we'll skip this part for now.
+    return getComposedParent(element.assignedSlot); // content of a shadow DOM slot
   } else if (element.parentNode) {
     var parentNode = element.parentNode;
     if (parentNode.nodeType === 1) {
diff --git a/test/checks/lists/dlitem.js b/test/checks/lists/dlitem.js
index f8d50778c8..827e6a6405 100644
--- a/test/checks/lists/dlitem.js
+++ b/test/checks/lists/dlitem.js
@@ -2,26 +2,42 @@ describe('dlitem', function () {
 	'use strict';
 
 	var fixture = document.getElementById('fixture');
+	var checkSetup = axe.testUtils.checkSetup;
+	var shadowSupport = axe.testUtils.shadowSupport;
 
 	afterEach(function () {
 		fixture.innerHTML = '';
 	});
 
 	it('should pass if the dlitem has a parent <dl>', function () {
-		fixture.innerHTML = '<dl><dt id="target">My list item</dl>';
-		var node = fixture.querySelector('#target');
+		var checkArgs = checkSetup('<dl><dt id="target">My list item</dl>');
 
-		assert.isTrue(checks.dlitem.evaluate(node));
+		assert.isTrue(checks.dlitem.evaluate.apply(null, checkArgs));
+	});
 
+	it('should fail if the dlitem has an incorrect parent', function () {
+		var checkArgs = checkSetup('<video><dt id="target">My list item</video>');
 
+		assert.isFalse(checks.dlitem.evaluate.apply(null, checkArgs));
 	});
 
-	it('should fail if the dlitem has an incorrect parent', function () {
-		fixture.innerHTML = '<video><dt id="target">My list item</video>';
-		var node = fixture.querySelector('#target');
+	(shadowSupport ? it : xit)('should return true in a shadow DOM pass', function () {
+		var node = document.createElement('div');
+		node.innerHTML = '<dt>My list item </dt>';
+		var shadow = node.attachShadow({ mode: 'open' });
+		shadow.innerHTML = '<dl><slot></slot></dl>';
 
-		assert.isFalse(checks.dlitem.evaluate(node));
+		var checkArgs = checkSetup(node, 'dt');
+		assert.isTrue(checks.dlitem.evaluate.apply(null, checkArgs));
+	});
 
+	(shadowSupport ? it : xit)('should return false in a shadow DOM fail', function () {
+		var node = document.createElement('div');
+		node.innerHTML = '<dt>My list item </dt>';
+		var shadow = node.attachShadow({ mode: 'open' });
+		shadow.innerHTML = '<div><slot></slot></div>';
 
+		var checkArgs = checkSetup(node, 'dt');
+		assert.isFalse(checks.dlitem.evaluate.apply(null, checkArgs));
 	});
 });
diff --git a/test/checks/lists/has-listitem.js b/test/checks/lists/has-listitem.js
index 083e2f68f9..87ca1f5865 100644
--- a/test/checks/lists/has-listitem.js
+++ b/test/checks/lists/has-listitem.js
@@ -2,45 +2,55 @@ describe('has-listitem', function () {
 	'use strict';
 
 	var fixture = document.getElementById('fixture');
+	var checkSetup = axe.testUtils.checkSetup;
+	var shadowSupport = axe.testUtils.shadowSupport;
 
 	afterEach(function () {
 		fixture.innerHTML = '';
 	});
 
 	it('should return true if the list has no contents', function () {
-		fixture.innerHTML = '<ol id="target"></ol>';
-		var node = fixture.querySelector('#target');
-
-		assert.isTrue(checks['has-listitem'].evaluate(node));
-
+		var checkArgs = checkSetup('<ol id="target"></ol>');
 
+		assert.isTrue(checks['has-listitem'].evaluate.apply(null, checkArgs));
 	});
 
 	it('should return true if the list has non-li contents with li children', function () {
-		fixture.innerHTML = '<ol id="target"><p>Not a list <ul><li>item</li></ul></p></ol>';
-		var node = fixture.querySelector('#target');
-
-		assert.isTrue(checks['has-listitem'].evaluate(node));
-
+		var checkArgs = checkSetup('<ol id="target"><p>Not a list <ul><li>item</li></ul></p></ol>');
 
+		assert.isTrue(checks['has-listitem'].evaluate.apply(null, checkArgs));
 	});
 
 	it('should return true if the list has non-li contents', function () {
-		fixture.innerHTML = '<ol id="target"><p>Not a list</p></ol>';
-		var node = fixture.querySelector('#target');
+		var checkArgs = checkSetup('<ol id="target"><p>Not a list</p></ol>');
 
-		assert.isTrue(checks['has-listitem'].evaluate(node));
+		assert.isTrue(checks['has-listitem'].evaluate.apply(null, checkArgs));
+	});
 
+	it('should return false if the list has at least one li', function () {
+		var checkArgs = checkSetup('<ol id="target"><li>A list</li><p>Not a list</p></ol>');
 
+		assert.isFalse(checks['has-listitem'].evaluate.apply(null, checkArgs));
 	});
 
-	it('should return false if the list has at least one li', function () {
-		fixture.innerHTML = '<ol id="target"><li>A list</li><p>Not a list</p></ol>';
-		var node = fixture.querySelector('#target');
+	(shadowSupport ? it : xit)('should return true in a shadow DOM pass', function () {
+		var node = document.createElement('div');
+		node.innerHTML = '<li>My list item </li>';
+		var shadow = node.attachShadow({ mode: 'open' });
+		shadow.innerHTML = '<ul><slot></slot></ul>';
 
-		assert.isFalse(checks['has-listitem'].evaluate(node));
+		var checkArgs = checkSetup(node, 'ul');
+		assert.isFalse(checks['has-listitem'].evaluate.apply(null, checkArgs));
+	});
 
+	(shadowSupport ? it : xit)('should return false in a shadow DOM fail', function () {
+		var node = document.createElement('div');
+		node.innerHTML = '<p>Not a list</p>';
+		var shadow = node.attachShadow({ mode: 'open' });
+		shadow.innerHTML = '<ul><slot></slot></ul>';
 
+		var checkArgs = checkSetup(node, 'ul');
+		assert.isTrue(checks['has-listitem'].evaluate.apply(null, checkArgs));
 	});
 
 });
diff --git a/test/checks/lists/listitem.js b/test/checks/lists/listitem.js
index 1c094a5eaa..179a631cd6 100644
--- a/test/checks/lists/listitem.js
+++ b/test/checks/lists/listitem.js
@@ -2,40 +2,54 @@ describe('listitem', function () {
 	'use strict';
 
 	var fixture = document.getElementById('fixture');
+	var checkSetup = axe.testUtils.checkSetup;
+	var shadowSupport = axe.testUtils.shadowSupport;
 
 	afterEach(function () {
 		fixture.innerHTML = '';
 	});
 
 	it('should pass if the listitem has a parent <ol>', function () {
-		fixture.innerHTML = '<ol><li id="target">My list item</li></ol>';
-		var node = fixture.querySelector('#target');
-
-		assert.isTrue(checks.listitem.evaluate(node));
+		var checkArgs = checkSetup('<ol><li id="target">My list item</li></ol>');
 
+		assert.isTrue(checks.listitem.evaluate.apply(null, checkArgs));
 	});
 
 	it('should pass if the listitem has a parent <ul>', function () {
-		fixture.innerHTML = '<ul><li id="target">My list item</li></ul>';
-		var node = fixture.querySelector('#target');
-
-		assert.isTrue(checks.listitem.evaluate(node));
+		var checkArgs = checkSetup('<ul><li id="target">My list item</li></ul>');
 
+		assert.isTrue(checks.listitem.evaluate.apply(null, checkArgs));
 	});
 
 	it('should pass if the listitem has a parent role=list', function () {
-		fixture.innerHTML = '<div role="list"><li id="target">My list item</li></div>';
-		var node = fixture.querySelector('#target');
-
-		assert.isTrue(checks.listitem.evaluate(node));
+		var checkArgs = checkSetup('<div role="list"><li id="target">My list item</li></div>');
 
+		assert.isTrue(checks.listitem.evaluate.apply(null, checkArgs));
 	});
 
 	it('should fail if the listitem has an incorrect parent', function () {
-		fixture.innerHTML = '<div><li id="target">My list item</li></div>';
-		var node = fixture.querySelector('#target');
+		var checkArgs = checkSetup('<div><li id="target">My list item</li></div>');
+
+		assert.isFalse(checks.listitem.evaluate.apply(null, checkArgs));
+	});
+
+	(shadowSupport ? it : xit)('should return true in a shadow DOM pass', function () {
+		var node = document.createElement('div');
+		node.innerHTML = '<li>My list item </li>';
+		var shadow = node.attachShadow({ mode: 'open' });
+		shadow.innerHTML = '<ul><slot></slot></ul>';
+
+		var checkArgs = checkSetup(node, 'li');
+		assert.isTrue(checks.listitem.evaluate.apply(null, checkArgs));
+	});
 
-		assert.isFalse(checks.listitem.evaluate(node));
+	(shadowSupport ? it : xit)('should return false in a shadow DOM fail', function () {
+		var node = document.createElement('div');
+		node.innerHTML = '<li>My list item </li>';
+		var shadow = node.attachShadow({ mode: 'open' });
+		shadow.innerHTML = '<div><slot></slot></div>';
 
+		var checkArgs = checkSetup(node, 'li');
+		assert.isFalse(checks.listitem.evaluate.apply(null, checkArgs));
 	});
 });
diff --git a/test/checks/lists/only-dlitems.js b/test/checks/lists/only-dlitems.js
index 6bfae020fa..efca12bc64 100644
--- a/test/checks/lists/only-dlitems.js
+++ b/test/checks/lists/only-dlitems.js
@@ -2,6 +2,8 @@ describe('only-dlitems', function () {
 	'use strict';
 
 	var fixture = document.getElementById('fixture');
+	var checkSetup = axe.testUtils.checkSetup;
+	var shadowSupport = axe.testUtils.shadowSupport;
 
 	var checkContext = {
 		_relatedNodes: [],
@@ -16,115 +18,109 @@ describe('only-dlitems', function () {
 	});
 
 	it('should return false if the list has no contents', function () {
-		fixture.innerHTML = '<dl id="target"></dl>';
-		var node = fixture.querySelector('#target');
-
-		assert.isFalse(checks['only-dlitems'].evaluate(node));
-
+		var checkArgs = checkSetup('<dl id="target"></dl>');
 
+		assert.isFalse(checks['only-dlitems'].evaluate.apply(checkContext, checkArgs));
 	});
 
 	it('should return true if the list has non-dd/dt contents', function () {
-		fixture.innerHTML = '<dl id="target"><p>Not a list</p></dl>';
-		var node = fixture.querySelector('#target');
-
-		assert.isTrue(checks['only-dlitems'].evaluate.call(checkContext, node));
-		assert.deepEqual(checkContext._relatedNodes, [node.querySelector('p')]);
-
+		var checkArgs = checkSetup('<dl id="target"><p>Not a list</p></dl>');
 
+		assert.isTrue(checks['only-dlitems'].evaluate.apply(checkContext, checkArgs));
+		assert.deepEqual(checkContext._relatedNodes, [fixture.querySelector('p')]);
 	});
 
 	it('should return false if the list has only a dd', function () {
-		fixture.innerHTML = '<dl id="target"><dd>A list</dd></dl>';
-		var node = fixture.querySelector('#target');
-
-		assert.isFalse(checks['only-dlitems'].evaluate(node));
-
+		var checkArgs = checkSetup('<dl id="target"><dd>A list</dd></dl>');
 
+		assert.isFalse(checks['only-dlitems'].evaluate.apply(checkContext, checkArgs));
 	});
 
 	it('should return false if the list has only a dt', function () {
-		fixture.innerHTML = '<dl id="target"><dt>A list</dt></dl>';
-		var node = fixture.querySelector('#target');
-
-		assert.isFalse(checks['only-dlitems'].evaluate(node));
-
+		var checkArgs = checkSetup('<dl id="target"><dt>A list</dt></dl>');
 
+		assert.isFalse(checks['only-dlitems'].evaluate.apply(checkContext, checkArgs));
 	});
 
 	it('should return false if the list has dt and dd with child content', function () {
-		fixture.innerHTML = '<dl id="target"><dt><p>An item</p></dt><dd>A list</dd></dl>';
-		var node = fixture.querySelector('#target');
-
-		assert.isFalse(checks['only-dlitems'].evaluate(node));
-
+		var checkArgs = checkSetup('<dl id="target"><dt><p>An item</p></dt><dd>A list</dd></dl>');
 
+		assert.isFalse(checks['only-dlitems'].evaluate.apply(checkContext, checkArgs));
 	});
 
 	it('should return false if the list has dt and dd', function () {
-		fixture.innerHTML = '<dl id="target"><dt>An item</dt><dd>A list</dd></dl>';
-		var node = fixture.querySelector('#target');
-
-		assert.isFalse(checks['only-dlitems'].evaluate(node));
-
+		var checkArgs = checkSetup('<dl id="target"><dt>An item</dt><dd>A list</dd></dl>');
 
+		assert.isFalse(checks['only-dlitems'].evaluate.apply(checkContext, checkArgs));
 	});
 
 	it('should return false if the list has dt, dd and a comment', function () {
-		fixture.innerHTML = '<dl id="target"><dt>An item</dt><dd>A list</dd><!-- foo --></dl>';
-		var node = fixture.querySelector('#target');
-
-		assert.isFalse(checks['only-dlitems'].evaluate(node));
-
+		var checkArgs = checkSetup('<dl id="target"><dt>An item</dt><dd>A list</dd><!-- foo --></dl>');
 
+		assert.isFalse(checks['only-dlitems'].evaluate.apply(checkContext, checkArgs));
 	});
 
 	it('should return true if the list has a dt and dd with other content', function () {
-		fixture.innerHTML = '<dl id="target"><dt>Item one</dt><dd>Description</dd><p>Not a list</p></dl>';
-		var node = fixture.querySelector('#target');
-
-		assert.isTrue(checks['only-dlitems'].evaluate.call(checkContext, node));
-		assert.deepEqual(checkContext._relatedNodes, [node.querySelector('p')]);
-
+		var checkArgs = checkSetup('<dl id="target"><dt>Item one</dt><dd>Description</dd><p>Not a list</p></dl>');
 
+		assert.isTrue(checks['only-dlitems'].evaluate.apply(checkContext, checkArgs));
+		assert.deepEqual(checkContext._relatedNodes, [fixture.querySelector('p')]);
 	});
 
 	it('should return true if the list has a textNode as a child', function () {
-		fixture.innerHTML = '<dl id="target"><!--hi--><dt>hi</dt>hello<dd>hi</dd></dl>';
-		var node = fixture.querySelector('#target');
+		var checkArgs = checkSetup('<dl id="target"><!--hi--><dt>hi</dt>hello<dd>hi</dd></dl>');
 
-		assert.isTrue(checks['only-dlitems'].evaluate.call(checkContext, node));
+		assert.isTrue(checks['only-dlitems'].evaluate.apply(checkContext, checkArgs));
 		assert.deepEqual(checkContext._relatedNodes, []);
 	});
 
-
 	it('should return false if <link> is used along side dt', function () {
-		fixture.innerHTML = '<dl id="target"><link rel="stylesheet" href="theme.css"><dt>A list</dt></dl>';
-		var node = fixture.querySelector('#target');
-		assert.isFalse(checks['only-dlitems'].evaluate.call(checkContext, node));
+		var checkArgs = checkSetup('<dl id="target"><link rel="stylesheet" href="theme.css"><dt>A list</dt></dl>');
+
+		assert.isFalse(checks['only-dlitems'].evaluate.apply(checkContext, checkArgs));
 	});
 
 	it('should return false if <meta> is used along side dt', function () {
-		fixture.innerHTML = '<dl id="target"><meta name="description" content=""><dt>A list</dt></dl>';
-		var node = fixture.querySelector('#target');
-		assert.isFalse(checks['only-dlitems'].evaluate.call(checkContext, node));
+		var checkArgs = checkSetup('<dl id="target"><meta name="description" content=""><dt>A list</dt></dl>');
+
+		assert.isFalse(checks['only-dlitems'].evaluate.apply(checkContext, checkArgs));
 	});
 
 	it('should return false if <script> is used along side dt', function () {
-		fixture.innerHTML = '<dl id="target"><script src="script.js"></script><dt>A list</dt></dl>';
-		var node = fixture.querySelector('#target');
-		assert.isFalse(checks['only-dlitems'].evaluate.call(checkContext, node));
+		var checkArgs = checkSetup('<dl id="target"><script src="script.js"></script><dt>A list</dt></dl>');
+
+		assert.isFalse(checks['only-dlitems'].evaluate.apply(checkContext, checkArgs));
 	});
 
 	it('should return false if <style> is used along side dt', function () {
-		fixture.innerHTML = '<dl id="target"><style></style><dt>A list</dt></dl>';
-		var node = fixture.querySelector('#target');
-		assert.isFalse(checks['only-dlitems'].evaluate.call(checkContext, node));
+		var checkArgs = checkSetup('<dl id="target"><style></style><dt>A list</dt></dl>');
+
+		assert.isFalse(checks['only-dlitems'].evaluate.apply(checkContext, checkArgs));
 	});
 
 	it('should return false if <template> is used along side dt', function () {
-		fixture.innerHTML = '<dl id="target"><template></template><dt>A list</dt></dl>';
-		var node = fixture.querySelector('#target');
-		assert.isFalse(checks['only-dlitems'].evaluate.call(checkContext, node));
+		var checkArgs = checkSetup('<dl id="target"><template></template><dt>A list</dt></dl>');
+
+		assert.isFalse(checks['only-dlitems'].evaluate.apply(checkContext, checkArgs));
+	});
+
+	(shadowSupport ? it : xit)('should return false in a shadow DOM pass', function () {
+		var node = document.createElement('div');
+		node.innerHTML = '<dt>My list item </dt>';
+		var shadow = node.attachShadow({ mode: 'open' });
+		shadow.innerHTML = '<dl><slot></slot></dl>';
+
+		var checkArgs = checkSetup(node, 'dl');
+		assert.isFalse(checks['only-dlitems'].evaluate.apply(checkContext, checkArgs));
+	});
+
+	(shadowSupport ? it : xit)('should return true in a shadow DOM fail', function () {
+		var node = document.createElement('div');
+		node.innerHTML = '<p>Not a list</p>';
+		var shadow = node.attachShadow({ mode: 'open' });
+		shadow.innerHTML = '<dl><slot></slot></dl>';
+
+		var checkArgs = checkSetup(node, 'dl');
+		assert.isTrue(checks['only-dlitems'].evaluate.apply(checkContext, checkArgs));
 	});
 });
diff --git a/test/checks/lists/only-listitems.js b/test/checks/lists/only-listitems.js
index 066ae53d03..4be9a4e8b4 100644
--- a/test/checks/lists/only-listitems.js
+++ b/test/checks/lists/only-listitems.js
@@ -2,6 +2,8 @@ describe('only-listitems', function () {
 	'use strict';
 
 	var fixture = document.getElementById('fixture');
+	var checkSetup = axe.testUtils.checkSetup;
+	var shadowSupport = axe.testUtils.shadowSupport;
 
 	var checkContext = {
 		_relatedNodes: [],
@@ -16,103 +18,103 @@ describe('only-listitems', function () {
 	});
 
 	it('should return false if the list has no contents', function () {
-		fixture.innerHTML = '<ol id="target"></ol>';
-		var node = fixture.querySelector('#target');
-
-		assert.isFalse(checks['only-listitems'].evaluate(node));
-
+		var checkArgs = checkSetup('<ol id="target"></ol>');
 
+		assert.isFalse(checks['only-listitems'].evaluate.apply(checkContext, checkArgs));
 	});
 
 	it('should return false if the list has whitespace', function () {
-		fixture.innerHTML = '<ol id="target"><li>Item</li>    </ol>';
-		var node = fixture.querySelector('#target');
-
-		assert.isFalse(checks['only-listitems'].evaluate(node));
-
+		var checkArgs = checkSetup('<ol id="target"><li>Item</li>    </ol>');
 
+		assert.isFalse(checks['only-listitems'].evaluate.apply(checkContext, checkArgs));
 	});
 
 	it('should return false if the list has non-li comments', function () {
-		fixture.innerHTML = '<ol id="target"><li>Item</li><!--comment--></ol>';
-		var node = fixture.querySelector('#target');
-
-		assert.isFalse(checks['only-listitems'].evaluate(node));
-
+		var checkArgs = checkSetup('<ol id="target"><li>Item</li><!--comment--></ol>');
 
+		assert.isFalse(checks['only-listitems'].evaluate.apply(checkContext, checkArgs));
 	});
 
 	it('should return true if the list has non-li text contents', function () {
-		fixture.innerHTML = '<ol id="target"><li>Item</li>Not an item</ol>';
-		var node = fixture.querySelector('#target');
-
-		assert.isTrue(checks['only-listitems'].evaluate(node));
-
+		var checkArgs = checkSetup('<ol id="target"><li>Item</li>Not an item</ol>');
 
+		assert.isTrue(checks['only-listitems'].evaluate.apply(checkContext, checkArgs));
 	});
 
 	it('should return true if the list has non-li contents', function () {
-		fixture.innerHTML = '<ol id="target"><p>Not a list</p></ol>';
-		var node = fixture.querySelector('#target');
-
-		assert.isTrue(checks['only-listitems'].evaluate.call(checkContext, node));
-		assert.deepEqual(checkContext._relatedNodes, [node.querySelector('p')]);
-
+		var checkArgs = checkSetup('<ol id="target"><p>Not a list</p></ol>');
 
+		assert.isTrue(checks['only-listitems'].evaluate.apply(checkContext, checkArgs));
+		assert.deepEqual(checkContext._relatedNodes, [fixture.querySelector('p')]);
 	});
 
 	it('should return false if the list has only an li with child content', function () {
-		fixture.innerHTML = '<ol id="target"><li>A <i>list</i></li></ol>';
-		var node = fixture.querySelector('#target');
-
-		assert.isFalse(checks['only-listitems'].evaluate(node));
-
+		var checkArgs = checkSetup('<ol id="target"><li>A <i>list</i></li></ol>');
 
+		assert.isFalse(checks['only-listitems'].evaluate.apply(checkContext, checkArgs));
 	});
 
 	it('should return false if the list has only an li', function () {
-		fixture.innerHTML = '<ol id="target"><li>A list</li></ol>';
-		var node = fixture.querySelector('#target');
+		var checkArgs = checkSetup('<ol id="target"><li>A list</li></ol>');
 
-		assert.isFalse(checks['only-listitems'].evaluate(node));
+		assert.isFalse(checks['only-listitems'].evaluate.apply(checkContext, checkArgs));
 	});
 
 	it('should return true if the list has an li with other content', function () {
-		fixture.innerHTML = '<ol id="target"><li>A list</li><p>Not a list</p></ol>';
-		var node = fixture.querySelector('#target');
+		var checkArgs = checkSetup('<ol id="target"><li>A list</li><p>Not a list</p></ol>');
 
-		assert.isTrue(checks['only-listitems'].evaluate.call(checkContext, node));
-		assert.deepEqual(checkContext._relatedNodes, [node.querySelector('p')]);
+		assert.isTrue(checks['only-listitems'].evaluate.apply(checkContext, checkArgs));
+		assert.deepEqual(checkContext._relatedNodes, [fixture.querySelector('p')]);
 	});
 
 	it('should return false if <link> is used along side li', function () {
-		fixture.innerHTML = '<ol id="target"><link rel="stylesheet" href="theme.css"><li>A list</li></ol>';
-		var node = fixture.querySelector('#target');
-		assert.isFalse(checks['only-listitems'].evaluate.call(checkContext, node));
+		var checkArgs = checkSetup('<ol id="target"><link rel="stylesheet" href="theme.css"><li>A list</li></ol>');
+
+		assert.isFalse(checks['only-listitems'].evaluate.apply(checkContext, checkArgs));
 	});
 
 	it('should return false if <meta> is used along side li', function () {
-		fixture.innerHTML = '<ol id="target"><meta name="description" content=""><li>A list</li></ol>';
-		var node = fixture.querySelector('#target');
-		assert.isFalse(checks['only-listitems'].evaluate.call(checkContext, node));
+		var checkArgs = checkSetup('<ol id="target"><meta name="description" content=""><li>A list</li></ol>');
+
+		assert.isFalse(checks['only-listitems'].evaluate.apply(checkContext, checkArgs));
 	});
 
 	it('should return false if <script> is used along side li', function () {
-		fixture.innerHTML = '<ol id="target"><script src="script.js"></script><li>A list</li></ol>';
-		var node = fixture.querySelector('#target');
-		assert.isFalse(checks['only-listitems'].evaluate.call(checkContext, node));
+		var checkArgs = checkSetup('<ol id="target"><script src="script.js"></script><li>A list</li></ol>');
+
+		assert.isFalse(checks['only-listitems'].evaluate.apply(checkContext, checkArgs));
 	});
 
 	it('should return false if <style> is used along side li', function () {
-		fixture.innerHTML = '<ol id="target"><style></style><li>A list</li></ol>';
-		var node = fixture.querySelector('#target');
-		assert.isFalse(checks['only-listitems'].evaluate.call(checkContext, node));
+		var checkArgs = checkSetup('<ol id="target"><style></style><li>A list</li></ol>');
+
+		assert.isFalse(checks['only-listitems'].evaluate.apply(checkContext, checkArgs));
 	});
 
 	it('should return false if <template> is used along side li', function () {
-		fixture.innerHTML = '<ol id="target"><template></template><li>A list</li></ol>';
-		var node = fixture.querySelector('#target');
-		assert.isFalse(checks['only-listitems'].evaluate.call(checkContext, node));
+		var checkArgs = checkSetup('<ol id="target"><template></template><li>A list</li></ol>');
+
+		assert.isFalse(checks['only-listitems'].evaluate.apply(checkContext, checkArgs));
+	});
+
+	(shadowSupport ? it : xit)('should return false in a shadow DOM pass', function () {
+		var node = document.createElement('div');
+		node.innerHTML = '<li>My list item </li>';
+		var shadow = node.attachShadow({ mode: 'open' });
+		shadow.innerHTML = '<ul><slot></slot></ul>';
+
+		var checkArgs = checkSetup(node, 'ul');
+		assert.isFalse(checks['only-listitems'].evaluate.apply(null, checkArgs));
+	});
+
+	(shadowSupport ? it : xit)('should return true in a shadow DOM fail', function () {
+		var node = document.createElement('div');
+		node.innerHTML = '<p>Not a list item</p>';
+		var shadow = node.attachShadow({ mode: 'open' });
+		shadow.innerHTML = '<ul><slot></slot></ul>';
+
+		var checkArgs = checkSetup(node, 'ul');
+		assert.isTrue(checks['only-listitems'].evaluate.apply(null, checkArgs));
 	});
 
 });
diff --git a/test/checks/lists/structured-dlitems.js b/test/checks/lists/structured-dlitems.js
index e95fb22265..87dac603cd 100644
--- a/test/checks/lists/structured-dlitems.js
+++ b/test/checks/lists/structured-dlitems.js
@@ -2,72 +2,71 @@ describe('structured-dlitems', function () {
 	'use strict';
 
 	var fixture = document.getElementById('fixture');
+	var checkSetup = axe.testUtils.checkSetup;
+	var shadowSupport = axe.testUtils.shadowSupport;
 
 	afterEach(function () {
 		fixture.innerHTML = '';
 	});
 
 	it('should return false if the list has no contents', function () {
-		fixture.innerHTML = '<dl id="target"></dl>';
-		var node = fixture.querySelector('#target');
-
-		assert.isFalse(checks['structured-dlitems'].evaluate(node));
-
-
+		var checkArgs = checkSetup('<dl id="target"></dl>');
+		assert.isFalse(checks['structured-dlitems'].evaluate.apply(null, checkArgs));
 	});
 
 	it('should return true if the list has only a dd', function () {
-		fixture.innerHTML = '<dl id="target"><dd>A list</dd></dl>';
-		var node = fixture.querySelector('#target');
-
-		assert.isTrue(checks['structured-dlitems'].evaluate(node));
-
-
+		var checkArgs = checkSetup('<dl id="target"><dd>A list</dd></dl>');
+		assert.isTrue(checks['structured-dlitems'].evaluate.apply(null, checkArgs));
 	});
 
 	it('should return true if the list has only a dt', function () {
-		fixture.innerHTML = '<dl id="target"><dt>A list</dt></dl>';
-		var node = fixture.querySelector('#target');
-
-		assert.isTrue(checks['structured-dlitems'].evaluate(node));
-
+		var checkArgs = checkSetup('<dl id="target"><dt>A list</dt></dl>');
 
+		assert.isTrue(checks['structured-dlitems'].evaluate.apply(null, checkArgs));
 	});
 
 	it('should return true if the list has dt and dd in the incorrect order', function () {
-		fixture.innerHTML = '<dl id="target"><dd>A list</dd><dt>An item</dt></dl>';
-		var node = fixture.querySelector('#target');
-
-		assert.isTrue(checks['structured-dlitems'].evaluate(node));
-
+		var checkArgs = checkSetup('<dl id="target"><dd>A list</dd><dt>An item</dt></dl>');
 
+		assert.isTrue(checks['structured-dlitems'].evaluate.apply(null, checkArgs));
 	});
 
 	it('should return true if the list has dt and dd in the correct order as non-child descendants', function () {
-		fixture.innerHTML = '<dl id="target"><dd><dl><dt>An item</dt><dd>A list</dd></dl></dd></dl>';
-		var node = fixture.querySelector('#target');
-
-		assert.isTrue(checks['structured-dlitems'].evaluate(node));
-
+		var checkArgs = checkSetup('<dl id="target"><dd><dl><dt>An item</dt><dd>A list</dd></dl></dd></dl>');
 
+		assert.isTrue(checks['structured-dlitems'].evaluate.apply(null, checkArgs));
 	});
 
 	it('should return false if the list has dt and dd in the correct order', function () {
-		fixture.innerHTML = '<dl id="target"><dt>An item</dt><dd>A list</dd></dl>';
-		var node = fixture.querySelector('#target');
+		var checkArgs = checkSetup('<dl id="target"><dt>An item</dt><dd>A list</dd></dl>');
 
-		assert.isFalse(checks['structured-dlitems'].evaluate(node));
+		assert.isFalse(checks['structured-dlitems'].evaluate.apply(null, checkArgs));
+	});
 
+	it('should return false if the list has a correctly-ordered dt and dd with other content', function () {
+		var checkArgs = checkSetup('<dl id="target"><dt>Stuff</dt><dt>Item one</dt><dd>Description</dd><p>Not a list</p></dl>');
 
+		assert.isFalse(checks['structured-dlitems'].evaluate.apply(null, checkArgs));
 	});
 
-	it('should return false if the list has a correctly-ordered dt and dd with other content', function () {
-		fixture.innerHTML = '<dl id="target"><dt>Stuff</dt><dt>Item one</dt><dd>Description</dd><p>Not a list</p></dl>';
-		var node = fixture.querySelector('#target');
+	(shadowSupport ? it : xit)('should return false in a shadow DOM pass', function () {
+		var node = document.createElement('div');
+		node.innerHTML = '<dt>Grayhound bus</dt><dd>at dawn</dd>';
+		var shadow = node.attachShadow({ mode: 'open' });
+		shadow.innerHTML = '<dl><slot></slot></dl>';
 
-		assert.isFalse(checks['structured-dlitems'].evaluate(node));
+		var checkArgs = checkSetup(node, 'dl');
+		assert.isFalse(checks['structured-dlitems'].evaluate.apply(null, checkArgs));
+	});
 
+	(shadowSupport ? it : xit)('should return true in a shadow DOM fail', function () {
+		var node = document.createElement('div');
+		node.innerHTML = '<p>Galileo</p><p>Figaro</p>';
+		var shadow = node.attachShadow({ mode: 'open' });
+		shadow.innerHTML = '<dl><slot></slot></dl>';
 
+		var checkArgs = checkSetup(node, 'dl');
+		assert.isTrue(checks['structured-dlitems'].evaluate.apply(null, checkArgs));
 	});
 
 });
diff --git a/test/commons/dom/get-composed-parent.js b/test/commons/dom/get-composed-parent.js
index f7c5138b4a..60923a1fe0 100644
--- a/test/commons/dom/get-composed-parent.js
+++ b/test/commons/dom/get-composed-parent.js
@@ -23,7 +23,7 @@ describe('dom.getComposedParent', function () {
     );
   });
 
-  (shadowSupport ? it : xit)('returns the slot node for slotted content', function () {
+  (shadowSupport ? it : xit)('skip the slot node for slotted content', function () {
     fixture.innerHTML = '<div id="shadow"><div id="target"></div></div>';
     var shadowRoot = document.getElementById('shadow').attachShadow({ mode: 'open' });
     shadowRoot.innerHTML = '<div id="grand-parent">' +
@@ -32,15 +32,15 @@ describe('dom.getComposedParent', function () {
 
     var actual = getComposedParent(fixture.querySelector('#target'));
     assert.instanceOf(actual, Node);
-    assert.equal(actual, shadowRoot.querySelector('#parent'));
+    assert.equal(actual, shadowRoot.querySelector('#grand-parent'));
   });
 
-  (shadowSupport ? it : xit)('returns explicitly slotted nodes', function () {
+  (shadowSupport ? it : xit)('understands explicitly slotted nodes', function () {
     fixture.innerHTML = '<div id="shadow"><div id="target" slot="bar"></div></div>';
     var shadowRoot = document.getElementById('shadow').attachShadow({ mode: 'open' });
     shadowRoot.innerHTML = '<div id="grand-parent">' +
       '<slot name="foo"></slot>' +
-      '<slot id="parent" name="bar"></slot>' +
+      '<div id="parent"><slot name="bar"></slot></div>' +
     '</div>';
 
     var actual = getComposedParent(fixture.querySelector('#target'));

From 0478cbd6615247d152da240ac0ed868a365fbc58 Mon Sep 17 00:00:00 2001
From: Wilco Fiers <WilcoFiers@users.noreply.github.com>
Date: Sun, 16 Jul 2017 15:54:52 +0200
Subject: [PATCH 077/142] fix: getComposedParent should not return slot nodes
 (#438)

* fix: getComposedParent should not return slot nodes

* chore: Fix comment mistake
---
 lib/commons/dom/get-composed-parent.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/commons/dom/get-composed-parent.js b/lib/commons/dom/get-composed-parent.js
index fdec0a4b18..82e50dac78 100644
--- a/lib/commons/dom/get-composed-parent.js
+++ b/lib/commons/dom/get-composed-parent.js
@@ -9,7 +9,7 @@ dom.getComposedParent = function getComposedParent (element)  {
     // NOTE: If the display of a slot element isn't 'contents',
     // the slot shouldn't be ignored. Chrome does not support this (yet) so,
     // we'll skip this part for now.
-    return getComposedParent(element.assignedSlot); // content of a shadow DOM slot
+    return getComposedParent(element.assignedSlot); // parent of a shadow DOM slot
   } else if (element.parentNode) {
     var parentNode = element.parentNode;
     if (parentNode.nodeType === 1) {

From 414fcbe11d12af3467a11744dd09fe5f229485b1 Mon Sep 17 00:00:00 2001
From: Wilco Fiers <WilcoFiers@users.noreply.github.com>
Date: Mon, 17 Jul 2017 12:15:08 +0200
Subject: [PATCH 078/142] feat: Run text.accessibleText() on virtual elements
 (#420)

---
 lib/commons/dom/find-elms-in-context.js    |  26 ++
 lib/commons/text/accessible-text.js        | 174 +++++----
 test/checks/forms/fieldset.js              |  74 ++--
 test/checks/forms/labelledby.js            |  30 +-
 test/checks/keyboard/focusable-no-name.js  |  27 +-
 test/checks/label/explicit.js              |   9 +-
 test/checks/label/implicit.js              |   9 +-
 test/checks/lists/only-listitems.js        |   4 +-
 test/checks/lists/structured-dlitems.js    |   2 +-
 test/checks/shared/aria-labelledby.js      |  14 +-
 test/checks/shared/has-visible-text.js     |   7 +-
 test/checks/tables/same-caption-summary.js |  27 +-
 test/checks/visibility/hidden-content.js   |   9 +-
 test/commons/.jshintrc                     |   1 +
 test/commons/dom/find-elms-in-context.js   |  53 +++
 test/commons/text/accessible-text.js       | 401 +++++++++++++++------
 16 files changed, 585 insertions(+), 282 deletions(-)
 create mode 100644 lib/commons/dom/find-elms-in-context.js
 create mode 100644 test/commons/dom/find-elms-in-context.js

diff --git a/lib/commons/dom/find-elms-in-context.js b/lib/commons/dom/find-elms-in-context.js
new file mode 100644
index 0000000000..f9b784c400
--- /dev/null
+++ b/lib/commons/dom/find-elms-in-context.js
@@ -0,0 +1,26 @@
+/* global axe, dom */
+/**
+ * Find elements referenced from a given context
+ * 
+ * @param object {
+ *    context:  Node | virtual node    Element in the same context
+ *    value:    String  attribute value to search for
+ *    attr:     String  attribute name to search for
+ *    elm:      String  ndoeName to search for (optional)
+ *  }
+ * @return Array[Node]  
+ */
+dom.findElmsInContext = function ({ context, value, attr, elm = '' }) {
+  let root;
+  context = context.actualNode || context;
+  const escapedValue = axe.utils.escapeSelector(value);
+
+  if (context.nodeType === 9 || context.nodeType === 11) { // It's already root
+    root = context;
+  } else {
+    root = dom.getRootNode(context);
+  }
+  return Array.from(
+    root.querySelectorAll(elm + '[' + attr + '=' + escapedValue + ']')
+  );
+};
diff --git a/lib/commons/text/accessible-text.js b/lib/commons/text/accessible-text.js
index 6c6eb3dcf9..ed07a7df41 100644
--- a/lib/commons/text/accessible-text.js
+++ b/lib/commons/text/accessible-text.js
@@ -1,5 +1,5 @@
 /*global text, dom, aria, axe */
-/*jshint maxstatements: 25, maxcomplexity: 19 */
+/*jshint maxstatements: 27, maxcomplexity: 19 */
 
 var defaultButtonValues = {
 	submit: 'Submit',
@@ -19,34 +19,34 @@ var phrasingElements = ['A', 'EM', 'STRONG', 'SMALL', 'MARK', 'ABBR', 'DFN', 'I'
  * @param {HTMLElement} element The HTMLElement
  * @return {HTMLElement} The label element, or null if none is found
  */
-function findLabel(element) {
-	var ref = null;
-	if (element.id) {
-		ref = document.querySelector('label[for="' + axe.utils.escapeSelector(element.id) + '"]');
-		if (ref) {
-			return ref;
-		}
+function findLabel({ actualNode }) {
+	let label;
+	if (actualNode.id) {
+		label = dom.findElmsInContext({
+			elm: 'label', attr: 'for', value: actualNode.id, context: actualNode
+		})[0];
+	} else {
+		label = dom.findUp(actualNode, 'label');
 	}
-	ref = dom.findUp(element, 'label');
-	return ref;
+	return axe.utils.getNodeFromTree(axe._tree[0], label);
 }
 
-function isButton(element) {
-	return ['button', 'reset', 'submit'].indexOf(element.type) !== -1;
+function isButton({ actualNode }) {
+	return ['button', 'reset', 'submit'].includes(actualNode.type.toLowerCase());
 }
 
-function isInput(element) {
-	var nodeName = element.nodeName.toUpperCase();
+function isInput({ actualNode }) {
+	var nodeName = actualNode.nodeName.toUpperCase();
 	return (nodeName === 'TEXTAREA' || nodeName === 'SELECT') ||
-		(nodeName === 'INPUT' && element.type.toLowerCase() !== 'hidden');
+		(nodeName === 'INPUT' && actualNode.type.toLowerCase() !== 'hidden');
 }
 
-function shouldCheckSubtree(element) {
-	return ['BUTTON', 'SUMMARY', 'A'].indexOf(element.nodeName.toUpperCase()) !== -1;
+function shouldCheckSubtree({ actualNode }) {
+	return ['BUTTON', 'SUMMARY', 'A'].includes(actualNode.nodeName.toUpperCase());
 }
 
-function shouldNeverCheckSubtree(element) {
-	return ['TABLE', 'FIGURE'].indexOf(element.nodeName.toUpperCase()) !== -1;
+function shouldNeverCheckSubtree({ actualNode }) {
+	return ['TABLE', 'FIGURE'].includes(actualNode.nodeName.toUpperCase());
 }
 
 /**
@@ -55,19 +55,18 @@ function shouldNeverCheckSubtree(element) {
  * @param {HTMLElement} element The HTMLElement
  * @return {string} The calculated value
  */
-function formValueText(element) {
-	var nodeName = element.nodeName.toUpperCase();
+function formValueText({ actualNode }) {
+	const nodeName = actualNode.nodeName.toUpperCase();
 	if (nodeName === 'INPUT') {
-		if (!element.hasAttribute('type') || (
-				inputTypes.indexOf(element.getAttribute('type').toLowerCase()) !== -1) &&
-				element.value) {
-			return element.value;
+		if (!actualNode.hasAttribute('type') ||
+				inputTypes.includes(actualNode.type.toLowerCase())) {
+			return actualNode.value;
 		}
 		return '';
 	}
 
 	if (nodeName === 'SELECT') {
-		var opts = element.options;
+		var opts = actualNode.options;
 		if (opts && opts.length) {
 			var returnText = '';
 			for (var i = 0; i < opts.length; i++) {
@@ -80,14 +79,18 @@ function formValueText(element) {
 		return '';
 	}
 
-	if (nodeName === 'TEXTAREA' && element.value) {
-		return element.value;
+	if (nodeName === 'TEXTAREA' && actualNode.value) {
+		return actualNode.value;
 	}
 	return '';
 }
 
-function checkDescendant(element, nodeName) {
-	var candidate = element.querySelector(nodeName.toLowerCase());
+/**
+ * Get the accessible text of first matching node
+ * IMPORTANT: This method does not look at the composed tree
+ */
+function checkDescendant({ actualNode }, nodeName) {
+	var candidate = actualNode.querySelector(nodeName.toLowerCase());
 	if (candidate) {
 		return text.accessibleText(candidate);
 	}
@@ -102,25 +105,27 @@ function checkDescendant(element, nodeName) {
  * @param {HTMLElement} element The HTMLElement
  * @return {boolean} True if embedded control
  */
-function isEmbeddedControl(e) {
-	if (!e) {
+function isEmbeddedControl(elm) {
+	if (!elm) {
 		return false;
 	}
-	switch (e.nodeName.toUpperCase()) {
+	const { actualNode } = elm;
+	switch (actualNode.nodeName.toUpperCase()) {
 		case 'SELECT':
 		case 'TEXTAREA':
 			return true;
 		case 'INPUT':
-			return !e.hasAttribute('type') || (inputTypes.indexOf(e.getAttribute('type').toLowerCase()) !== -1);
+			return (!actualNode.hasAttribute('type') || 
+					inputTypes.includes(actualNode.getAttribute('type').toLowerCase()));
 		default:
 			return false;
 	}
 }
 
-function shouldCheckAlt(element) {
-	var nodeName = element.nodeName.toUpperCase();
-	return (nodeName === 'INPUT' && element.type.toLowerCase() === 'image') ||
-		['IMG', 'APPLET', 'AREA'].indexOf(nodeName) !== -1;
+function shouldCheckAlt({ actualNode }) {
+	const nodeName = actualNode.nodeName.toUpperCase();
+	return ['IMG', 'APPLET', 'AREA'].includes(nodeName) ||
+			(nodeName === 'INPUT' && actualNode.type.toLowerCase() === 'image');
 }
 
 function nonEmptyText(t) {
@@ -137,34 +142,33 @@ function nonEmptyText(t) {
  * @return {string}
  */
 text.accessibleText = function(element, inLabelledByContext) {
-	//todo: implement shadowDOM
-	var accessibleNameComputation;
-	var encounteredNodes = [];
+	let accessibleNameComputation;
+	const encounteredNodes = [];
+	if (element instanceof Node) {
+		element = axe.utils.getNodeFromTree(axe._tree[0], element);
+	}
 
 	function getInnerText (element, inLabelledByContext, inControlContext) {
-		var nodes = element.childNodes;
-		var returnText = '';
-		var node;
-
-		for (var i = 0; i < nodes.length; i++) {
-			node = nodes[i];
-			if (node.nodeType === 3) {
-				returnText += node.textContent;
-			} else if (node.nodeType === 1) {
-				if (phrasingElements.indexOf(node.nodeName.toUpperCase()) === -1) {
+		return element.children.reduce((returnText, child) => {
+			const { actualNode } = child;
+			if (actualNode.nodeType === 3) {
+				returnText += actualNode.nodeValue;
+			} else if (actualNode.nodeType === 1) {
+				if (!phrasingElements.includes(actualNode.nodeName.toUpperCase())) {
 					returnText += ' ';
 				}
-				returnText += accessibleNameComputation(nodes[i], inLabelledByContext, inControlContext);
+				returnText += accessibleNameComputation(child, inLabelledByContext,
+						inControlContext);
 			}
-		}
-
-		return returnText;
+			return returnText;
+		}, '');
 	}
 
 	function checkNative (element, inLabelledByContext, inControlContext) {
 		// jshint maxstatements:30
-		var returnText = '';
-		var nodeName = element.nodeName.toUpperCase();
+		let returnText = '';
+		const { actualNode } = element;
+		const nodeName = actualNode.nodeName.toUpperCase();
 
 		if (shouldCheckSubtree(element)) {
 			returnText = getInnerText(element, false, false) || '';
@@ -187,7 +191,8 @@ text.accessibleText = function(element, inLabelledByContext) {
 				return returnText;
 			}
 
-			returnText = element.getAttribute('title') || element.getAttribute('summary') || '';
+			returnText = (actualNode.getAttribute('title') ||
+					actualNode.getAttribute('summary') || '');
 
 			if (nonEmptyText(returnText)) {
 				return returnText;
@@ -195,12 +200,12 @@ text.accessibleText = function(element, inLabelledByContext) {
 		}
 
 		if (shouldCheckAlt(element)) {
-			return element.getAttribute('alt') || '';
+			return actualNode.getAttribute('alt') || '';
 		}
 
 		if (isInput(element) && !inControlContext) {
 			if (isButton(element)) {
-				return element.value || element.title || defaultButtonValues[element.type] || '';
+				return actualNode.value || actualNode.title || defaultButtonValues[actualNode.type] || '';
 			}
 
 			var labelElement = findLabel(element);
@@ -213,21 +218,29 @@ text.accessibleText = function(element, inLabelledByContext) {
 	}
 
 	function checkARIA (element, inLabelledByContext, inControlContext) {
-
-		if (!inLabelledByContext && element.hasAttribute('aria-labelledby')) {
-			return text.sanitize(dom.idrefs(element, 'aria-labelledby').map(function(l) {
-				if (element === l) {
-					encounteredNodes.pop();
-				} //let element be encountered twice
-				return accessibleNameComputation(l, true, element !== l);
+		let returnText = '';
+		const { actualNode } = element;
+		if (!inLabelledByContext && actualNode.hasAttribute('aria-labelledby')) {
+			// Store the return text, if it's empty, fall back to aria-label
+			returnText = text.sanitize(dom.idrefs(actualNode, 'aria-labelledby').map(label => {
+				if (label !== null) {// handle unfound elements by dom.idref
+					if (actualNode === label) {
+						encounteredNodes.pop();
+					} //let element be encountered twice
+					const vLabel = axe.utils.getNodeFromTree(axe._tree[0], label);
+					return accessibleNameComputation(vLabel, true, actualNode !== label);
+				} else {
+					return '';
+				}
 			}).join(' '));
 		}
 
-		if (!(inControlContext && isEmbeddedControl(element)) && element.hasAttribute('aria-label')) {
-			return text.sanitize(element.getAttribute('aria-label'));
+		if (!returnText && !(inControlContext && isEmbeddedControl(element)) && 
+				actualNode.hasAttribute('aria-label')) {
+			return text.sanitize(actualNode.getAttribute('aria-label'));
 		}
 
-		return '';
+		return returnText;
 	}
 
 	/**
@@ -240,20 +253,22 @@ text.accessibleText = function(element, inLabelledByContext) {
 	 * @return {string}
 	 */
 	accessibleNameComputation = function (element, inLabelledByContext, inControlContext) {
-		'use strict';
-
-		var returnText;
+		let returnText;
 		// If the node was already checked or is null, skip
-		if (element === null || (encounteredNodes.indexOf(element) !== -1)) {
+		if (!element || encounteredNodes.includes(element)) {
 			return '';
 
+		// if the node is invalid, throw
+		} else if (element !== null && element.actualNode instanceof Node !== true) {
+			throw new Error('Invalid argument. Virtual Node must be provided');
+
 		//Step 2a: Skip if the element is hidden, unless part of labelledby
-		} else if(!inLabelledByContext && !dom.isVisible(element, true)) {
+		} else if(!inLabelledByContext && !dom.isVisible(element.actualNode, true)) {
 			return '';
 		}
 
 		encounteredNodes.push(element);
-		var role = element.getAttribute('role');
+		var role = element.actualNode.getAttribute('role');
 
 		//Step 2b & 2c
 		returnText = checkARIA(element, inLabelledByContext, inControlContext);
@@ -276,7 +291,8 @@ text.accessibleText = function(element, inLabelledByContext) {
 		}
 
 		//Step 2f
-		if (!shouldNeverCheckSubtree(element) && (!role || aria.getRolesWithNameFromContents().indexOf(role) !== -1)) {
+		if (!shouldNeverCheckSubtree(element) &&
+					(!role || aria.getRolesWithNameFromContents().indexOf(role) !== -1)) {
 
 			returnText = getInnerText(element, inLabelledByContext, inControlContext);
 
@@ -288,8 +304,8 @@ text.accessibleText = function(element, inLabelledByContext) {
 		//Step 2g - if text node, return value (handled in getInnerText)
 
 		//Step 2h
-		if (element.hasAttribute('title')) {
-			return element.getAttribute('title');
+		if (element.actualNode.hasAttribute('title')) {
+			return element.actualNode.getAttribute('title');
 		}
 
 		return '';
diff --git a/test/checks/forms/fieldset.js b/test/checks/forms/fieldset.js
index 3c4e59e014..2a6e3ee4ac 100644
--- a/test/checks/forms/fieldset.js
+++ b/test/checks/forms/fieldset.js
@@ -1,7 +1,7 @@
 describe('fieldset', function () {
 	'use strict';
 	var fixture = document.getElementById('fixture');
-
+	var fixtureSetup = axe.testUtils.fixtureSetup;
 	var checkContext = {
 		_data: null,
 		data: function (d) {
@@ -20,16 +20,16 @@ describe('fieldset', function () {
 	function tests(type) {
 
 		it('should return true if there is only one ' + type + ' element with the same name', function () {
-			fixture.innerHTML = '<input type="' + type + '" id="target" name="uniqueyname">' +
-				'<input type="' + type + '" name="differentname">';
+			fixtureSetup('<input type="' + type + '" id="target" name="uniqueyname">' +
+				'<input type="' + type + '" name="differentname">');
 
 			var node = fixture.querySelector('#target');
 			assert.isTrue(checks.fieldset.evaluate.call(checkContext, node));
 		});
 
 		it('should return false if there are two ungrouped ' + type + ' elements with the same name', function () {
-			fixture.innerHTML = '<input type="' + type + '" id="target" name="uniqueyname">' +
-				'<input type="' + type + '" name="uniqueyname">';
+			fixtureSetup('<input type="' + type + '" id="target" name="uniqueyname">' +
+				'<input type="' + type + '" name="uniqueyname">');
 
 			var node = fixture.querySelector('#target');
 			assert.isFalse(checks.fieldset.evaluate.call(checkContext, node));
@@ -43,8 +43,8 @@ describe('fieldset', function () {
 		});
 
 		it('should return false if the group has no legend element', function () {
-			fixture.innerHTML = '<fieldset><input type="' + type + '" id="target" name="uniqueyname">' +
-				'<input type="' + type + '" name="uniqueyname"></fieldset>';
+			fixtureSetup('<fieldset><input type="' + type + '" id="target" name="uniqueyname">' +
+				'<input type="' + type + '" name="uniqueyname"></fieldset>');
 			var node = fixture.querySelector('#target');
 			assert.isFalse(checks.fieldset.evaluate.call(checkContext, node));
 			assert.deepEqual(checkContext._data, {
@@ -57,9 +57,9 @@ describe('fieldset', function () {
 		});
 
 		it('should return false if the group has no legend text', function () {
-			fixture.innerHTML = '<fieldset><legend></legend>' +
+			fixtureSetup('<fieldset><legend></legend>' +
 				'<input type="' + type + '" id="target" name="uniqueyname">' +
-				'<input type="' + type + '" name="uniqueyname"></fieldset>';
+				'<input type="' + type + '" name="uniqueyname"></fieldset>');
 			var node = fixture.querySelector('#target');
 			assert.isFalse(checks.fieldset.evaluate.call(checkContext, node));
 			assert.deepEqual(checkContext._data, {
@@ -72,10 +72,10 @@ describe('fieldset', function () {
 		});
 
 		it('should return false if the group contains extra elements', function () {
-			fixture.innerHTML = '<fieldset><legend>Legendary</legend>' +
+			fixtureSetup('<fieldset><legend>Legendary</legend>' +
 				'<input type="text" id="random">' +
 				'<input type="' + type + '" id="target" name="uniqueyname">' +
-				'<input type="' + type + '" name="uniqueyname"></fieldset>';
+				'<input type="' + type + '" name="uniqueyname"></fieldset>');
 			var node = fixture.querySelector('#target');
 			assert.isFalse(checks.fieldset.evaluate.call(checkContext, node));
 			assert.deepEqual(checkContext._data, {
@@ -88,17 +88,17 @@ describe('fieldset', function () {
 		});
 
 		it('should return true if the group contains only the right elements and has legend', function () {
-			fixture.innerHTML = '<fieldset><legend>Legendary</legend>' +
+			fixtureSetup('<fieldset><legend>Legendary</legend>' +
 				'<input type="' + type + '" id="target" name="uniqueyname">' +
-				'<input type="' + type + '" name="uniqueyname"></fieldset>';
+				'<input type="' + type + '" name="uniqueyname"></fieldset>');
 			var node = fixture.querySelector('#target');
 			assert.isTrue(checks.fieldset.evaluate.call(checkContext, node));
 		});
 
 		it('should return false if an unlabelled ARIA group contains only the right elements', function () {
-			fixture.innerHTML = '<div role="group">' +
+			fixtureSetup('<div role="group">' +
 				'<input type="' + type + '" id="target" name="uniqueyname">' +
-				'<input type="' + type + '" name="uniqueyname"></div>';
+				'<input type="' + type + '" name="uniqueyname"></div>');
 
 			var node = fixture.querySelector('#target');
 			assert.isFalse(checks.fieldset.evaluate.call(checkContext, node));
@@ -112,10 +112,10 @@ describe('fieldset', function () {
 		});
 
 		it('should return false if an improperly labelled-by ARIA group contains only the right elements', function () {
-			fixture.innerHTML = '<div id="grouplabel"></div>' +
+			fixtureSetup('<div id="grouplabel"></div>' +
 				'<div role="group" aria-labelledby="grouplabel">' +
 				'<input type="' + type + '" id="target" name="uniqueyname">' +
-				'<input type="' + type + '" name="uniqueyname"></div>';
+				'<input type="' + type + '" name="uniqueyname"></div>');
 
 			var node = fixture.querySelector('#target');
 			assert.isFalse(checks.fieldset.evaluate.call(checkContext, node));
@@ -129,10 +129,10 @@ describe('fieldset', function () {
 		});
 
 		it('should return false if the group contains extra elements', function () {
-			fixture.innerHTML = '<div role="group" aria-labelledby="g1"><div id="g1">Legendary</div>' +
+			fixtureSetup('<div role="group" aria-labelledby="g1"><div id="g1">Legendary</div>' +
 				'<input type="text" id="random">' +
 				'<input type="' + type + '" id="target" name="uniqueyname">' +
-				'<input type="' + type + '" name="uniqueyname"></div>';
+				'<input type="' + type + '" name="uniqueyname"></div>');
 			var node = fixture.querySelector('#target');
 			assert.isFalse(checks.fieldset.evaluate.call(checkContext, node));
 			assert.deepEqual(checkContext._data, {
@@ -145,10 +145,10 @@ describe('fieldset', function () {
 		});
 
 		it('should return true if a properly labelled-by ARIA group contains only the right elements', function () {
-			fixture.innerHTML = '<div id="grouplabel">Label</div>' +
+			fixtureSetup('<div id="grouplabel">Label</div>' +
 				'<div role="group" aria-labelledby="grouplabel">' +
 				'<input type="' + type + '" id="target" name="uniqueyname">' +
-				'<input type="' + type + '" name="uniqueyname"></div>';
+				'<input type="' + type + '" name="uniqueyname"></div>');
 
 			var node = fixture.querySelector('#target');
 			assert.isTrue(checks.fieldset.evaluate.call(checkContext, node));
@@ -160,10 +160,10 @@ describe('fieldset', function () {
 
 
 		it('should return true if a properly labelled-by ARIA group contains only the right elements - special characters', function () {
-			fixture.innerHTML = '<div id="grouplabel">Label</div>' +
+			fixtureSetup('<div id="grouplabel">Label</div>' +
 				'<div role="group" aria-labelledby="grouplabel">' +
 				'<input type="' + type + '" id="target" name="s.%$#n">' +
-				'<input type="' + type + '" name="s.%$#n"></div>';
+				'<input type="' + type + '" name="s.%$#n"></div>');
 
 			var node = fixture.querySelector('#target');
 			assert.isTrue(checks.fieldset.evaluate.call(checkContext, node));
@@ -175,46 +175,46 @@ describe('fieldset', function () {
 		});
 
 		it('should return true if a properly labelled ARIA group contains only the right elements', function () {
-			fixture.innerHTML = '<div role="group" aria-label="group label">' +
+			fixtureSetup('<div role="group" aria-label="group label">' +
 				'<input type="' + type + '" id="target" name="uniqueyname">' +
-				'<input type="' + type + '" name="uniqueyname"></div>';
+				'<input type="' + type + '" name="uniqueyname"></div>');
 			var node = fixture.querySelector('#target');
 			assert.isTrue(checks.fieldset.evaluate.call(checkContext, node));
 		});
 
 
 		it('should ignore hidden inputs', function () {
-			fixture.innerHTML = '<fieldset><legend>Legendary</legend>' +
+			fixtureSetup('<fieldset><legend>Legendary</legend>' +
 				'<input type="' + type + '" id="target" name="uniqueyname">' +
 				'<input type="' + type + '" name="uniqueyname"></div>' +
-				'<input type="hidden" name="things"></fieldset>';
+				'<input type="hidden" name="things"></fieldset>');
 			var node = fixture.querySelector('#target');
 			assert.isTrue(checks.fieldset.evaluate.call(checkContext, node));
 
 		});
 
 		it('should allow elements to be contained in 2 or more fieldsets', function () {
-			fixture.innerHTML = '<fieldset><legend>Legendary</legend>' +
+			fixtureSetup('<fieldset><legend>Legendary</legend>' +
 				'<input type="' + type + '" id="target" name="uniqueyname">' +
 				'<input type="' + type + '" name="uniqueyname"></div>' +
 				'</fieldset>' +
 				'<fieldset><legend>Also Legendary</legend>' +
 				'<input type="' + type + '" name="uniqueyname">' +
 				'<input type="' + type + '" name="uniqueyname"></div>' +
-				'</fieldset>';
+				'</fieldset>');
 			var node = fixture.querySelector('#target');
 			assert.isTrue(checks.fieldset.evaluate.call(checkContext, node));
 		});
 
 		it('should allow elements to be contained in 2 or more groups', function () {
-			fixture.innerHTML = '<div role="group" aria-labelledby="g1"><div id="g1">Legendary</div>' +
+			fixtureSetup('<div role="group" aria-labelledby="g1"><div id="g1">Legendary</div>' +
 				'<input type="' + type + '" id="target" name="uniqueyname">' +
 				'<input type="' + type + '" name="uniqueyname"></div>' +
 				'</div>' +
 				'<div role="group" aria-labelledby="g2"><div id="g2">Also Legendary</div>' +
 				'<input type="' + type + '" name="uniqueyname">' +
 				'<input type="' + type + '" name="uniqueyname"></div>' +
-				'</fieldset>';
+				'</fieldset>');
 			var node = fixture.querySelector('#target');
 			assert.isTrue(checks.fieldset.evaluate.call(checkContext, node));
 		});
@@ -226,29 +226,27 @@ describe('fieldset', function () {
 		tests(type);
 
 		it('should allow radiogroup role', function () {
-			fixture.innerHTML = '<div id="grouplabel">Label</div>' +
+			fixtureSetup('<div id="grouplabel">Label</div>' +
 				'<div role="radiogroup" aria-labelledby="grouplabel">' +
 				'<input type="' + type + '" id="target" name="s.%$#n">' +
-				'<input type="' + type + '" name="s.%$#n"></div>';
+				'<input type="' + type + '" name="s.%$#n"></div>');
 
 			var node = fixture.querySelector('#target');
 			assert.isTrue(checks.fieldset.evaluate.call(checkContext, node));
-
 		});
 	});
+
 	describe('checkbox', function () {
 		var type = 'checkbox';
 		tests(type);
 
 		it('should NOT allow radiogroup role', function () {
-			fixture.innerHTML = '<div id="grouplabel">Label</div>' +
+			fixtureSetup('<div id="grouplabel">Label</div>' +
 				'<div role="radiogroup" aria-labelledby="grouplabel">' +
 				'<input type="' + type + '" id="target" name="s.%$#n">' +
-				'<input type="' + type + '" name="s.%$#n"></div>';
-
+				'<input type="' + type + '" name="s.%$#n"></div>');
 			var node = fixture.querySelector('#target');
 			assert.isFalse(checks.fieldset.evaluate.call(checkContext, node));
-
 		});
 	});
 });
diff --git a/test/checks/forms/labelledby.js b/test/checks/forms/labelledby.js
index 7eb1e2f10a..6525fa4b61 100644
--- a/test/checks/forms/labelledby.js
+++ b/test/checks/forms/labelledby.js
@@ -2,7 +2,7 @@ describe('group-labelledby', function () {
 	'use strict';
 
 	var fixture = document.getElementById('fixture');
-
+	var fixtureSetup = axe.testUtils.fixtureSetup;
 	var checkContext = {
 		_data: null,
 		data: function (d) {
@@ -21,16 +21,16 @@ describe('group-labelledby', function () {
 			var check = checks['group-labelledby'];
 
 			it('should return true if there is only one ' + type + ' element with the same name', function () {
-				fixture.innerHTML = '<input type="' + type + '" id="target" name="uniqueyname">' +
-					'<input type="' + type + '" name="differentname">';
+				fixtureSetup('<input type="' + type + '" id="target" name="uniqueyname">' +
+					'<input type="' + type + '" name="differentname">');
 
 				var node = fixture.querySelector('#target');
 				assert.isTrue(check.evaluate.call(checkContext, node));
 			});
 
 			it('should return false if there are two ungrouped ' + type + ' elements with the same name', function () {
-				fixture.innerHTML = '<input type="' + type + '" id="target" name="uniqueyname">' +
-					'<input type="' + type + '" name="uniqueyname">';
+				fixtureSetup('<input type="' + type + '" id="target" name="uniqueyname">' +
+					'<input type="' + type + '" name="uniqueyname">');
 
 				var node = fixture.querySelector('#target');
 				assert.isFalse(check.evaluate.call(checkContext, node));
@@ -41,9 +41,9 @@ describe('group-labelledby', function () {
 			});
 
 			it('should return false if there are ungrouped ' + type + ' elements with the same name and without shared labelledby', function () {
-				fixture.innerHTML = '<input type="' + type + '" id="target" aria-labelledby="unique one" name="uniqueyname">' +
+				fixtureSetup('<input type="' + type + '" id="target" aria-labelledby="unique one" name="uniqueyname">' +
 					'<input type="' + type + '" aria-labelledby="notshared two" name="uniqueyname">' +
-					'<input type="' + type + '" aria-labelledby="different three" name="uniqueyname">';
+					'<input type="' + type + '" aria-labelledby="different three" name="uniqueyname">');
 				var node = fixture.querySelector('#target');
 				assert.isFalse(check.evaluate.call(checkContext, node));
 				assert.deepEqual(checkContext._data, {
@@ -55,9 +55,9 @@ describe('group-labelledby', function () {
 			it('should return false if there are ungrouped ' + type + ' elements with the same name and with shared labelledby ' +
 				'pointing to no real node', function () {
 
-				fixture.innerHTML = '<input type="' + type + '" id="target" aria-labelledby="shared one" name="uniqueyname">' +
+				fixtureSetup('<input type="' + type + '" id="target" aria-labelledby="shared one" name="uniqueyname">' +
 					'<input type="' + type + '" aria-labelledby="shared two" name="uniqueyname">' +
-					'<input type="' + type + '" aria-labelledby="shared three" name="uniqueyname">';
+					'<input type="' + type + '" aria-labelledby="shared three" name="uniqueyname">');
 
 				var node = fixture.querySelector('#target');
 				assert.isFalse(check.evaluate.call(checkContext, node));
@@ -69,10 +69,10 @@ describe('group-labelledby', function () {
 
 			it('should return false if there are ungrouped ' + type + ' elements with the same name and with shared labelledby ' +
 				'pointing to an empty node', function () {
-				fixture.innerHTML = '<p id="shared"></p>' +
+				fixtureSetup('<p id="shared"></p>' +
 					'<input type="' + type + '" id="target" aria-labelledby="shared one" name="uniqueyname">' +
 					'<input type="' + type + '" aria-labelledby="shared two" name="uniqueyname">' +
-					'<input type="' + type + '" aria-labelledby="shared three" name="uniqueyname">';
+					'<input type="' + type + '" aria-labelledby="shared three" name="uniqueyname">');
 
 				var node = fixture.querySelector('#target');
 				assert.isFalse(check.evaluate.call(checkContext, node));
@@ -85,10 +85,10 @@ describe('group-labelledby', function () {
 			it('should return true if there are ungrouped ' + type + ' elements with the same name and with shared labelledby' +
 				'pointing to a node with text content', function () {
 
-				fixture.innerHTML = '<p id="shared">Label</p>' +
+				fixtureSetup('<p id="shared">Label</p>' +
 					'<input type="' + type + '" id="target" aria-labelledby="shared one" name="uniqueyname">' +
 					'<input type="' + type + '" aria-labelledby="shared two" name="uniqueyname">' +
-					'<input type="' + type + '" aria-labelledby="shared three" name="uniqueyname">';
+					'<input type="' + type + '" aria-labelledby="shared three" name="uniqueyname">');
 
 				var node = fixture.querySelector('#target');
 				assert.isTrue(check.evaluate.call(checkContext, node));
@@ -101,10 +101,10 @@ describe('group-labelledby', function () {
 			it('should return true if there are ungrouped ' + type + ' elements with the same name and with shared labelledby ' +
 				'pointing to a node with text content - SPECIAL CHARACTERS', function () {
 
-				fixture.innerHTML = '<p id="shared">Label</p>' +
+				fixtureSetup('<p id="shared">Label</p>' +
 					'<input type="' + type + '" id="target" aria-labelledby="shared one" name="s$.#0">' +
 					'<input type="' + type + '" aria-labelledby="shared two" name="s$.#0">' +
-					'<input type="' + type + '" aria-labelledby="shared three" name="s$.#0">';
+					'<input type="' + type + '" aria-labelledby="shared three" name="s$.#0">');
 
 				var node = fixture.querySelector('#target');
 				assert.isTrue(check.evaluate.call(checkContext, node));
diff --git a/test/checks/keyboard/focusable-no-name.js b/test/checks/keyboard/focusable-no-name.js
index a1f6d71524..70191cc18b 100644
--- a/test/checks/keyboard/focusable-no-name.js
+++ b/test/checks/keyboard/focusable-no-name.js
@@ -2,39 +2,52 @@ describe('focusable-no-name', function () {
 	'use strict';
 
 	var fixture = document.getElementById('fixture');
+	var fixtureSetup = axe.testUtils.fixtureSetup;
+	var shadowSupport = axe.testUtils.shadowSupport;
 
 	afterEach(function () {
 		fixture.innerHTML = '';
 	});
 
 	it('should pass if tabindex < 0', function () {
-		fixture.innerHTML = '<a href="#" tabindex="-1"></a>';
+		fixtureSetup('<a href="#" tabindex="-1"></a>');
 		var node = fixture.querySelector('a');
 		assert.isFalse(checks['focusable-no-name'].evaluate(node));
 	});
 
 	it('should pass element is not natively focusable', function () {
-		fixture.innerHTML = '<span role="link" href="#"></span>';
+		fixtureSetup('<span role="link" href="#"></span>');
 		var node = fixture.querySelector('span');
 		assert.isFalse(checks['focusable-no-name'].evaluate(node));
 	});
 
 	it('should fail if element is tabbable with no name - native', function () {
-		fixture.innerHTML = '<a href="#"></a>';
+		fixtureSetup('<a href="#"></a>');
 		var node = fixture.querySelector('a');
 		assert.isTrue(checks['focusable-no-name'].evaluate(node));
 	});
 
-	it('should fail if element is tabbable with no name - ARIA', function () {
-		fixture.innerHTML = '<span tabindex="0" role="link" href="#"></spam>';
+	it('should fail if element is tabable with no name - ARIA', function () {
+		fixtureSetup('<span tabindex="0" role="link" href="#"></spam>');
 		var node = fixture.querySelector('span');
 		assert.isTrue(checks['focusable-no-name'].evaluate(node));
 	});
 
-	it('should pass if the element is tabbable but has an accessible name', function () {
-		fixture.innerHTML = '<a href="#" title="Hello"></a>';
+	it('should pass if the element is tabable but has an accessible name', function () {
+		fixtureSetup('<a href="#" title="Hello"></a>');
 		var node = fixture.querySelector('a');
 		assert.isFalse(checks['focusable-no-name'].evaluate(node));
 	});
 
+	(shadowSupport.v1 ? it : xit)('should pass if the content is passed in with shadow DOM', function () {
+		var node = document.createElement('div');
+		node.innerText = 'Content!';
+		var shadow = node.attachShadow({ mode: 'open' });
+		shadow.innerHTML = '<a href="#"><slot></slot></a>';
+		fixtureSetup(node);
+
+		var link = shadow.querySelector('a');
+		assert.isFalse(checks['focusable-no-name'].evaluate(link));
+	});
+
 });
diff --git a/test/checks/label/explicit.js b/test/checks/label/explicit.js
index c0b4e32928..11aae79908 100644
--- a/test/checks/label/explicit.js
+++ b/test/checks/label/explicit.js
@@ -2,25 +2,26 @@ describe('explicit-label', function () {
 	'use strict';
 
 	var fixture = document.getElementById('fixture');
+	var fixtureSetup = axe.testUtils.fixtureSetup;
 
 	afterEach(function () {
 		fixture.innerHTML = '';
 	});
 
 	it('should return false if an empty label is present', function () {
-		fixture.innerHTML = '<label for="target"></label><input type="text" id="target">';
+		fixtureSetup('<label for="target"></label><input type="text" id="target">');
 		var node = fixture.querySelector('#target');
 		assert.isFalse(checks['explicit-label'].evaluate(node));
 	});
 
 	it('should return false if an invisible non-empty label is present', function () {
-		fixture.innerHTML = '<label for="target" style="display: none">Label</label><input type="text" id="target">';
+		fixtureSetup('<label for="target" style="display: none">Label</label><input type="text" id="target">');
 		var node = fixture.querySelector('#target');
 		assert.isFalse(checks['explicit-label'].evaluate(node));
 	});
 
 	it('should return true if a non-empty label is present', function () {
-		fixture.innerHTML = '<label for="target">Text</label><input type="text" id="target">';
+		fixtureSetup('<label for="target">Text</label><input type="text" id="target">');
 		var node = fixture.querySelector('#target');
 		assert.isTrue(checks['explicit-label'].evaluate(node));
 	});
@@ -28,7 +29,7 @@ describe('explicit-label', function () {
 	it('should return false if a label is not present', function () {
 		var node = document.createElement('input');
 		node.type = 'text';
-		fixture.appendChild(node);
+		fixtureSetup(node);
 
 		assert.isFalse(checks['explicit-label'].evaluate(node));
 	});
diff --git a/test/checks/label/implicit.js b/test/checks/label/implicit.js
index f55bb094d8..bcc04c8983 100644
--- a/test/checks/label/implicit.js
+++ b/test/checks/label/implicit.js
@@ -2,25 +2,26 @@ describe('implicit-label', function () {
 	'use strict';
 
 	var fixture = document.getElementById('fixture');
+	var fixtureSetup = axe.testUtils.fixtureSetup;
 
 	afterEach(function () {
 		fixture.innerHTML = '';
 	});
 
 	it('should return false if an empty label is present', function () {
-		fixture.innerHTML = '<label><input type="text" id="target"></label>';
+		fixtureSetup('<label><input type="text" id="target"></label>');
 		var node = fixture.querySelector('#target');
 		assert.isFalse(checks['implicit-label'].evaluate(node));
 	});
 
 	it('should return false if an invisible non-empty label is present', function () {
-		fixture.innerHTML = '<label><span style="display: none">Text</span> <input type="text" id="target"></label>';
+		fixtureSetup('<label><span style="display: none">Text</span> <input type="text" id="target"></label>');
 		var node = fixture.querySelector('#target');
 		assert.isFalse(checks['implicit-label'].evaluate(node));
 	});
 
 	it('should return true if a non-empty label is present', function () {
-		fixture.innerHTML = '<label>Text <input type="text" id="target"></label>';
+		fixtureSetup('<label>Text <input type="text" id="target"></label>');
 		var node = fixture.querySelector('#target');
 		assert.isTrue(checks['implicit-label'].evaluate(node));
 	});
@@ -28,7 +29,7 @@ describe('implicit-label', function () {
 	it('should return false if a label is not present', function () {
 		var node = document.createElement('input');
 		node.type = 'text';
-		fixture.appendChild(node);
+		fixtureSetup(node);
 
 		assert.isFalse(checks['implicit-label'].evaluate(node));
 	});
diff --git a/test/checks/lists/only-listitems.js b/test/checks/lists/only-listitems.js
index 4be9a4e8b4..ad283c26b6 100644
--- a/test/checks/lists/only-listitems.js
+++ b/test/checks/lists/only-listitems.js
@@ -104,7 +104,7 @@ describe('only-listitems', function () {
 		shadow.innerHTML = '<ul><slot></slot></ul>';
 
 		var checkArgs = checkSetup(node, 'ul');
-		assert.isFalse(checks['only-listitems'].evaluate.apply(null, checkArgs));
+		assert.isFalse(checks['only-listitems'].evaluate.apply(checkContext, checkArgs));
 	});
 
 	(shadowSupport ? it : xit)('should return true in a shadow DOM fail', function () {
@@ -114,7 +114,7 @@ describe('only-listitems', function () {
 		shadow.innerHTML = '<ul><slot></slot></ul>';
 
 		var checkArgs = checkSetup(node, 'ul');
-		assert.isTrue(checks['only-listitems'].evaluate.apply(null, checkArgs));
+		assert.isTrue(checks['only-listitems'].evaluate.apply(checkContext, checkArgs));
 	});
 
 });
diff --git a/test/checks/lists/structured-dlitems.js b/test/checks/lists/structured-dlitems.js
index 87dac603cd..953b47acd6 100644
--- a/test/checks/lists/structured-dlitems.js
+++ b/test/checks/lists/structured-dlitems.js
@@ -61,7 +61,7 @@ describe('structured-dlitems', function () {
 
 	(shadowSupport ? it : xit)('should return true in a shadow DOM fail', function () {
 		var node = document.createElement('div');
-		node.innerHTML = '<p>Galileo</p><p>Figaro</p>';
+		node.innerHTML = '<dd>Galileo</dd><dt>Figaro</dt>';
 		var shadow = node.attachShadow({ mode: 'open' });
 		shadow.innerHTML = '<dl><slot></slot></dl>';
 
diff --git a/test/checks/shared/aria-labelledby.js b/test/checks/shared/aria-labelledby.js
index 6a8a7c7b73..623986fd7f 100644
--- a/test/checks/shared/aria-labelledby.js
+++ b/test/checks/shared/aria-labelledby.js
@@ -2,6 +2,7 @@ describe('aria-labelledby', function () {
 	'use strict';
 
 	var fixture = document.getElementById('fixture');
+	var fixtureSetup = axe.testUtils.fixtureSetup;
 
 	afterEach(function () {
 		fixture.innerHTML = '';
@@ -14,7 +15,7 @@ describe('aria-labelledby', function () {
 		var target = document.createElement('div');
 		target.id = 'woohoo';
 		target.innerHTML = 'bananas';
-		fixture.appendChild(target);
+		fixtureSetup(target);
 
 		assert.isTrue(checks['aria-labelledby'].evaluate(node));
 	});
@@ -26,14 +27,14 @@ describe('aria-labelledby', function () {
 		var target = document.createElement('div');
 		target.id = 'woohoo';
 		target.innerHTML = 'bananas';
-		fixture.appendChild(target);
+		fixtureSetup(target);
 
 		assert.isTrue(checks['aria-labelledby'].evaluate(node));
 	});
 
 	it('should return false if an aria-labelledby is not present', function () {
 		var node = document.createElement('div');
-		fixture.appendChild(node);
+		fixtureSetup(node);
 
 		assert.isFalse(checks['aria-labelledby'].evaluate(node));
 	});
@@ -45,7 +46,7 @@ describe('aria-labelledby', function () {
 		var target = document.createElement('div');
 		target.id = 'woohoo';
 		target.innerHTML = '<span style="display: none">bananas</span>';
-		fixture.appendChild(target);
+		fixtureSetup(target);
 
 		assert.isTrue(checks['aria-labelledby'].evaluate(node));
 	});
@@ -58,10 +59,9 @@ describe('aria-labelledby', function () {
 		target.id = 'woohoo';
 		target.setAttribute('aria-hidden', 'true');
 		target.innerHTML = 'bananas';
-		fixture.appendChild(target);
+		fixtureSetup(target);
 
 		assert.isTrue(checks['aria-labelledby'].evaluate(node));
 	});
 
-
-});
\ No newline at end of file
+});
diff --git a/test/checks/shared/has-visible-text.js b/test/checks/shared/has-visible-text.js
index 18400de13a..f62e080bd6 100644
--- a/test/checks/shared/has-visible-text.js
+++ b/test/checks/shared/has-visible-text.js
@@ -2,25 +2,26 @@ describe('has-visible-text', function () {
 	'use strict';
 
 	var fixture = document.getElementById('fixture');
+	var fixtureSetup = axe.testUtils.fixtureSetup;
 
 	afterEach(function () {
 		fixture.innerHTML = '';
 	});
 
 	it('should return false if there is no visible text', function () {
-		fixture.innerHTML = '<object></object>';
+		fixtureSetup('<object></object>');
 		var node = document.querySelector('object');
 		assert.isFalse(checks['has-visible-text'].evaluate(node));
 	});
 
 	it('should return false if there is text, but its hidden', function () {
-		fixture.innerHTML = '<object><span style="display:none">hello!</span></object>';
+		fixtureSetup('<object><span style="display:none">hello!</span></object>');
 		var node = document.querySelector('object');
 		assert.isFalse(checks['has-visible-text'].evaluate(node));
 	});
 
 	it('should return true if there is visible text', function () {
-		fixture.innerHTML = '<object>hello!</object>';
+		fixtureSetup('<object>hello!</object>');
 		var node = document.querySelector('object');
 		assert.isTrue(checks['has-visible-text'].evaluate(node));
 	});
diff --git a/test/checks/tables/same-caption-summary.js b/test/checks/tables/same-caption-summary.js
index ceef09933c..f56dfedd2c 100644
--- a/test/checks/tables/same-caption-summary.js
+++ b/test/checks/tables/same-caption-summary.js
@@ -2,13 +2,15 @@ describe('same-caption-summary', function () {
 	'use strict';
 
 	var fixture = document.getElementById('fixture');
+	var fixtureSetup = axe.testUtils.fixtureSetup;
+	var shadowSupport = axe.testUtils.shadowSupport;
 
 	afterEach(function () {
 		fixture.innerHTML = '';
 	});
 
 	it('should return false there is no caption', function () {
-		fixture.innerHTML = '<table summary="hi"><tr><td></td></tr></table>';
+		fixtureSetup('<table summary="hi"><tr><td></td></tr></table>');
 		var node = fixture.querySelector('table');
 
 		assert.isFalse(checks['same-caption-summary'].evaluate(node));
@@ -16,7 +18,7 @@ describe('same-caption-summary', function () {
 	});
 
 	it('should return false there is no summary', function () {
-		fixture.innerHTML = '<table><caption>Hi</caption><tr><td></td></tr></table>';
+		fixtureSetup('<table><caption>Hi</caption><tr><td></td></tr></table>');
 		var node = fixture.querySelector('table');
 
 		assert.isFalse(checks['same-caption-summary'].evaluate(node));
@@ -24,7 +26,7 @@ describe('same-caption-summary', function () {
 	});
 
 	it('should return false if summary and caption are different', function () {
-		fixture.innerHTML = '<table summary="bye"><caption>Hi</caption><tr><td></td></tr></table>';
+		fixtureSetup('<table summary="bye"><caption>Hi</caption><tr><td></td></tr></table>');
 		var node = fixture.querySelector('table');
 
 		assert.isFalse(checks['same-caption-summary'].evaluate(node));
@@ -32,12 +34,27 @@ describe('same-caption-summary', function () {
 	});
 
 	it('should return true if summary and caption are the same', function () {
-		fixture.innerHTML = '<table summary="Hi"><caption>Hi</caption><tr><td></td></tr></table>';
+		fixtureSetup('<table summary="Hi"><caption>Hi</caption><tr><td></td></tr></table>');
 		var node = fixture.querySelector('table');
 
 		assert.isTrue(checks['same-caption-summary'].evaluate(node));
-
 	});
 
+	(shadowSupport.v1 ? it : xit)('should match slotted caption elements', function () {
+		var node = document.createElement('div');
+		node.innerHTML = '<span slot="caption">Caption</span>' +
+			'<span slot="one">Data element 1</span>' +
+			'<span slot="two">Data element 2</span>';
+
+		var root = node.attachShadow({ mode: 'open' });
+		var table = document.createElement('table');
+		table.innerHTML = '<caption><slot name="caption"></slot></caption>' +
+				'<tr><td><slot name="one"></slot></td><td><slot name="two"></slot></td></tr>';
+		table.setAttribute('summary', 'Caption');
+		root.appendChild(table);
+		fixtureSetup(node);
+
+		assert.isTrue(checks['same-caption-summary'].evaluate(table));
+	});
 
 });
\ No newline at end of file
diff --git a/test/checks/visibility/hidden-content.js b/test/checks/visibility/hidden-content.js
index 0b5fa6bda8..58ddc8ab29 100644
--- a/test/checks/visibility/hidden-content.js
+++ b/test/checks/visibility/hidden-content.js
@@ -4,6 +4,7 @@ describe('hidden content', function () {
 
 	var fixture = document.getElementById('fixture');
 	var shadowSupport = axe.testUtils.shadowSupport.v1;
+	var checkSetup = axe.testUtils.checkSetup;
 	var checkContext = {
 		_data: null,
 		data: function (d) {
@@ -11,14 +12,6 @@ describe('hidden content', function () {
 		}
 	};
 
-	function checkSetup (html, options, target) {
-		fixture.innerHTML = html;
-		axe._tree = axe.utils.getFlattenedTree(fixture);
-		var node = fixture.querySelector(target || '#target');
-		var virtualNode = axe.utils.getNodeFromTree(axe._tree[0], node);
-		return [node, options, virtualNode];
-	}
-
 	afterEach(function () {
 		fixture.innerHTML = '';
 		checkContext._data = null;
diff --git a/test/commons/.jshintrc b/test/commons/.jshintrc
index 1c4d868423..7cca133389 100644
--- a/test/commons/.jshintrc
+++ b/test/commons/.jshintrc
@@ -3,6 +3,7 @@
 	"globals": {
 		"describe": true,
 		"it": true,
+		"xit": true,
 		"before": true,
 		"beforeEach": true,
 		"after": true,
diff --git a/test/commons/dom/find-elms-in-context.js b/test/commons/dom/find-elms-in-context.js
new file mode 100644
index 0000000000..ca5470b0e8
--- /dev/null
+++ b/test/commons/dom/find-elms-in-context.js
@@ -0,0 +1,53 @@
+describe('dom.findElmsInContext', function () {
+  'use strict';
+
+  var shadowSupport = axe.testUtils.shadowSupport;
+  var fixtureSetup = axe.testUtils.fixtureSetup;
+  var findElmsInContext = axe.commons.dom.findElmsInContext;
+
+  afterEach(function () {
+    fixtureSetup('');
+  });
+
+  it('returns an array or elements in the same context', function () {
+    var fixture = fixtureSetup(
+      '<b name="foo">1</b>' + 
+      '<b name="foo">2</b>' + 
+      '<b name="bar">3</b>' + 
+      '<i name="foo">4</i>');
+
+    assert.deepEqual(
+      findElmsInContext({ elm: 'b', attr: 'name', value: 'foo', context: fixture }),
+      Array.from( document.querySelectorAll('b[name=foo]') )
+    );
+  });
+
+  (shadowSupport.v1 ? it : xit)('ignores elements inside shadow tree', function () {
+    var node = document.createElement('div');
+    node.innerHTML = '<b name="foo">1</b>';
+    var shadow = node.attachShadow({ mode: 'open' });
+    shadow.innerHTML = '<b name="foo">2</b> <slot></slot>';
+    var fixture = fixtureSetup(node);
+
+    var result = findElmsInContext({
+      elm: 'b', attr: 'name', value: 'foo', context: fixture
+    });
+    assert.lengthOf(result, 1);
+    assert.equal(result[0].innerText, '1');
+  });
+
+  (shadowSupport.v1 ? it : xit)('can search elements limited to the shadow tree', function () {
+    var node = document.createElement('div');
+    node.innerHTML = '<b name="foo">1</b>';
+    var shadow = node.attachShadow({ mode: 'open' });
+    shadow.innerHTML = '<b name="foo">2</b><slot></slot>';
+    fixtureSetup(node);
+
+    var result = findElmsInContext({
+      elm: 'b', attr: 'name', value: 'foo', context: shadow
+    });
+
+    assert.lengthOf(result, 1);
+    assert.equal(result[0].innerText, '2');
+  });
+});
diff --git a/test/commons/text/accessible-text.js b/test/commons/text/accessible-text.js
index 504856ee1e..2cbd9eef73 100644
--- a/test/commons/text/accessible-text.js
+++ b/test/commons/text/accessible-text.js
@@ -2,9 +2,11 @@ describe('text.accessibleText', function() {
 	'use strict';
 
 	var fixture = document.getElementById('fixture');
+	var shadowSupport = axe.testUtils.shadowSupport;
 
 	afterEach(function() {
 		fixture.innerHTML = '';
+		axe._tree = null;
 	});
 
 	it('should match the first example from the ARIA spec', function() {
@@ -20,11 +22,13 @@ describe('text.accessibleText', function() {
 			'    </ul>' +
 			'  </li>' +
 			'</ul>';
-		var rule2a = fixture.querySelector('#rule2a');
-		var rule2c = fixture.querySelector('#rule2c');
+		axe._tree = axe.utils.getFlattenedTree(fixture);
+
+		var rule2a = axe.utils.querySelectorAll(axe._tree, '#rule2a')[0];
+		var rule2c = axe.utils.querySelectorAll(axe._tree, '#rule2c')[0];
+
 		assert.equal(axe.commons.text.accessibleText(rule2a), 'File');
 		assert.equal(axe.commons.text.accessibleText(rule2c), 'New');
-
 	});
 
 	it('should match the second example from the ARIA spec', function() {
@@ -42,9 +46,10 @@ describe('text.accessibleText', function() {
 			'    times' +
 			'  </label>' +
 			'</fieldset>';
+		axe._tree = axe.utils.getFlattenedTree(fixture);
 
-		var rule2a = fixture.querySelector('#beep');
-		var rule2b = fixture.querySelector('#flash');
+		var rule2a = axe.utils.querySelectorAll(axe._tree, '#beep')[0];
+		var rule2b = axe.utils.querySelectorAll(axe._tree, '#flash')[0];
 		assert.equal(axe.commons.text.accessibleText(rule2a), 'Beep');
 		assert.equal(axe.commons.text.accessibleText(rule2b), 'Flash the screen 3 times');
 	});
@@ -56,8 +61,9 @@ describe('text.accessibleText', function() {
 			'<div id="t1label">This is a <b>label</b></div>' +
 			'<label for="t1">HTML Label</label>' +
 			'<input type="text" id="t2" aria-labelledby="t2label">';
+		axe._tree = axe.utils.getFlattenedTree(fixture);
 
-		var target = fixture.querySelector('#t1');
+		var target = axe.utils.querySelectorAll(axe._tree, '#t1')[0];
 		assert.equal(axe.commons.text.accessibleText(target), 'This is a label');
 	});
 
@@ -67,8 +73,9 @@ describe('text.accessibleText', function() {
 			'<div id="t1label">This is a <b>label</b></div>' +
 			'<label for="t1">HTML Label</label>' +
 			'<input type="text" id="t2" aria-labelledby="t2label">';
+		axe._tree = axe.utils.getFlattenedTree(fixture);
 
-		var target = fixture.querySelector('#t1');
+		var target = axe.utils.querySelectorAll(axe._tree, '#t1')[0];
 		assert.equal(axe.commons.text.accessibleText(target), 'ARIA Label This is a label');
 	});
 
@@ -78,15 +85,17 @@ describe('text.accessibleText', function() {
 			'<span aria-hidden="true">secret</span></div>'+
 			'<label for="t1">HTML Label</label>' +
 			'<input type="text" id="t1" aria-labelledby="t1label">';
+		axe._tree = axe.utils.getFlattenedTree(fixture);
 
-		var target = fixture.querySelector('#t1');
+		var target = axe.utils.querySelectorAll(axe._tree, '#t1')[0];
  		assert.equal(axe.commons.text.accessibleText(target), 'This is a hidden secret');
 	});
 
 	it('should allow setting the initial inLabelledbyContext value', function () {
 		fixture.innerHTML = '<label id="lbl1" style="display:none;">hidden label</label>';
+		axe._tree = axe.utils.getFlattenedTree(fixture);
 
-		var target = fixture.querySelector('#lbl1');
+		var target = axe.utils.querySelectorAll(axe._tree, '#lbl1')[0];
  		assert.equal(axe.commons.text.accessibleText(target, false), '');
  		assert.equal(axe.commons.text.accessibleText(target, true), 'hidden label');
 	});
@@ -97,8 +106,9 @@ describe('text.accessibleText', function() {
 			'<div id="t1label">This is a <b>label</b></div>' +
 			'<label for="t1">HTML Label</label>' +
 			'<input type="text" id="t2" aria-labelledby="t2label">';
+		axe._tree = axe.utils.getFlattenedTree(fixture);
 
-		var target = fixture.querySelector('#t1');
+		var target = axe.utils.querySelectorAll(axe._tree, '#t1')[0];
 		assert.equal(axe.commons.text.accessibleText(target), 'ARIA Label');
 	});
 
@@ -109,8 +119,9 @@ describe('text.accessibleText', function() {
 			'<div id="t1label">This is a <b>label</b></div>' +
 			'<label for="t1">HTML Label</label>' +
 			'<input type="text" id="t2" aria-labelledby="t2label">';
+		axe._tree = axe.utils.getFlattenedTree(fixture);
 
-		var target = fixture.querySelector('#target');
+		var target = axe.utils.querySelectorAll(axe._tree, '#target')[0];
 		assert.equal(axe.commons.text.accessibleText(target), 'Alt text goes here');
 	});
 
@@ -121,8 +132,9 @@ describe('text.accessibleText', function() {
 			'<div id="t1label">This is a <b>label</b></div>' +
 			'<label for="t1">HTML Label</label>' +
 			'<input type="text" id="t2" aria-labelledby="t2label">';
+		axe._tree = axe.utils.getFlattenedTree(fixture);
 
-		var target = fixture.querySelector('#target');
+		var target = axe.utils.querySelectorAll(axe._tree, '#target')[0];
 		assert.equal(axe.commons.text.accessibleText(target), 'Alt text goes here');
 	});
 
@@ -133,8 +145,9 @@ describe('text.accessibleText', function() {
 			'<div id="t1label">This is a <b>label</b></div>' +
 			'<label for="t1">HTML Label</label>' +
 			'<input type="text" id="t2" aria-labelledby="t2label">';
+		axe._tree = axe.utils.getFlattenedTree(fixture);
 
-		var target = fixture.querySelector('#target');
+		var target = axe.utils.querySelectorAll(axe._tree, '#target')[0];
 		assert.equal(axe.commons.text.accessibleText(target), '');
 	});
 
@@ -144,8 +157,9 @@ describe('text.accessibleText', function() {
 			'<div id="t1label">This is a <b>label</b></div>' +
 			'<label for="t1">HTML Label</label>' +
 			'<input type="text" id="t2" aria-labelledby="t2label">';
+		axe._tree = axe.utils.getFlattenedTree(fixture);
 
-		var target = fixture.querySelector('#t1');
+		var target = axe.utils.querySelectorAll(axe._tree, '#t1')[0];
 		assert.equal(axe.commons.text.accessibleText(target), 'HTML Label');
 	});
 
@@ -155,8 +169,9 @@ describe('text.accessibleText', function() {
 			'<div id="t1label">This is a <b>label</b></div>' +
 			'<label for="t1">HTML Label</label>' +
 			'<input type="text" id="t2" aria-labelledby="t2label">';
+		axe._tree = axe.utils.getFlattenedTree(fixture);
 
-		var target = fixture.querySelector('#t2label');
+		var target = axe.utils.querySelectorAll(axe._tree, '#t2label')[0];
 		assert.equal(axe.commons.text.accessibleText(target), 'This is This is a label of italics');
 	});
 
@@ -166,8 +181,9 @@ describe('text.accessibleText', function() {
 			'<div id="t1label">This is a <b>label</b></div>' +
 			'<label for="t1">HTML Label</label>' +
 			'<input type="text" id="t2" aria-labelledby="t2label">';
+		axe._tree = axe.utils.getFlattenedTree(fixture);
 
-		var target = fixture.querySelector('#t2label');
+		var target = axe.utils.querySelectorAll(axe._tree, '#t2label')[0];
 		assert.equal(axe.commons.text.accessibleText(target), 'This is This is a label of');
 	});
 
@@ -178,15 +194,17 @@ describe('text.accessibleText', function() {
 			'<div id="t1label">This is a <b>label</b></div>' +
 			'<label for="t1">HTML Label</label>' +
 			'<input type="text" id="t2" aria-labelledby="t2label">';
+		axe._tree = axe.utils.getFlattenedTree(fixture);
 
-		var target = fixture.querySelector('#t2label');
+		var target = axe.utils.querySelectorAll(axe._tree, '#t2label')[0];
 		assert.equal(axe.commons.text.accessibleText(target), 'This is This is a label of');
 	});
 
 	it('should only show each node once when label is before input', function() {
 		fixture.innerHTML = '<div id="target"><label for="tb1">My form input</label>' +
 			'<input type="text" id="tb1"></div>';
-		var target = fixture.querySelector('#target');
+		axe._tree = axe.utils.getFlattenedTree(fixture);
+		var target = axe.utils.querySelectorAll(axe._tree, '#target')[0];
 		assert.equal(axe.commons.text.accessibleText(target), 'My form input');
 	});
 
@@ -194,7 +212,8 @@ describe('text.accessibleText', function() {
 		fixture.innerHTML = '<div id="target">' +
 			'<input type="text" id="tb1"></div>' +
 			'<label for="tb1">My form input</label>';
-		var target = fixture.querySelector('#target');
+		axe._tree = axe.utils.getFlattenedTree(fixture);
+		var target = axe.utils.querySelectorAll(axe._tree, '#target')[0];
 		assert.equal(axe.commons.text.accessibleText(target), 'My form input');
 	});
 
@@ -204,8 +223,9 @@ describe('text.accessibleText', function() {
 			'<div id="t1label">This is a <b>label</b></div>' +
 			'<label for="t1">HTML Label</label>' +
 			'<input type="text" id="t2" aria-labelledby="t2label">';
+		axe._tree = axe.utils.getFlattenedTree(fixture);
 
-		var target = fixture.querySelector('#t2label');
+		var target = axe.utils.querySelectorAll(axe._tree, '#t2label')[0];
 		assert.equal(axe.commons.text.accessibleText(target), 'This is This is a label of everything');
 	});
 
@@ -215,8 +235,9 @@ describe('text.accessibleText', function() {
 			'<div id="t1label">This is a <b>label</b></div>' +
 			'<label for="t1">HTML Label</label>' +
 			'<input type="text" id="t2" aria-labelledby="t2label">';
+		axe._tree = axe.utils.getFlattenedTree(fixture);
 
-		var target = fixture.querySelector('#t2');
+		var target = axe.utils.querySelectorAll(axe._tree, '#t2')[0];
 		assert.equal(axe.commons.text.accessibleText(target), 'This is the value of everything');
 	});
 
@@ -226,8 +247,9 @@ describe('text.accessibleText', function() {
 			'<div id="t1label">This is a <b>label</b></div>' +
 			'<label for="t1">HTML Label</label>' +
 			'<input type="text" id="t2" aria-labelledby="t2label">';
+		axe._tree = axe.utils.getFlattenedTree(fixture);
 
-		var target = fixture.querySelector('#t2');
+		var target = axe.utils.querySelectorAll(axe._tree, '#t2')[0];
 		assert.equal(axe.commons.text.accessibleText(target), 'This is of everything');
 	});
 
@@ -237,8 +259,9 @@ describe('text.accessibleText', function() {
 			'<div id="t1label">This is a <b>label</b></div>' +
 			'<label for="t1">HTML Label</label>' +
 			'<input type="text" id="t2" aria-labelledby="t2label">';
+		axe._tree = axe.utils.getFlattenedTree(fixture);
 
-		var target = fixture.querySelector('#t2');
+		var target = axe.utils.querySelectorAll(axe._tree, '#t2')[0];
 		assert.equal(axe.commons.text.accessibleText(target), 'This is the value of everything');
 	});
 
@@ -250,8 +273,9 @@ describe('text.accessibleText', function() {
 			'<div id="t1label">This is a <b>label</b></div>' +
 			'<label for="t1">HTML Label</label>' +
 			'<input type="text" id="t2" aria-labelledby="t2label">';
+		axe._tree = axe.utils.getFlattenedTree(fixture);
 
-		var target = fixture.querySelector('#t2');
+		var target = axe.utils.querySelectorAll(axe._tree, '#t2')[0];
 		assert.equal(axe.commons.text.accessibleText(target), 'This is first third of everything');
 	});
 
@@ -261,8 +285,9 @@ describe('text.accessibleText', function() {
 			'<div id="t1label">This is a <b>label</b></div>' +
 			'<label for="t1">HTML Label</label>' +
 			'<input type="text" id="t2" aria-labelledby="t2label">';
+		axe._tree = axe.utils.getFlattenedTree(fixture);
 
-		var target = fixture.querySelector('#t2');
+		var target = axe.utils.querySelectorAll(axe._tree, '#t2')[0];
 		assert.equal(axe.commons.text.accessibleText(target), 'This is the value of everything');
 	});
 
@@ -273,144 +298,242 @@ describe('text.accessibleText', function() {
 			'<div id="t1label">This is a <b>label</b></div>' +
 			'<label for="t1">HTML Label</label>' +
 			'<input type="text" id="t2" aria-labelledby="t2label">';
+		axe._tree = axe.utils.getFlattenedTree(fixture);
 
-		var target = fixture.querySelector('#t2');
+		var target = axe.utils.querySelectorAll(axe._tree, '#t2')[0];
 		assert.equal(axe.commons.text.accessibleText(target), 'This not a span is the value of everything');
 	});
 
 	it('shoud properly fall back to title', function() {
 		fixture.innerHTML = '<a href="#" role="presentation" title="Hello"></a>';
-		var target = fixture.querySelector('a');
+		axe._tree = axe.utils.getFlattenedTree(fixture);
+
+		var target = axe.utils.querySelectorAll(axe._tree, 'a')[0];
 		assert.equal(axe.commons.text.accessibleText(target), 'Hello');
 	});
 
 	it('should give text even for role=presentation on anchors', function() {
 		fixture.innerHTML = '<a href="#" role="presentation">Hello</a>';
-		var target = fixture.querySelector('a');
+		axe._tree = axe.utils.getFlattenedTree(fixture);
+
+		var target = axe.utils.querySelectorAll(axe._tree, 'a')[0];
 		assert.equal(axe.commons.text.accessibleText(target), 'Hello');
 	});
 
 	it('should give text even for role=presentation on buttons', function() {
 		fixture.innerHTML = '<button role="presentation">Hello</button>';
-		var target = fixture.querySelector('button');
+		axe._tree = axe.utils.getFlattenedTree(fixture);
+
+		var target = axe.utils.querySelectorAll(axe._tree, 'button')[0];
 		assert.equal(axe.commons.text.accessibleText(target), 'Hello');
 	});
 
 	it('should give text even for role=presentation on summary', function() {
 		fixture.innerHTML = '<summary role="presentation">Hello</summary>';
-		var target = fixture.querySelector('summary');
+		axe._tree = axe.utils.getFlattenedTree(fixture);
+		var target = axe.utils.querySelectorAll(axe._tree, 'summary')[0];
 		assert.equal(axe.commons.text.accessibleText(target), 'Hello');
 	});
 
 	it('shoud properly fall back to title', function() {
 		fixture.innerHTML = '<a href="#" role="none" title="Hello"></a>';
-		var target = fixture.querySelector('a');
+		axe._tree = axe.utils.getFlattenedTree(fixture);
+		var target = axe.utils.querySelectorAll(axe._tree, 'a')[0];
 		assert.equal(axe.commons.text.accessibleText(target), 'Hello');
 	});
 
 	it('should give text even for role=none on anchors', function() {
 		fixture.innerHTML = '<a href="#" role="none">Hello</a>';
-		var target = fixture.querySelector('a');
+		axe._tree = axe.utils.getFlattenedTree(fixture);
+
+		var target = axe.utils.querySelectorAll(axe._tree, 'a')[0];
 		assert.equal(axe.commons.text.accessibleText(target), 'Hello');
 	});
 
 	it('should give text even for role=none on buttons', function() {
 		fixture.innerHTML = '<button role="none">Hello</button>';
-		var target = fixture.querySelector('button');
+		axe._tree = axe.utils.getFlattenedTree(fixture);
+
+		var target = axe.utils.querySelectorAll(axe._tree, 'button')[0];
 		assert.equal(axe.commons.text.accessibleText(target), 'Hello');
 	});
 
 	it('should give text even for role=none on summary', function() {
 		fixture.innerHTML = '<summary role="none">Hello</summary>';
-		var target = fixture.querySelector('summary');
+		axe._tree = axe.utils.getFlattenedTree(fixture);
+
+		var target = axe.utils.querySelectorAll(axe._tree, 'summary')[0];
 		assert.equal(axe.commons.text.accessibleText(target), 'Hello');
 	});
 
 	it('should not add extra spaces around phrasing elements', function() {
 		fixture.innerHTML = '<a href="#">Hello<span>World</span></a>';
-		var target = fixture.querySelector('a');
+		axe._tree = axe.utils.getFlattenedTree(fixture);
+
+		var target = axe.utils.querySelectorAll(axe._tree, 'a')[0];
 		assert.equal(axe.commons.text.accessibleText(target), 'HelloWorld');
 	});
 
 	it('should add spaces around non-phrasing elements', function() {
 		fixture.innerHTML = '<a href="#">Hello<div>World</div></a>';
-		var target = fixture.querySelector('a');
+		axe._tree = axe.utils.getFlattenedTree(fixture);
+
+		var target = axe.utils.querySelectorAll(axe._tree, 'a')[0];
 		assert.equal(axe.commons.text.accessibleText(target), 'Hello World');
 	});
 
 	it('should not look at scripts', function() {
 		fixture.innerHTML = '<a href="#"><script> var ajiasdf = true; </script></a>';
-		var target = fixture.querySelector('a');
+		axe._tree = axe.utils.getFlattenedTree(fixture);
+
+		var target = axe.utils.querySelectorAll(axe._tree, 'a')[0];
 		assert.equal(axe.commons.text.accessibleText(target), '');
 	});
 
 	it('should use <label> for input buttons', function() {
 		fixture.innerHTML = '<label><input type="button"></label>';
-		var target = fixture.querySelector('input');
+		axe._tree = axe.utils.getFlattenedTree(fixture);
+
+		var target = axe.utils.querySelectorAll(axe._tree, 'input')[0];
 		assert.equal(axe.commons.text.accessibleText(target), '');
 	});
 
+	(shadowSupport.v1 ? it : xit)('should only find aria-labelledby element in the same context ', function() {
+		fixture.innerHTML = '<div id="t2label">This is <input type="text" value="the value" ' +
+			'aria-labelledby="t1label" aria-label="ARIA Label" id="t1"> of <i>everything</i></div>' +
+			'<div id="shadow"></div>';
+
+		var shadow = document.getElementById('shadow').attachShadow({ mode: 'open' });
+		shadow.innerHTML = '<div id="t1label">This is a <b>label</b></div>' +
+			'<label for="t1">HTML Label</label>' +
+			'<input type="text" id="t2" aria-labelledby="t2label">';
+
+		axe._tree = axe.utils.getFlattenedTree(fixture);
+		var target = axe.utils.querySelectorAll(axe._tree, '#t1')[0];
+		assert.equal(axe.commons.text.accessibleText(target), 'ARIA Label');
+	});
+
+	(shadowSupport.v1 ? it : xit)('should find attributes within a shadow tree', function() {
+		fixture.innerHTML = '<div id="shadow"></div>';
+
+		var shadow = document.getElementById('shadow').attachShadow({ mode: 'open' });
+		shadow.innerHTML = '<input type="text" id="t1" title="I will be king">';
+
+		axe._tree = axe.utils.getFlattenedTree(fixture);
+		var target = axe.utils.querySelectorAll(axe._tree, 'input')[0];
+		assert.equal(axe.commons.text.accessibleText(target), 'I will be king');
+	});
+
+	(shadowSupport.v1 ? it : xit)('should find attributes within a slot on the shadow tree', function() {
+		fixture.innerHTML = '<div id="shadow"><input type="text" id="t1" title="you will be queen"></div>';
+
+		var shadow = document.getElementById('shadow').attachShadow({ mode: 'open' });
+		shadow.innerHTML = '<slot></slot>';
+
+		axe._tree = axe.utils.getFlattenedTree(fixture);
+		var target = axe.utils.querySelectorAll(axe._tree, 'input')[0];
+		assert.equal(axe.commons.text.accessibleText(target), 'you will be queen');
+	});
+
+	(shadowSupport.v1 ? it : xit)('should find fallback content for shadow DOM', function() {
+		fixture.innerHTML = '<div id="shadow"></div>';
+
+		var shadow = document.getElementById('shadow').attachShadow({ mode: 'open' });
+		shadow.innerHTML = '<input type="text" id="t1">' +
+			'<label for="t1"><slot>Fallback content heroes</slot></label>';
+
+		axe._tree = axe.utils.getFlattenedTree(fixture);
+		var target = axe.utils.querySelectorAll(axe._tree, 'input')[0];
+		assert.equal(axe.commons.text.accessibleText(target), 'Fallback content heroes');
+	});
+
 	describe('figure', function() {
 
-		it('shoud check aria-labelledby', function() {
+		it('should check aria-labelledby', function() {
 			fixture.innerHTML = '<div id="t1">Hello</div>' +
 				'<figure aria-labelledby="t1">Not part of a11yName <figcaption>Fail</figcaption></figure>';
-			var target = fixture.querySelector('figure');
+			axe._tree = axe.utils.getFlattenedTree(fixture);
+
+			var target = axe.utils.querySelectorAll(axe._tree, 'figure')[0];
 			assert.equal(axe.commons.text.accessibleText(target), 'Hello');
 		});
 
-		it('shoud check aria-label', function() {
+		it('should check aria-label', function() {
 			fixture.innerHTML = '<figure aria-label="Hello">Not part of a11yName <figcaption>Fail</figcaption></figure>';
-			var target = fixture.querySelector('figure');
+			axe._tree = axe.utils.getFlattenedTree(fixture);
+
+			var target = axe.utils.querySelectorAll(axe._tree, 'figure')[0];
 			assert.equal(axe.commons.text.accessibleText(target), 'Hello');
 		});
 
-		it('shoud check the figures figcaption', function() {
+		it('should check the figures figcaption', function() {
 			fixture.innerHTML = '<figure>Not part of a11yName <figcaption>Hello</figcaption></figure>';
-			var target = fixture.querySelector('figure');
+			axe._tree = axe.utils.getFlattenedTree(fixture);
+
+			var target = axe.utils.querySelectorAll(axe._tree, 'figure')[0];
 			assert.equal(axe.commons.text.accessibleText(target), 'Hello');
 		});
 
-		it('shoud check title on figure', function() {
+		it('should check title on figure', function() {
 			fixture.innerHTML = '<figure title="Hello">Not part of a11yName <figcaption></figcaption></figure>';
-			var target = fixture.querySelector('figure');
+			axe._tree = axe.utils.getFlattenedTree(fixture);
+
+			var target = axe.utils.querySelectorAll(axe._tree, 'figure')[0];
 			assert.equal(axe.commons.text.accessibleText(target), 'Hello');
 		});
 
 		it('should not visit innerText of figure', function() {
 			fixture.innerHTML = '<figure>Hello<figcaption></figcaption></figure>';
-			var target = fixture.querySelector('figure');
+			axe._tree = axe.utils.getFlattenedTree(fixture);
+
+			var target = axe.utils.querySelectorAll(axe._tree, 'figure')[0];
 			assert.equal(axe.commons.text.accessibleText(target), '');
 		});
+
+		(shadowSupport.v1 ? it : xit)('should check within the composed (shadow) tree', function () {
+			var node = document.createElement('div');
+			node.innerHTML = 'Hello';
+			var shadowRoot = node.attachShadow({ mode: 'open' });
+			shadowRoot.innerHTML = '<figure>Not part of a11yName <figcaption><slot></slot></figcaption></figure>';
+			fixture.appendChild(node);
+			axe._tree = axe.utils.getFlattenedTree(fixture);
+
+			var target = axe.utils.querySelectorAll(axe._tree, 'figure')[0];
+			assert.equal(axe.commons.text.accessibleText(target), 'Hello');
+		});
 	});
 
 	describe('img', function() {
 		it('should work with aria-labelledby attribute', function() {
 			fixture.innerHTML = '<div id="t1">Hello</div><div id="t2">World</div>' +
 				'<img aria-labelledby="t1 t2">';
+			axe._tree = axe.utils.getFlattenedTree(fixture);
 
-			var target = fixture.querySelector('img');
+			var target = axe.utils.querySelectorAll(axe._tree, 'img')[0];
 			assert.equal(axe.commons.text.accessibleText(target), 'Hello World');
 		});
 
 		it('should work with aria-label attribute', function() {
 			fixture.innerHTML = '<img aria-label="Hello World">';
+			axe._tree = axe.utils.getFlattenedTree(fixture);
 
-			var target = fixture.querySelector('img');
+			var target = axe.utils.querySelectorAll(axe._tree, 'img')[0];
 			assert.equal(axe.commons.text.accessibleText(target), 'Hello World');
 		});
 
 		it('should work with alt attribute', function() {
 			fixture.innerHTML = '<img alt="Hello World">';
+			axe._tree = axe.utils.getFlattenedTree(fixture);
 
-			var target = fixture.querySelector('img');
+			var target = axe.utils.querySelectorAll(axe._tree, 'img')[0];
 			assert.equal(axe.commons.text.accessibleText(target), 'Hello World');
 		});
 
 		it('should work with title attribute', function() {
 			fixture.innerHTML = '<img title="Hello World">';
+			axe._tree = axe.utils.getFlattenedTree(fixture);
 
-			var target = fixture.querySelector('img');
+			var target = axe.utils.querySelectorAll(axe._tree, 'img')[0];
 			assert.equal(axe.commons.text.accessibleText(target), 'Hello World');
 		});
 	});
@@ -418,32 +541,42 @@ describe('text.accessibleText', function() {
 	describe('input buttons', function() {
 		it('should find value for input type=button', function() {
 			fixture.innerHTML = '<input type="button" value="Hello">';
-			var target = fixture.querySelector('input');
+			axe._tree = axe.utils.getFlattenedTree(fixture);
+
+			var target = axe.utils.querySelectorAll(axe._tree, 'input')[0];
 			assert.equal(axe.commons.text.accessibleText(target), 'Hello');
 		});
 
 		it('should find value for input type=reset', function() {
 			fixture.innerHTML = '<input type="reset" value="Hello">';
-			var target = fixture.querySelector('input');
+			axe._tree = axe.utils.getFlattenedTree(fixture);
+
+			var target = axe.utils.querySelectorAll(axe._tree, 'input')[0];
 			assert.equal(axe.commons.text.accessibleText(target), 'Hello');
 		});
 
 		it('should find value for input type=submit', function() {
 			fixture.innerHTML = '<input type="submit" value="Hello">';
-			var target = fixture.querySelector('input');
+			axe._tree = axe.utils.getFlattenedTree(fixture);
+
+			var target = axe.utils.querySelectorAll(axe._tree, 'input')[0];
 			assert.equal(axe.commons.text.accessibleText(target), 'Hello');
 		});
 
 		it('should provide a default value for input type="submit"', function() {
 			fixture.innerHTML = '<input type="submit">';
-			var target = fixture.querySelector('input');
+			axe._tree = axe.utils.getFlattenedTree(fixture);
+
+			var target = axe.utils.querySelectorAll(axe._tree, 'input')[0];
 			// IE inserts this for us, thanks!
 			assert.equal(axe.commons.text.accessibleText(target), target.value || 'Submit');
 		});
 
 		it('should provide a default value for input type="reset"', function() {
 			fixture.innerHTML = '<input type="reset">';
-			var target = fixture.querySelector('input');
+			axe._tree = axe.utils.getFlattenedTree(fixture);
+
+			var target = axe.utils.querySelectorAll(axe._tree, 'input')[0];
 			var defaultText = axe.commons.text.accessibleText(target);
 			assert.isString(defaultText);
 			assert.notEqual(defaultText.trim(), '');
@@ -451,20 +584,26 @@ describe('text.accessibleText', function() {
 
 		it('should find title for input type=button', function() {
 			fixture.innerHTML = '<input type="button" title="Hello">';
-			var target = fixture.querySelector('input');
+			axe._tree = axe.utils.getFlattenedTree(fixture);
+
+			var target = axe.utils.querySelectorAll(axe._tree, 'input')[0];
 			assert.equal(axe.commons.text.accessibleText(target), 'Hello');
 		});
 
 		it('should find title for input type=reset', function() {
 			fixture.innerHTML = '<input type="reset" title="Hello">';
-			var target = fixture.querySelector('input');
+			axe._tree = axe.utils.getFlattenedTree(fixture);
+
+			var target = axe.utils.querySelectorAll(axe._tree, 'input')[0];
 			// IE does not use title; but will use default value instead
 			assert.equal(axe.commons.text.accessibleText(target), target.value || 'Hello');
 		});
 
 		it('should find title for input type=submit', function() {
 			fixture.innerHTML = '<input type="submit" title="Hello">';
-			var target = fixture.querySelector('input');
+			axe._tree = axe.utils.getFlattenedTree(fixture);
+
+			var target = axe.utils.querySelectorAll(axe._tree, 'input')[0];
 			// Again, default value takes precedence over title
 			assert.equal(axe.commons.text.accessibleText(target), target.value || 'Hello');
 		});
@@ -474,43 +613,49 @@ describe('text.accessibleText', function() {
 		it('should work with aria-labelledby', function() {
 			fixture.innerHTML = '<div id="t1">Hello</div><div id="t2">World</div>' +
 				'<table aria-labelledby="t1 t2"></table>';
+			axe._tree = axe.utils.getFlattenedTree(fixture);
 
-			var target = fixture.querySelector('table');
+			var target = axe.utils.querySelectorAll(axe._tree, 'table')[0];
 			assert.equal(axe.commons.text.accessibleText(target), 'Hello World');
 		});
 
 		it('should work with aria-label', function() {
 			fixture.innerHTML = '<table aria-label="Hello World"></table>';
+			axe._tree = axe.utils.getFlattenedTree(fixture);
 
-			var target = fixture.querySelector('table');
+			var target = axe.utils.querySelectorAll(axe._tree, 'table')[0];
 			assert.equal(axe.commons.text.accessibleText(target), 'Hello World');
 		});
 
 		it('should work with the caption element', function() {
 			fixture.innerHTML = '<table><caption>Hello World</caption><tr><td>Stuff</td></tr></table>';
+			axe._tree = axe.utils.getFlattenedTree(fixture);
 
-			var target = fixture.querySelector('table');
+			var target = axe.utils.querySelectorAll(axe._tree, 'table')[0];
 			assert.equal(axe.commons.text.accessibleText(target), 'Hello World');
 		});
 
 		it('should work with the title attribute', function() {
 			fixture.innerHTML = '<table title="Hello World"></table>';
+			axe._tree = axe.utils.getFlattenedTree(fixture);
 
-			var target = fixture.querySelector('table');
+			var target = axe.utils.querySelectorAll(axe._tree, 'table')[0];
 			assert.equal(axe.commons.text.accessibleText(target), 'Hello World');
 		});
 
 		it('should work with the summary attribute', function() {
 			fixture.innerHTML = '<table summary="Hello World"></table>';
+			axe._tree = axe.utils.getFlattenedTree(fixture);
 
-			var target = fixture.querySelector('table');
+			var target = axe.utils.querySelectorAll(axe._tree, 'table')[0];
 			assert.equal(axe.commons.text.accessibleText(target), 'Hello World');
 		});
 
 		it('should prefer title attribute over summary attribute', function() {
 			fixture.innerHTML = '<table title="Hello World" summary="FAIL"></table>';
+			axe._tree = axe.utils.getFlattenedTree(fixture);
 
-			var target = fixture.querySelector('table');
+			var target = axe.utils.querySelectorAll(axe._tree, 'table')[0];
 			assert.equal(axe.commons.text.accessibleText(target), 'Hello World');
 		});
 	});
@@ -524,8 +669,9 @@ describe('text.accessibleText', function() {
 				var t = type ? ' type="' + type + '"' : '';
 				fixture.innerHTML = '<div id="t1">Hello</div><div id="t2">World</div>' +
 					'<input' + t + ' aria-labelledby="t1 t2">';
+				axe._tree = axe.utils.getFlattenedTree(fixture);
 
-				var target = fixture.querySelector('input');
+				var target = axe.utils.querySelectorAll(axe._tree, 'input')[0];
 				assert.equal(axe.commons.text.accessibleText(target), 'Hello World', type);
 			});
 		});
@@ -534,8 +680,9 @@ describe('text.accessibleText', function() {
 			types.forEach(function(type) {
 				var t = type ? ' type="' + type + '"' : '';
 				fixture.innerHTML = '<input' + t + ' aria-label="Hello World">';
+				axe._tree = axe.utils.getFlattenedTree(fixture);
 
-				var target = fixture.querySelector('input');
+				var target = axe.utils.querySelectorAll(axe._tree, 'input')[0];
 				assert.equal(axe.commons.text.accessibleText(target), 'Hello World', type);
 			});
 		});
@@ -545,8 +692,9 @@ describe('text.accessibleText', function() {
 				var t = type ? ' type="' + type + '"' : '';
 				fixture.innerHTML = '<label for="t1">Hello World' +
 					'<input' + t + '></label>';
+				axe._tree = axe.utils.getFlattenedTree(fixture);
 
-				var target = fixture.querySelector('input');
+				var target = axe.utils.querySelectorAll(axe._tree, 'input')[0];
 				assert.equal(axe.commons.text.accessibleText(target), 'Hello World', type);
 			});
 		});
@@ -556,8 +704,9 @@ describe('text.accessibleText', function() {
 				var t = type ? ' type="' + type + '"' : '';
 				fixture.innerHTML = '<label for="t1">Hello World</label>' +
 					'<input' + t + ' id="t1">';
+				axe._tree = axe.utils.getFlattenedTree(fixture);
 
-				var target = fixture.querySelector('input');
+				var target = axe.utils.querySelectorAll(axe._tree, 'input')[0];
 				assert.equal(axe.commons.text.accessibleText(target), 'Hello World', type);
 			});
 		});
@@ -567,8 +716,9 @@ describe('text.accessibleText', function() {
 			types.forEach(function(type) {
 				var t = type ? ' type="' + type + '"' : '';
 				fixture.innerHTML = '<input' + t + ' placeholder="Hello World">';
+				axe._tree = axe.utils.getFlattenedTree(fixture);
 
-				var target = fixture.querySelector('input');
+				var target = axe.utils.querySelectorAll(axe._tree, 'input')[0];
 				assert.equal(axe.commons.text.accessibleText(target), 'Hello World', type);
 			});
 		});
@@ -577,8 +727,9 @@ describe('text.accessibleText', function() {
 			types.forEach(function(type) {
 				var t = type ? ' type="' + type + '"' : '';
 				fixture.innerHTML = '<input' + t + ' title="Hello World">';
+				axe._tree = axe.utils.getFlattenedTree(fixture);
 
-				var target = fixture.querySelector('input');
+				var target = axe.utils.querySelectorAll(axe._tree, 'input')[0];
 				assert.equal(axe.commons.text.accessibleText(target), 'Hello World', type);
 			});
 		});
@@ -587,8 +738,9 @@ describe('text.accessibleText', function() {
 			types.forEach(function(type) {
 				var t = type ? ' type="' + type + '"' : '';
 				fixture.innerHTML = '<input' + t + '>';
+				axe._tree = axe.utils.getFlattenedTree(fixture);
 
-				var target = fixture.querySelector('input');
+				var target = axe.utils.querySelectorAll(axe._tree, 'input')[0];
 				assert.equal(axe.commons.text.accessibleText(target), '');
 			});
 		});
@@ -599,53 +751,60 @@ describe('text.accessibleText', function() {
 		it('should find aria-labelledby', function() {
 			fixture.innerHTML = '<div id="t1">Hello</div><div id="t2">World</div>' +
 				'<textarea aria-labelledby="t1 t2"></textarea>';
+			axe._tree = axe.utils.getFlattenedTree(fixture);
 
-			var target = fixture.querySelector('textarea');
+			var target = axe.utils.querySelectorAll(axe._tree, 'textarea')[0];
 			assert.equal(axe.commons.text.accessibleText(target), 'Hello World');
 		});
 
 		it('should find aria-label', function() {
 			fixture.innerHTML = '<textarea aria-label="Hello World"></textarea>';
+			axe._tree = axe.utils.getFlattenedTree(fixture);
 
-			var target = fixture.querySelector('textarea');
+			var target = axe.utils.querySelectorAll(axe._tree, 'textarea')[0];
 			assert.equal(axe.commons.text.accessibleText(target), 'Hello World');
 		});
 
 		it('should find an implicit label', function() {
 			fixture.innerHTML = '<label for="t1">Hello World' +
 				'<textarea></textarea></label>';
+			axe._tree = axe.utils.getFlattenedTree(fixture);
 
-			var target = fixture.querySelector('textarea');
+			var target = axe.utils.querySelectorAll(axe._tree, 'textarea')[0];
 			assert.equal(axe.commons.text.accessibleText(target), 'Hello World');
 		});
 
 		it('should find an explicit label', function() {
 			fixture.innerHTML = '<label for="t1">Hello World</label>' +
 				'<textarea id="t1"></textarea>';
+			axe._tree = axe.utils.getFlattenedTree(fixture);
 
-			var target = fixture.querySelector('textarea');
+			var target = axe.utils.querySelectorAll(axe._tree, 'textarea')[0];
 			assert.equal(axe.commons.text.accessibleText(target), 'Hello World');
 		});
 
 		// not implemented yet, doesn't work accross ATs
 		it.skip('should find a placeholder attribute', function() {
 			fixture.innerHTML = '<textarea placeholder="Hello World"></textarea>';
+			axe._tree = axe.utils.getFlattenedTree(fixture);
 
-			var target = fixture.querySelector('textarea');
+			var target = axe.utils.querySelectorAll(axe._tree, 'textarea')[0];
 			assert.equal(axe.commons.text.accessibleText(target), 'Hello World');
 		});
 
 		it('should find a title attribute', function() {
 			fixture.innerHTML = '<textarea title="Hello World"></textarea>';
+			axe._tree = axe.utils.getFlattenedTree(fixture);
 
-			var target = fixture.querySelector('textarea');
+			var target = axe.utils.querySelectorAll(axe._tree, 'textarea')[0];
 			assert.equal(axe.commons.text.accessibleText(target), 'Hello World');
 		});
 
 		it('should otherwise be empty string', function() {
 			fixture.innerHTML = '<textarea></textarea>';
+			axe._tree = axe.utils.getFlattenedTree(fixture);
 
-			var target = fixture.querySelector('textarea');
+			var target = axe.utils.querySelectorAll(axe._tree, 'textarea')[0];
 			assert.equal(axe.commons.text.accessibleText(target), '');
 		});
 	});
@@ -655,44 +814,50 @@ describe('text.accessibleText', function() {
 		it('should find aria-labelledby', function() {
 			fixture.innerHTML = '<div id="t1">Hello</div><div id="t2">World</div>' +
 				'<input type="image" aria-labelledby="t1 t2">';
+			axe._tree = axe.utils.getFlattenedTree(fixture);
 
-			var target = fixture.querySelector('input');
+			var target = axe.utils.querySelectorAll(axe._tree, 'input')[0];
 			assert.equal(axe.commons.text.accessibleText(target), 'Hello World');
 		});
 
 		it('should find aria-label', function() {
 			fixture.innerHTML = '<input type="image" aria-label="Hello World">';
+			axe._tree = axe.utils.getFlattenedTree(fixture);
 
-			var target = fixture.querySelector('input');
+			var target = axe.utils.querySelectorAll(axe._tree, 'input')[0];
 			assert.equal(axe.commons.text.accessibleText(target), 'Hello World');
 		});
 
 		it('should find an alt attribute', function() {
 			fixture.innerHTML = '<input type="image" alt="Hello World">';
+			axe._tree = axe.utils.getFlattenedTree(fixture);
 
-			var target = fixture.querySelector('input');
+			var target = axe.utils.querySelectorAll(axe._tree, 'input')[0];
 			assert.equal(axe.commons.text.accessibleText(target), 'Hello World');
 		});
 
 		// doesn't work consistently across ATs yet
 		it.skip('should find a value attribute', function() {
 			fixture.innerHTML = '<input type="image" value="Hello World">';
+			axe._tree = axe.utils.getFlattenedTree(fixture);
 
-			var target = fixture.querySelector('input');
+			var target = axe.utils.querySelectorAll(axe._tree, 'input')[0];
 			assert.equal(axe.commons.text.accessibleText(target), 'Hello World');
 		});
 
 		it('should find a title attribute', function() {
 			fixture.innerHTML = '<input type="image" title="Hello World">';
+			axe._tree = axe.utils.getFlattenedTree(fixture);
 
-			var target = fixture.querySelector('input');
+			var target = axe.utils.querySelectorAll(axe._tree, 'input')[0];
 			assert.equal(axe.commons.text.accessibleText(target), 'Hello World');
 		});
 
 		it('should otherwise be empty string', function() {
 			fixture.innerHTML = '<input type="image">';
+			axe._tree = axe.utils.getFlattenedTree(fixture);
 
-			var target = fixture.querySelector('input');
+			var target = axe.utils.querySelectorAll(axe._tree, 'input')[0];
 			assert.equal(axe.commons.text.accessibleText(target), '');
 		});
 	});
@@ -701,36 +866,41 @@ describe('text.accessibleText', function() {
 		it('should find aria-labelledby', function() {
 			fixture.innerHTML = '<div id="t1">Hello</div><div id="t2">World</div>' +
 				'<a aria-labelledby="t1 t2"></a>';
+			axe._tree = axe.utils.getFlattenedTree(fixture);
 
-			var target = fixture.querySelector('a');
+			var target = axe.utils.querySelectorAll(axe._tree, 'a')[0];
 			assert.equal(axe.commons.text.accessibleText(target), 'Hello World');
 		});
 
 		it('should find aria-label', function() {
 			fixture.innerHTML = '<a aria-label="Hello World"></a>';
+			axe._tree = axe.utils.getFlattenedTree(fixture);
 
-			var target = fixture.querySelector('a');
+			var target = axe.utils.querySelectorAll(axe._tree, 'a')[0];
 			assert.equal(axe.commons.text.accessibleText(target), 'Hello World');
 		});
 
 		it('should check subtree', function() {
 			fixture.innerHTML = '<a><span>Hello<span> World</span></span></a>';
+			axe._tree = axe.utils.getFlattenedTree(fixture);
 
-			var target = fixture.querySelector('a');
+			var target = axe.utils.querySelectorAll(axe._tree, 'a')[0];
 			assert.equal(axe.commons.text.accessibleText(target), 'Hello World');
 		});
 
 		it('should find a title attribute', function() {
 			fixture.innerHTML = '<a title="Hello World"></a>';
+			axe._tree = axe.utils.getFlattenedTree(fixture);
 
-			var target = fixture.querySelector('a');
+			var target = axe.utils.querySelectorAll(axe._tree, 'a')[0];
 			assert.equal(axe.commons.text.accessibleText(target), 'Hello World');
 		});
 
 		it('should otherwise be empty string', function() {
 			fixture.innerHTML = '<a></a>';
+			axe._tree = axe.utils.getFlattenedTree(fixture);
 
-			var target = fixture.querySelector('a');
+			var target = axe.utils.querySelectorAll(axe._tree, 'a')[0];
 			assert.equal(axe.commons.text.accessibleText(target), '');
 		});
 	});
@@ -739,36 +909,41 @@ describe('text.accessibleText', function() {
 		it('should find aria-labelledby', function() {
 			fixture.innerHTML = '<div id="t1">Hello</div><div id="t2">World</div>' +
 				'<button aria-labelledby="t1 t2"></button>';
+			axe._tree = axe.utils.getFlattenedTree(fixture);
 
-			var target = fixture.querySelector('button');
+			var target = axe.utils.querySelectorAll(axe._tree, 'button')[0];
 			assert.equal(axe.commons.text.accessibleText(target), 'Hello World');
 		});
 
 		it('should find aria-label', function() {
 			fixture.innerHTML = '<button aria-label="Hello World"></button>';
+			axe._tree = axe.utils.getFlattenedTree(fixture);
 
-			var target = fixture.querySelector('button');
+			var target = axe.utils.querySelectorAll(axe._tree, 'button')[0];
 			assert.equal(axe.commons.text.accessibleText(target), 'Hello World');
 		});
 
 		it('should check subtree', function() {
 			fixture.innerHTML = '<button><span>Hello<span> World</span></span></button>';
+			axe._tree = axe.utils.getFlattenedTree(fixture);
 
-			var target = fixture.querySelector('button');
+			var target = axe.utils.querySelectorAll(axe._tree, 'button')[0];
 			assert.equal(axe.commons.text.accessibleText(target), 'Hello World');
 		});
 
 		it('should find a title attribute', function() {
 			fixture.innerHTML = '<button title="Hello World"></button>';
+			axe._tree = axe.utils.getFlattenedTree(fixture);
 
-			var target = fixture.querySelector('button');
+			var target = axe.utils.querySelectorAll(axe._tree, 'button')[0];
 			assert.equal(axe.commons.text.accessibleText(target), 'Hello World');
 		});
 
 		it('should otherwise be empty string', function() {
 			fixture.innerHTML = '<button></button>';
+			axe._tree = axe.utils.getFlattenedTree(fixture);
 
-			var target = fixture.querySelector('button');
+			var target = axe.utils.querySelectorAll(axe._tree, 'button')[0];
 			assert.equal(axe.commons.text.accessibleText(target), '');
 		});
 	});
@@ -781,11 +956,15 @@ describe('text.accessibleText', function() {
 		it('should find aria-labelledby', function() {
 			tags.forEach(function(tag) {
 				fixture.innerHTML = '<div id="t1">Hello</div><div id="t2">World</div>';
-				var target = document.createElement(tag);
-				target.setAttribute('aria-labelledby', 't1 t2');
-				target.style.display = 'inline'; // Firefox hides some of these elements because reasons...
-				fixture.appendChild(target);
+				axe._tree = axe.utils.getFlattenedTree(fixture);
+
+				var elm = document.createElement(tag);
+				elm.setAttribute('aria-labelledby', 't1 t2');
+				elm.style.display = 'inline'; // Firefox hides some of these elements because reasons...
+				fixture.appendChild(elm);
+				axe._tree = axe.utils.getFlattenedTree(fixture);
 
+				var target = axe.utils.getNodeFromTree(axe._tree[0], elm);
 				var result = axe.commons.text.accessibleText(target);
 				assert.equal(result, 'Hello World', tag);
 			});
@@ -793,11 +972,13 @@ describe('text.accessibleText', function() {
 
 		it('should find aria-label', function() {
 			tags.forEach(function(tag) {
-				var target = document.createElement(tag);
-				target.setAttribute('aria-label', 'Hello World');
-				target.style.display = 'inline'; // Firefox hack, see above
-				fixture.appendChild(target);
+				var elm = document.createElement(tag);
+				elm.setAttribute('aria-label', 'Hello World');
+				elm.style.display = 'inline'; // Firefox hack, see above
+				fixture.appendChild(elm);
+				axe._tree = axe.utils.getFlattenedTree(fixture);
 
+				var target = axe.utils.getNodeFromTree(axe._tree[0], elm);
 				var result = axe.commons.text.accessibleText(target);
 				assert.equal(result, 'Hello World', tag);
 			});
@@ -805,11 +986,13 @@ describe('text.accessibleText', function() {
 
 		it('should find a title attribute', function() {
 			tags.forEach(function(tag) {
-				var target = document.createElement(tag);
-				target.setAttribute('title', 'Hello World');
-				target.style.display = 'inline'; // Firefox hack, see above
-				fixture.appendChild(target);
+				var elm = document.createElement(tag);
+				elm.setAttribute('title', 'Hello World');
+				elm.style.display = 'inline'; // Firefox hack, see above
+				fixture.appendChild(elm);
+				axe._tree = axe.utils.getFlattenedTree(fixture);
 
+				var target = axe.utils.getNodeFromTree(axe._tree[0], elm);
 				var result = axe.commons.text.accessibleText(target);
 				assert.equal(result, 'Hello World', tag);
 			});
@@ -818,12 +1001,12 @@ describe('text.accessibleText', function() {
 		it('should otherwise be empty string', function() {
 			tags.forEach(function(tag) {
 				fixture.innerHTML = '<' + tag + '></' + tag + '>';
+				axe._tree = axe.utils.getFlattenedTree(fixture);
 
-				var target = fixture.querySelector(tag);
+				var target = axe.utils.querySelectorAll(axe._tree, tag)[0];
 				assert.equal(axe.commons.text.accessibleText(target), '');
 			});
 		});
 	});
 
-
 });

From 98f60232425cbcadf7bc7ed31ea275d367b91955 Mon Sep 17 00:00:00 2001
From: Wilco Fiers <wilco.fiers@deque.com>
Date: Mon, 17 Jul 2017 15:13:11 +0200
Subject: [PATCH 079/142] feat: Add shadow DOM to landmark check

---
 lib/checks/navigation/landmark.js  |  2 +-
 test/checks/navigation/landmark.js | 42 +++++++++++++++++++++++++-----
 2 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/lib/checks/navigation/landmark.js b/lib/checks/navigation/landmark.js
index 6739a2bcc1..acd7aec4dd 100644
--- a/lib/checks/navigation/landmark.js
+++ b/lib/checks/navigation/landmark.js
@@ -1 +1 @@
-return node.getElementsByTagName('main').length > 0 || !!node.querySelector('[role="main"]') ;
\ No newline at end of file
+return axe.utils.querySelectorAll(virtualNode, 'main, [role="main"]').length > 0;
\ No newline at end of file
diff --git a/test/checks/navigation/landmark.js b/test/checks/navigation/landmark.js
index e2c2e94a0b..0d679d8913 100644
--- a/test/checks/navigation/landmark.js
+++ b/test/checks/navigation/landmark.js
@@ -2,24 +2,54 @@ describe('landmark', function () {
 	'use strict';
 
 	var fixture = document.getElementById('fixture');
+	var checkSetup = axe.testUtils.checkSetup;
+	var shadowSupport = axe.testUtils.shadowSupport;
 
 	afterEach(function () {
 		fixture.innerHTML = '';
 	});
 
 	it('should return true when role=main is found', function () {
-		fixture.innerHTML = '<div role="main"></div>';
-		assert.isTrue(checks.landmark.evaluate(fixture));
+		var checkArgs = checkSetup('<div role="main"></div>', '#fixture');
+		assert.isTrue(checks.landmark.evaluate.apply(null, checkArgs));
 	});
 
 	it('should return true when <main> is found', function () {
-		fixture.innerHTML = '<main></main>';
-		assert.isTrue(checks.landmark.evaluate(fixture));
+		var checkArgs = checkSetup('<main></main>', '#fixture');
+		assert.isTrue(checks.landmark.evaluate.apply(null, checkArgs));
 	});
 
 	it('should otherwise return false', function () {
-		fixture.innerHTML = '<div role="contentinfo"></div>';
-		assert.isFalse(checks.landmark.evaluate(fixture));
+		var checkArgs = checkSetup('<div role="contentinfo"></div>', '#fixture');
+		assert.isFalse(checks.landmark.evaluate.apply(null, checkArgs));
+	});
+
+	(shadowSupport ? it : xit)('should not automatically pass if there is a shadow tree', function () {
+		var node = document.createElement('div');
+		var shadow = node.attachShadow({ mode: 'open' });
+		shadow.innerHTML = '<div></div>';
+		var checkArgs = checkSetup(node, '#fixture');
+
+		assert.isFalse(checks.landmark.evaluate.apply(null, checkArgs));
+	});
+
+	(shadowSupport ? it : xit)('should find elements inside shadow trees', function () {
+		var node = document.createElement('div');
+		var shadow = node.attachShadow({ mode: 'open' });
+		shadow.innerHTML = '<main></main>';
+		var checkArgs = checkSetup(node, '#fixture');
+
+		assert.isTrue(checks.landmark.evaluate.apply(null, checkArgs));
+	});
+
+	(shadowSupport ? it : xit)('should find elements slotted in shadow trees', function () {
+		var node = document.createElement('div');
+		node.innerHTML = '<main></main>';
+		var shadow = node.attachShadow({ mode: 'open' });
+		shadow.innerHTML = '<slot></slot>';
+		var checkArgs = checkSetup(node, '#fixture');
+
+		assert.isTrue(checks.landmark.evaluate.apply(null, checkArgs));
 	});
 
 });

From 9ddfc0f415cf7ae562e775c83a48adbe74c5ed4d Mon Sep 17 00:00:00 2001
From: Wilco Fiers <WilcoFiers@users.noreply.github.com>
Date: Mon, 17 Jul 2017 19:38:30 +0200
Subject: [PATCH 080/142] feat: Make explicit check consider shadow DOM (#442)

---
 test/checks/label/explicit.js | 44 +++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/test/checks/label/explicit.js b/test/checks/label/explicit.js
index 11aae79908..805f261062 100644
--- a/test/checks/label/explicit.js
+++ b/test/checks/label/explicit.js
@@ -3,6 +3,7 @@ describe('explicit-label', function () {
 
 	var fixture = document.getElementById('fixture');
 	var fixtureSetup = axe.testUtils.fixtureSetup;
+	var shadowSupport = axe.testUtils.shadowSupport;
 
 	afterEach(function () {
 		fixture.innerHTML = '';
@@ -34,4 +35,47 @@ describe('explicit-label', function () {
 		assert.isFalse(checks['explicit-label'].evaluate(node));
 	});
 
+	(shadowSupport.v1 ? it : xit)('should return true if input and label are in the same shadow root', function () {
+		var root = document.createElement('div');
+		var shadow = root.attachShadow({ mode: 'open' });
+		shadow.innerHTML = '<label for="target">American band</label><input id="target">';
+		fixtureSetup(root);
+
+		var node = shadow.querySelector('#target');
+		assert.isTrue(checks['explicit-label'].evaluate(node));
+	});
+
+	(shadowSupport.v1 ? it : xit)('should return true if label content is slotted', function () {
+		var root = document.createElement('div');
+		root.innerHTML = 'American band';
+		var shadow = root.attachShadow({ mode: 'open' });
+		shadow.innerHTML = '<label for="target"><slot></slot></label><input id="target">';
+		fixtureSetup(root);
+
+		var node = shadow.querySelector('#target');
+		assert.isTrue(checks['explicit-label'].evaluate(node));
+	});
+
+	(shadowSupport.v1 ? it : xit)('should return false if input is inside shadow DOM and the label is not', function () {
+		var root = document.createElement('div');
+		root.innerHTML = '<label for="target">American band</label>';
+		var shadow = root.attachShadow({ mode: 'open' });
+		shadow.innerHTML = '<slot></slot><input id="target">';
+		fixtureSetup(root);
+
+		var node = shadow.querySelector('#target');
+		assert.isFalse(checks['explicit-label'].evaluate(node));
+	});
+
+	(shadowSupport.v1 ? it : xit)('should return false if label is inside shadow DOM and the input is not', function () {
+		var root = document.createElement('div');
+		root.innerHTML = '<input id="target">';
+		var shadow = root.attachShadow({ mode: 'open' });
+		shadow.innerHTML = '<label for="target">American band</label><slot></slot>';
+		fixtureSetup(root);
+
+		var node = root.querySelector('#target');
+		assert.isFalse(checks['explicit-label'].evaluate(node));
+	});
+
 });

From 025221818b184cacdefa06e995e3659b11263bf3 Mon Sep 17 00:00:00 2001
From: Wilco Fiers <wilco.fiers@deque.com>
Date: Tue, 18 Jul 2017 11:46:49 +0200
Subject: [PATCH 081/142] fix: Let findUp work on shadow root children

---
 lib/commons/dom/find-up.js  | 25 ++++++------------
 test/commons/dom/find-up.js | 52 +++++++++++++++++++++++++------------
 2 files changed, 44 insertions(+), 33 deletions(-)

diff --git a/lib/commons/dom/find-up.js b/lib/commons/dom/find-up.js
index 06e20ffe05..8f2db7f8f9 100644
--- a/lib/commons/dom/find-up.js
+++ b/lib/commons/dom/find-up.js
@@ -9,25 +9,16 @@
  * @return {HTMLElement|null} Either the matching HTMLElement or `null` if there was no match
  */
 dom.findUp = function (element, target) {
-	'use strict';
-	/*jslint browser:true*/
+	let doc, matches,
+		parent = element;
 
-	var parent,
-		doc = axe.commons.dom.getRootNode(element),
-		matches;
-
-	matches = doc.querySelectorAll(target);
-	matches = axe.utils.toArray(matches);
-	if (doc === document && !matches.length) {
-		return null;
-	}
-
-	// recursively walk up the DOM, checking each parent node
-	parent = dom.getComposedParent(element);
-	while (parent && matches.indexOf(parent) === -1) {
-		parent = (parent.assignedSlot) ? parent.assignedSlot : parent.parentNode;
+	do {// recursively walk up the DOM, checking each parent node
+		parent = (parent.assignedSlot ? parent.assignedSlot : parent.parentNode);
 		if (parent && parent.nodeType === 11) {
+			matches = null;
 			parent = parent.host;
+		}
+		if (!matches) {
 			doc = axe.commons.dom.getRootNode(parent);
 			matches = doc.querySelectorAll(target);
 			matches = axe.utils.toArray(matches);
@@ -35,7 +26,7 @@ dom.findUp = function (element, target) {
 				return null;
 			}
 		}
-	}
+	} while (parent && !matches.includes(parent));
 
 	return parent;
 };
diff --git a/test/commons/dom/find-up.js b/test/commons/dom/find-up.js
index e96f4983ed..8db3436d3e 100644
--- a/test/commons/dom/find-up.js
+++ b/test/commons/dom/find-up.js
@@ -74,7 +74,18 @@ describe('dom.findUp', function () {
 		assert.equal(axe.commons.dom.findUp(el.actualNode, 'label'), fixture.firstChild);
 	});
 
-	it('should walk up the assigned slot', function () {
+	(shadowSupport.v0 ? it : xit)('should work on shadow root children', function () {
+		fixture.innerHTML = '<div role="list"><div id="something"></div></div>';
+		var shadow = fixture.querySelector('#something').createShadowRoot();
+
+		shadow.innerHTML = '<div role="listitem">item 1</div>';
+		var listItem = shadow.querySelector('[role=listitem]');
+
+		assert.equal(axe.commons.dom.findUp(listItem, '[role=list]'),
+			fixture.firstChild);
+	});
+
+	(shadowSupport.v1 ? it : xit)('should walk up the assigned slot', function () {
 		function createContentSlotted() {
 			var group = document.createElement('div');
 			group.innerHTML = '<div id="target" style="display:none;">Stuff<slot></slot></div>';
@@ -86,16 +97,15 @@ describe('dom.findUp', function () {
 			root.appendChild(div);
 			div.appendChild(createContentSlotted());
 		}
-		if (shadowSupport.v1) {
-			fixture.innerHTML = '<label><div><p><a>hello</a></p></div></label>';
-			makeShadowTree(fixture.querySelector('div'));
-			var tree = axe.utils.getFlattenedTree(fixture.firstChild);
-			var el = axe.utils.querySelectorAll(tree, 'a')[0];
-			assert.equal(axe.commons.dom.findUp(el.actualNode, 'label'), fixture.firstChild);
-		}
+
+		fixture.innerHTML = '<label><div><p><a>hello</a></p></div></label>';
+		makeShadowTree(fixture.querySelector('div'));
+		var tree = axe.utils.getFlattenedTree(fixture.firstChild);
+		var el = axe.utils.querySelectorAll(tree, 'a')[0];
+		assert.equal(axe.commons.dom.findUp(el.actualNode, 'label'), fixture.firstChild);
 	});
 
-	it('should walk up the shadow DOM', function () {
+	(shadowSupport.v1 ? it : xit)('should walk up the shadow DOM', function () {
 		function createContent() {
 			var group = document.createElement('div');
 			group.innerHTML = '<a>thing</a>';
@@ -107,12 +117,22 @@ describe('dom.findUp', function () {
 			root.appendChild(div);
 			div.appendChild(createContent());
 		}
-		if (shadowSupport.v1) {
-			fixture.innerHTML = '<label><div></div></label>';
-			makeShadowTree(fixture.querySelector('div'));
-			var tree = axe.utils.getFlattenedTree(fixture.firstChild);
-			var el = axe.utils.querySelectorAll(tree, 'a')[0];
-			assert.equal(axe.commons.dom.findUp(el.actualNode, 'label'), fixture.firstChild);
-		}
+
+		fixture.innerHTML = '<label><div></div></label>';
+		makeShadowTree(fixture.querySelector('div'));
+		var tree = axe.utils.getFlattenedTree(fixture.firstChild);
+		var el = axe.utils.querySelectorAll(tree, 'a')[0];
+		assert.equal(axe.commons.dom.findUp(el.actualNode, 'label'), fixture.firstChild);
+	});
+
+	(shadowSupport.v1 ? it : xit)('should work on shadow root children', function () {
+		fixture.innerHTML = '<div role="list"><div id="something"></div></div>';
+		var shadow = fixture.querySelector('#something').attachShadow({ mode: 'open' });
+
+		shadow.innerHTML = '<div role="listitem">item 1</div>';
+		var listItem = shadow.querySelector('[role=listitem]');
+
+		assert.equal(axe.commons.dom.findUp(listItem, '[role=list]'),
+			fixture.firstChild);
 	});
 });
\ No newline at end of file

From 2c0b0754a3d587a484b46f80d9857198cf35d655 Mon Sep 17 00:00:00 2001
From: Wilco Fiers <WilcoFiers@users.noreply.github.com>
Date: Tue, 18 Jul 2017 11:49:59 +0200
Subject: [PATCH 082/142] feat: Add shadow DOM to duplicate-img-label check
 (#443)

* feat: Add shadow DOM to duplicate-img-label check

* fix: Use tabs
---
 lib/checks/label/duplicate-img-label.js  | 24 ++++++++--------
 test/checks/label/duplicate-img-label.js | 36 ++++++++++++++++++++++++
 test/testutils.js                        | 12 +++++++-
 3 files changed, 58 insertions(+), 14 deletions(-)

diff --git a/lib/checks/label/duplicate-img-label.js b/lib/checks/label/duplicate-img-label.js
index d184c572c2..6dec209a8f 100644
--- a/lib/checks/label/duplicate-img-label.js
+++ b/lib/checks/label/duplicate-img-label.js
@@ -1,18 +1,16 @@
-var imgs = node.querySelectorAll('img');
-var text = axe.commons.text.visible(virtualNode, true).toLowerCase();
-
+const text = axe.commons.text.visible(virtualNode, true).toLowerCase();
 if (text === '') {
 	return false;
 }
 
-for (var i = 0, len = imgs.length; i < len; i++) {
-	var img = imgs[i];
-	var imgAlt = axe.commons.text.accessibleText(img).toLowerCase();
-	if (imgAlt === text &&
-	img.getAttribute('role') !== 'presentation' &&
-	axe.commons.dom.isVisible(img)) {
-		return true;
-	}
-}
+// Get all visible images in the composed tree of the current node
+const images = axe.utils.querySelectorAll(virtualNode, 'img')
+	// Ignore hidden or role=none/presentation images
+	.filter(({ actualNode }) => (axe.commons.dom.isVisible(actualNode) && 
+		!['none', 'presentation'].includes(actualNode.getAttribute('role'))
+	));
 
-return false;
+// See if any of the images duplicate the node's text
+return images.some(img =>
+	text === axe.commons.text.accessibleText(img).toLowerCase()
+);
diff --git a/test/checks/label/duplicate-img-label.js b/test/checks/label/duplicate-img-label.js
index 737bdc0122..57a4ee8f90 100644
--- a/test/checks/label/duplicate-img-label.js
+++ b/test/checks/label/duplicate-img-label.js
@@ -2,6 +2,8 @@ describe('duplicate-img-label', function () {
 	'use strict';
 
 	var fixture = document.getElementById('fixture');
+	var checkSetup = axe.testUtils.checkSetup;
+	var shadowSupport = axe.testUtils.shadowSupport;
 
 	afterEach(function () {
 		fixture.innerHTML = '';
@@ -64,4 +66,38 @@ describe('duplicate-img-label', function () {
 		var tree = axe._tree = axe.utils.getFlattenedTree(fixture);
 		assert.isFalse(checks['duplicate-img-label'].evaluate(node, undefined, axe.utils.getNodeFromTree(tree[0], node)));
 	});
+
+	(shadowSupport.v1 ? it : xit)('should return true if the img is part of a shadow tree', function () {
+		var button = document.createElement('div');
+		button.setAttribute('role', 'button');
+		button.innerHTML = 'My button';
+		var shadow = button.attachShadow({ mode: 'open' });
+		shadow.innerHTML = '<slot></slot><img alt="My button">';
+		var checkArgs = checkSetup(button);
+
+		assert.isTrue(checks['duplicate-img-label'].evaluate.apply(null, checkArgs));
+	});
+
+	(shadowSupport.v1 ? it : xit)('should return true if the img is a slotted element', function () {
+		var button = document.createElement('div');
+		button.setAttribute('role', 'button');
+		button.innerHTML = '<img alt="My button">';
+		var shadow = button.attachShadow({ mode: 'open' });
+		shadow.innerHTML = '<span>My button</span> <slot></slot>';
+		var checkArgs = checkSetup(button);
+
+		assert.isTrue(checks['duplicate-img-label'].evaluate.apply(null, checkArgs));
+	});
+
+	(shadowSupport.v1 ? it : xit)('should return false if the shadow img has a different text', function () {
+		var button = document.createElement('div');
+		button.setAttribute('role', 'button');
+		button.innerHTML = 'My button';
+		var shadow = button.attachShadow({ mode: 'open' });
+		shadow.innerHTML = '<slot></slot><img alt="My image">';
+		var checkArgs = checkSetup(button);
+
+		assert.isFalse(checks['duplicate-img-label'].evaluate.apply(null, checkArgs));
+	});
+
 });
diff --git a/test/testutils.js b/test/testutils.js
index 07508a5b33..ab8cfc811c 100644
--- a/test/testutils.js
+++ b/test/testutils.js
@@ -42,8 +42,18 @@ testUtils.checkSetup = function (content, options, target) {
 		target = options;
 		options = {};
 	}
+	// Normalize target, allow it to be the inserted node or '#target'
+	target = target || (content instanceof Node ? content : '#target');
 	testUtils.fixtureSetup(content);
-	var node = axe.utils.querySelectorAll(axe._tree[0], target || '#target')[0];
+
+	var node;
+	if (typeof target === 'string') {
+		node = axe.utils.querySelectorAll(axe._tree[0], target)[0];
+	} else if (target instanceof Node) {
+		node = axe.utils.getNodeFromTree(axe._tree[0], target);
+	} else {
+		node = target;
+	}
 	return [node.actualNode, options, node];
 };
 

From 02daad1cfe797c477d208729813240bf7aeb5d0e Mon Sep 17 00:00:00 2001
From: Wilco Fiers <wilco.fiers@deque.com>
Date: Tue, 18 Jul 2017 12:21:34 +0200
Subject: [PATCH 083/142] fix: Solve a few tests

# Conflicts:
#	test/testutils.js
---
 lib/checks/label/explicit.js                  |  3 ++-
 test/checks/shared/button-has-visible-text.js | 22 ++++++++-----------
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/lib/checks/label/explicit.js b/lib/checks/label/explicit.js
index bff93e1482..eee064f700 100644
--- a/lib/checks/label/explicit.js
+++ b/lib/checks/label/explicit.js
@@ -1,6 +1,7 @@
 if (node.getAttribute('id')) {
+	const root = axe.commons.dom.getRootNode(node);
 	const id = axe.commons.utils.escapeSelector(node.getAttribute('id'));
-	const label = document.querySelector(`label[for="${id}"]`);
+	const label = root.querySelector(`label[for="${id}"]`);
 
 	if (label) {
 		return !!axe.commons.text.accessibleText(label);
diff --git a/test/checks/shared/button-has-visible-text.js b/test/checks/shared/button-has-visible-text.js
index fb3d0fa565..3526aea46b 100644
--- a/test/checks/shared/button-has-visible-text.js
+++ b/test/checks/shared/button-has-visible-text.js
@@ -2,7 +2,7 @@ describe('button-has-visible-text', function () {
 	'use strict';
 
 	var fixture = document.getElementById('fixture');
-
+	var checkSetup = axe.testUtils.checkSetup;
 	var checkContext = {
 		_data: null,
 		data: function (d) {
@@ -16,32 +16,28 @@ describe('button-has-visible-text', function () {
 	});
 
 	it('should return false if button element is empty', function () {
-		fixture.innerHTML = '<button></button>';
+		var checkArgs = checkSetup('<button></button>', 'button');
 
-		var node = fixture.querySelector('button');
-		assert.isFalse(checks['button-has-visible-text'].evaluate.call(checkContext, node));
+		assert.isFalse(checks['button-has-visible-text'].evaluate.apply(checkContext, checkArgs));
 	});
 
 	it('should return true if a button element has text', function () {
-		fixture.innerHTML = '<button>Name</button>';
+		var checkArgs = checkSetup('<button>Name</button>', 'button');
 
-		var node = fixture.querySelector('button');
-		assert.isTrue(checks['button-has-visible-text'].evaluate.call(checkContext, node));
+		assert.isTrue(checks['button-has-visible-text'].evaluate.apply(checkContext, checkArgs));
 		assert.deepEqual(checkContext._data, 'Name');
 	});
 
 	it('should return true if ARIA button has text', function () {
-		fixture.innerHTML = '<div role="button">Text</div>';
+		var checkArgs = checkSetup('<div role="button">Text</div>>', '[role=button]');
 
-		var node = fixture.querySelector('div');
-		assert.isTrue(checks['button-has-visible-text'].evaluate.call(checkContext, node));
+		assert.isTrue(checks['button-has-visible-text'].evaluate.apply(checkContext, checkArgs));
 		assert.deepEqual(checkContext._data, 'Text');
 	});
 
 	it('should return false if ARIA button has no text', function () {
-		fixture.innerHTML = '<div role="button"></div>';
+		var checkArgs = checkSetup('<div role="button"></div>>', '[role=button]');
 
-		var node = fixture.querySelector('div');
-		assert.isFalse(checks['button-has-visible-text'].evaluate.call(checkContext, node));
+		assert.isFalse(checks['button-has-visible-text'].evaluate.apply(checkContext, checkArgs));
 	});
 });
\ No newline at end of file

From ecd222f5654886a3866000db6dfdbec96635e2d2 Mon Sep 17 00:00:00 2001
From: Wilco Fiers <wilco.fiers@deque.com>
Date: Tue, 18 Jul 2017 16:04:19 +0200
Subject: [PATCH 084/142] feat: Make region check work with shadow DOM

---
 lib/checks/navigation/region.js             |  69 +++++++----
 lib/commons/dom/get-element-by-reference.js |  12 +-
 lib/commons/dom/has-content.js              |   6 +-
 test/checks/navigation/region.js            | 130 ++++++++++++++------
 test/commons/dom/has-content.js             |   7 ++
 test/testutils.js                           |  30 ++++-
 6 files changed, 179 insertions(+), 75 deletions(-)

diff --git a/lib/checks/navigation/region.js b/lib/checks/navigation/region.js
index 4443bf535a..7e61f79e3a 100644
--- a/lib/checks/navigation/region.js
+++ b/lib/checks/navigation/region.js
@@ -1,34 +1,51 @@
-//jshint latedef: false
+const { dom, aria } = axe.commons;
+function getSkiplink (virtualNode) {
+  const firstLink = axe.utils.querySelectorAll(virtualNode, 'a[href]')[0];
+  if (firstLink && axe.commons.dom.getElementByReference(firstLink.actualNode, 'href')) {
+    return firstLink.actualNode;
+  }
+}
 
-var landmarkRoles = axe.commons.aria.getRolesByType('landmark'),
-	firstLink = node.querySelector('a[href]');
+const skipLink = getSkiplink(virtualNode);
+const landmarkRoles = aria.getRolesByType('landmark');
+const implicitLandmarks = landmarkRoles
+	.reduce((arr, role) => arr.concat(aria.implicitNodes(role)), [])
+	.filter(r => r !== null).map(r => r.toUpperCase());
 
-function isSkipLink(n) {
-	return firstLink &&
-		axe.commons.dom.isFocusable(axe.commons.dom.getElementByReference(firstLink, 'href')) &&
-		firstLink === n;
+// Check if the current element it the skiplink
+function isSkipLink (node) {
+	return skipLink && skipLink === node;
 }
 
-function isLandmark(n) {
-	var role = n.getAttribute('role');
-	return role && (landmarkRoles.indexOf(role) !== -1);
+// Check if the current element is a landmark
+function isLandmark (node) {
+	const nodeName = node.nodeName.toUpperCase();
+	return (landmarkRoles.includes(node.getAttribute('role')) ||
+			implicitLandmarks.includes(nodeName));
 }
 
-function checkRegion(n) {
-	if (isLandmark(n)) { return null; }
-	if (isSkipLink(n)) { return getViolatingChildren(n); }
-	if (axe.commons.dom.isVisible(n, true) &&
-		(axe.commons.text.visible(n, true, true) || axe.commons.dom.isVisualContent(n))) { return n; }
-	return getViolatingChildren(n);
-}
-function getViolatingChildren(n) {
-	var children =  axe.commons.utils.toArray(n.children);
-	if (children.length === 0) { return []; }
-	return children.map(checkRegion)
-		.filter(function (c) { return c !== null; })
-		.reduce(function (a, b) { return a.concat(b); }, []);
+/**
+ * Find all visible elements not wrapped inside a landmark or skiplink
+ */
+function findRegionlessElms (virtualNode) {
+	const node = virtualNode.actualNode;
+	// End recursion if the element a landmark, skiplink, or hidden content
+	if (isLandmark(node) || isSkipLink(node) || !dom.isVisible(node, true)) {
+		return [];
+
+	// Return the node is a content element
+	} else if (dom.hasContent(node, /* noRecursion: */ true)) {
+		return [node];
+	
+	// Recursively look at all child elements
+	} else {
+		return virtualNode.children.filter(({ actualNode }) => actualNode.nodeType === 1)
+			.map(findRegionlessElms)
+			.reduce((a, b) => a.concat(b), []); // flatten the results
+	}
 }
 
-var v = getViolatingChildren(node);
-this.relatedNodes(v);
-return !v.length;
+var regionlessNodes = findRegionlessElms(virtualNode);
+this.relatedNodes(regionlessNodes);
+
+return regionlessNodes.length === 0;
diff --git a/lib/commons/dom/get-element-by-reference.js b/lib/commons/dom/get-element-by-reference.js
index 44027aeda3..aa24d35ca1 100644
--- a/lib/commons/dom/get-element-by-reference.js
+++ b/lib/commons/dom/get-element-by-reference.js
@@ -1,26 +1,20 @@
 /*global dom */
 
 dom.getElementByReference = function (node, attr) {
-	'use strict';
-
-	var candidate,
-		fragment = node.getAttribute(attr),
-		doc = document;
+	let fragment = node.getAttribute(attr);
 
 	if (fragment && fragment.charAt(0) === '#') {
 		fragment = fragment.substring(1);
 
-		candidate = doc.getElementById(fragment);
+		let candidate = document.getElementById(fragment);
 		if (candidate) {
 			return candidate;
 		}
 
-		candidate = doc.getElementsByName(fragment);
+		candidate = document.getElementsByName(fragment);
 		if (candidate.length) {
 			return candidate[0];
 		}
-
 	}
-
 	return null;
 };
\ No newline at end of file
diff --git a/lib/commons/dom/has-content.js b/lib/commons/dom/has-content.js
index 72bcfb449f..bd5407c033 100644
--- a/lib/commons/dom/has-content.js
+++ b/lib/commons/dom/has-content.js
@@ -19,7 +19,7 @@ function hasChildTextNodes (elm) {
  * @param {Object} virtual DOM node
  * @return boolean
  */
-dom.hasContent = function hasContent (elm) {
+dom.hasContent = function hasContent (elm, noRecursion) {
   if (!elm.actualNode) {
     elm = axe.utils.getNodeFromTree(axe._tree[0], elm);
   }
@@ -31,8 +31,8 @@ dom.hasContent = function hasContent (elm) {
      // It has an ARIA label
     !!aria.label(elm) ||
     // or one of it's descendants does
-    elm.children.some(child => (
+    (!noRecursion && elm.children.some(child => (
       child.actualNode.nodeType === 1 && dom.hasContent(child)
-    ))
+    )))
   );
 };
diff --git a/test/checks/navigation/region.js b/test/checks/navigation/region.js
index 8bcad07f35..5333f22c8f 100644
--- a/test/checks/navigation/region.js
+++ b/test/checks/navigation/region.js
@@ -2,70 +2,62 @@ describe('region', function () {
 	'use strict';
 
 	var fixture = document.getElementById('fixture');
+	var shadowSupport = axe.testUtils.shadowSupport;
+	var checkSetup = axe.testUtils.checkSetup;
 
-	var checkContext = {
-		_relatedNodes: [],
-		_data: null,
-		data: function (d) {
-			this._data = d;
-		},
-		relatedNodes: function (rn) {
-			this._relatedNodes = rn;
-		}
-	};
+	var checkContext = new axe.testUtils.MockCheckContext();
 
 	afterEach(function () {
 		fixture.innerHTML = '';
-		checkContext._relatedNodes = [];
-		checkContext._data = null;
+		checkContext.reset();
 	});
 
 	it('should return true when all content is inside the region', function () {
-		fixture.innerHTML = '<div id="target"><div role="main"><a href="a.html#mainheader">Click Here</a><div><h1 id="mainheader" tabindex="0">Introduction</h1></div></div></div>';
-		var node = fixture.querySelector('#target');
-		assert.isTrue(checks.region.evaluate.call(checkContext, node));
+		var checkArgs = checkSetup('<div id="target"><div role="main"><a href="a.html#mainheader">Click Here</a><div><h1 id="mainheader" tabindex="0">Introduction</h1></div></div></div>');
+
+		assert.isTrue(checks.region.evaluate.apply(checkContext, checkArgs));
 		assert.equal(checkContext._relatedNodes.length, 0);
 	});
 
 	it('should return false when img content is outside the region', function () {
-		fixture.innerHTML = '<div id="target"><img src="data:image/gif;base64,R0lGODlhEAAQAMQAAORHHOVSKudfOulrSOp3WOyDZu6QdvCchPGolfO0o/XBs/fNwfjZ0frl3/zy7////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAkAABAALAAAAAAQABAAAAVVICSOZGlCQAosJ6mu7fiyZeKqNKToQGDsM8hBADgUXoGAiqhSvp5QAnQKGIgUhwFUYLCVDFCrKUE1lBavAViFIDlTImbKC5Gm2hB0SlBCBMQiB0UjIQA7"><div role="main"><h1 id="mainheader" tabindex="0">Introduction</h1></div></div>';
-		var node = fixture.querySelector('#target');
-		assert.isFalse(checks.region.evaluate.call(checkContext, node));
+		var checkArgs = checkSetup('<div id="target"><img src="data:image/gif;base64,R0lGODlhEAAQAMQAAORHHOVSKudfOulrSOp3WOyDZu6QdvCchPGolfO0o/XBs/fNwfjZ0frl3/zy7////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAkAABAALAAAAAAQABAAAAVVICSOZGlCQAosJ6mu7fiyZeKqNKToQGDsM8hBADgUXoGAiqhSvp5QAnQKGIgUhwFUYLCVDFCrKUE1lBavAViFIDlTImbKC5Gm2hB0SlBCBMQiB0UjIQA7"><div role="main"><h1 id="mainheader" tabindex="0">Introduction</h1></div></div>');
+
+		assert.isFalse(checks.region.evaluate.apply(checkContext, checkArgs));
 		assert.equal(checkContext._relatedNodes.length, 1);
 	});
 
 	it('should return true when textless text content is outside the region', function () {
-		fixture.innerHTML = '<div id="target"><p></p><div role="main"><h1 id="mainheader" tabindex="0">Introduction</h1></div></div>';
-		var node = fixture.querySelector('#target');
-		assert.isTrue(checks.region.evaluate.call(checkContext, node));
+		var checkArgs = checkSetup('<div id="target"><p></p><div role="main"><h1 id="mainheader" tabindex="0">Introduction</h1></div></div>');
+
+		assert.isTrue(checks.region.evaluate.apply(checkContext, checkArgs));
 		assert.equal(checkContext._relatedNodes.length, 0);
 	});
 
 	it('should return true when wrapper content is outside the region', function () {
-		fixture.innerHTML = '<div id="target"><div><div role="main"><h1 id="mainheader" tabindex="0">Introduction</h1></div></div></div>';
-		var node = fixture.querySelector('#target');
-		assert.isTrue(checks.region.evaluate.call(checkContext, node));
+		var checkArgs = checkSetup('<div id="target"><div><div role="main"><h1 id="mainheader" tabindex="0">Introduction</h1></div></div></div>');
+
+		assert.isTrue(checks.region.evaluate.apply(checkContext, checkArgs));
 		assert.equal(checkContext._relatedNodes.length, 0);
 	});
 
 	it('should return true when invisible content is outside the region', function () {
-		fixture.innerHTML = '<div id="target"><p style="display: none">Click Here</p><div role="main"><h1 id="mainheader" tabindex="0">Introduction</h1></div></div>';
-		var node = fixture.querySelector('#target');
-		assert.isTrue(checks.region.evaluate.call(checkContext, node));
+		var checkArgs = checkSetup('<div id="target"><p style="display: none">Click Here</p><div role="main"><h1 id="mainheader" tabindex="0">Introduction</h1></div></div>');
+
+		assert.isTrue(checks.region.evaluate.apply(checkContext, checkArgs));
 		assert.equal(checkContext._relatedNodes.length, 0);
 	});
 
 	it('should return true when there is a skiplink', function () {
-		fixture.innerHTML = '<div id="target"><a href="#mainheader">Click Here</a><div role="main"><h1 id="mainheader" tabindex="0">Introduction</h1></div></div>';
-		var node = fixture.querySelector('#target');
-		assert.isTrue(checks.region.evaluate.call(checkContext, node));
+		var checkArgs = checkSetup('<div id="target"><a href="#mainheader">Click Here</a><div role="main"><h1 id="mainheader" tabindex="0">Introduction</h1></div></div>');
+
+		assert.isTrue(checks.region.evaluate.apply(checkContext, checkArgs));
 		assert.equal(checkContext._relatedNodes.length, 0);
 	});
 
 	it('should return false when there is a non-region element', function () {
-		fixture.innerHTML = '<div id="target"><div>This is random content.</div><div role="main"><h1 id="mainheader">Introduction</h1></div></div>';
-		var node = fixture.querySelector('#target');
-		assert.isFalse(checks.region.evaluate.call(checkContext, node));
+		var checkArgs = checkSetup('<div id="target"><div>This is random content.</div><div role="main"><h1 id="mainheader">Introduction</h1></div></div>');
+
+		assert.isFalse(checks.region.evaluate.apply(checkContext, checkArgs));
 		assert.equal(checkContext._relatedNodes.length, 1);
 	});
 
@@ -74,9 +66,75 @@ describe('region', function () {
 	});
 
 	it('should return false when there is a non-skiplink', function () {
-		fixture.innerHTML = '<div id="target"><a href="something.html#mainheader">Click Here</a><div role="main"><h1 id="mainheader">Introduction</h1></div></div>';
-		var node = fixture.querySelector('#target');
-		assert.isFalse(checks.region.evaluate.call(checkContext, node));
+		var checkArgs = checkSetup('<div id="target"><a href="something.html#mainheader">Click Here</a><div role="main"><h1 id="mainheader">Introduction</h1></div></div>');
+
+		assert.isFalse(checks.region.evaluate.apply(checkContext, checkArgs));
 		assert.equal(checkContext._relatedNodes.length, 1);
 	});
+
+	it('should return true if the non-region element is a script', function () {
+		var checkArgs = checkSetup('<div id="target"><script>axe.run()</script><div role="main">Content</div></div>');
+
+		assert.isTrue(checks.region.evaluate.apply(checkContext, checkArgs));
+	});
+
+	it('should considered aria labelled elements as content', function () {
+		var checkArgs = checkSetup('<div id="target"><div aria-label="axe-core logo"></div><div role="main">Content</div></div>');
+
+		assert.isFalse(checks.region.evaluate.apply(checkContext, checkArgs));
+		assert.deepEqual(checkContext._relatedNodes, [
+			fixture.querySelector('div[aria-label]')
+		]);
+	});
+
+	it('should allow native landmark elements', function () {
+		var checkArgs = checkSetup('<div id="target"><header>branding</header><main>Content </main><aside>stuff</aside><footer>copyright</footer></div>');
+
+		assert.isTrue(checks.region.evaluate.apply(checkContext, checkArgs));
+		assert.lengthOf(checkContext._relatedNodes, 0);
+	});
+
+	(shadowSupport.v1 ? it : xit)('should test Shadow tree content', function () {
+		var div = document.createElement('div');
+		var shadow = div.attachShadow({ mode: 'open' });
+		shadow.innerHTML = 'Some text';
+		var checkArgs = checkSetup(div);
+
+		assert.isFalse(checks.region.evaluate.apply(checkContext, checkArgs));
+		assert.deepEqual(checkContext._relatedNodes, [div]);
+	});
+
+	(shadowSupport.v1 ? it : xit)('should test slotted content', function () {
+		var div = document.createElement('div');
+		div.innerHTML = 'Some content';
+		var shadow = div.attachShadow({ mode: 'open' });
+		shadow.innerHTML = '<div role="main"><slot></slot></div>';
+		var checkArgs = checkSetup(div);
+
+		assert.isTrue(checks.region.evaluate.apply(checkContext, checkArgs));
+		assert.lengthOf(checkContext._relatedNodes, 0);
+	});
+
+	(shadowSupport.v1 ? it : xit)('should ignore skiplink targets inside shadow trees', function () {
+		var div = document.createElement('div');
+		div.innerHTML = '<a href="#foo">skiplink</a><div>Content</div>';
+
+		var shadow = div.querySelector('div').attachShadow({ mode: 'open' });
+		shadow.innerHTML = '<div role="main" id=#foo"><slot></slot></div>';
+		var checkArgs = checkSetup(div);
+
+		assert.isFalse(checks.region.evaluate.apply(checkContext, checkArgs));
+		assert.deepEqual(checkContext._relatedNodes, [div.querySelector('a')]);
+	});
+
+	(shadowSupport.v1 ? it : xit)('should find the skiplink in shadow DOM', function () {
+		var div = document.createElement('div');
+		div.innerHTML = '<span id="foo">Content!</span>';
+		var shadow = div.attachShadow({ mode: 'open' });
+		shadow.innerHTML = '<a href="#foo">skiplink</a><div role="main"><slot></slot></div>';
+		var checkArgs = checkSetup(div);
+
+		assert.isTrue(checks.region.evaluate.apply(checkContext, checkArgs));
+		assert.lengthOf(checkContext._relatedNodes, 0);
+	});
 });
diff --git a/test/commons/dom/has-content.js b/test/commons/dom/has-content.js
index 8b10bcbd88..a0b8b87144 100644
--- a/test/commons/dom/has-content.js
+++ b/test/commons/dom/has-content.js
@@ -77,6 +77,13 @@ describe('dom.hasContent', function () {
     );
   });
 
+  it('is false if noRecurstion is true and the content is not in a child', function () {
+    fixture.innerHTML = '<div id="target"><span> text </span></div>';
+    tree = axe.utils.getFlattenedTree(fixture);
+
+    assert.isFalse(hasContent(axe.utils.querySelectorAll(tree, '#target')[0], true));
+  });
+
   (shadowSupport ? it : xit)('looks at content of shadow dom elements', function () {
     fixture.innerHTML = '<div id="target"></div>';
     var shadow = fixture.querySelector('#target').attachShadow({ mode: 'open' });
diff --git a/test/testutils.js b/test/testutils.js
index 07508a5b33..543597248c 100644
--- a/test/testutils.js
+++ b/test/testutils.js
@@ -1,5 +1,23 @@
 var testUtils = {};
 
+testUtils.MockCheckContext = function () {
+	'use strict';
+	return {
+		_relatedNodes: [],
+		_data: null,
+		data: function (d) {
+			this._data = d;
+		},
+		relatedNodes: function (rn) {
+			this._relatedNodes = rn;
+		},
+		reset: function () {
+			this._data = null;
+			this._relatedNodes = [];
+		}
+	};
+};
+
 testUtils.shadowSupport = (function(document) {
 	'use strict';
 	var v0 = document.body && typeof document.body.createShadowRoot === 'function',
@@ -42,8 +60,18 @@ testUtils.checkSetup = function (content, options, target) {
 		target = options;
 		options = {};
 	}
+	// Normalize target, allow it to be the inserted node or '#target'
+	target = target || (content instanceof Node ? content : '#target');
 	testUtils.fixtureSetup(content);
-	var node = axe.utils.querySelectorAll(axe._tree[0], target || '#target')[0];
+
+	var node;
+	if (typeof target === 'string') {
+		node = axe.utils.querySelectorAll(axe._tree[0], target)[0];
+	} else if (target instanceof Node) {
+		node = axe.utils.getNodeFromTree(axe._tree[0], target);
+	} else {
+		node = target;
+	}
 	return [node.actualNode, options, node];
 };
 

From 0f98481346f4032a3eefa175dc0af80e64d87bf8 Mon Sep 17 00:00:00 2001
From: Wilco Fiers <WilcoFiers@users.noreply.github.com>
Date: Tue, 18 Jul 2017 18:44:56 +0200
Subject: [PATCH 085/142] fix: Let findUp work on shadow root children (#447)

* fix: Let findUp work on shadow root children

* fix: Solve a few tests

# Conflicts:
#	test/testutils.js

* Fix: Properly disable of shadow DOM checks

* test: Use findUp on host element
---
 lib/checks/label/explicit.js                  |  3 +-
 lib/commons/dom/find-up.js                    | 25 +++------
 test/checks/lists/dlitem.js                   |  4 +-
 test/checks/lists/has-listitem.js             |  4 +-
 test/checks/lists/listitem.js                 |  4 +-
 test/checks/lists/only-dlitems.js             |  4 +-
 test/checks/lists/only-listitems.js           |  4 +-
 test/checks/lists/structured-dlitems.js       |  4 +-
 test/checks/navigation/landmark.js            |  6 +--
 test/checks/shared/button-has-visible-text.js | 22 ++++----
 test/commons/dom/find-up.js                   | 52 +++++++++++++------
 11 files changed, 70 insertions(+), 62 deletions(-)

diff --git a/lib/checks/label/explicit.js b/lib/checks/label/explicit.js
index bff93e1482..eee064f700 100644
--- a/lib/checks/label/explicit.js
+++ b/lib/checks/label/explicit.js
@@ -1,6 +1,7 @@
 if (node.getAttribute('id')) {
+	const root = axe.commons.dom.getRootNode(node);
 	const id = axe.commons.utils.escapeSelector(node.getAttribute('id'));
-	const label = document.querySelector(`label[for="${id}"]`);
+	const label = root.querySelector(`label[for="${id}"]`);
 
 	if (label) {
 		return !!axe.commons.text.accessibleText(label);
diff --git a/lib/commons/dom/find-up.js b/lib/commons/dom/find-up.js
index 06e20ffe05..8f2db7f8f9 100644
--- a/lib/commons/dom/find-up.js
+++ b/lib/commons/dom/find-up.js
@@ -9,25 +9,16 @@
  * @return {HTMLElement|null} Either the matching HTMLElement or `null` if there was no match
  */
 dom.findUp = function (element, target) {
-	'use strict';
-	/*jslint browser:true*/
+	let doc, matches,
+		parent = element;
 
-	var parent,
-		doc = axe.commons.dom.getRootNode(element),
-		matches;
-
-	matches = doc.querySelectorAll(target);
-	matches = axe.utils.toArray(matches);
-	if (doc === document && !matches.length) {
-		return null;
-	}
-
-	// recursively walk up the DOM, checking each parent node
-	parent = dom.getComposedParent(element);
-	while (parent && matches.indexOf(parent) === -1) {
-		parent = (parent.assignedSlot) ? parent.assignedSlot : parent.parentNode;
+	do {// recursively walk up the DOM, checking each parent node
+		parent = (parent.assignedSlot ? parent.assignedSlot : parent.parentNode);
 		if (parent && parent.nodeType === 11) {
+			matches = null;
 			parent = parent.host;
+		}
+		if (!matches) {
 			doc = axe.commons.dom.getRootNode(parent);
 			matches = doc.querySelectorAll(target);
 			matches = axe.utils.toArray(matches);
@@ -35,7 +26,7 @@ dom.findUp = function (element, target) {
 				return null;
 			}
 		}
-	}
+	} while (parent && !matches.includes(parent));
 
 	return parent;
 };
diff --git a/test/checks/lists/dlitem.js b/test/checks/lists/dlitem.js
index 827e6a6405..56f7596b36 100644
--- a/test/checks/lists/dlitem.js
+++ b/test/checks/lists/dlitem.js
@@ -21,7 +21,7 @@ describe('dlitem', function () {
 		assert.isFalse(checks.dlitem.evaluate.apply(null, checkArgs));
 	});
 
-	(shadowSupport ? it : xit)('should return true in a shadow DOM pass', function () {
+	(shadowSupport.v1 ? it : xit)('should return true in a shadow DOM pass', function () {
 		var node = document.createElement('div');
 		node.innerHTML = '<dt>My list item </dt>';
 		var shadow = node.attachShadow({ mode: 'open' });
@@ -31,7 +31,7 @@ describe('dlitem', function () {
 		assert.isTrue(checks.dlitem.evaluate.apply(null, checkArgs));
 	});
 
-	(shadowSupport ? it : xit)('should return false in a shadow DOM fail', function () {
+	(shadowSupport.v1 ? it : xit)('should return false in a shadow DOM fail', function () {
 		var node = document.createElement('div');
 		node.innerHTML = '<dt>My list item </dt>';
 		var shadow = node.attachShadow({ mode: 'open' });
diff --git a/test/checks/lists/has-listitem.js b/test/checks/lists/has-listitem.js
index 87ca1f5865..b3b2087a60 100644
--- a/test/checks/lists/has-listitem.js
+++ b/test/checks/lists/has-listitem.js
@@ -33,7 +33,7 @@ describe('has-listitem', function () {
 		assert.isFalse(checks['has-listitem'].evaluate.apply(null, checkArgs));
 	});
 
-	(shadowSupport ? it : xit)('should return true in a shadow DOM pass', function () {
+	(shadowSupport.v1 ? it : xit)('should return true in a shadow DOM pass', function () {
 		var node = document.createElement('div');
 		node.innerHTML = '<li>My list item </li>';
 		var shadow = node.attachShadow({ mode: 'open' });
@@ -43,7 +43,7 @@ describe('has-listitem', function () {
 		assert.isFalse(checks['has-listitem'].evaluate.apply(null, checkArgs));
 	});
 
-	(shadowSupport ? it : xit)('should return false in a shadow DOM fail', function () {
+	(shadowSupport.v1 ? it : xit)('should return false in a shadow DOM fail', function () {
 		var node = document.createElement('div');
 		node.innerHTML = '<p>Not a list</p>';
 		var shadow = node.attachShadow({ mode: 'open' });
diff --git a/test/checks/lists/listitem.js b/test/checks/lists/listitem.js
index 179a631cd6..e543634883 100644
--- a/test/checks/lists/listitem.js
+++ b/test/checks/lists/listitem.js
@@ -33,7 +33,7 @@ describe('listitem', function () {
 		assert.isFalse(checks.listitem.evaluate.apply(null, checkArgs));
 	});
 
-	(shadowSupport ? it : xit)('should return true in a shadow DOM pass', function () {
+	(shadowSupport.v1 ? it : xit)('should return true in a shadow DOM pass', function () {
 		var node = document.createElement('div');
 		node.innerHTML = '<li>My list item </li>';
 		var shadow = node.attachShadow({ mode: 'open' });
@@ -43,7 +43,7 @@ describe('listitem', function () {
 		assert.isTrue(checks.listitem.evaluate.apply(null, checkArgs));
 	});
 
-	(shadowSupport ? it : xit)('should return false in a shadow DOM fail', function () {
+	(shadowSupport.v1 ? it : xit)('should return false in a shadow DOM fail', function () {
 		var node = document.createElement('div');
 		node.innerHTML = '<li>My list item </li>';
 		var shadow = node.attachShadow({ mode: 'open' });
diff --git a/test/checks/lists/only-dlitems.js b/test/checks/lists/only-dlitems.js
index efca12bc64..e0b890f514 100644
--- a/test/checks/lists/only-dlitems.js
+++ b/test/checks/lists/only-dlitems.js
@@ -104,7 +104,7 @@ describe('only-dlitems', function () {
 		assert.isFalse(checks['only-dlitems'].evaluate.apply(checkContext, checkArgs));
 	});
 
-	(shadowSupport ? it : xit)('should return false in a shadow DOM pass', function () {
+	(shadowSupport.v1 ? it : xit)('should return false in a shadow DOM pass', function () {
 		var node = document.createElement('div');
 		node.innerHTML = '<dt>My list item </dt>';
 		var shadow = node.attachShadow({ mode: 'open' });
@@ -114,7 +114,7 @@ describe('only-dlitems', function () {
 		assert.isFalse(checks['only-dlitems'].evaluate.apply(checkContext, checkArgs));
 	});
 
-	(shadowSupport ? it : xit)('should return true in a shadow DOM fail', function () {
+	(shadowSupport.v1 ? it : xit)('should return true in a shadow DOM fail', function () {
 		var node = document.createElement('div');
 		node.innerHTML = '<p>Not a list</p>';
 		var shadow = node.attachShadow({ mode: 'open' });
diff --git a/test/checks/lists/only-listitems.js b/test/checks/lists/only-listitems.js
index ad283c26b6..9150cad922 100644
--- a/test/checks/lists/only-listitems.js
+++ b/test/checks/lists/only-listitems.js
@@ -97,7 +97,7 @@ describe('only-listitems', function () {
 		assert.isFalse(checks['only-listitems'].evaluate.apply(checkContext, checkArgs));
 	});
 
-	(shadowSupport ? it : xit)('should return false in a shadow DOM pass', function () {
+	(shadowSupport.v1 ? it : xit)('should return false in a shadow DOM pass', function () {
 		var node = document.createElement('div');
 		node.innerHTML = '<li>My list item </li>';
 		var shadow = node.attachShadow({ mode: 'open' });
@@ -107,7 +107,7 @@ describe('only-listitems', function () {
 		assert.isFalse(checks['only-listitems'].evaluate.apply(checkContext, checkArgs));
 	});
 
-	(shadowSupport ? it : xit)('should return true in a shadow DOM fail', function () {
+	(shadowSupport.v1 ? it : xit)('should return true in a shadow DOM fail', function () {
 		var node = document.createElement('div');
 		node.innerHTML = '<p>Not a list item</p>';
 		var shadow = node.attachShadow({ mode: 'open' });
diff --git a/test/checks/lists/structured-dlitems.js b/test/checks/lists/structured-dlitems.js
index 953b47acd6..09d3898504 100644
--- a/test/checks/lists/structured-dlitems.js
+++ b/test/checks/lists/structured-dlitems.js
@@ -49,7 +49,7 @@ describe('structured-dlitems', function () {
 		assert.isFalse(checks['structured-dlitems'].evaluate.apply(null, checkArgs));
 	});
 
-	(shadowSupport ? it : xit)('should return false in a shadow DOM pass', function () {
+	(shadowSupport.v1 ? it : xit)('should return false in a shadow DOM pass', function () {
 		var node = document.createElement('div');
 		node.innerHTML = '<dt>Grayhound bus</dt><dd>at dawn</dd>';
 		var shadow = node.attachShadow({ mode: 'open' });
@@ -59,7 +59,7 @@ describe('structured-dlitems', function () {
 		assert.isFalse(checks['structured-dlitems'].evaluate.apply(null, checkArgs));
 	});
 
-	(shadowSupport ? it : xit)('should return true in a shadow DOM fail', function () {
+	(shadowSupport.v1 ? it : xit)('should return true in a shadow DOM fail', function () {
 		var node = document.createElement('div');
 		node.innerHTML = '<dd>Galileo</dd><dt>Figaro</dt>';
 		var shadow = node.attachShadow({ mode: 'open' });
diff --git a/test/checks/navigation/landmark.js b/test/checks/navigation/landmark.js
index 0d679d8913..81747751f0 100644
--- a/test/checks/navigation/landmark.js
+++ b/test/checks/navigation/landmark.js
@@ -24,7 +24,7 @@ describe('landmark', function () {
 		assert.isFalse(checks.landmark.evaluate.apply(null, checkArgs));
 	});
 
-	(shadowSupport ? it : xit)('should not automatically pass if there is a shadow tree', function () {
+	(shadowSupport.v1 ? it : xit)('should not automatically pass if there is a shadow tree', function () {
 		var node = document.createElement('div');
 		var shadow = node.attachShadow({ mode: 'open' });
 		shadow.innerHTML = '<div></div>';
@@ -33,7 +33,7 @@ describe('landmark', function () {
 		assert.isFalse(checks.landmark.evaluate.apply(null, checkArgs));
 	});
 
-	(shadowSupport ? it : xit)('should find elements inside shadow trees', function () {
+	(shadowSupport.v1 ? it : xit)('should find elements inside shadow trees', function () {
 		var node = document.createElement('div');
 		var shadow = node.attachShadow({ mode: 'open' });
 		shadow.innerHTML = '<main></main>';
@@ -42,7 +42,7 @@ describe('landmark', function () {
 		assert.isTrue(checks.landmark.evaluate.apply(null, checkArgs));
 	});
 
-	(shadowSupport ? it : xit)('should find elements slotted in shadow trees', function () {
+	(shadowSupport.v1 ? it : xit)('should find elements slotted in shadow trees', function () {
 		var node = document.createElement('div');
 		node.innerHTML = '<main></main>';
 		var shadow = node.attachShadow({ mode: 'open' });
diff --git a/test/checks/shared/button-has-visible-text.js b/test/checks/shared/button-has-visible-text.js
index fb3d0fa565..3526aea46b 100644
--- a/test/checks/shared/button-has-visible-text.js
+++ b/test/checks/shared/button-has-visible-text.js
@@ -2,7 +2,7 @@ describe('button-has-visible-text', function () {
 	'use strict';
 
 	var fixture = document.getElementById('fixture');
-
+	var checkSetup = axe.testUtils.checkSetup;
 	var checkContext = {
 		_data: null,
 		data: function (d) {
@@ -16,32 +16,28 @@ describe('button-has-visible-text', function () {
 	});
 
 	it('should return false if button element is empty', function () {
-		fixture.innerHTML = '<button></button>';
+		var checkArgs = checkSetup('<button></button>', 'button');
 
-		var node = fixture.querySelector('button');
-		assert.isFalse(checks['button-has-visible-text'].evaluate.call(checkContext, node));
+		assert.isFalse(checks['button-has-visible-text'].evaluate.apply(checkContext, checkArgs));
 	});
 
 	it('should return true if a button element has text', function () {
-		fixture.innerHTML = '<button>Name</button>';
+		var checkArgs = checkSetup('<button>Name</button>', 'button');
 
-		var node = fixture.querySelector('button');
-		assert.isTrue(checks['button-has-visible-text'].evaluate.call(checkContext, node));
+		assert.isTrue(checks['button-has-visible-text'].evaluate.apply(checkContext, checkArgs));
 		assert.deepEqual(checkContext._data, 'Name');
 	});
 
 	it('should return true if ARIA button has text', function () {
-		fixture.innerHTML = '<div role="button">Text</div>';
+		var checkArgs = checkSetup('<div role="button">Text</div>>', '[role=button]');
 
-		var node = fixture.querySelector('div');
-		assert.isTrue(checks['button-has-visible-text'].evaluate.call(checkContext, node));
+		assert.isTrue(checks['button-has-visible-text'].evaluate.apply(checkContext, checkArgs));
 		assert.deepEqual(checkContext._data, 'Text');
 	});
 
 	it('should return false if ARIA button has no text', function () {
-		fixture.innerHTML = '<div role="button"></div>';
+		var checkArgs = checkSetup('<div role="button"></div>>', '[role=button]');
 
-		var node = fixture.querySelector('div');
-		assert.isFalse(checks['button-has-visible-text'].evaluate.call(checkContext, node));
+		assert.isFalse(checks['button-has-visible-text'].evaluate.apply(checkContext, checkArgs));
 	});
 });
\ No newline at end of file
diff --git a/test/commons/dom/find-up.js b/test/commons/dom/find-up.js
index e96f4983ed..2463d30537 100644
--- a/test/commons/dom/find-up.js
+++ b/test/commons/dom/find-up.js
@@ -74,7 +74,18 @@ describe('dom.findUp', function () {
 		assert.equal(axe.commons.dom.findUp(el.actualNode, 'label'), fixture.firstChild);
 	});
 
-	it('should walk up the assigned slot', function () {
+	(shadowSupport.v0 ? it : xit)('should work on shadow root children', function () {
+		fixture.innerHTML = '<div role="list" id="something"></div>';
+		var shadow = fixture.querySelector('#something').createShadowRoot();
+
+		shadow.innerHTML = '<div role="listitem">item 1</div>';
+		var listItem = shadow.querySelector('[role=listitem]');
+
+		assert.equal(axe.commons.dom.findUp(listItem, '[role=list]'),
+			fixture.firstChild);
+	});
+
+	(shadowSupport.v1 ? it : xit)('should walk up the assigned slot', function () {
 		function createContentSlotted() {
 			var group = document.createElement('div');
 			group.innerHTML = '<div id="target" style="display:none;">Stuff<slot></slot></div>';
@@ -86,16 +97,15 @@ describe('dom.findUp', function () {
 			root.appendChild(div);
 			div.appendChild(createContentSlotted());
 		}
-		if (shadowSupport.v1) {
-			fixture.innerHTML = '<label><div><p><a>hello</a></p></div></label>';
-			makeShadowTree(fixture.querySelector('div'));
-			var tree = axe.utils.getFlattenedTree(fixture.firstChild);
-			var el = axe.utils.querySelectorAll(tree, 'a')[0];
-			assert.equal(axe.commons.dom.findUp(el.actualNode, 'label'), fixture.firstChild);
-		}
+
+		fixture.innerHTML = '<label><div><p><a>hello</a></p></div></label>';
+		makeShadowTree(fixture.querySelector('div'));
+		var tree = axe.utils.getFlattenedTree(fixture.firstChild);
+		var el = axe.utils.querySelectorAll(tree, 'a')[0];
+		assert.equal(axe.commons.dom.findUp(el.actualNode, 'label'), fixture.firstChild);
 	});
 
-	it('should walk up the shadow DOM', function () {
+	(shadowSupport.v1 ? it : xit)('should walk up the shadow DOM', function () {
 		function createContent() {
 			var group = document.createElement('div');
 			group.innerHTML = '<a>thing</a>';
@@ -107,12 +117,22 @@ describe('dom.findUp', function () {
 			root.appendChild(div);
 			div.appendChild(createContent());
 		}
-		if (shadowSupport.v1) {
-			fixture.innerHTML = '<label><div></div></label>';
-			makeShadowTree(fixture.querySelector('div'));
-			var tree = axe.utils.getFlattenedTree(fixture.firstChild);
-			var el = axe.utils.querySelectorAll(tree, 'a')[0];
-			assert.equal(axe.commons.dom.findUp(el.actualNode, 'label'), fixture.firstChild);
-		}
+
+		fixture.innerHTML = '<label><div></div></label>';
+		makeShadowTree(fixture.querySelector('div'));
+		var tree = axe.utils.getFlattenedTree(fixture.firstChild);
+		var el = axe.utils.querySelectorAll(tree, 'a')[0];
+		assert.equal(axe.commons.dom.findUp(el.actualNode, 'label'), fixture.firstChild);
+	});
+
+	(shadowSupport.v1 ? it : xit)('should work on shadow root children', function () {
+		fixture.innerHTML = '<div role="list" id="something"></div>';
+		var shadow = fixture.querySelector('#something').attachShadow({ mode: 'open' });
+
+		shadow.innerHTML = '<div role="listitem">item 1</div>';
+		var listItem = shadow.querySelector('[role=listitem]');
+
+		assert.equal(axe.commons.dom.findUp(listItem, '[role=list]'),
+			fixture.firstChild);
 	});
 });
\ No newline at end of file

From 46a2ccab7e3266f06dfeb91cce8bf0793ed14f54 Mon Sep 17 00:00:00 2001
From: Wilco Fiers <wilco.fiers@deque.com>
Date: Wed, 19 Jul 2017 13:08:29 +0200
Subject: [PATCH 086/142] feat(link-in-text-block): Add shadow DOM support

---
 lib/checks/color/link-in-text-block.js  |  8 +--
 test/checks/color/link-in-text-block.js | 66 ++++++++++++++++++++-----
 2 files changed, 57 insertions(+), 17 deletions(-)

diff --git a/lib/checks/color/link-in-text-block.js b/lib/checks/color/link-in-text-block.js
index 8bcf7eddae..d6f4e7de0c 100644
--- a/lib/checks/color/link-in-text-block.js
+++ b/lib/checks/color/link-in-text-block.js
@@ -1,5 +1,5 @@
 /* global axe*/
-var color = axe.commons.color;
+const { color, dom } = axe.commons;
 
 function getContrast(color1, color2) {
 	var c1lum = color1.getRelativeLuminance();
@@ -7,7 +7,7 @@ function getContrast(color1, color2) {
 	return (Math.max(c1lum, c2lum) + 0.05) / (Math.min(c1lum, c2lum) + 0.05);
 }
 
-var blockLike = ['block', 'list-item', 'table', 'flex', 'grid', 'inline-block'];
+const blockLike = ['block', 'list-item', 'table', 'flex', 'grid', 'inline-block'];
 function isBlock(elm) {
 	var display = window.getComputedStyle(elm).getPropertyValue('display');
 	return (blockLike.indexOf(display) !== -1 ||
@@ -19,9 +19,9 @@ if (isBlock(node)) {
 	return false;
 }
 
-var parentBlock = node.parentNode;
+var parentBlock = dom.getComposedParent(node);
 while (parentBlock.nodeType === 1 && !isBlock(parentBlock)) {
-	parentBlock = parentBlock.parentNode;
+	parentBlock = dom.getComposedParent(parentBlock);
 }
 
 this.relatedNodes([ parentBlock ]);
diff --git a/test/checks/color/link-in-text-block.js b/test/checks/color/link-in-text-block.js
index d37444f631..f557602af4 100644
--- a/test/checks/color/link-in-text-block.js
+++ b/test/checks/color/link-in-text-block.js
@@ -2,6 +2,7 @@ describe('link-in-text-block', function () {
 	'use strict';
 
 	var fixture = document.getElementById('fixture');
+	var shadowSupport = axe.testUtils.shadowSupport;
 	var styleElm;
 
 	var checkContext = {
@@ -48,12 +49,12 @@ describe('link-in-text-block', function () {
 			if (defaultStyle.hasOwnProperty(prop)) {
 				styleObj[prop] = defaultStyle[prop];
 			}
-    	}
+		}
 		for (prop in outerStyle) {
 			if (outerStyle.hasOwnProperty(prop)) {
 				styleObj[prop] = outerStyle[prop];
 			}
-    	}
+		}
 
 		var cssLines = Object.keys(styleObj).map(function (prop) {
 			// Make camelCase prop dash separated
@@ -143,6 +144,45 @@ describe('link-in-text-block', function () {
 			axe.commons.color.elementIsDistinct = orig;
 		});
 
+		(shadowSupport.v1 ? it : xit)('works with the block outside the shadow tree', function () {
+			var parentElm = document.createElement('div');
+			var shadow = parentElm.attachShadow({ mode: 'open' });
+			shadow.innerHTML = '<a href="">Link</a>';
+			var linkElm = shadow.querySelector('a');
+			fixture.appendChild(parentElm);
+
+			var orig = axe.commons.color.elementIsDistinct;
+			axe.commons.color.elementIsDistinct = function (arg1, arg2) {
+				assert.deepEqual(arg1, linkElm);
+				assert.deepEqual(arg2, parentElm);
+				return orig(arg1, arg2);
+			};
+
+			checks['link-in-text-block'].evaluate.call(checkContext, linkElm);
+			axe.commons.color.elementIsDistinct = orig;
+		});
+
+		(shadowSupport.v1 ? it : xit)('works with the link inside the shadow tree slot', function () {
+			var div = document.createElement('div');
+			div.innerHTML = '<a href="">Link</a>';
+			var shadow = div.attachShadow({ mode: 'open' });
+			shadow.innerHTML = '<p><slot></slot></p>';
+			fixture.appendChild(div);
+
+			var linkElm = div.querySelector('a');
+			var parentElm = shadow.querySelector('p');
+
+			var orig = axe.commons.color.elementIsDistinct;
+			axe.commons.color.elementIsDistinct = function (arg1, arg2) {
+				assert.deepEqual(arg1, linkElm);
+				assert.deepEqual(arg2, parentElm);
+				return orig(arg1, arg2);
+			};
+
+			checks['link-in-text-block'].evaluate.call(checkContext, linkElm);
+			axe.commons.color.elementIsDistinct = orig;
+		});
+
 	});
 
 
@@ -208,16 +248,16 @@ describe('link-in-text-block', function () {
 	});
 
 	it('returns relatedNodes with undefined', function () {
-			var linkElm = getLinkElm({ }, {
-				color: '#000010',
-				backgroundImage: 'url(data:image/gif;base64,R0lGODlhEAAQAMQAAORHHOVSKudfOulrSOp3WOyDZu6QdvCchPGolfO0o/XBs/fNwfjZ0frl3/zy7////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAkAABAALAAAAAAQABAAAAVVICSOZGlCQAosJ6mu7fiyZeKqNKToQGDsM8hBADgUXoGAiqhSvp5QAnQKGIgUhwFUYLCVDFCrKUE1lBavAViFIDlTImbKC5Gm2hB0SlBCBMQiB0UjIQA7)'
-			}, {
-				color: '#000000'
-			});
-			assert.isUndefined(checks['link-in-text-block'].evaluate.call(checkContext, linkElm));
-			assert.equal(
-				checkContext._relatedNodes[0],
-				linkElm.parentNode
-			);
+		var linkElm = getLinkElm({ }, {
+			color: '#000010',
+			backgroundImage: 'url(data:image/gif;base64,R0lGODlhEAAQAMQAAORHHOVSKudfOulrSOp3WOyDZu6QdvCchPGolfO0o/XBs/fNwfjZ0frl3/zy7////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAkAABAALAAAAAAQABAAAAVVICSOZGlCQAosJ6mu7fiyZeKqNKToQGDsM8hBADgUXoGAiqhSvp5QAnQKGIgUhwFUYLCVDFCrKUE1lBavAViFIDlTImbKC5Gm2hB0SlBCBMQiB0UjIQA7)'
+		}, {
+			color: '#000000'
 		});
+		assert.isUndefined(checks['link-in-text-block'].evaluate.call(checkContext, linkElm));
+		assert.equal(
+			checkContext._relatedNodes[0],
+			linkElm.parentNode
+		);
+	});
 });
\ No newline at end of file

From a125f792b91c782ff7847cc13ea4dab3874713c5 Mon Sep 17 00:00:00 2001
From: Wilco Fiers <wilco.fiers@deque.com>
Date: Wed, 19 Jul 2017 17:20:33 +0200
Subject: [PATCH 087/142] fix(is-in-text-block): Add Shadow DOM support

---
 lib/commons/dom/is-in-text-block.js  | 50 +++++++--------
 test/commons/dom/is-in-text-block.js | 94 +++++++++++++++++++---------
 2 files changed, 87 insertions(+), 57 deletions(-)

diff --git a/lib/commons/dom/is-in-text-block.js b/lib/commons/dom/is-in-text-block.js
index 97c53d0fbd..a6f867b508 100644
--- a/lib/commons/dom/is-in-text-block.js
+++ b/lib/commons/dom/is-in-text-block.js
@@ -1,48 +1,42 @@
 /* global axe, dom, window */
-
 function walkDomNode(node, functor) {
-	'use strict';
-    var shouldWalk = functor(node);
-    node = node.firstChild;
-    while (node) {
-    	if (shouldWalk !== false) {
-        	walkDomNode(node, functor);
-    	}
-        node = node.nextSibling;
-    }
+	if (functor(node.actualNode) !== false) {
+		node.children.forEach(child => walkDomNode(child, functor));
+	}
 }
 
 var blockLike = ['block', 'list-item', 'table', 'flex', 'grid', 'inline-block'];
 function isBlock(elm) {
-	'use strict';
 	var display = window.getComputedStyle(elm).getPropertyValue('display');
-	return (blockLike.indexOf(display) !== -1 ||
-			display.substr(0, 6) === 'table-');
+	return (blockLike.includes(display) || display.substr(0, 6) === 'table-');
+}
+
+function getBlockParent (node) {
+	// Find the closest parent
+	let parentBlock = dom.getComposedParent(node);
+	while (parentBlock && !isBlock(parentBlock)) {
+		parentBlock = dom.getComposedParent(parentBlock);
+	}
+	return axe.utils.getNodeFromTree(axe._tree[0], parentBlock);
 }
 
 
 dom.isInTextBlock = function isInTextBlock(node) {
 	// jshint maxcomplexity: 15
-	'use strict';
-	// Ignore if the link is a block
 	if (isBlock(node)) {
+		// Ignore if the link is a block
 		return false;
 	}
 
-	// Find the closest parent
-	var parentBlock = node.parentNode;
-	while (parentBlock.nodeType === 1 && !isBlock(parentBlock)) {
-		parentBlock = parentBlock.parentNode;
-	}
-
 	// Find all the text part of the parent block not in a link, and all the text in a link
-	var parentText = '';
-	var linkText = '';
-	var inBrBlock = 0;
+	const virtualParent = getBlockParent(node);
+	let parentText = '';
+	let linkText = '';
+	let inBrBlock = 0;
 
 	// We want to ignore hidden text, and if br / hr is used, only use the section of the parent 
 	// that has the link we're looking at
-	walkDomNode(parentBlock, function (currNode) {
+	walkDomNode(virtualParent, function (currNode) {
 		// We're already passed it, skip everything else
 		if (inBrBlock === 2) {
 			return false;
@@ -59,7 +53,7 @@ dom.isInTextBlock = function isInTextBlock(node) {
 
 		var nodeName = (currNode.nodeName || '').toUpperCase();
 		// BR and HR elements break the line
-		if (['BR', 'HR'].indexOf(nodeName) !== -1) {
+		if (['BR', 'HR'].includes(nodeName)) {
 			if (inBrBlock === 0) {
 				parentText = '';
 				linkText = '';
@@ -70,8 +64,8 @@ dom.isInTextBlock = function isInTextBlock(node) {
 		// Don't walk nodes with content not displayed on screen.
 		} else if (currNode.style.display === 'none' ||
 				currNode.style.overflow === 'hidden' ||
-				['', null, 'none'].indexOf(currNode.style.float) === -1 ||
-				['', null, 'relative'].indexOf(currNode.style.position) === -1) {
+				!['', null, 'none'].includes(currNode.style.float) ||
+				!['', null, 'relative'].includes(currNode.style.position)) {
 			return false;
 
 		// Don't walk links, we're only interested in what's not in them.
diff --git a/test/commons/dom/is-in-text-block.js b/test/commons/dom/is-in-text-block.js
index 6c779b2e9d..f89519bb19 100644
--- a/test/commons/dom/is-in-text-block.js
+++ b/test/commons/dom/is-in-text-block.js
@@ -2,143 +2,179 @@ describe('dom.isInTextBlock', function () {
 	'use strict';
 
 	var fixture = document.getElementById('fixture');
+	var shadowSupport = axe.testUtils.shadowSupport;
+	var fixtureSetup = axe.testUtils.fixtureSetup;
 
 	afterEach(function () {
 		fixture.innerHTML = '';
 	});
 
 	it('returns true if the element is a node in a block of text', function () {
-		fixture.innerHTML = 
+		fixtureSetup(
 			'<p>Some paragraph with text ' +
 			'  <a href="" id="link">link</a>' +
-			'</p>';
+			'</p>');
 		var link = document.getElementById('link');
 		assert.isTrue(axe.commons.dom.isInTextBlock(link));
 	});
 
 	it('returns false if the element is a block', function () {
-		fixture.innerHTML = 
+		fixtureSetup(
 			'<p>Some paragraph with text ' +
 			'  <a href="" id="link" style="display:block">link</a>' +
-			'</p>';
+			'</p>');
 		var link = document.getElementById('link');
 		assert.isFalse(axe.commons.dom.isInTextBlock(link));
 	});
 
 	it('returns false if the element has the only text in the block', function () {
-		fixture.innerHTML = 
+		fixtureSetup(
 			'<p>' +
 			'  <a href="" id="link">link</a>'+
-			'</p>';
+			'</p>');
 		var link = document.getElementById('link');
 		assert.isFalse(axe.commons.dom.isInTextBlock(link));
 	});
 
 	it('returns false if there is more text in link(s) than in the rest of the block', function () {
-		fixture.innerHTML = 
+		fixtureSetup(
 			'<p> short text:' +
 			'  <a href="" id="link">on a link with a very long text</a>' +
-			'</p>';
+			'</p>');
 		var link = document.getElementById('link');
 		assert.isFalse(axe.commons.dom.isInTextBlock(link));
 	});
 
 	it('return false if there are links along side other links', function () {
-		fixture.innerHTML = 
+		fixtureSetup(
 			'<p>' +
 			'  <a href="" id="link">link</a>' +
 			'  <a href="">other link</a>' +
-			'</p>';
+			'</p>');
 		var link = document.getElementById('link');
 		assert.isFalse(axe.commons.dom.isInTextBlock(link));
 	});
 
 	it('ignores hidden content', function () {
-		fixture.innerHTML = 
+		fixtureSetup(
 			'<p>' +
 			'  <a href="" id="link">link</a>' +
 			'  <span style="display:none">some hidden text</span>' +
-			'</p>';
+			'</p>');
 		var link = document.getElementById('link');
 		assert.isFalse(axe.commons.dom.isInTextBlock(link));
 	});
 
 	it('ignores floated content', function () {
-		fixture.innerHTML = 
+		fixtureSetup(
 			'<p>' +
 			'  <span style="float: left">A floating text in the area</span>' +
 			'  <a href="" id="link">link</a>' +
-			'</p>';
+			'</p>');
 		var link = document.getElementById('link');
 		assert.isFalse(axe.commons.dom.isInTextBlock(link));
 	});
 
 	it('ignores positioned content', function () {
-		fixture.innerHTML = 
+		fixtureSetup(
 			'<p>' +
 			'  <span style="position:absolute;">Some absolute potitioned text</span>' +
 			'  <a href="" id="link">link</a>' +
-			'</p>';
+			'</p>');
 		var link = document.getElementById('link');
 		assert.isFalse(axe.commons.dom.isInTextBlock(link));
 	});
 
 	it('ignores none-text content', function () {
-		fixture.innerHTML = 
+		fixtureSetup(
 			'<p>' +
 			'  <img alt="Some graphical component" src="img.png" />' +
 			'  <a href="" id="link">link</a>' +
-			'</p>';
+			'</p>');
 		var link = document.getElementById('link');
 		assert.isFalse(axe.commons.dom.isInTextBlock(link));
 	});
 
 	it('ignore text in the block coming before a br', function () {
-		fixture.innerHTML = 
+		fixtureSetup(
 			'<p>Some paragraph with text <br>' +
 			'  <a href="" id="link">link</a>' +
-			'</p>';
+			'</p>');
 		var link = document.getElementById('link');
 		assert.isFalse(axe.commons.dom.isInTextBlock(link));
 	});
 
 	it('ignore text in the block coming after a br', function () {
-		fixture.innerHTML = 
+		fixtureSetup(
 			'<p>' +
 			'  <a href="" id="link">link</a> <br>' +
 			'  Some paragraph with text ' +
-			'</p>';
+			'</p>');
 		var link = document.getElementById('link');
 		assert.isFalse(axe.commons.dom.isInTextBlock(link));
 	});
 
 	it('ignore text in the block coming before and after a br', function () {
-		fixture.innerHTML = 
+		fixtureSetup(
 			'<p>Some paragraph with text <br>' +
 			'  <a href="" id="link">link</a> <br>' +
 			'  Some paragraph with text ' +
-			'</p>';
+			'</p>');
 		var link = document.getElementById('link');
 		assert.isFalse(axe.commons.dom.isInTextBlock(link));
 	});
 
 	it('treats hr elements the same as br elements', function () {
-		fixture.innerHTML = 
-			'<p>Some paragraph with text <hr>' +
+		fixtureSetup(
+			'<div>Some paragraph with text <hr>' +
 			'  <a href="" id="link">link</a> <hr>' +
 			'  Some paragraph with text ' +
-			'</p>';
+			'</div>');
 		var link = document.getElementById('link');
 		assert.isFalse(axe.commons.dom.isInTextBlock(link));
 	});
 
 	it('ignore comments', function () {
-		fixture.innerHTML = 
+		fixtureSetup(
 			'<p><!-- Some paragraph with text -->' +
 			'  <a href="" id="link">link</a>' +
-			'</p>';
+			'</p>');
 		var link = document.getElementById('link');
 		assert.isFalse(axe.commons.dom.isInTextBlock(link));
 	});
 
+	(shadowSupport ? it : xit)('can reach outside a shadow tree', function () {
+		var div = document.createElement('div');
+		div.innerHTML = 'Some paragraph with text <span></span> ';
+		var shadow = div.querySelector('span').attachShadow({ mode: 'open' });
+		shadow.innerHTML = '<a href="" id="link">link</a>';
+		fixtureSetup(div);
+
+		var link = shadow.querySelector('#link');
+		assert.isTrue(axe.commons.dom.isInTextBlock(link));
+	});
+
+	(shadowSupport.v1 ? it : xit)('can reach into a shadow tree', function () {
+		var div = document.createElement('div');
+		div.innerHTML = '<a href="" id="link">link</a>';
+		var shadow = div.attachShadow({ mode: 'open' });
+		shadow.innerHTML = '<p>Some paragraph with text <slot></slot> </p>';
+		fixtureSetup(div);
+
+		var link = fixture.querySelector('#link');
+		assert.isTrue(axe.commons.dom.isInTextBlock(link));
+	});
+
+	(shadowSupport.v1 ? it : xit)('treats shadow DOM slots as siblings', function () {
+		var div = document.createElement('div');
+		div.innerHTML = '<br>';
+		var shadow = div.attachShadow({ mode: 'open' });
+		shadow.innerHTML = '<p>Some paragraph with text ' +
+			'<slot></slot> <a href="" id="link">link</a></p>';
+		fixtureSetup(div);
+
+		var link = shadow.querySelector('#link');
+		assert.isFalse(axe.commons.dom.isInTextBlock(link));
+	});
+
 });
\ No newline at end of file

From 7ea8d6b82b76e688ac3384c37a5d13841798138d Mon Sep 17 00:00:00 2001
From: Wilco Fiers <wilco.fiers@deque.com>
Date: Tue, 11 Jul 2017 17:58:08 +0200
Subject: [PATCH 088/142] fix: Pass all tests that use accessibleText

---
 test/checks/keyboard/focusable-no-name.js | 4 ++--
 test/testutils.js                         | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/test/checks/keyboard/focusable-no-name.js b/test/checks/keyboard/focusable-no-name.js
index 70191cc18b..4ed49328c0 100644
--- a/test/checks/keyboard/focusable-no-name.js
+++ b/test/checks/keyboard/focusable-no-name.js
@@ -27,13 +27,13 @@ describe('focusable-no-name', function () {
 		assert.isTrue(checks['focusable-no-name'].evaluate(node));
 	});
 
-	it('should fail if element is tabable with no name - ARIA', function () {
+	it('should fail if element is tabbable with no name - ARIA', function () {
 		fixtureSetup('<span tabindex="0" role="link" href="#"></spam>');
 		var node = fixture.querySelector('span');
 		assert.isTrue(checks['focusable-no-name'].evaluate(node));
 	});
 
-	it('should pass if the element is tabable but has an accessible name', function () {
+	it('should pass if the element is tabbable but has an accessible name', function () {
 		fixtureSetup('<a href="#" title="Hello"></a>');
 		var node = fixture.querySelector('a');
 		assert.isFalse(checks['focusable-no-name'].evaluate(node));
diff --git a/test/testutils.js b/test/testutils.js
index ab8cfc811c..e3b13ec8ac 100644
--- a/test/testutils.js
+++ b/test/testutils.js
@@ -27,7 +27,6 @@ testUtils.fixtureSetup = function (content) {
 	axe._tree = axe.utils.getFlattenedTree(fixture);
 	return fixture;
 };
-
 /**
  * Create check arguments
  *

From f729e25300bc82a2679870e653b13f4c3aeee31a Mon Sep 17 00:00:00 2001
From: Marcy Sutton <marcy.sutton@deque.com>
Date: Thu, 13 Jul 2017 16:31:40 -0700
Subject: [PATCH 089/142] feat: add shadow support to aria-required-children

Closes https://github.com/dequelabs/axe-core/issues/421
---
 lib/checks/aria/required-children.js  |  12 +--
 test/checks/aria/required-children.js | 129 +++++++++++++++++---------
 2 files changed, 93 insertions(+), 48 deletions(-)

diff --git a/lib/checks/aria/required-children.js b/lib/checks/aria/required-children.js
index 6d61ef5db5..73e30dd1e3 100644
--- a/lib/checks/aria/required-children.js
+++ b/lib/checks/aria/required-children.js
@@ -3,7 +3,7 @@ implicitNodes = axe.commons.aria.implicitNodes,
 matchesSelector = axe.commons.utils.matchesSelector,
 idrefs = axe.commons.dom.idrefs;
 
-function owns(node, role, ariaOwned) {
+function owns(node, virtualTree, role, ariaOwned) {
 	if (node === null) { return false; }
 	var implicit = implicitNodes(role),
 	selector = ['[role="' + role + '"]'];
@@ -13,9 +13,8 @@ function owns(node, role, ariaOwned) {
 	}
 
 	selector = selector.join(',');
-
-	return ariaOwned ? (matchesSelector(node, selector) || !!node.querySelector(selector)) :
-		!!node.querySelector(selector);
+	return ariaOwned ? (matchesSelector(node, selector) || !!axe.utils.querySelectorAll(virtualTree, selector)[0]) :
+		!!axe.utils.querySelectorAll(virtualTree, selector)[0];
 }
 
 function ariaOwns(nodes, role) {
@@ -23,7 +22,8 @@ function ariaOwns(nodes, role) {
 
 	for (index = 0, length = nodes.length; index < length; index++) {
 		if (nodes[index] === null) { continue; }
-		if (owns(nodes[index], role, true)) {
+		let virtualTree = axe.utils.getFlattenedTree(nodes[index]);
+		if (owns(nodes[index], virtualTree, role, true)) {
 			return true;
 		}
 	}
@@ -39,7 +39,7 @@ function missingRequiredChildren(node, childRoles, all) {
 
 	for (i = 0; i < l; i++) {
 		var r = childRoles[i];
-		if (owns(node, r) || ariaOwns(ownedElements, r)) {
+		if (owns(node, virtualNode, r) || ariaOwns(ownedElements, r)) {
 			if (!all) { return null; }
 		} else {
 			if (all) { missing.push(r); }
diff --git a/test/checks/aria/required-children.js b/test/checks/aria/required-children.js
index 57cdb5046c..46296572c4 100644
--- a/test/checks/aria/required-children.js
+++ b/test/checks/aria/required-children.js
@@ -2,6 +2,7 @@ describe('aria-required-children', function () {
 	'use strict';
 
 	var fixture = document.getElementById('fixture');
+	var shadowSupported = axe.testUtils.shadowSupport.v1;
 
 	var checkContext = {
 		_data: null,
@@ -10,97 +11,141 @@ describe('aria-required-children', function () {
 		}
 	};
 
+	function checkSetup (html, options, target) {
+		fixture.innerHTML = html;
+		axe._tree = axe.utils.getFlattenedTree(fixture);
+		var node = fixture.querySelector(target || '#target');
+		var virtualNode = axe.utils.getNodeFromTree(axe._tree[0], node);
+		return [node, options, virtualNode];
+	}
+
 	afterEach(function () {
 		fixture.innerHTML = '';
+		axe._tree = undefined;
 		checkContext._data = null;
 	});
 
 	it('should detect missing sole required child', function () {
-		fixture.innerHTML = '<div role="list" id="target"><p>Nothing here.</p></div>';
-		var node = fixture.querySelector('#target');
-		assert.isFalse(checks['aria-required-children'].evaluate.call(checkContext, node));
+		var params = checkSetup('<div role="list" id="target"><p>Nothing here.</p></div>');
+
+		assert.isFalse(checks['aria-required-children'].evaluate.apply(checkContext, params));
+		assert.deepEqual(checkContext._data, ['listitem']);
+	});
+
+	(shadowSupported ? it : xit)
+	('should detect missing sole required child in shadow tree', function () {
+		fixture.innerHTML = '<div id="target" role="list"></div>';
+
+		var target = document.querySelector('#target');
+		var shadowRoot = target.attachShadow({ mode: 'open' });
+		shadowRoot.innerHTML = '<p>Nothing here.</p>';
+
+		var tree = axe._tree = axe.utils.getFlattenedTree(fixture);
+		var virtualTarget = axe.utils.getNodeFromTree(tree[0], target);
+
+		var params = [target, undefined, virtualTarget];
+		assert.isFalse(checks['aria-required-children'].evaluate.apply(checkContext, params));
 		assert.deepEqual(checkContext._data, ['listitem']);
 	});
 
 	it('should detect multiple missing required children when one required', function () {
-		fixture.innerHTML = '<div role="grid" id="target"><p>Nothing here.</p></div>';
-		var node = fixture.querySelector('#target');
-		assert.isFalse(checks['aria-required-children'].evaluate.call(checkContext, node));
+		var params = checkSetup('<div role="grid" id="target"><p>Nothing here.</p></div>');
+
+		assert.isFalse(checks['aria-required-children'].evaluate.apply(checkContext, params));
+		assert.deepEqual(checkContext._data, ['rowgroup', 'row']);
+	});
+
+	(shadowSupported ? it : xit)
+	('should detect missing multiple required children in shadow tree when one required', function () {
+		fixture.innerHTML = '<div role="grid" id="target"></div>';
+
+		var target = document.querySelector('#target');
+		var shadowRoot = target.attachShadow({ mode: 'open' });
+		shadowRoot.innerHTML = '<p>Nothing here.</p>';
+
+		var tree = axe._tree = axe.utils.getFlattenedTree(fixture);
+		var virtualTarget = axe.utils.getNodeFromTree(tree[0], target);
+
+		var params = [target, undefined, virtualTarget];
+		assert.isFalse(checks['aria-required-children'].evaluate.apply(checkContext, params));
 		assert.deepEqual(checkContext._data, ['rowgroup', 'row']);
 	});
 
 	it('should detect multiple missing required children when all required', function () {
-		fixture.innerHTML = '<div role="combobox" id="target"><p>Nothing here.</p></div>';
-		var node = fixture.querySelector('#target');
-		assert.isFalse(checks['aria-required-children'].evaluate.call(checkContext, node));
+		var params = checkSetup('<div role="combobox" id="target"><p>Nothing here.</p></div>');
+		assert.isFalse(checks['aria-required-children'].evaluate.apply(checkContext, params));
 		assert.deepEqual(checkContext._data, ['listbox', 'textbox']);
 	});
 
 	it('should detect single missing required child when all required', function () {
-		fixture.innerHTML = '<div role="combobox" id="target"><p role="listbox">Nothing here.</p></div>';
-		var node = fixture.querySelector('#target');
-		assert.isFalse(checks['aria-required-children'].evaluate.call(checkContext, node));
+		var params = checkSetup('<div role="combobox" id="target"><p role="listbox">Nothing here.</p></div>');
+		assert.isFalse(checks['aria-required-children'].evaluate.apply(checkContext, params));
 		assert.deepEqual(checkContext._data, ['textbox']);
 	});
 
 	it('should pass all existing required children when all required', function () {
-		fixture.innerHTML = '<div role="combobox" id="target"><p role="listbox">Nothing here.</p><p role="textbox">Textbox</p></div>';
-		var node = fixture.querySelector('#target');
-		assert.isTrue(checks['aria-required-children'].evaluate.call(checkContext, node));
+		var params = checkSetup('<div role="combobox" id="target"><p role="listbox">Nothing here.</p><p role="textbox">Textbox</p></div>');
+		assert.isTrue(checks['aria-required-children'].evaluate.apply(checkContext, params));
+	});
+
+	(shadowSupported ? it : xit)
+	('should pass all existing required children in shadow tree when all required', function () {
+		fixture.innerHTML = '<div role="combobox" id="target"></div>';
+
+		var target = document.querySelector('#target');
+		var shadowRoot = target.attachShadow({ mode: 'open' });
+		shadowRoot.innerHTML = '<p role="listbox">Nothing here.</p><p role="textbox">Textbox</p>';
+
+		var tree = axe._tree = axe.utils.getFlattenedTree(fixture);
+		var virtualTarget = axe.utils.getNodeFromTree(tree[0], target);
+
+		var params = [target, undefined, virtualTarget];
+		assert.isTrue(checks['aria-required-children'].evaluate.apply(checkContext, params));
 	});
 
 	it('should pass one indirectly aria-owned child when one required', function () {
-		fixture.innerHTML = '<div role="grid" id="target" aria-owns="r"></div><div id="r"><div role="row">Nothing here.</div></div>';
-		var node = fixture.querySelector('#target');
-		assert.isTrue(checks['aria-required-children'].evaluate.call(checkContext, node));
+		var params = checkSetup('<div role="grid" id="target" aria-owns="r"></div><div id="r"><div role="row">Nothing here.</div></div>');
+		assert.isTrue(checks['aria-required-children'].evaluate.apply(checkContext, params));
 	});
 
 	it('should not break if aria-owns points to non-existent node', function () {
-		fixture.innerHTML = '<div role="grid" id="target" aria-owns="nonexistent"></div>';
-		var node = fixture.querySelector('#target');
-		assert.isFalse(checks['aria-required-children'].evaluate.call(checkContext, node));
+		var params = checkSetup('<div role="grid" id="target" aria-owns="nonexistent"></div>');
+		assert.isFalse(checks['aria-required-children'].evaluate.apply(checkContext, params));
 	});
 
 	it('should pass one existing aria-owned child when one required', function () {
-		fixture.innerHTML = '<div role="grid" id="target" aria-owns="r"></div><p id="r" role="row">Nothing here.</p>';
-		var node = fixture.querySelector('#target');
-		assert.isTrue(checks['aria-required-children'].evaluate.call(checkContext, node));
+		var params = checkSetup('<div role="grid" id="target" aria-owns="r"></div><p id="r" role="row">Nothing here.</p>');
+		assert.isTrue(checks['aria-required-children'].evaluate.apply(checkContext, params));
 	});
 
 	it('should pass one existing required child when one required', function () {
-		fixture.innerHTML = '<div role="grid" id="target"><p role="row">Nothing here.</p></div>';
-		var node = fixture.querySelector('#target');
-		assert.isTrue(checks['aria-required-children'].evaluate.call(checkContext, node));
+		var params = checkSetup('<div role="grid" id="target"><p role="row">Nothing here.</p></div>');
+		assert.isTrue(checks['aria-required-children'].evaluate.apply(checkContext, params));
 	});
 
 	it('should pass one existing required child when one required because of implicit role', function () {
-		fixture.innerHTML = '<table id="target"><p role="row">Nothing here.</p></table>';
-		var node = fixture.querySelector('#target');
-		assert.isTrue(checks['aria-required-children'].evaluate.call(checkContext, node));
+		var params = checkSetup('<table id="target"><p role="row">Nothing here.</p></table>');
+		assert.isTrue(checks['aria-required-children'].evaluate.apply(checkContext, params));
 	});
 
 	it('should pass when a child with an implicit role is present', function () {
-		fixture.innerHTML = '<table role="grid" id="target"><tr><td>Nothing here.</td></tr></table>';
-		var node = fixture.querySelector('#target');
-		assert.isTrue(checks['aria-required-children'].evaluate.call(checkContext, node));
+		var params = checkSetup('<table role="grid" id="target"><tr><td>Nothing here.</td></tr></table>');
+		assert.isTrue(checks['aria-required-children'].evaluate.apply(checkContext, params));
 	});
 
 	it('should pass direct existing required children', function () {
-		fixture.innerHTML = '<div role="list" id="target"><p role="listitem">Nothing here.</p></div>';
-		var node = fixture.querySelector('#target');
-		assert.isTrue(checks['aria-required-children'].evaluate.call(checkContext, node));
+		var params = checkSetup('<div role="list" id="target"><p role="listitem">Nothing here.</p></div>');
+		assert.isTrue(checks['aria-required-children'].evaluate.apply(checkContext, params));
 	});
 
 	it('should pass indirect required children', function () {
-		fixture.innerHTML = '<div role="list" id="target"><p>Just a regular ol p that contains a... <p role="listitem">Nothing here.</p></p></div>';
-		var node = fixture.querySelector('#target');
-		assert.isTrue(checks['aria-required-children'].evaluate.call(checkContext, node));
+		var params = checkSetup('<div role="list" id="target"><p>Just a regular ol p that contains a... <p role="listitem">Nothing here.</p></p></div>');
+		assert.isTrue(checks['aria-required-children'].evaluate.apply(checkContext, params));
 	});
 
 	it('should return true when a role has no required owned', function () {
-		fixture.innerHTML = '<div role="listitem" id="target"><p>Nothing here.</p></div>';
-		var node = fixture.querySelector('#target');
-		assert.isTrue(checks['aria-required-children'].evaluate.call(checkContext, node));
+		var params = checkSetup('<div role="listitem" id="target"><p>Nothing here.</p></div>');
+		assert.isTrue(checks['aria-required-children'].evaluate.apply(checkContext, params));
 	});
 
 });

From c62a6d350c31f57580088b3977623f5049ab8bf0 Mon Sep 17 00:00:00 2001
From: Wilco Fiers <wilco.fiers@deque.com>
Date: Fri, 14 Jul 2017 12:44:38 +0200
Subject: [PATCH 090/142] test: More testing for accessibleText()

# Conflicts:
#	lib/commons/dom/find-elms-in-context.js
#	lib/commons/text/accessible-text.js
#	test/checks/keyboard/focusable-no-name.js
#	test/checks/tables/same-caption-summary.js
#	test/commons/text/accessible-text.js
---
 test/checks/keyboard/focusable-no-name.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/checks/keyboard/focusable-no-name.js b/test/checks/keyboard/focusable-no-name.js
index 4ed49328c0..70191cc18b 100644
--- a/test/checks/keyboard/focusable-no-name.js
+++ b/test/checks/keyboard/focusable-no-name.js
@@ -27,13 +27,13 @@ describe('focusable-no-name', function () {
 		assert.isTrue(checks['focusable-no-name'].evaluate(node));
 	});
 
-	it('should fail if element is tabbable with no name - ARIA', function () {
+	it('should fail if element is tabable with no name - ARIA', function () {
 		fixtureSetup('<span tabindex="0" role="link" href="#"></spam>');
 		var node = fixture.querySelector('span');
 		assert.isTrue(checks['focusable-no-name'].evaluate(node));
 	});
 
-	it('should pass if the element is tabbable but has an accessible name', function () {
+	it('should pass if the element is tabable but has an accessible name', function () {
 		fixtureSetup('<a href="#" title="Hello"></a>');
 		var node = fixture.querySelector('a');
 		assert.isFalse(checks['focusable-no-name'].evaluate(node));

From 71a97ac7ac4744a2b3244aca02256b0310bd8c40 Mon Sep 17 00:00:00 2001
From: Marcy Sutton <marcy.sutton@deque.com>
Date: Fri, 14 Jul 2017 09:13:24 -0700
Subject: [PATCH 091/142] test: use abstracted checkSetup from testutils

---
 test/checks/aria/required-children.js | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/test/checks/aria/required-children.js b/test/checks/aria/required-children.js
index 46296572c4..e63ff498b3 100644
--- a/test/checks/aria/required-children.js
+++ b/test/checks/aria/required-children.js
@@ -11,13 +11,7 @@ describe('aria-required-children', function () {
 		}
 	};
 
-	function checkSetup (html, options, target) {
-		fixture.innerHTML = html;
-		axe._tree = axe.utils.getFlattenedTree(fixture);
-		var node = fixture.querySelector(target || '#target');
-		var virtualNode = axe.utils.getNodeFromTree(axe._tree[0], node);
-		return [node, options, virtualNode];
-	}
+	var checkSetup = axe.testUtils.checkSetup;
 
 	afterEach(function () {
 		fixture.innerHTML = '';

From 9bf2870e4ccb954238786f75b191860922411966 Mon Sep 17 00:00:00 2001
From: Marcy Sutton <marcy.sutton@deque.com>
Date: Fri, 14 Jul 2017 09:14:00 -0700
Subject: [PATCH 092/142] fix: get virtualNode with getNodeFromTree

---
 lib/checks/aria/required-children.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/checks/aria/required-children.js b/lib/checks/aria/required-children.js
index 73e30dd1e3..19bf438f53 100644
--- a/lib/checks/aria/required-children.js
+++ b/lib/checks/aria/required-children.js
@@ -22,7 +22,7 @@ function ariaOwns(nodes, role) {
 
 	for (index = 0, length = nodes.length; index < length; index++) {
 		if (nodes[index] === null) { continue; }
-		let virtualTree = axe.utils.getFlattenedTree(nodes[index]);
+		let virtualTree = axe.utils.getNodeFromTree(axe._tree[0], nodes[index]);
 		if (owns(nodes[index], virtualTree, role, true)) {
 			return true;
 		}

From 6ed29f00e4b85bbca3f611f1777187312661bea2 Mon Sep 17 00:00:00 2001
From: Marcy Sutton <marcy.sutton@deque.com>
Date: Tue, 18 Jul 2017 13:58:35 -0700
Subject: [PATCH 093/142] feat(aria-required-parent): add Shadow DOM support

Closes https://github.com/dequelabs/axe-core/issues/422
---
 lib/checks/aria/required-parent.js  |  3 +-
 test/checks/aria/required-parent.js | 85 ++++++++++++++++++++++-------
 2 files changed, 68 insertions(+), 20 deletions(-)

diff --git a/lib/checks/aria/required-parent.js b/lib/checks/aria/required-parent.js
index d227f0635d..5a4ef3614f 100644
--- a/lib/checks/aria/required-parent.js
+++ b/lib/checks/aria/required-parent.js
@@ -36,7 +36,8 @@ function getAriaOwners(element) {
 	while (element) {
 		if (element.getAttribute('id')) {
 			const id = axe.commons.utils.escapeSelector(element.getAttribute('id'));
-			o = document.querySelector(`[aria-owns~=${id}]`);
+			let doc = axe.commons.dom.getRootNode(element);
+			o = doc.querySelector(`[aria-owns~=${id}]`);
 			if (o) { owners.push(o); }
 		}
 		element = element.parentElement;
diff --git a/test/checks/aria/required-parent.js b/test/checks/aria/required-parent.js
index aef8f598ae..e105231c9f 100644
--- a/test/checks/aria/required-parent.js
+++ b/test/checks/aria/required-parent.js
@@ -2,6 +2,7 @@ describe('aria-required-parent', function () {
 	'use strict';
 
 	var fixture = document.getElementById('fixture');
+	var shadowSupported = axe.testUtils.shadowSupport.v1;
 
 	var checkContext = {
 		_data: null,
@@ -10,47 +11,93 @@ describe('aria-required-parent', function () {
 		}
 	};
 
+	var checkSetup = axe.testUtils.checkSetup;
+
 	afterEach(function () {
 		fixture.innerHTML = '';
 		checkContext._data = null;
 	});
 
 	it('should detect missing required parent', function () {
-		fixture.innerHTML = '<div><p role="listitem" id="target">Nothing here.</p></div>';
-		var node = fixture.querySelector('#target');
-		assert.isFalse(checks['aria-required-parent'].evaluate.call(checkContext, node));
+		var params = checkSetup('<div><p role="listitem" id="target">Nothing here.</p></div>');
+		assert.isFalse(checks['aria-required-parent'].evaluate.apply(checkContext, params));
+		assert.deepEqual(checkContext._data, ['list']);
+	});
+
+	(shadowSupported ? it : xit)
+	('should detect missing required parent across shadow boundary', function () {
+		fixture.innerHTML = '<div id="target"></div>';
+
+		var shadowRoot = document.querySelector('#target').attachShadow({ mode: 'open' });
+		shadowRoot.innerHTML = '<p role="listitem" id="target">Nothing here.</p>';
+
+		var tree = axe._tree = axe.utils.getFlattenedTree(fixture);
+		var shadowContent = shadowRoot.querySelector('#target');
+		var virtualTarget = axe.utils.getNodeFromTree(tree[0], shadowContent);
+
+		var params = [shadowContent, undefined, virtualTarget];
+		assert.isFalse(checks['aria-required-parent'].evaluate.apply(checkContext, params));
 		assert.deepEqual(checkContext._data, ['list']);
 	});
 
 	it('should pass when required parent is present in an ancestral aria-owns context', function () {
-		fixture.innerHTML = '<div role="list" ><div aria-owns="parent"></div></div><div id="parent"><p role="listitem" id="target">Nothing here.</p></div>';
-		var node = fixture.querySelector('#target');
-		assert.isTrue(checks['aria-required-parent'].evaluate.call(checkContext, node));
+		var snippet = '<div role="list"><div aria-owns="parent"></div></div>'+
+			'<div id="parent"><p role="listitem" id="target">Nothing here.</p></div>';
+		var params = checkSetup(snippet);
+		assert.isTrue(checks['aria-required-parent'].evaluate.apply(checkContext, params));
 	});
 
 	it('should fail when wrong role is present in an aria-owns context', function () {
-		fixture.innerHTML = '<div role="menu" ><div aria-owns="target"></div></div><div><p role="listitem" id="target">Nothing here.</p></div>';
-		var node = fixture.querySelector('#target');
-		assert.isFalse(checks['aria-required-parent'].evaluate.call(checkContext, node));
+		var params = checkSetup(
+			'<div role="menu"><div aria-owns="target"></div></div>' +
+			'<div><p role="listitem" id="target">Nothing here.</p></div>'
+		);
+		assert.isFalse(checks['aria-required-parent'].evaluate.apply(checkContext, params));
 		assert.deepEqual(checkContext._data, ['list']);
 	});
 
-
 	it('should pass when required parent is present in an aria-owns context', function () {
-		fixture.innerHTML = '<div role="list" aria-owns="target"></div><div><p role="listitem" id="target">Nothing here.</p></div>';
-		var node = fixture.querySelector('#target');
-		assert.isTrue(checks['aria-required-parent'].evaluate.call(checkContext, node));
+		var params = checkSetup('<div role="list" aria-owns="target"></div><div><p role="listitem" id="target">Nothing here.</p></div>');
+		assert.isTrue(checks['aria-required-parent'].evaluate.apply(checkContext, params));
 	});
 
 	it('should pass when at least one required parent of multiple is present', function () {
-		fixture.innerHTML = '<div role="grid" ><p role="row" id="target">Nothing here.</p></div>';
-		var node = fixture.querySelector('#target');
-		assert.isTrue(checks['aria-required-parent'].evaluate.call(checkContext, node));
+		var params = checkSetup('<div role="grid"><p role="row" id="target">Nothing here.</p></div>');
+		assert.isTrue(checks['aria-required-parent'].evaluate.apply(checkContext, params));
 	});
+
 	it('should pass when required parent is present', function () {
-		fixture.innerHTML = '<div role="list" ><p role="listitem" id="target">Nothing here.</p></div>';
-		var node = fixture.querySelector('#target');
-		assert.isTrue(checks['aria-required-parent'].evaluate.call(checkContext, node));
+		var params = checkSetup('<div role="list"><p role="listitem" id="target">Nothing here.</p></div>');
+		assert.isTrue(checks['aria-required-parent'].evaluate.apply(checkContext, params));
 	});
 
+	(shadowSupported ? it : xit)
+	('should pass when required parent is present across shadow boundary', function () {
+		fixture.innerHTML = '<div role="list" id="parent"></div>';
+
+		var shadowRoot = document.querySelector('#parent').attachShadow({ mode: 'open' });
+		shadowRoot.innerHTML = '<p role="listitem" id="target">Nothing here.</p>';
+
+		var tree = axe._tree = axe.utils.getFlattenedTree(fixture);
+		var shadowContent = shadowRoot.querySelector('#target');
+		var virtualTarget = axe.utils.getNodeFromTree(tree[0], shadowContent);
+
+		var params = [shadowContent, undefined, virtualTarget];
+		assert.isTrue(checks['aria-required-parent'].evaluate.apply(checkContext, params));
+	});
+
+	(shadowSupported ? it : xit)
+	('should fail when aria-owns context crosses shadow boundary', function () {
+		fixture.innerHTML = '<div id="parent"><div role="list" aria-owns="target"></div></div>';
+
+		var shadowRoot = document.querySelector('#parent').attachShadow({ mode: 'open' });
+		shadowRoot.innerHTML = '<p role="listitem" id="target">Nothing here.</p>';
+
+		var tree = axe._tree = axe.utils.getFlattenedTree(fixture);
+		var shadowContent = shadowRoot.querySelector('#target');
+		var virtualTarget = axe.utils.getNodeFromTree(tree[0], shadowContent);
+
+		var params = [shadowContent, undefined, virtualTarget];
+		assert.isFalse(checks['aria-required-parent'].evaluate.apply(checkContext, params));
+	});
 });

From 08509b936305e61bf9b376add504a1b13e748b8b Mon Sep 17 00:00:00 2001
From: Wilco Fiers <wilco.fiers@deque.com>
Date: Thu, 20 Jul 2017 11:14:56 +0200
Subject: [PATCH 094/142] chore(region): Minor test/comment fixes

---
 lib/checks/navigation/region.js  | 24 +++++++++++++++---------
 test/checks/navigation/region.js | 10 +++++++++-
 test/commons/dom/has-content.js  |  2 +-
 3 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/lib/checks/navigation/region.js b/lib/checks/navigation/region.js
index 7e61f79e3a..a956251dd2 100644
--- a/lib/checks/navigation/region.js
+++ b/lib/checks/navigation/region.js
@@ -1,27 +1,33 @@
 const { dom, aria } = axe.commons;
+
+// Return the skplink, if any
 function getSkiplink (virtualNode) {
-  const firstLink = axe.utils.querySelectorAll(virtualNode, 'a[href]')[0];
-  if (firstLink && axe.commons.dom.getElementByReference(firstLink.actualNode, 'href')) {
-    return firstLink.actualNode;
-  }
+	const firstLink = axe.utils.querySelectorAll(virtualNode, 'a[href]')[0];
+	if (firstLink && axe.commons.dom.getElementByReference(firstLink.actualNode, 'href')) {
+		return firstLink.actualNode;
+	}
 }
 
 const skipLink = getSkiplink(virtualNode);
 const landmarkRoles = aria.getRolesByType('landmark');
+
+// Create a list of nodeNames that have a landmark as an implicit role
 const implicitLandmarks = landmarkRoles
 	.reduce((arr, role) => arr.concat(aria.implicitNodes(role)), [])
 	.filter(r => r !== null).map(r => r.toUpperCase());
 
-// Check if the current element it the skiplink
+// Check if the current element is the skiplink
 function isSkipLink (node) {
 	return skipLink && skipLink === node;
 }
 
 // Check if the current element is a landmark
 function isLandmark (node) {
-	const nodeName = node.nodeName.toUpperCase();
-	return (landmarkRoles.includes(node.getAttribute('role')) ||
-			implicitLandmarks.includes(nodeName));
+	if (node.hasAttribute('role')) {
+		return landmarkRoles.includes(node.getAttribute('role').toLowerCase());
+	} else {
+		return implicitLandmarks.includes(node.nodeName.toUpperCase());
+	}
 }
 
 /**
@@ -29,7 +35,7 @@ function isLandmark (node) {
  */
 function findRegionlessElms (virtualNode) {
 	const node = virtualNode.actualNode;
-	// End recursion if the element a landmark, skiplink, or hidden content
+	// End recursion if the element is a landmark, skiplink, or hidden content
 	if (isLandmark(node) || isSkipLink(node) || !dom.isVisible(node, true)) {
 		return [];
 
diff --git a/test/checks/navigation/region.js b/test/checks/navigation/region.js
index 5333f22c8f..7a2c35328e 100644
--- a/test/checks/navigation/region.js
+++ b/test/checks/navigation/region.js
@@ -79,7 +79,7 @@ describe('region', function () {
 	});
 
 	it('should considered aria labelled elements as content', function () {
-		var checkArgs = checkSetup('<div id="target"><div aria-label="axe-core logo"></div><div role="main">Content</div></div>');
+		var checkArgs = checkSetup('<div id="target"><div aria-label="axe-core logo" role="img"></div><div role="main">Content</div></div>');
 
 		assert.isFalse(checks.region.evaluate.apply(checkContext, checkArgs));
 		assert.deepEqual(checkContext._relatedNodes, [
@@ -94,6 +94,14 @@ describe('region', function () {
 		assert.lengthOf(checkContext._relatedNodes, 0);
 	});
 
+	it('ignores native landmark elements with an overwriting role', function () {
+		var checkArgs = checkSetup('<div id="target"><header role="banner"></header><main role="none"></main></div>');
+
+		assert.isFalse(checks.region.evaluate.apply(checkContext, checkArgs));
+		assert.lengthOf(checkContext._relatedNodes, 1);
+		assert.deepEqual(checkContext._relatedNodes, [fixture.querySelector('main')]);
+	});
+
 	(shadowSupport.v1 ? it : xit)('should test Shadow tree content', function () {
 		var div = document.createElement('div');
 		var shadow = div.attachShadow({ mode: 'open' });
diff --git a/test/commons/dom/has-content.js b/test/commons/dom/has-content.js
index a0b8b87144..68c6c6c0a4 100644
--- a/test/commons/dom/has-content.js
+++ b/test/commons/dom/has-content.js
@@ -77,7 +77,7 @@ describe('dom.hasContent', function () {
     );
   });
 
-  it('is false if noRecurstion is true and the content is not in a child', function () {
+  it('is false if noRecursion is true and the content is not in a child', function () {
     fixture.innerHTML = '<div id="target"><span> text </span></div>';
     tree = axe.utils.getFlattenedTree(fixture);
 

From 4874327401e96ef553e96ff69767539e693fac38 Mon Sep 17 00:00:00 2001
From: Dylan Barrell <dylan@barrell.com>
Date: Fri, 21 Jul 2017 04:48:07 -0400
Subject: [PATCH 095/142] fix: get tests all passing (#457)

---
 lib/core/base/audit.js               | 2 +-
 lib/core/utils/flattened-tree.js     | 3 +++
 test/checks/navigation/region.js     | 2 +-
 test/commons/dom/is-in-text-block.js | 2 +-
 test/core/utils/flattened-tree.js    | 6 ++++++
 5 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/lib/core/base/audit.js b/lib/core/base/audit.js
index d9f80598f8..c07b66818f 100644
--- a/lib/core/base/audit.js
+++ b/lib/core/base/audit.js
@@ -144,7 +144,7 @@ Audit.prototype.run = function (context, options, resolve, reject) {
 	'use strict';
 	this.validateOptions(options);
 
-	axe._tree = axe.utils.getFlattenedTree(document.body); //cache the flattened tree
+	axe._tree = axe.utils.getFlattenedTree(document.documentElement); //cache the flattened tree
 	var q = axe.utils.queue();
 	this.rules.forEach(function (rule) {
 		if (axe.utils.ruleShouldRun(rule, context, options)) {
diff --git a/lib/core/utils/flattened-tree.js b/lib/core/utils/flattened-tree.js
index 8d7aabb38a..2fc6b192a6 100644
--- a/lib/core/utils/flattened-tree.js
+++ b/lib/core/utils/flattened-tree.js
@@ -123,6 +123,9 @@ axe.utils.getFlattenedTree = function (node, shadowId) {
 axe.utils.getNodeFromTree = function (vNode, node) {
 	var found;
 
+	if (vNode.actualNode === node) {
+		return vNode;
+	}
 	vNode.children.forEach((candidate) => {
 		var retVal;
 
diff --git a/test/checks/navigation/region.js b/test/checks/navigation/region.js
index 7a2c35328e..4ce4aa5d1c 100644
--- a/test/checks/navigation/region.js
+++ b/test/checks/navigation/region.js
@@ -95,7 +95,7 @@ describe('region', function () {
 	});
 
 	it('ignores native landmark elements with an overwriting role', function () {
-		var checkArgs = checkSetup('<div id="target"><header role="banner"></header><main role="none"></main></div>');
+		var checkArgs = checkSetup('<div id="target"><header role="heading" level="1"></header><main role="none">Content</main></div>');
 
 		assert.isFalse(checks.region.evaluate.apply(checkContext, checkArgs));
 		assert.lengthOf(checkContext._relatedNodes, 1);
diff --git a/test/commons/dom/is-in-text-block.js b/test/commons/dom/is-in-text-block.js
index f89519bb19..20574d0ba6 100644
--- a/test/commons/dom/is-in-text-block.js
+++ b/test/commons/dom/is-in-text-block.js
@@ -143,7 +143,7 @@ describe('dom.isInTextBlock', function () {
 		assert.isFalse(axe.commons.dom.isInTextBlock(link));
 	});
 
-	(shadowSupport ? it : xit)('can reach outside a shadow tree', function () {
+	(shadowSupport.v1 ? it : xit)('can reach outside a shadow tree', function () {
 		var div = document.createElement('div');
 		div.innerHTML = 'Some paragraph with text <span></span> ';
 		var shadow = div.querySelector('span').attachShadow({ mode: 'open' });
diff --git a/test/core/utils/flattened-tree.js b/test/core/utils/flattened-tree.js
index f8121c219e..279a4af8a6 100644
--- a/test/core/utils/flattened-tree.js
+++ b/test/core/utils/flattened-tree.js
@@ -231,6 +231,12 @@ if (shadowSupport.v1) {
 			assert.equal(node, vNode.actualNode);
 			assert.equal(vNode.actualNode.textContent, '1');
 		});
+		it('should find the virtual node if it is the very top of the tree', function () {
+			var virtualDOM = axe.utils.getFlattenedTree(fixture);
+			var vNode = axe.utils.getNodeFromTree(virtualDOM[0], virtualDOM[0].actualNode);
+			assert.isDefined(vNode);
+			assert.equal(virtualDOM[0].actualNode, vNode.actualNode);
+		});
 	});
 }
 

From e2a964207729d7c712819d67e0ed27aa688179b6 Mon Sep 17 00:00:00 2001
From: Marcy Sutton <marcy.sutton@deque.com>
Date: Thu, 20 Jul 2017 13:07:29 -0700
Subject: [PATCH 096/142] feat: add shadow support to group-labelledby

Closes https://github.com/dequelabs/axe-core/issues/426
---
 lib/checks/forms/labelledby.js  |  7 +++---
 test/checks/forms/labelledby.js | 38 +++++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/lib/checks/forms/labelledby.js b/lib/checks/forms/labelledby.js
index a06ddd7ac4..a9b3e84263 100644
--- a/lib/checks/forms/labelledby.js
+++ b/lib/checks/forms/labelledby.js
@@ -3,7 +3,8 @@ this.data({
 	type: node.getAttribute('type')
 });
 
-var matchingNodes = document.querySelectorAll('input[type="' +
+var doc = axe.commons.dom.getRootNode(node);
+var matchingNodes = doc.querySelectorAll('input[type="' +
 	axe.commons.utils.escapeSelector(node.type) + '"][name="' + axe.commons.utils.escapeSelector(node.name) + '"]');
 if (matchingNodes.length <= 1) {
 	return true;
@@ -15,9 +16,9 @@ return [].map.call(matchingNodes, function (m) {
 	return l ? l.split(/\s+/) : [];
 }).reduce(function (prev, curr) {
 	return prev.filter(function (n) {
-		return curr.indexOf(n) !== -1;
+		return curr.includes(n);
 	});
 }).filter(function (n) {
-	var labelNode = document.getElementById(n);
+	var labelNode = doc.getElementById(n);
 	return labelNode && axe.commons.text.accessibleText(labelNode);
 }).length !== 0;
diff --git a/test/checks/forms/labelledby.js b/test/checks/forms/labelledby.js
index 6525fa4b61..0c5c16f83b 100644
--- a/test/checks/forms/labelledby.js
+++ b/test/checks/forms/labelledby.js
@@ -3,6 +3,8 @@ describe('group-labelledby', function () {
 
 	var fixture = document.getElementById('fixture');
 	var fixtureSetup = axe.testUtils.fixtureSetup;
+	var shadowSupport = axe.testUtils.shadowSupport.v1;
+
 	var checkContext = {
 		_data: null,
 		data: function (d) {
@@ -10,6 +12,10 @@ describe('group-labelledby', function () {
 		}
 	};
 
+	beforeEach(function () {
+		axe._tree = undefined;
+	});
+
 	afterEach(function () {
 		fixture.innerHTML = '';
 		checkContext._data = null;
@@ -114,6 +120,38 @@ describe('group-labelledby', function () {
 				});
 			});
 
+			(shadowSupport ? it : xit)
+			('should return false if label is outside of shadow boundary', function () {
+				fixture.innerHTML = '<div id="container"><h2 id="shared">Label</h2></div>';
+				var shadowRoot = fixture.querySelector('#container').attachShadow({ mode: 'open' });
+				shadowRoot.innerHTML = '<input type="' + type + '" id="target" aria-labelledby="shared one" name="uniqueyname">' +
+					'<input type="' + type + '" aria-labelledby="shared two" name="uniqueyname">' +
+					'<input type="' + type + '" aria-labelledby="shared three" name="uniqueyname">';
+
+				var tree = axe._tree = axe.utils.getFlattenedTree(fixture);
+				var shadowContent = shadowRoot.querySelector('#target');
+				var virtualTarget = axe.utils.getNodeFromTree(tree[0], shadowContent);
+
+				var params = [shadowContent, undefined, virtualTarget];
+				assert.isFalse(check.evaluate.apply(checkContext, params));
+			});
+
+			(shadowSupport ? it : xit)
+			('should return true if all ' + type + ' components are in the shadow boundary', function () {
+				fixture.innerHTML = '<div id="container"></div>';
+
+				var shadowRoot = fixture.querySelector('#container').attachShadow({ mode: 'open' });
+				shadowRoot.innerHTML = '<p id="shared">Label</p>' +
+					'<input type="' + type + '" name="samename" aria-labelledby="shared one">' +
+					'<input type="' + type + '" id="target" name="samename" aria-labelledby="shared two">';
+
+				var tree = axe._tree = axe.utils.getFlattenedTree(fixture);
+				var shadowContent = shadowRoot.querySelector('#target');
+				var virtualTarget = axe.utils.getNodeFromTree(tree[0], shadowContent);
+
+				var params = [shadowContent, undefined, virtualTarget];
+				assert.isTrue(check.evaluate.apply(checkContext, params));
+			});
 		};
 
 	}

From da148d344c33c8c4dc2300cbb041cd84aa9f2efe Mon Sep 17 00:00:00 2001
From: Wilco Fiers <wilco.fiers@deque.com>
Date: Tue, 18 Jul 2017 12:29:19 +0200
Subject: [PATCH 097/142] feat: fieldset check shadow DOM

---
 lib/checks/forms/fieldset.js  | 19 ++++++++++++------
 test/checks/forms/fieldset.js | 36 ++++++++++++++++++++++++++++++++---
 2 files changed, 46 insertions(+), 9 deletions(-)

diff --git a/lib/checks/forms/fieldset.js b/lib/checks/forms/fieldset.js
index 8800412c91..4eaaedfb12 100644
--- a/lib/checks/forms/fieldset.js
+++ b/lib/checks/forms/fieldset.js
@@ -57,21 +57,28 @@ function spliceCurrentNode(nodes, current) {
 }
 
 function runCheck(element) {
-	var name = axe.commons.utils.escapeSelector(node.name);
-	var matchingNodes = document.querySelectorAll('input[type="' +
+	const name = axe.commons.utils.escapeSelector(node.name);
+	const root = axe.commons.dom.getRootNode(node);
+	const matchingNodes = root.querySelectorAll('input[type="' +
 		axe.commons.utils.escapeSelector(node.type) + '"][name="' + name + '"]');
+
 	if (matchingNodes.length < 2) {
 		return true;
 	}
-	var fieldset = axe.commons.dom.findUp(element, 'fieldset');
-	var group = axe.commons.dom.findUp(element, '[role="group"]' + (node.type === 'radio' ? ',[role="radiogroup"]' : ''));
+	const fieldset = axe.commons.dom.findUp(element, 'fieldset');
+	const group = axe.commons.dom.findUp(element, '[role="group"]' + 
+		(node.type === 'radio' ? ',[role="radiogroup"]' : ''));
+
 	if (!group && !fieldset) {
 		failureCode = 'no-group';
 		self.relatedNodes(spliceCurrentNode(matchingNodes, element));
 		return false;
-	}
-	return fieldset ? checkFieldset(fieldset, name) : checkARIAGroup(group, name);
 
+	} else if (fieldset) {
+		return checkFieldset(fieldset, name);
+	} else {
+		return checkARIAGroup(group, name);	
+	}
 }
 
 var data = {
diff --git a/test/checks/forms/fieldset.js b/test/checks/forms/fieldset.js
index 2a6e3ee4ac..8b8cb2844c 100644
--- a/test/checks/forms/fieldset.js
+++ b/test/checks/forms/fieldset.js
@@ -1,7 +1,9 @@
 describe('fieldset', function () {
 	'use strict';
 	var fixture = document.getElementById('fixture');
+	var shadowSupport = axe.testUtils.shadowSupport;
 	var fixtureSetup = axe.testUtils.fixtureSetup;
+
 	var checkContext = {
 		_data: null,
 		data: function (d) {
@@ -158,7 +160,6 @@ describe('fieldset', function () {
 			});
 		});
 
-
 		it('should return true if a properly labelled-by ARIA group contains only the right elements - special characters', function () {
 			fixtureSetup('<div id="grouplabel">Label</div>' +
 				'<div role="group" aria-labelledby="grouplabel">' +
@@ -182,7 +183,6 @@ describe('fieldset', function () {
 			assert.isTrue(checks.fieldset.evaluate.call(checkContext, node));
 		});
 
-
 		it('should ignore hidden inputs', function () {
 			fixtureSetup('<fieldset><legend>Legendary</legend>' +
 				'<input type="' + type + '" id="target" name="uniqueyname">' +
@@ -190,7 +190,6 @@ describe('fieldset', function () {
 				'<input type="hidden" name="things"></fieldset>');
 			var node = fixture.querySelector('#target');
 			assert.isTrue(checks.fieldset.evaluate.call(checkContext, node));
-
 		});
 
 		it('should allow elements to be contained in 2 or more fieldsets', function () {
@@ -218,6 +217,36 @@ describe('fieldset', function () {
 			var node = fixture.querySelector('#target');
 			assert.isTrue(checks.fieldset.evaluate.call(checkContext, node));
 		});
+
+		(shadowSupport ? it : xit)('should find fieldsets outside a shadow tree', function () {
+			var fieldset = document.createElement('fieldset');
+			fieldset.innerHTML = '<legend>Legendary</legend> <div></div>';
+
+			var div = fieldset.querySelector('div');
+			var shadow = div.attachShadow({ mode: 'open' });
+			shadow.innerHTML = 
+				'<input type="' + type + '" id="target" name="sharedname">' +
+				'<input type="' + type + '" name="sharedname">';
+			fixtureSetup(fieldset);
+
+			var node = shadow.querySelector('#target');
+			assert.isTrue(checks.fieldset.evaluate.call(checkContext, node));
+		});
+
+		(shadowSupport ? it : xit)('should find fieldsets inside a shadow tree', function () {
+			var div = document.createElement('div');
+			div.innerHTML = 
+				'<input type="' + type + '" id="target" name="sharedname">' +
+				'<input type="' + type + '" name="sharedname">';
+
+			var shadow = div.attachShadow({ mode: 'open' });
+			shadow.innerHTML = '<fieldset><legend>Legendary</legend>' +
+				'<slot></slot></fieldset>';
+			fixtureSetup(div);
+
+			var node = div.querySelector('#target');
+			assert.isTrue(checks.fieldset.evaluate.call(checkContext, node));
+		});
 	}
 
 
@@ -249,4 +278,5 @@ describe('fieldset', function () {
 			assert.isFalse(checks.fieldset.evaluate.call(checkContext, node));
 		});
 	});
+
 });

From 9df8c9c2a9ca23b5ad08dfb98fd50a2010d441e2 Mon Sep 17 00:00:00 2001
From: Marcy Sutton <marcy.sutton@deque.com>
Date: Fri, 21 Jul 2017 10:33:06 -0700
Subject: [PATCH 098/142] test: add missing .v1 property to fieldset

---
 test/checks/forms/fieldset.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/checks/forms/fieldset.js b/test/checks/forms/fieldset.js
index 8b8cb2844c..35fb506153 100644
--- a/test/checks/forms/fieldset.js
+++ b/test/checks/forms/fieldset.js
@@ -1,7 +1,7 @@
 describe('fieldset', function () {
 	'use strict';
 	var fixture = document.getElementById('fixture');
-	var shadowSupport = axe.testUtils.shadowSupport;
+	var shadowSupport = axe.testUtils.shadowSupport.v1;
 	var fixtureSetup = axe.testUtils.fixtureSetup;
 
 	var checkContext = {

From 93a0273b43113a247cd16a4115e33afa08bd8f70 Mon Sep 17 00:00:00 2001
From: Marcy Sutton <holla@marcysutton.com>
Date: Mon, 31 Jul 2017 05:03:48 -0400
Subject: [PATCH 099/142] chore: add descriptions to Grunt tasks (#459)

Closes https://github.com/dequelabs/axe-core/issues/364
---
 build/tasks/add-locale.js     | 4 +++-
 build/tasks/configure.js      | 5 +++--
 build/tasks/fixture.js        | 4 +++-
 build/tasks/langs.js          | 4 +++-
 build/tasks/test-webdriver.js | 4 +++-
 build/tasks/testconfig.js     | 2 +-
 build/tasks/update-help.js    | 4 +++-
 build/tasks/validate.js       | 4 +++-
 8 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/build/tasks/add-locale.js b/build/tasks/add-locale.js
index a7ec59f3f1..50b17a0b61 100644
--- a/build/tasks/add-locale.js
+++ b/build/tasks/add-locale.js
@@ -3,7 +3,9 @@
 var buildManual = require('../build-manual');
 
 module.exports = function (grunt) {
-  grunt.registerMultiTask('add-locale', function () {
+  grunt.registerMultiTask('add-locale',
+  'Task for localizing messages in rules and checks',
+  function () {
     var options = this.options({
       rules: ['lib/rules/**/*.json'],
       checks: ['lib/checks/**/*.json'],
diff --git a/build/tasks/configure.js b/build/tasks/configure.js
index a15fe8064f..00b4b39b94 100644
--- a/build/tasks/configure.js
+++ b/build/tasks/configure.js
@@ -2,8 +2,9 @@
 'use strict';
 var buildRules = require('../configure');
 module.exports = function (grunt) {
-	grunt.registerMultiTask('configure', function () {
-
+	grunt.registerMultiTask('configure',
+	'Task for configuring rules and checks',
+	function () {
 		var done = this.async();
 		var options = this.options({
       rules: ['lib/rules/**/*.json'],
diff --git a/build/tasks/fixture.js b/build/tasks/fixture.js
index e58f1d5d9a..45303d202e 100644
--- a/build/tasks/fixture.js
+++ b/build/tasks/fixture.js
@@ -2,7 +2,9 @@
 'use strict';
 
 module.exports = function (grunt) {
-	grunt.registerMultiTask('fixture', function () {
+	grunt.registerMultiTask('fixture',
+	'Task for generating HTML test fixtures from a common template',
+	function () {
 		var options = this.options({
 			fixture: 'test/runner.tmpl',
 			testCwd: 'test/core',
diff --git a/build/tasks/langs.js b/build/tasks/langs.js
index a99203d8ed..d5f489710e 100644
--- a/build/tasks/langs.js
+++ b/build/tasks/langs.js
@@ -47,7 +47,9 @@ module.exports = function (grunt) {
 		].join('');
 		grunt.file.write(path, template);
 	}
-	grunt.registerMultiTask('langs', function () {
+	grunt.registerMultiTask('langs',
+	'Task for generating commons language codes from IANA registry',
+	function () {
 		var done = this.async();
 		var ianaLangsURL = 'http://www.iana.org/assignments/language-subtag-registry/language-subtag-registry';
 		if (!this.data.check) {
diff --git a/build/tasks/test-webdriver.js b/build/tasks/test-webdriver.js
index 53c730ae1b..3c23fbf814 100644
--- a/build/tasks/test-webdriver.js
+++ b/build/tasks/test-webdriver.js
@@ -117,7 +117,9 @@ module.exports = function (grunt) {
 	/**
 	 * Run all tests in a browser using webdriver
 	 */
-	grunt.registerMultiTask('test-webdriver', function () {
+	grunt.registerMultiTask('test-webdriver',
+	'Task for launching Webdriver with options and running tests against options URLs',
+	function () {
 		var driver;
 		var done = this.async();
 		var options = this.options({
diff --git a/build/tasks/testconfig.js b/build/tasks/testconfig.js
index 306cfb2086..87db90bf23 100644
--- a/build/tasks/testconfig.js
+++ b/build/tasks/testconfig.js
@@ -3,7 +3,7 @@
 
 module.exports = function (grunt) {
 	grunt.registerMultiTask('testconfig',
-	'This task creates a file with all the source test config and HTML fixutres in a single JS object "test"',
+	'This task creates a file with all the source test config and HTML fixtures in a single JS object `tests`',
 	function () {
 
 		var result = {
diff --git a/build/tasks/update-help.js b/build/tasks/update-help.js
index 3d2edf58a5..ff8d8e99cb 100644
--- a/build/tasks/update-help.js
+++ b/build/tasks/update-help.js
@@ -2,7 +2,9 @@
 'use strict';
 
 module.exports = function (grunt) {
-	grunt.registerMultiTask('update-help', function () {
+	grunt.registerMultiTask('update-help',
+	'Task for updating Deque University helpUrls based on rule JSON files',
+	function () {
 		var options = this.options({
 			version: '1.0.0'
 		});
diff --git a/build/tasks/validate.js b/build/tasks/validate.js
index 04f4d8d270..ed86863df4 100644
--- a/build/tasks/validate.js
+++ b/build/tasks/validate.js
@@ -233,7 +233,9 @@ function validateFiles(grunt, files, schema) {
 }
 
 module.exports = function (grunt) {
-	grunt.registerMultiTask('validate', function () {
+	grunt.registerMultiTask('validate',
+	'Task for validating API schema for tools, checks and rules',
+	function () {
 		var schemas = createSchemas();
 		var options = this.options();
 		if (!options.type || !schemas[options.type]) {

From 439bc71674e8211e590c116c4c8ba15af4f255d2 Mon Sep 17 00:00:00 2001
From: Wilco Fiers <wilco.fiers@deque.com>
Date: Wed, 19 Jul 2017 12:18:55 +0200
Subject: [PATCH 100/142] feat(duplicate-id): Add shadow DOM support

---
 lib/checks/shared/duplicate-id.js  | 24 ++++++-------
 test/checks/shared/duplicate-id.js | 54 ++++++++++++++++++++++++++++--
 2 files changed, 61 insertions(+), 17 deletions(-)

diff --git a/lib/checks/shared/duplicate-id.js b/lib/checks/shared/duplicate-id.js
index 70b5ae79b3..b7ef630c90 100644
--- a/lib/checks/shared/duplicate-id.js
+++ b/lib/checks/shared/duplicate-id.js
@@ -1,21 +1,17 @@
+const id = node.getAttribute('id').trim();
 // Since empty ID's are not meaningful and are ignored by Edge, we'll
 // let those pass.
-if (!node.getAttribute('id').trim()) {
+if (!id) {
 	return true;
 }
+const root = axe.commons.dom.getRootNode(node);
+const matchingNodes = Array.from(root.querySelectorAll(
+    `[id="${ axe.commons.utils.escapeSelector(id) }"]`
+  )).filter(foundNode => foundNode !== node);
 
-const id = axe.commons.utils.escapeSelector(node.getAttribute('id'));
-var matchingNodes = document.querySelectorAll(`[id="${id}"]`);
-var related = [];
-
-for (var i = 0; i < matchingNodes.length; i++) {
-	if (matchingNodes[i] !== node) {
-		related.push(matchingNodes[i]);
-	}
-}
-if (related.length) {
-	this.relatedNodes(related);
+if (matchingNodes.length) {
+	this.relatedNodes(matchingNodes);
 }
-this.data(node.getAttribute('id'));
+this.data(id);
 
-return (matchingNodes.length <= 1);
+return (matchingNodes.length === 0);
diff --git a/test/checks/shared/duplicate-id.js b/test/checks/shared/duplicate-id.js
index 93d8d41991..bb31ca4d54 100644
--- a/test/checks/shared/duplicate-id.js
+++ b/test/checks/shared/duplicate-id.js
@@ -2,7 +2,7 @@ describe('duplicate-id', function () {
 	'use strict';
 
 	var fixture = document.getElementById('fixture');
-
+	var shadowSupport = axe.testUtils.shadowSupport;
 
 	var checkContext = {
 		_relatedNodes: [],
@@ -27,7 +27,6 @@ describe('duplicate-id', function () {
 		assert.isTrue(checks['duplicate-id'].evaluate.call(checkContext, node));
 		assert.equal(checkContext._data, node.id);
 		assert.deepEqual(checkContext._relatedNodes, []);
-
 	});
 
 	it('should return false if there are multiple elements with an ID', function () {
@@ -39,7 +38,8 @@ describe('duplicate-id', function () {
 	});
 
 	it('should return remove duplicates', function () {
-		assert.deepEqual(checks['duplicate-id'].after([{data: 'a'}, {data: 'b'}, {data: 'b'}]), [{data: 'a'}, {data: 'b'}]);
+		assert.deepEqual(checks['duplicate-id'].after([
+			{data: 'a'}, {data: 'b'}, {data: 'b'}]), [{data: 'a'}, {data: 'b'}]);
 	});
 
 	it('should ignore empty ids', function () {
@@ -58,4 +58,52 @@ describe('duplicate-id', function () {
 		assert.isTrue(checks['duplicate-id'].evaluate.call(checkContext, node));
 	});
 
+	(shadowSupport.v1 ? it : xit)('should find duplicate IDs in shadow trees', function () {
+		var div = document.createElement('div');
+		div.id = 'target';
+		var shadow = div.attachShadow({ mode: 'open' });
+		shadow.innerHTML = '<span id="target"></span><p id="target">text</p>';
+		var node = shadow.querySelector('span');
+		fixture.appendChild(div);
+
+		assert.isFalse(checks['duplicate-id'].evaluate.call(checkContext, node));
+		assert.lengthOf(checkContext._relatedNodes, 1);
+		assert.deepEqual(checkContext._relatedNodes, [shadow.querySelector('p')]);
+	});
+
+	(shadowSupport.v1 ? it : xit)('should ignore same IDs in shadow trees', function () {
+		var node = document.createElement('div');
+		node.id = 'target';
+		var shadow = node.attachShadow({ mode: 'open' });
+		shadow.innerHTML = '<span id="target"></span>';
+		fixture.appendChild(node);
+
+		assert.isTrue(checks['duplicate-id'].evaluate.call(checkContext, node));
+		assert.lengthOf(checkContext._relatedNodes, 0);
+	});
+
+	(shadowSupport.v1 ? it : xit)('should ignore same IDs outside shadow trees', function () {
+		var div = document.createElement('div');
+		div.id = 'target';
+		var shadow = div.attachShadow({ mode: 'open' });
+		shadow.innerHTML = '<span id="target"></span>';
+		var node = shadow.querySelector('#target');
+		fixture.appendChild(div);
+
+		assert.isTrue(checks['duplicate-id'].evaluate.call(checkContext, node));
+		assert.lengthOf(checkContext._relatedNodes, 0);
+	});
+
+	(shadowSupport.v1 ? it : xit)('should not ignore slotted elements', function () {
+		var node = document.createElement('div');
+		node.id = 'target';
+		node.innerHTML = '<p id="target">text</p>';
+		var shadow = node.attachShadow({ mode: 'open' });
+		shadow.innerHTML = '<span id="target"><slot></slot></span>';
+		fixture.appendChild(node);
+
+		assert.isFalse(checks['duplicate-id'].evaluate.call(checkContext, node));
+		assert.lengthOf(checkContext._relatedNodes, 1);
+		assert.deepEqual(checkContext._relatedNodes, [node.querySelector('p')]);
+	});
 });

From 797f9c28b164ab5a49c7b211ca8efb99d9a1e827 Mon Sep 17 00:00:00 2001
From: Wilco Fiers <wilco.fiers@deque.com>
Date: Mon, 24 Jul 2017 15:24:50 +0200
Subject: [PATCH 101/142] test(duplicate-id): clarify test statement

---
 test/checks/shared/duplicate-id.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/checks/shared/duplicate-id.js b/test/checks/shared/duplicate-id.js
index bb31ca4d54..2fd4c949a0 100644
--- a/test/checks/shared/duplicate-id.js
+++ b/test/checks/shared/duplicate-id.js
@@ -94,7 +94,7 @@ describe('duplicate-id', function () {
 		assert.lengthOf(checkContext._relatedNodes, 0);
 	});
 
-	(shadowSupport.v1 ? it : xit)('should not ignore slotted elements', function () {
+	(shadowSupport.v1 ? it : xit)('should compare slotted content with the outer tree', function () {
 		var node = document.createElement('div');
 		node.id = 'target';
 		node.innerHTML = '<p id="target">text</p>';

From 5b1cc7a0bec7d751fb55a7e386c10e1222c161e1 Mon Sep 17 00:00:00 2001
From: Wilco Fiers <wilco.fiers@deque.com>
Date: Tue, 1 Aug 2017 12:47:57 +0200
Subject: [PATCH 102/142] test(duplicate-id): Update test text

---
 test/checks/shared/duplicate-id.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/checks/shared/duplicate-id.js b/test/checks/shared/duplicate-id.js
index 2fd4c949a0..95e6627150 100644
--- a/test/checks/shared/duplicate-id.js
+++ b/test/checks/shared/duplicate-id.js
@@ -58,7 +58,7 @@ describe('duplicate-id', function () {
 		assert.isTrue(checks['duplicate-id'].evaluate.call(checkContext, node));
 	});
 
-	(shadowSupport.v1 ? it : xit)('should find duplicate IDs in shadow trees', function () {
+	(shadowSupport.v1 ? it : xit)('should find duplicate IDs in the same shadow DOM', function () {
 		var div = document.createElement('div');
 		div.id = 'target';
 		var shadow = div.attachShadow({ mode: 'open' });
@@ -71,7 +71,7 @@ describe('duplicate-id', function () {
 		assert.deepEqual(checkContext._relatedNodes, [shadow.querySelector('p')]);
 	});
 
-	(shadowSupport.v1 ? it : xit)('should ignore same IDs in shadow trees', function () {
+	(shadowSupport.v1 ? it : xit)('should ignore duplicate IDs if they are in different document roots', function () {
 		var node = document.createElement('div');
 		node.id = 'target';
 		var shadow = node.attachShadow({ mode: 'open' });
@@ -94,7 +94,7 @@ describe('duplicate-id', function () {
 		assert.lengthOf(checkContext._relatedNodes, 0);
 	});
 
-	(shadowSupport.v1 ? it : xit)('should compare slotted content with the outer tree', function () {
+	(shadowSupport.v1 ? it : xit)('should compare slotted content with the light DOM', function () {
 		var node = document.createElement('div');
 		node.id = 'target';
 		node.innerHTML = '<p id="target">text</p>';

From fcc51eb8b35be1a957767de9930b793dd15d1fa8 Mon Sep 17 00:00:00 2001
From: Wilco Fiers <wilco.fiers@deque.com>
Date: Tue, 1 Aug 2017 17:01:20 +0200
Subject: [PATCH 103/142] fix: incomplete results should have impact

---
 lib/core/utils/aggregateChecks.js  |  4 ++--
 lib/core/utils/aggregateRule.js    | 14 +++++++++-----
 test/core/utils/aggregateChecks.js | 18 ++++++++++++++++++
 test/core/utils/aggregateRule.js   | 11 +++++++++--
 test/playground.html               | 21 +++++++--------------
 5 files changed, 45 insertions(+), 23 deletions(-)

diff --git a/lib/core/utils/aggregateChecks.js b/lib/core/utils/aggregateChecks.js
index dec080a003..fce52ecc15 100644
--- a/lib/core/utils/aggregateChecks.js
+++ b/lib/core/utils/aggregateChecks.js
@@ -1,3 +1,4 @@
+const { CANTTELL_PRIO, FAIL_PRIO } = axe.constants;
 let checkMap = [];
 checkMap[axe.constants.PASS_PRIO] = true;
 checkMap[axe.constants.CANTTELL_PRIO] = null;
@@ -51,9 +52,8 @@ axe.utils.aggregateChecks = function (nodeResOriginal) {
 		nodeResult[type].forEach((check) => impacts.push(check.impact));
 	});
 
-
 	// for failed nodes, define the impact
-	if (nodeResult.priority === axe.constants.FAIL_PRIO) {
+	if ([CANTTELL_PRIO, FAIL_PRIO].includes(nodeResult.priority)) {
 		nodeResult.impact = axe.utils.aggregate(axe.constants.impact, impacts);
 	} else {
 		nodeResult.impact = null;
diff --git a/lib/core/utils/aggregateRule.js b/lib/core/utils/aggregateRule.js
index 5cf07d3408..4d6f266ba7 100644
--- a/lib/core/utils/aggregateRule.js
+++ b/lib/core/utils/aggregateRule.js
@@ -35,11 +35,15 @@ axe.utils.aggregateRule = function (subResults) {
 		ruleResult[groupName].push(subResult);
 	});
 
-	// Take the highest impact of failed rules
-	var failGroup = axe.constants.FAIL_GROUP;
-	if (ruleResult[failGroup].length > 0) {
-		// Get the impact of all violations
-		let impactList = ruleResult[failGroup]
+	// Take the highest impact of failed or canttell rules
+	var impactGroup = axe.constants.FAIL_GROUP;
+	if (ruleResult[impactGroup].length === 0) {
+		impactGroup = axe.constants.CANTTELL_GROUP;
+	}
+
+	if (ruleResult[impactGroup].length > 0) {
+		// Get the impact of all issues
+		let impactList = ruleResult[impactGroup]
 		.map((failure) => failure.impact);
 
 		ruleResult.impact = axe.utils.aggregate(axe.constants.impact, impactList) || null;
diff --git a/test/core/utils/aggregateChecks.js b/test/core/utils/aggregateChecks.js
index 0b67f2fb04..ad53f553ac 100644
--- a/test/core/utils/aggregateChecks.js
+++ b/test/core/utils/aggregateChecks.js
@@ -54,6 +54,24 @@ describe('axe.utils.aggregateChecks', function() {
 		});
 	});
 
+	it('returns impact for fail and canttell', function () {
+		var failCheck = axe.utils.aggregateChecks( createTestCheckResults({
+			any: [{ result: false, impact: 'serious' }]
+		}));
+		var canttellCheck = axe.utils.aggregateChecks( createTestCheckResults({
+			any: [{ result: undefined, impact: 'moderate' }]
+		}));
+
+		assert.equal(failCheck.impact, 'serious');
+		assert.equal(canttellCheck.impact, 'moderate');
+	});
+
+	it('sets impact to null for pass', function () {
+		var passCheck = axe.utils.aggregateChecks( createTestCheckResults({
+			any: [{ result: true, impact: 'serious' }]
+		}));
+		assert.isNull(passCheck.impact);
+	});
 
 	describe('none', function () {
 		it('gives result FAIL when any is true', function() {
diff --git a/test/core/utils/aggregateRule.js b/test/core/utils/aggregateRule.js
index 32ca67fa53..4f4f765f82 100644
--- a/test/core/utils/aggregateRule.js
+++ b/test/core/utils/aggregateRule.js
@@ -107,6 +107,13 @@ describe('axe.utils.aggregateRule', function() {
 		assert.lengthOf(ruleResult.passes, 1);
 	});
 
+	it('should provide impact on incomplete', function () {
+		var ruleResult = axe.utils.aggregateRule( createTestResults({
+			none: { result: undefined, impact: 'serious' }
+		}));
+		assert.equal(ruleResult.impact, 'serious');
+	});
+
 	it('should raise the highest "raisedMetadata" on failing checks', function() {
 		var ruleResult = axe.utils.aggregateRule( createTestResults({
 				none: { result: true, impact: 'moderate' },
@@ -116,12 +123,12 @@ describe('axe.utils.aggregateRule', function() {
 					{ result: false, impact: 'serious'}
 				]
 			},
-			{ none: { result: false, impact: 'critical' }},
+			{ none: { result: undefined, impact: 'critical' }},
 			{ none: { result: false, impact: 'critical' }}
 		));
 		assert.equal(ruleResult.impact, 'serious');
 		assert.equal(ruleResult.violations[0].impact, 'serious');
+		assert.equal(ruleResult.incomplete[0].impact, 'critical');
 		assert.isNull(ruleResult.passes[0].impact);
-		assert.isNull(ruleResult.passes[1].impact);
 	});
 });
diff --git a/test/playground.html b/test/playground.html
index 94c489c015..98e016a17a 100644
--- a/test/playground.html
+++ b/test/playground.html
@@ -2,24 +2,17 @@
 <html lang="en">
 <title>O hai</title>
 
-<div style="
-  height: 50px;
-  width: 50px;
-  border: solid 1px black;
-  overflow: auto;
-">
-  <p>foofoofoofoofoofoo</p>
-  <p>foofoofoofoofoofoo</p>
-  <p>foofoofoofoofoofoo</p>
-  <p>foofoofoofoofoofoo</p>
-  <p>foofoofoofoofoofoo</p>
-</div>
+<video src="https://youtu.be/cgbJo5fuFMo"></video>
+<p style="color: #ccc">Some text</p>
+<p style="background:url(https://bennettfeely.com/gradients/img/gradient_24.png)">
+  Some more text</p>
 
 <script src="/axe.js"></script>
 <script>
 window.addEventListener('load' , function () {
-  axe.a11yCheck(document, { restoreScroll: true }, function (res) {
-    console.log(res);
+  axe.run(document, function (err, res) {
+    console.log(res.violations[0]);
+    res.incomplete.forEach(issue => console.log(issue))
   });
 })
 </script>

From b94974900b482be6ae59283e4c8fd0724f45268c Mon Sep 17 00:00:00 2001
From: Wilco Fiers <wilco.fiers@deque.com>
Date: Wed, 2 Aug 2017 18:00:51 +0200
Subject: [PATCH 104/142] fix(aria): Allow implicit attribute values

---
 lib/commons/aria/index.js                     | 17 +++++-------
 test/checks/aria/required-attr.js             |  6 ++---
 .../aria-required-attr/required-attr.html     | 26 +++++--------------
 .../aria-required-attr/required-attr.json     |  7 ++---
 4 files changed, 17 insertions(+), 39 deletions(-)

diff --git a/lib/commons/aria/index.js b/lib/commons/aria/index.js
index c2ac200a4a..5805de6747 100644
--- a/lib/commons/aria/index.js
+++ b/lib/commons/aria/index.js
@@ -230,7 +230,7 @@ lookupTables.role = {
 	'checkbox': {
 		type: 'widget',
 		attributes:  {
-			required: ['aria-checked']
+			allowed: ['aria-checked']
 		},
 		owned: null,
 		nameFrom: ['author', 'contents'],
@@ -250,8 +250,7 @@ lookupTables.role = {
 	'combobox': {
 		type: 'composite',
 		attributes:  {
-			required: ['aria-expanded'],
-			allowed: ['aria-autocomplete', 'aria-required', 'aria-activedescendant']
+			allowed: ['aria-expanded', 'aria-autocomplete', 'aria-required', 'aria-activedescendant']
 		},
 		owned: {
 			all: ['listbox', 'textbox']
@@ -510,7 +509,7 @@ lookupTables.role = {
 	'menuitemcheckbox': {
 		type: 'widget',
 		attributes: {
-			required: ['aria-checked']
+			allowed: ['aria-checked']
 		},
 		owned: null,
 		nameFrom: ['author', 'contents'],
@@ -520,8 +519,7 @@ lookupTables.role = {
 	'menuitemradio': {
 		type: 'widget',
 		attributes:  {
-			allowed: ['aria-selected', 'aria-posinset', 'aria-setsize'],
-			required: ['aria-checked']
+			allowed: ['aria-checked', 'aria-selected', 'aria-posinset', 'aria-setsize'],
 		},
 		owned: null,
 		nameFrom: ['author', 'contents'],
@@ -584,8 +582,7 @@ lookupTables.role = {
 	'radio': {
 		type: 'widget',
 		attributes:  {
-			allowed: ['aria-selected', 'aria-posinset', 'aria-setsize'],
-			required: ['aria-checked']
+			allowed: ['aria-checked', 'aria-selected', 'aria-posinset', 'aria-setsize'],
 		},
 		owned: null,
 		nameFrom: ['author', 'contents'],
@@ -657,8 +654,8 @@ lookupTables.role = {
 	'scrollbar': {
 		type: 'widget',
 		attributes: {
-			required: ['aria-controls', 'aria-orientation', 'aria-valuenow', 'aria-valuemax', 'aria-valuemin'],
-			allowed: ['aria-valuetext']
+			required: ['aria-controls', 'aria-valuenow', 'aria-valuemax', 'aria-valuemin'],
+			allowed: ['aria-valuetext', 'aria-orientation']
 		},
 		owned: null,
 		nameFrom: ['author'],
diff --git a/test/checks/aria/required-attr.js b/test/checks/aria/required-attr.js
index 7a0cc8bfe6..8d410221da 100644
--- a/test/checks/aria/required-attr.js
+++ b/test/checks/aria/required-attr.js
@@ -17,15 +17,13 @@ describe('aria-required-attr', function () {
 
 	it('should detect missing attributes', function () {
 		var node = document.createElement('div');
-		node.setAttribute('role', 'checkbox');
+		node.setAttribute('role', 'slider');
 		node.id = 'test';
 		node.tabIndex = 1;
 		fixture.appendChild(node);
 
 		assert.isFalse(checks['aria-required-attr'].evaluate.call(checkContext, node));
-		assert.deepEqual(checkContext._data, ['aria-checked']);
-
-
+		assert.deepEqual(checkContext._data, ['aria-valuenow', 'aria-valuemax', 'aria-valuemin']);
 	});
 
 	it('should return true if there is no role', function () {
diff --git a/test/integration/rules/aria-required-attr/required-attr.html b/test/integration/rules/aria-required-attr/required-attr.html
index e8416c95e9..c21d12840c 100644
--- a/test/integration/rules/aria-required-attr/required-attr.html
+++ b/test/integration/rules/aria-required-attr/required-attr.html
@@ -1,21 +1,7 @@
+<div role="scrollbar" id="pass1" aria-controls="value" aria-orientation="value" aria-valuenow="value" aria-valuemax="value" aria-valuemin="value">ok</div>
+<div role="slider" id="pass2" aria-valuenow="value" aria-valuemax="value" aria-valuemin="value">ok</div>
+<div role="spinbutton" id="pass3" aria-valuenow="value" aria-valuemax="value" aria-valuemin="value">ok</div>
 
-<div role="checkbox" id="pass1" aria-checked="value">ok</div>
-<div role="combobox" id="pass2" aria-expanded="value">ok</div>
-<div role="menuitemcheckbox" id="pass3" aria-checked="value">ok</div>
-<div role="menuitemradio" id="pass4" aria-checked="value">ok</div>
-<div role="radio" id="pass5" aria-checked="value">ok</div>
-<div role="scrollbar" id="pass6" aria-controls="value" aria-orientation="value" aria-valuenow="value" aria-valuemax="value" aria-valuemin="value">ok</div>
-<div role="slider" id="pass7" aria-valuenow="value" aria-valuemax="value" aria-valuemin="value">ok</div>
-<div role="spinbutton" id="pass8" aria-valuenow="value" aria-valuemax="value" aria-valuemin="value">ok</div>
-<div role="switch" id="pass9" aria-checked="value">ok</div>
-
-
-<div role="checkbox" id="violation1">fail</div>
-<div role="combobox" id="violation2">fail</div>
-<div role="menuitemcheckbox" id="violation3">fail</div>
-<div role="menuitemradio" id="violation4">fail</div>
-<div role="radio" id="violation5">fail</div>
-<div role="scrollbar" id="violation6">fail</div>
-<div role="slider" id="violation7">fail</div>
-<div role="spinbutton" id="violation8">fail</div>
-<div role="switch" id="violation9">fail</div>
+<div role="scrollbar" id="violation1">fail</div>
+<div role="slider" id="violation2">fail</div>
+<div role="spinbutton" id="violation3">fail</div>
diff --git a/test/integration/rules/aria-required-attr/required-attr.json b/test/integration/rules/aria-required-attr/required-attr.json
index 205baa0b04..307f31b9a8 100644
--- a/test/integration/rules/aria-required-attr/required-attr.json
+++ b/test/integration/rules/aria-required-attr/required-attr.json
@@ -2,12 +2,9 @@
 	"description": "aria-required-attr tests",
 	"rule": "aria-required-attr",
 	"violations": [
-		["#violation1"], ["#violation2"], ["#violation3"], ["#violation4"],
-		["#violation5"], ["#violation6"], ["#violation7"], ["#violation8"],
-		["#violation9"]
+		["#violation1"], ["#violation2"], ["#violation3"]
 	],
 	"passes": [
-		["#pass1"], ["#pass2"], ["#pass3"], ["#pass4"], ["#pass5"], ["#pass6"],
-		["#pass7"], ["#pass8"], ["#pass9"]
+		["#pass1"], ["#pass2"], ["#pass3"]
 	]
 }
\ No newline at end of file

From 2dd3d68770a0e414f5085e67c4a55bff46620b28 Mon Sep 17 00:00:00 2001
From: Wilco Fiers <WilcoFiers@users.noreply.github.com>
Date: Thu, 3 Aug 2017 10:43:46 +0200
Subject: [PATCH 105/142] fix: Exclude `any` checks from output if one passed
 (#466)

---
 lib/core/utils/aggregateChecks.js  | 16 +++++++++-------
 test/core/utils/aggregateChecks.js | 20 ++++++++++++++++++++
 2 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/lib/core/utils/aggregateChecks.js b/lib/core/utils/aggregateChecks.js
index dec080a003..064741e62c 100644
--- a/lib/core/utils/aggregateChecks.js
+++ b/lib/core/utils/aggregateChecks.js
@@ -33,20 +33,22 @@ axe.utils.aggregateChecks = function (nodeResOriginal) {
 	});
 
 	// Find the result with the highest priority
-	let priorities = anyAllNone(nodeResult, (c) => c.priority);
-	nodeResult.priority = Math.max(
-		priorities.all.reduce((a, b) => Math.max(a,b), 0),
-		priorities.none.reduce((a, b) => Math.max(a,b), 0),
+	const priorities = {
+		all: nodeResult.all.reduce((a, b) => Math.max(a, b.priority), 0),
+		none: nodeResult.none.reduce((a, b) => Math.max(a,b.priority), 0),
 		// get the lowest passing of 'any' defaulting
 		// to 0 by wrapping around 4 to 0 (inapplicable)
-		priorities.any.reduce((a, b) => Math.min(a,b), 4) % 4
-	);
+		any: nodeResult.any.reduce((a, b) => Math.min(a, b.priority), 4) % 4
+	};
+
+	nodeResult.priority = Math.max(priorities.all, priorities.none, priorities.any);
 
 	// Of each type, filter out all results not matching the final priority
 	let impacts = [];
 	checkTypes.forEach((type) => {
 		nodeResult[type] = nodeResult[type].filter((check) => {
-			return check.priority === nodeResult.priority;
+			return (check.priority === nodeResult.priority &&
+				check.priority === priorities[type]);
 		});
 		nodeResult[type].forEach((check) => impacts.push(check.impact));
 	});
diff --git a/test/core/utils/aggregateChecks.js b/test/core/utils/aggregateChecks.js
index 0b67f2fb04..5c79486821 100644
--- a/test/core/utils/aggregateChecks.js
+++ b/test/core/utils/aggregateChecks.js
@@ -156,6 +156,26 @@ describe('axe.utils.aggregateChecks', function() {
 			}));
 			assert.equal(checkResult.result, FAIL);
 		});
+
+		it('ignores fail checks on any, if at least one passed', function () {
+			var checkResult = axe.utils.aggregateChecks( createTestCheckResults({
+				any: [false, undefined, true], // cantTell
+				none: [true, false] // fail
+			}));
+
+			assert.lengthOf(checkResult.any, 0);
+			assert.lengthOf(checkResult.none, 1);
+		});
+
+		it('includes cantTell checks from any if there are no fails', function () {
+			var checkResult = axe.utils.aggregateChecks( createTestCheckResults({
+				any: [undefined, undefined, false], // cantTell
+				none: [undefined, false] // cantTell
+			}));
+
+			assert.lengthOf(checkResult.any, 2);
+			assert.lengthOf(checkResult.none, 1);
+		});
 	});
 
 });

From 86a4c25238af968feb61123b735c678074616cdf Mon Sep 17 00:00:00 2001
From: Wilco Fiers <WilcoFiers@users.noreply.github.com>
Date: Thu, 3 Aug 2017 10:46:36 +0200
Subject: [PATCH 106/142] feat(shadow DOM): Create commons virtual methods, for
 backward compatibility

* feat(aria.label): Works without a virtualNode

* feat: Add hasContentVirtual method

* feat(is-offscreen): Add shadow DOM support

* chore: Some code cleanup

* feat(text.visible): Created text.visibleVirtual for shadowDOM

* fix: Pass all tests that use accessibleText

* feat: add shadow support to aria-required-children

Closes https://github.com/dequelabs/axe-core/issues/421

* test: use abstracted checkSetup from testutils

* fix: get virtualNode with getNodeFromTree

* test: More testing for accessibleText()

# Conflicts:
#	lib/commons/dom/find-elms-in-context.js
#	lib/commons/text/accessible-text.js
#	test/checks/keyboard/focusable-no-name.js
#	test/checks/tables/same-caption-summary.js
#	test/commons/text/accessible-text.js

* feat(aria-required-parent): add Shadow DOM support

Closes https://github.com/dequelabs/axe-core/issues/422

* fix: Rename text.label to text.labelVirtual

* fix: Create aria.labelVirtual method
---
 lib/checks/label/duplicate-img-label.js       |  2 +-
 lib/checks/label/help-same-as-label.js        |  2 +-
 lib/checks/label/title-only.js                |  2 +-
 lib/checks/media/description.js               |  1 -
 lib/checks/visibility/hidden-content.js       |  2 +-
 lib/commons/aria/label-virtual.js             | 39 +++++++++
 lib/commons/aria/label.js                     | 37 ---------
 lib/commons/dom/find-elms-in-context.js       |  3 +-
 ...{has-content.js => has-content-virtual.js} | 21 +++--
 lib/commons/dom/is-offscreen.js               | 38 ++++-----
 lib/commons/table/is-data-table.js            |  4 +-
 lib/commons/table/is-row-header.js            |  2 +-
 .../text/{label.js => label-virtual.js}       | 11 ++-
 .../text/{visible.js => visible-virtual.js}   | 31 +++----
 lib/rules/color-contrast-matches.js           |  2 +-
 test/commons/aria/label-virtual.js            | 69 ++++++++++++++++
 test/commons/aria/label.js                    | 82 -------------------
 ...{has-content.js => has-content-virtual.js} | 52 ++++++------
 test/commons/dom/is-offscreen.js              | 26 +++++-
 .../text/{label.js => label-virtual.js}       | 41 ++++++----
 .../text/{visible.js => visible-virtual.js}   | 41 ++++------
 21 files changed, 259 insertions(+), 249 deletions(-)
 create mode 100644 lib/commons/aria/label-virtual.js
 delete mode 100644 lib/commons/aria/label.js
 rename lib/commons/dom/{has-content.js => has-content-virtual.js} (67%)
 rename lib/commons/text/{label.js => label-virtual.js} (84%)
 rename lib/commons/text/{visible.js => visible-virtual.js} (53%)
 create mode 100644 test/commons/aria/label-virtual.js
 delete mode 100644 test/commons/aria/label.js
 rename test/commons/dom/{has-content.js => has-content-virtual.js} (69%)
 rename test/commons/text/{label.js => label-virtual.js} (78%)
 rename test/commons/text/{visible.js => visible-virtual.js} (79%)

diff --git a/lib/checks/label/duplicate-img-label.js b/lib/checks/label/duplicate-img-label.js
index 6dec209a8f..432f197ae8 100644
--- a/lib/checks/label/duplicate-img-label.js
+++ b/lib/checks/label/duplicate-img-label.js
@@ -1,4 +1,4 @@
-const text = axe.commons.text.visible(virtualNode, true).toLowerCase();
+const text = axe.commons.text.visibleVirtual(virtualNode, true).toLowerCase();
 if (text === '') {
 	return false;
 }
diff --git a/lib/checks/label/help-same-as-label.js b/lib/checks/label/help-same-as-label.js
index c35b4b9cc4..4a45296f47 100644
--- a/lib/checks/label/help-same-as-label.js
+++ b/lib/checks/label/help-same-as-label.js
@@ -1,5 +1,5 @@
 
-var labelText = axe.commons.text.label(virtualNode),
+var labelText = axe.commons.text.labelVirtual(virtualNode),
 	check = node.getAttribute('title');
 
 if (!labelText) {
diff --git a/lib/checks/label/title-only.js b/lib/checks/label/title-only.js
index 8d92a917d0..772b1fa942 100644
--- a/lib/checks/label/title-only.js
+++ b/lib/checks/label/title-only.js
@@ -1,2 +1,2 @@
-var labelText = axe.commons.text.label(virtualNode);
+var labelText = axe.commons.text.labelVirtual(virtualNode);
 return !labelText && !!(node.getAttribute('title') || node.getAttribute('aria-describedby'));
\ No newline at end of file
diff --git a/lib/checks/media/description.js b/lib/checks/media/description.js
index f6bb01a5fb..529b75e0ee 100644
--- a/lib/checks/media/description.js
+++ b/lib/checks/media/description.js
@@ -5,7 +5,6 @@ if (tracks.length) {
   var out = !tracks.some(({ actualNode }) => (
     (actualNode.getAttribute('kind') || '').toLowerCase() === 'descriptions'
   ));
-  axe.log(tracks.map(t => t.actualNode.getAttribute('kind')), out);
   return out;
 }
 // Undefined if there are no tracks - media may be decorative
diff --git a/lib/checks/visibility/hidden-content.js b/lib/checks/visibility/hidden-content.js
index 37ebcdbe48..9489ff4c7b 100644
--- a/lib/checks/visibility/hidden-content.js
+++ b/lib/checks/visibility/hidden-content.js
@@ -1,6 +1,6 @@
 const whitelist = ['SCRIPT', 'HEAD', 'TITLE', 'NOSCRIPT', 'STYLE', 'TEMPLATE'];
 if (!whitelist.includes(node.tagName.toUpperCase()) &&
-    axe.commons.dom.hasContent(virtualNode)) {
+    axe.commons.dom.hasContentVirtual(virtualNode)) {
 
   const styles = window.getComputedStyle(node);
   if (styles.getPropertyValue('display') === 'none') {
diff --git a/lib/commons/aria/label-virtual.js b/lib/commons/aria/label-virtual.js
new file mode 100644
index 0000000000..88b479db4c
--- /dev/null
+++ b/lib/commons/aria/label-virtual.js
@@ -0,0 +1,39 @@
+/*global axe, aria, dom, text */
+/**
+ * Gets the accessible ARIA label text of a given element
+ * @see http://www.w3.org/WAI/PF/aria/roles#namecalculation
+ * @param  {Object} The virtualNode to test
+ * @return {Mixed}  String of visible text, or `null` if no label is found
+ */
+aria.labelVirtual = function ({ actualNode }) {
+	let ref, candidate;
+
+	if (actualNode.getAttribute('aria-labelledby')) {
+		// aria-labelledby
+		ref = dom.idrefs(actualNode, 'aria-labelledby');
+		candidate = ref.map(function (thing) {
+			const vNode = axe.utils.getNodeFromTree(axe._tree[0], thing);
+			return vNode ? text.visibleVirtual(vNode, true) : '';
+		}).join(' ').trim();
+
+		if (candidate) {
+			return candidate;
+		}
+	}
+
+	// aria-label
+	candidate = actualNode.getAttribute('aria-label');
+	if (candidate) {
+		candidate = text.sanitize(candidate).trim();
+		if (candidate) {
+			return candidate;
+		}
+	}
+
+	return null;
+};
+
+aria.label = function (node) {
+	node = axe.utils.getNodeFromTree(axe._tree[0], node);
+	return aria.labelVirtual(node);
+};
diff --git a/lib/commons/aria/label.js b/lib/commons/aria/label.js
deleted file mode 100644
index a3bbbfb655..0000000000
--- a/lib/commons/aria/label.js
+++ /dev/null
@@ -1,37 +0,0 @@
-/*global axe, aria, dom, text */
-/**
- * Gets the accessible ARIA label text of a given element
- * @see http://www.w3.org/WAI/PF/aria/roles#namecalculation
- * @param  {Object} node The virtual DOM node to test
- * @return {Mixed}      String of visible text, or `null` if no label is found
- */
-aria.label = function (node) {
-	var ref, candidate;
-	if (node.actualNode instanceof Node === false) {
-		node = axe.utils.getNodeFromTree(axe._tree[0], node);
-	}
-
-	if (node.actualNode.getAttribute('aria-labelledby')) {
-		// aria-labelledby
-		ref = dom.idrefs(node.actualNode, 'aria-labelledby');
-		candidate = ref.map(function (thing) {
-			var vNode = axe.utils.getNodeFromTree(axe._tree[0], thing);
-			return vNode ? text.visible(vNode, true) : '';
-		}).join(' ').trim();
-
-		if (candidate) {
-			return candidate;
-		}
-	}
-
-	// aria-label
-	candidate = node.actualNode.getAttribute('aria-label');
-	if (candidate) {
-		candidate = text.sanitize(candidate).trim();
-		if (candidate) {
-			return candidate;
-		}
-	}
-
-	return null;
-};
diff --git a/lib/commons/dom/find-elms-in-context.js b/lib/commons/dom/find-elms-in-context.js
index f9b784c400..4e27b99d79 100644
--- a/lib/commons/dom/find-elms-in-context.js
+++ b/lib/commons/dom/find-elms-in-context.js
@@ -3,7 +3,7 @@
  * Find elements referenced from a given context
  * 
  * @param object {
- *    context:  Node | virtual node    Element in the same context
+ *    context:  Node    Element in the same context
  *    value:    String  attribute value to search for
  *    attr:     String  attribute name to search for
  *    elm:      String  ndoeName to search for (optional)
@@ -12,7 +12,6 @@
  */
 dom.findElmsInContext = function ({ context, value, attr, elm = '' }) {
   let root;
-  context = context.actualNode || context;
   const escapedValue = axe.utils.escapeSelector(value);
 
   if (context.nodeType === 9 || context.nodeType === 11) { // It's already root
diff --git a/lib/commons/dom/has-content.js b/lib/commons/dom/has-content-virtual.js
similarity index 67%
rename from lib/commons/dom/has-content.js
rename to lib/commons/dom/has-content-virtual.js
index bd5407c033..1674aa710d 100644
--- a/lib/commons/dom/has-content.js
+++ b/lib/commons/dom/has-content-virtual.js
@@ -19,20 +19,29 @@ function hasChildTextNodes (elm) {
  * @param {Object} virtual DOM node
  * @return boolean
  */
-dom.hasContent = function hasContent (elm, noRecursion) {
-  if (!elm.actualNode) {
-    elm = axe.utils.getNodeFromTree(axe._tree[0], elm);
-  }
+dom.hasContentVirtual = function (elm, noRecursion) {
   return (
     // It has text
     hasChildTextNodes(elm) ||
      // It is a graphical element
     dom.isVisualContent(elm.actualNode) ||
      // It has an ARIA label
-    !!aria.label(elm) ||
+    !!aria.labelVirtual(elm) ||
     // or one of it's descendants does
     (!noRecursion && elm.children.some(child => (
-      child.actualNode.nodeType === 1 && dom.hasContent(child)
+      child.actualNode.nodeType === 1 && dom.hasContentVirtual(child)
     )))
   );
 };
+
+/**
+ * Like hasContentVirtual, except with a DOM Node
+ * IMPORTANT: This method requires the composed tree at axe._tree
+ *
+ * @param {Object}  DOM node
+ * @return boolean
+ */
+dom.hasContent = function hasContent (elm, noRecursion) {
+  elm = axe.utils.getNodeFromTree(axe._tree[0], elm);
+  return dom.hasContentVirtual(elm, noRecursion);
+};
diff --git a/lib/commons/dom/is-offscreen.js b/lib/commons/dom/is-offscreen.js
index 2d4ef7c3be..1c960abb48 100644
--- a/lib/commons/dom/is-offscreen.js
+++ b/lib/commons/dom/is-offscreen.js
@@ -1,27 +1,26 @@
 /*global dom */
 
-dom.isOffscreen = function (element) {
-	'use strict';
-	var noParentScrolled = function (element, offset) {
-		element = element.parentNode;
-		while (element.nodeName.toLowerCase() !== 'html') {
-			if (element.scrollTop) {
-				offset += element.scrollTop;
-				if (offset >= 0) {
-					return false;
-				}
+function noParentScrolled (element, offset) {
+	element = dom.getComposedParent(element);
+	while (element && element.nodeName.toLowerCase() !== 'html') {
+		if (element.scrollTop) {
+			offset += element.scrollTop;
+			if (offset >= 0) {
+				return false;
 			}
-			element = element.parentNode;
 		}
-		return true;
-	};
+		element = dom.getComposedParent(element);
+	}
+	return true;
+}
 
-	var leftBoundary,
-		docElement = document.documentElement,
-		styl = window.getComputedStyle(element),
-		dir = window.getComputedStyle(document.body || docElement)
-			.getPropertyValue('direction'),
-		coords = dom.getElementCoordinates(element);
+dom.isOffscreen = function (element) {
+	let leftBoundary;
+	const docElement = document.documentElement;
+	const styl = window.getComputedStyle(element);
+	const dir = window.getComputedStyle(document.body || docElement)
+			.getPropertyValue('direction');
+	const coords = dom.getElementCoordinates(element);
 
 	// bottom edge beyond
 	if (coords.bottom < 0 && (noParentScrolled(element, coords.bottom) ||
@@ -47,5 +46,4 @@ dom.isOffscreen = function (element) {
 	}
 
 	return false;
-
 };
diff --git a/lib/commons/table/is-data-table.js b/lib/commons/table/is-data-table.js
index ade3c2dd4f..74da5cd49a 100644
--- a/lib/commons/table/is-data-table.js
+++ b/lib/commons/table/is-data-table.js
@@ -9,7 +9,7 @@
  */
 table.isDataTable = function (node) {
 
-	var role = node.getAttribute('role');
+	var role = (node.getAttribute('role') || '').toLowerCase();
 
 	// The element is not focusable and has role=presentation
 	if ((role === 'presentation' || role === 'none') && !dom.isFocusable(node)) {
@@ -70,7 +70,7 @@ table.isDataTable = function (node) {
 			if (cell.getAttribute('scope') || cell.getAttribute('headers') || cell.getAttribute('abbr')) {
 				return true;
 			}
-			if (['columnheader', 'rowheader'].indexOf(cell.getAttribute('role')) !== -1) {
+			if (['columnheader', 'rowheader'].includes((cell.getAttribute('role') || '').toLowerCase())) {
 				return true;
 			}
 			// abbr element as a single child element of table cell
diff --git a/lib/commons/table/is-row-header.js b/lib/commons/table/is-row-header.js
index 8516a547db..e56af7ac17 100644
--- a/lib/commons/table/is-row-header.js
+++ b/lib/commons/table/is-row-header.js
@@ -6,5 +6,5 @@
  * @return {Boolean}
  */
 table.isRowHeader = function (node) {
-	return (['row', 'auto'].indexOf(table.getScope(node)) !== -1);
+	return (['row', 'auto'].includes(table.getScope(node)));
 };
\ No newline at end of file
diff --git a/lib/commons/text/label.js b/lib/commons/text/label-virtual.js
similarity index 84%
rename from lib/commons/text/label.js
rename to lib/commons/text/label-virtual.js
index c67449242e..1f724eec88 100644
--- a/lib/commons/text/label.js
+++ b/lib/commons/text/label-virtual.js
@@ -5,10 +5,10 @@
  * @param  {Object} node The virtual node mapping to the input to test
  * @return {Mixed}      String of visible text, or `null` if no label is found
  */
-text.label = function (node) {
+text.labelVirtual = function (node) {
 	var ref, candidate, doc;
 
-	candidate = aria.label(node);
+	candidate = aria.labelVirtual(node);
 	if (candidate) {
 		return candidate;
 	}
@@ -18,7 +18,6 @@ text.label = function (node) {
 		const id = axe.commons.utils.escapeSelector(node.actualNode.getAttribute('id'));
 		doc = axe.commons.dom.getRootNode(node.actualNode);
 		ref = doc.querySelector('label[for="' + id + '"]');
-		ref = axe.utils.getNodeFromTree(axe._tree[0], ref);
 		candidate = ref && text.visible(ref, true);
 		if (candidate) {
 			return candidate;
@@ -26,7 +25,6 @@ text.label = function (node) {
 	}
 
 	ref = dom.findUp(node.actualNode, 'label');
-	ref = axe.utils.getNodeFromTree(axe._tree[0], ref);
 	candidate = ref && text.visible(ref, true);
 	if (candidate) {
 		return candidate;
@@ -34,3 +32,8 @@ text.label = function (node) {
 
 	return null;
 };
+
+text.label = function (node) {
+	node = axe.utils.getNodeFromTree(axe._tree[0], node);
+	return text.labelVirtual(node);
+};
diff --git a/lib/commons/text/visible.js b/lib/commons/text/visible-virtual.js
similarity index 53%
rename from lib/commons/text/visible.js
rename to lib/commons/text/visible-virtual.js
index 954c10fec3..8fb973dfb8 100644
--- a/lib/commons/text/visible.js
+++ b/lib/commons/text/visible-virtual.js
@@ -1,31 +1,26 @@
-/*global text, dom */
+/*global text, dom, axe */
 
 /**
  * NOTE: when calculating the text or accessible text of a node that includes shadow
  * roots attached to it or its children, the flattened tree must be considered
  * rather than the "light DOM"
  */
-
-text.visible = function (element, screenReader, noRecursing) {
-	'use strict';
-
-	var index, child, nodeValue,
-		childNodes = element.children,
-		length = childNodes.length,
-		result = '';
-
-	for (index = 0; index < length; index++) {
-		child = childNodes[index];
-
+text.visibleVirtual = function (element, screenReader, noRecursing) {
+	const result = element.children.map(child => {
 		if (child.actualNode.nodeType === 3) { // filter on text nodes
-			nodeValue = child.actualNode.nodeValue;
+			const nodeValue = child.actualNode.nodeValue;
 			if (nodeValue && dom.isVisible(element.actualNode, screenReader)) {
-				result += nodeValue;
+				return nodeValue;
 			}
+
 		} else if (!noRecursing) {
-			result += text.visible(child, screenReader);
+			return text.visibleVirtual(child, screenReader);
 		}
-	}
-
+	}).join('');
 	return text.sanitize(result);
 };
+
+text.visible = function (element, screenReader, noRecursing) {
+	element = axe.utils.getNodeFromTree(axe._tree[0], element);
+	return text.visibleVirtual(element, screenReader, noRecursing);
+};
diff --git a/lib/rules/color-contrast-matches.js b/lib/rules/color-contrast-matches.js
index 522bbe164f..6377556636 100644
--- a/lib/rules/color-contrast-matches.js
+++ b/lib/rules/color-contrast-matches.js
@@ -63,7 +63,7 @@ if (node.getAttribute('id')) {
 	}
 }
 
-if (axe.commons.text.visible(virtualNode, false, true) === '') {
+if (axe.commons.text.visibleVirtual(virtualNode, false, true) === '') {
 	return false;
 }
 
diff --git a/test/commons/aria/label-virtual.js b/test/commons/aria/label-virtual.js
new file mode 100644
index 0000000000..c16751df94
--- /dev/null
+++ b/test/commons/aria/label-virtual.js
@@ -0,0 +1,69 @@
+describe('aria.labelVirtual', function() {
+	'use strict';
+
+	var fixture = document.getElementById('fixture');
+	var fixtureSetup = axe.testUtils.fixtureSetup;
+
+	afterEach(function() {
+		fixture.innerHTML = '';
+		axe._tree = undefined;
+	});
+
+	it('is called through aria.label with a DOM node', function () {
+		fixtureSetup('<div id="monkeys">monkeys</div><div id="bananas">bananas</div>' +
+			'<input id="target" aria-labelledby="monkeys bananas">');
+		var target = fixture.querySelector('#target');
+
+		assert.equal(axe.commons.aria.label(target), 'monkeys bananas');
+	});
+
+	describe('aria-labelledby', function() {
+		it('should join text with a single space', function() {
+			fixtureSetup('<div id="monkeys">monkeys</div><div id="bananas">bananas</div>' +
+				'<input id="target" aria-labelledby="monkeys bananas">');
+			var target = axe.utils.querySelectorAll(axe._tree[0], '#target')[0];
+
+			assert.equal(axe.commons.aria.labelVirtual(target), 'monkeys bananas');
+		});
+
+		it('should filter invisible elements', function() {
+			fixtureSetup('<div id="monkeys">monkeys</div><div id="bananas" style="display: none">bananas</div>' +
+				'<input id="target" aria-labelledby="monkeys bananas">');
+			var target = axe.utils.querySelectorAll(axe._tree[0], '#target')[0];
+
+			assert.equal(axe.commons.aria.labelVirtual(target), 'monkeys');
+		});
+
+		it('should take precedence over aria-label', function() {
+			fixtureSetup('<div id="monkeys">monkeys</div><div id="bananas">bananas</div>' +
+				'<input id="target" aria-labelledby="monkeys bananas" aria-label="nope">');
+			var target = axe.utils.querySelectorAll(axe._tree[0], '#target')[0];
+
+			assert.equal(axe.commons.aria.labelVirtual(target), 'monkeys bananas');
+		});
+
+		it('should ignore whitespace only labels', function() {
+			fixtureSetup('<div id="monkeys">	\n  </div><div id="bananas"></div>' +
+				'<input id="target" aria-labelledby="monkeys bananas">');
+			var target = axe.utils.querySelectorAll(axe._tree[0], '#target')[0];
+
+			assert.isNull(axe.commons.aria.labelVirtual(target));
+		});
+	});
+
+	describe('aria-label', function() {
+		it('should detect it', function() {
+			fixtureSetup('<input id="target" aria-label="monkeys">');
+			var target = axe.utils.querySelectorAll(axe._tree[0], '#target')[0];
+
+			assert.equal(axe.commons.aria.labelVirtual(target), 'monkeys');
+		});
+
+		it('should ignore whitespace only labels', function() {
+			fixtureSetup('<input id="target" aria-label="   \n	">');
+			var target = axe.utils.querySelectorAll(axe._tree[0], '#target')[0];
+
+			assert.isNull(axe.commons.aria.labelVirtual(target));
+		});
+	});
+});
diff --git a/test/commons/aria/label.js b/test/commons/aria/label.js
deleted file mode 100644
index ce368daf43..0000000000
--- a/test/commons/aria/label.js
+++ /dev/null
@@ -1,82 +0,0 @@
-describe('aria.label', function() {
-	'use strict';
-
-	var fixture = document.getElementById('fixture');
-	afterEach(function() {
-		fixture.innerHTML = '';
-		axe._tree = undefined;
-	});
-
-	it('accepts DOM Nodes and virtual nodes', function () {
-		it('should join text with a single space', function() {
-			fixture.innerHTML = '<div id="monkeys">monkeys</div><div id="bananas">bananas</div>' +
-				'<input id="target" aria-labelledby="monkeys bananas">';
-			var tree = axe._tree = axe.utils.getFlattenedTree(document.body);
-
-			// Virtual node
-			assert.equal(axe.commons.text.label(
-				axe.utils.querySelectorAll(tree, '#target')[0]
-			), 'monkeys bananas');
-			// DOM Node
-			assert.equal(axe.commons.text.label(
-				fixture.querySelector('#target')
-			), 'monkeys bananas');
-		});
-  });
-
-	describe('aria-labelledby', function() {
-		it('should join text with a single space', function() {
-			fixture.innerHTML = '<div id="monkeys">monkeys</div><div id="bananas">bananas</div>' +
-				'<input id="target" aria-labelledby="monkeys bananas">';
-
-			var tree = axe._tree = axe.utils.getFlattenedTree(document.body);
-			var target = axe.utils.querySelectorAll(tree, '#target')[0];
-			assert.equal(axe.commons.text.label(target), 'monkeys bananas');
-		});
-
-		it('should filter invisible elements', function() {
-			fixture.innerHTML = '<div id="monkeys">monkeys</div><div id="bananas" style="display: none">bananas</div>' +
-				'<input id="target" aria-labelledby="monkeys bananas">';
-
-			var tree = axe._tree = axe.utils.getFlattenedTree(document.body);
-			var target = axe.utils.querySelectorAll(tree, '#target')[0];
-			assert.equal(axe.commons.text.label(target), 'monkeys');
-		});
-
-		it('should take precedence over aria-label', function() {
-			fixture.innerHTML = '<div id="monkeys">monkeys</div><div id="bananas">bananas</div>' +
-				'<input id="target" aria-labelledby="monkeys bananas" aria-label="nope">';
-
-			var tree = axe._tree = axe.utils.getFlattenedTree(document.body);
-			var target = axe.utils.querySelectorAll(tree, '#target')[0];
-			assert.equal(axe.commons.text.label(target), 'monkeys bananas');
-		});
-
-		it('should ignore whitespace only labels', function() {
-			fixture.innerHTML = '<div id="monkeys">	\n  </div><div id="bananas"></div>' +
-				'<input id="target" aria-labelledby="monkeys bananas">';
-
-			var tree = axe._tree = axe.utils.getFlattenedTree(document.body);
-			var target = axe.utils.querySelectorAll(tree, '#target')[0];
-			assert.isNull(axe.commons.text.label(target));
-		});
-	});
-
-	describe('aria-label', function() {
-		it('should detect it', function() {
-			fixture.innerHTML = '<input id="target" aria-label="monkeys">';
-
-			var tree = axe._tree = axe.utils.getFlattenedTree(document.body);
-			var target = axe.utils.querySelectorAll(tree, '#target')[0];
-			assert.equal(axe.commons.text.label(target), 'monkeys');
-		});
-
-		it('should ignore whitespace only labels', function() {
-			fixture.innerHTML = '<input id="target" aria-label="   \n	">';
-
-			var tree = axe._tree = axe.utils.getFlattenedTree(document.body);
-			var target = axe.utils.querySelectorAll(tree, '#target')[0];
-			assert.isNull(axe.commons.text.label(target));
-		});
-	});
-});
diff --git a/test/commons/dom/has-content.js b/test/commons/dom/has-content-virtual.js
similarity index 69%
rename from test/commons/dom/has-content.js
rename to test/commons/dom/has-content-virtual.js
index 68c6c6c0a4..e0798b6eb1 100644
--- a/test/commons/dom/has-content.js
+++ b/test/commons/dom/has-content-virtual.js
@@ -1,7 +1,7 @@
 /* global xit */
-describe('dom.hasContent', function () {
+describe('dom.hasContentVirtual', function () {
   'use strict';
-  var hasContent = axe.commons.dom.hasContent;
+  var hasContentVirtual = axe.commons.dom.hasContentVirtual;
   var fixture = document.getElementById('fixture');
   var shadowSupport = axe.testUtils.shadowSupport.v1;
   var tree;
@@ -10,7 +10,7 @@ describe('dom.hasContent', function () {
     fixture.innerHTML = '<div id="target">  </div>';
     tree = axe.utils.getFlattenedTree(fixture);
     assert.isFalse(
-      hasContent(axe.utils.querySelectorAll(tree, '#target')[0])
+      hasContentVirtual(axe.utils.querySelectorAll(tree, '#target')[0])
     );
   });
 
@@ -18,7 +18,7 @@ describe('dom.hasContent', function () {
     fixture.innerHTML = '<div id="target"> <span></span> </div>';
     tree = axe.utils.getFlattenedTree(fixture);
     assert.isFalse(
-      hasContent(axe.utils.querySelectorAll(tree, '#target')[0])
+      hasContentVirtual(axe.utils.querySelectorAll(tree, '#target')[0])
     );
   });
 
@@ -26,7 +26,7 @@ describe('dom.hasContent', function () {
     fixture.innerHTML = '<div id="target"> text </div>';
     tree = axe.utils.getFlattenedTree(fixture);
     assert.isTrue(
-      hasContent(axe.utils.querySelectorAll(tree, '#target')[0])
+      hasContentVirtual(axe.utils.querySelectorAll(tree, '#target')[0])
     );
   });
 
@@ -34,7 +34,7 @@ describe('dom.hasContent', function () {
     fixture.innerHTML = '<div id="target" aria-label="my-label">  </div>';
     tree = axe.utils.getFlattenedTree(fixture);
     assert.isTrue(
-      hasContent(axe.utils.querySelectorAll(tree, '#target')[0])
+      hasContentVirtual(axe.utils.querySelectorAll(tree, '#target')[0])
     );
   });
 
@@ -42,7 +42,7 @@ describe('dom.hasContent', function () {
     fixture.innerHTML = '<div id="target"> <img src=""> </div>';
     tree = axe.utils.getFlattenedTree(fixture);
     assert.isTrue(
-      hasContent(axe.utils.querySelectorAll(tree, '#target')[0])
+      hasContentVirtual(axe.utils.querySelectorAll(tree, '#target')[0])
     );
   });
 
@@ -50,38 +50,34 @@ describe('dom.hasContent', function () {
     fixture.innerHTML = '<div id="target"> <span aria-label="my-label"></span> </div>';
     tree = axe.utils.getFlattenedTree(fixture);
     assert.isTrue(
-      hasContent(axe.utils.querySelectorAll(tree, '#target')[0])
+      hasContentVirtual(axe.utils.querySelectorAll(tree, '#target')[0])
     );
   });
 
-  it('accepts DOM Nodes and virtual nodes', function () {
-    fixture.innerHTML = '<div id="target"> text </div>';
-    axe._tree = axe.utils.getFlattenedTree(fixture);
-
-    // Virtual node
-    assert.isTrue(
-      hasContent(axe.utils.querySelectorAll(axe._tree, '#target')[0])
-    );
-    // DOM node
-    assert.isTrue(
-      hasContent(fixture.querySelector('#target'))
-    );
-    axe._tree = null;
-  });
-
   it('is false if the element does not show text', function () {
     fixture.innerHTML = '<style id="target"> #foo { color: green } </style>';
     tree = axe.utils.getFlattenedTree(fixture);
     assert.isFalse(
-      hasContent(axe.utils.querySelectorAll(tree, '#target')[0])
+      hasContentVirtual(axe.utils.querySelectorAll(tree, '#target')[0])
     );
   });
 
+  it('is called through hasContent, with a DOM node', function () {
+    var hasContent = axe.commons.dom.hasContent;
+    fixture.innerHTML = '<div id="target"> text </div>';
+    axe._tree = axe.utils.getFlattenedTree(fixture);
+    assert.isTrue(hasContent(fixture.querySelector('#target')));
+
+    fixture.innerHTML = '<div id="target"></div>';
+    axe._tree = axe.utils.getFlattenedTree(fixture);
+    assert.isFalse(hasContent(fixture.querySelector('#target')));
+  });
+
   it('is false if noRecursion is true and the content is not in a child', function () {
     fixture.innerHTML = '<div id="target"><span> text </span></div>';
     tree = axe.utils.getFlattenedTree(fixture);
 
-    assert.isFalse(hasContent(axe.utils.querySelectorAll(tree, '#target')[0], true));
+    assert.isFalse(hasContentVirtual(axe.utils.querySelectorAll(tree, '#target')[0], true));
   });
 
   (shadowSupport ? it : xit)('looks at content of shadow dom elements', function () {
@@ -91,7 +87,7 @@ describe('dom.hasContent', function () {
     tree = axe.utils.getFlattenedTree(fixture);
 
     assert.isTrue(
-      hasContent(axe.utils.querySelectorAll(tree, '#target')[0])
+      hasContentVirtual(axe.utils.querySelectorAll(tree, '#target')[0])
     );
   });
 
@@ -100,11 +96,9 @@ describe('dom.hasContent', function () {
     var shadow = fixture.querySelector('#shadow').attachShadow({ mode: 'open' });
     shadow.innerHTML = '<div class="target"><slot></slot></div>';
     tree = axe.utils.getFlattenedTree(fixture);
-    var node = axe.utils.querySelectorAll(tree, '.target');
 
-    axe.log(tree, node);
     assert.isTrue(
-      hasContent(axe.utils.querySelectorAll(tree, '.target')[0])
+      hasContentVirtual(axe.utils.querySelectorAll(tree, '.target')[0])
     );
   });
 });
diff --git a/test/commons/dom/is-offscreen.js b/test/commons/dom/is-offscreen.js
index b43bff763e..0479a03461 100644
--- a/test/commons/dom/is-offscreen.js
+++ b/test/commons/dom/is-offscreen.js
@@ -1,6 +1,7 @@
 describe('dom.isOffscreen', function () {
 	'use strict';
 	var fixture = document.getElementById('fixture');
+	var shadowSupport = axe.testUtils.shadowSupport;
 
 	afterEach(function () {
 		fixture.innerHTML = '';
@@ -82,8 +83,8 @@ describe('dom.isOffscreen', function () {
 		var el = document.getElementById('target');
 
 		assert.isTrue(axe.commons.dom.isOffscreen(el));
-
 	});
+
 	it('should NOT detect elements positioned outside the right edge on LTR documents', function () {
 		fixture.innerHTML = '<div id="target" style="position: absolute; width: 50px; right: -51px;">Offscreen?</div>';
 		var el = document.getElementById('target');
@@ -91,8 +92,6 @@ describe('dom.isOffscreen', function () {
 		assert.isFalse(axe.commons.dom.isOffscreen(el));
 	});
 
-
-
 	it('should detect elements positioned outside the right edge on RTL documents', function () {
 		document.body.style.direction = 'rtl';
 		fixture.innerHTML = '<div id="target" style="position: absolute; width: 50px; right: -151px;">Offscreen?</div>';
@@ -100,6 +99,7 @@ describe('dom.isOffscreen', function () {
 
 		assert.isTrue(axe.commons.dom.isOffscreen(el));
 	});
+
 	it('should NOT detect elements positioned outside the left edge on RTL documents', function () {
 		document.body.style.direction = 'rtl';
 		fixture.innerHTML = '<div id="target" style="position: absolute; width: 50px; left: -51px;">Offscreen?</div>';
@@ -107,6 +107,7 @@ describe('dom.isOffscreen', function () {
 
 		assert.isFalse(axe.commons.dom.isOffscreen(el));
 	});
+
 	it('should not detect elements positioned because of a scroll', function () {
 		fixture.innerHTML = '<div id="scrollable" style="max-height:20px;overflow:scroll">' +
 				'<div id="visible">goobye</div>' +
@@ -119,4 +120,23 @@ describe('dom.isOffscreen', function () {
 		scrollme.scrollIntoView();
 		assert.isFalse(axe.commons.dom.isOffscreen(viz));		
 	});
+
+	(shadowSupport.v1 ? it : xit)('should detect on screen shadow nodes', function () {
+		fixture.innerHTML = '<div></div>';
+		var shadow = fixture.querySelector('div').attachShadow({ mode: 'open' });
+		shadow.innerHTML = '<div id="target">Offscreen?</div>';
+
+		var el = shadow.querySelector('#target');
+		assert.isFalse(axe.commons.dom.isOffscreen(el));
+	});
+
+	(shadowSupport.v1 ? it : xit)('should detect off screen shadow nodes', function () {
+		fixture.innerHTML = '<div></div>';
+		var shadow = fixture.querySelector('div').attachShadow({ mode: 'open' });
+		shadow.innerHTML = '<div id="target" style="position: absolute; height: 50px; top: -51px;">Offscreen?</div>';
+
+		var el = shadow.querySelector('#target');
+		assert.isTrue(axe.commons.dom.isOffscreen(el));
+	});
+
 });
diff --git a/test/commons/text/label.js b/test/commons/text/label-virtual.js
similarity index 78%
rename from test/commons/text/label.js
rename to test/commons/text/label-virtual.js
index 66fec2895d..c6283ea363 100644
--- a/test/commons/text/label.js
+++ b/test/commons/text/label-virtual.js
@@ -1,4 +1,4 @@
-describe('text.label', function () {
+describe('text.labelVirtual', function () {
 	'use strict';
 
 	var fixture = document.getElementById('fixture');
@@ -6,6 +6,15 @@ describe('text.label', function () {
 		fixture.innerHTML = '';
 	});
 
+	it('is called from text.label', function () {
+		fixture.innerHTML = '<div id="monkeys">monkeys</div><div id="bananas">bananas</div>' +
+			'<input id="target" aria-labelledby="monkeys bananas">';
+
+		axe._tree = axe.utils.getFlattenedTree(document.body);
+		var target = fixture.querySelector('#target');
+		assert.equal(axe.commons.text.label(target), 'monkeys bananas');
+	});
+
 	describe('aria-labelledby', function () {
 		it('should join text with a single space', function () {
 			fixture.innerHTML = '<div id="monkeys">monkeys</div><div id="bananas">bananas</div>' +
@@ -13,7 +22,7 @@ describe('text.label', function () {
 
 			var tree = axe._tree = axe.utils.getFlattenedTree(document.body);
 			var target = axe.utils.querySelectorAll(tree, '#target')[0];
-			assert.equal(axe.commons.text.label(target), 'monkeys bananas');
+			assert.equal(axe.commons.text.labelVirtual(target), 'monkeys bananas');
 		});
 
 		it('should filter invisible elements', function () {
@@ -22,7 +31,7 @@ describe('text.label', function () {
 
 			var tree = axe._tree = axe.utils.getFlattenedTree(document.body);
 			var target = axe.utils.querySelectorAll(tree, '#target')[0];
-			assert.equal(axe.commons.text.label(target), 'monkeys');
+			assert.equal(axe.commons.text.labelVirtual(target), 'monkeys');
 		});
 
 		it('should take precedence over aria-label', function () {
@@ -31,7 +40,7 @@ describe('text.label', function () {
 
 			var tree = axe._tree = axe.utils.getFlattenedTree(document.body);
 			var target = axe.utils.querySelectorAll(tree, '#target')[0];
-			assert.equal(axe.commons.text.label(target), 'monkeys bananas');
+			assert.equal(axe.commons.text.labelVirtual(target), 'monkeys bananas');
 		});
 
 		it('should take precedence over explicit labels', function () {
@@ -41,7 +50,7 @@ describe('text.label', function () {
 
 			var tree = axe._tree = axe.utils.getFlattenedTree(document.body);
 			var target = axe.utils.querySelectorAll(tree, '#target')[0];
-			assert.equal(axe.commons.text.label(target), 'monkeys bananas');
+			assert.equal(axe.commons.text.labelVirtual(target), 'monkeys bananas');
 		});
 
 		it('should take precedence over implicit labels', function () {
@@ -51,7 +60,7 @@ describe('text.label', function () {
 
 			var tree = axe._tree = axe.utils.getFlattenedTree(document.body);
 			var target = axe.utils.querySelectorAll(tree, '#target')[0];
-			assert.equal(axe.commons.text.label(target), 'monkeys bananas');
+			assert.equal(axe.commons.text.labelVirtual(target), 'monkeys bananas');
 		});
 
 		it('should ignore whitespace only labels', function () {
@@ -60,7 +69,7 @@ describe('text.label', function () {
 
 			var tree = axe._tree = axe.utils.getFlattenedTree(document.body);
 			var target = axe.utils.querySelectorAll(tree, '#target')[0];
-			assert.isNull(axe.commons.text.label(target));
+			assert.isNull(axe.commons.text.labelVirtual(target));
 		});
 	});
 
@@ -70,7 +79,7 @@ describe('text.label', function () {
 
 			var tree = axe._tree = axe.utils.getFlattenedTree(document.body);
 			var target = axe.utils.querySelectorAll(tree, '#target')[0];
-			assert.equal(axe.commons.text.label(target), 'monkeys');
+			assert.equal(axe.commons.text.labelVirtual(target), 'monkeys');
 		});
 
 		it('should ignore whitespace only labels', function () {
@@ -78,7 +87,7 @@ describe('text.label', function () {
 
 			var tree = axe._tree = axe.utils.getFlattenedTree(document.body);
 			var target = axe.utils.querySelectorAll(tree, '#target')[0];
-			assert.isNull(axe.commons.text.label(target));
+			assert.isNull(axe.commons.text.labelVirtual(target));
 		});
 
 		it('should take precedence over explicit labels', function () {
@@ -87,7 +96,7 @@ describe('text.label', function () {
 
 			var tree = axe._tree = axe.utils.getFlattenedTree(document.body);
 			var target = axe.utils.querySelectorAll(tree, '#target')[0];
-			assert.equal(axe.commons.text.label(target), 'monkeys');
+			assert.equal(axe.commons.text.labelVirtual(target), 'monkeys');
 		});
 
 		it('should take precedence over implicit labels', function () {
@@ -96,7 +105,7 @@ describe('text.label', function () {
 
 			var tree = axe._tree = axe.utils.getFlattenedTree(document.body);
 			var target = axe.utils.querySelectorAll(tree, '#target')[0];
-			assert.equal(axe.commons.text.label(target), 'monkeys');
+			assert.equal(axe.commons.text.labelVirtual(target), 'monkeys');
 		});
 	});
 
@@ -107,7 +116,7 @@ describe('text.label', function () {
 
 			var tree = axe._tree = axe.utils.getFlattenedTree(document.body);
 			var target = axe.utils.querySelectorAll(tree, '#target')[0];
-			assert.equal(axe.commons.text.label(target), 'monkeys');
+			assert.equal(axe.commons.text.labelVirtual(target), 'monkeys');
 		});
 
 		it('should ignore whitespace only or empty labels', function () {
@@ -116,7 +125,7 @@ describe('text.label', function () {
 
 			var tree = axe._tree = axe.utils.getFlattenedTree(document.body);
 			var target = axe.utils.querySelectorAll(tree, '#target')[0];
-			assert.isNull(axe.commons.text.label(target));
+			assert.isNull(axe.commons.text.labelVirtual(target));
 		});
 
 		it('should take precedence over implicit labels', function () {
@@ -126,7 +135,7 @@ describe('text.label', function () {
 
 			var tree = axe._tree = axe.utils.getFlattenedTree(document.body);
 			var target = axe.utils.querySelectorAll(tree, '#target')[0];
-			assert.equal(axe.commons.text.label(target), 'monkeys');
+			assert.equal(axe.commons.text.labelVirtual(target), 'monkeys');
 
 		});
 	});
@@ -138,7 +147,7 @@ describe('text.label', function () {
 
 			var tree = axe._tree = axe.utils.getFlattenedTree(document.body);
 			var target = axe.utils.querySelectorAll(tree, '#target')[0];
-			assert.equal(axe.commons.text.label(target), 'monkeys');
+			assert.equal(axe.commons.text.labelVirtual(target), 'monkeys');
 		});
 
 		it('should ignore whitespace only or empty labels', function () {
@@ -147,7 +156,7 @@ describe('text.label', function () {
 
 			var tree = axe._tree = axe.utils.getFlattenedTree(document.body);
 			var target = axe.utils.querySelectorAll(tree, '#target')[0];
-			assert.isNull(axe.commons.text.label(target));
+			assert.isNull(axe.commons.text.labelVirtual(target));
 		});
 	});
 });
diff --git a/test/commons/text/visible.js b/test/commons/text/visible-virtual.js
similarity index 79%
rename from test/commons/text/visible.js
rename to test/commons/text/visible-virtual.js
index 11b46d79bb..a948d69507 100644
--- a/test/commons/text/visible.js
+++ b/test/commons/text/visible-virtual.js
@@ -3,6 +3,7 @@ describe('text.visible', function () {
 
 	var fixture = document.getElementById('fixture');
 	var shadowSupported = axe.testUtils.shadowSupport.v1;
+	var visibleVirtual = axe.commons.text.visibleVirtual;
 
 	afterEach(function () {
 		document.getElementById('fixture').innerHTML = '';
@@ -12,25 +13,25 @@ describe('text.visible', function () {
 		it('should not return elements with visibility: hidden', function () {
 			fixture.innerHTML = 'Hello<span style="visibility: hidden;">Hi</span>';
 			var tree = axe.utils.getFlattenedTree(fixture);
-			assert.equal(axe.commons.text.visible(tree[0]), 'Hello');
+			assert.equal(visibleVirtual(tree[0]), 'Hello');
 		});
 
 		it('should handle implicitly recursive calls', function () {
 			fixture.innerHTML = 'Hello<span><span>Hi</span></span>';
 			var tree = axe.utils.getFlattenedTree(fixture);
-			assert.equal(axe.commons.text.visible(tree[0]), 'HelloHi');
+			assert.equal(visibleVirtual(tree[0]), 'HelloHi');
 		});
 
 		it('should handle explicitly recursive calls', function () {
 			fixture.innerHTML = 'Hello<span><span>Hi</span></span>';
 			var tree = axe.utils.getFlattenedTree(fixture);
-			assert.equal(axe.commons.text.visible(tree[0], null, false), 'HelloHi');
+			assert.equal(visibleVirtual(tree[0], null, false), 'HelloHi');
 		});
 
 		it('should handle non-recursive calls', function () {
 			fixture.innerHTML = 'Hello<span><span>Hi</span></span>';
 			var tree = axe.utils.getFlattenedTree(fixture);
-			assert.equal(axe.commons.text.visible(tree[0], null, true), 'Hello');
+			assert.equal(visibleVirtual(tree[0], null, true), 'Hello');
 		});
 
 		it('should know how visibility works', function () {
@@ -39,20 +40,20 @@ describe('text.visible', function () {
 				'</span>';
 
 			var tree = axe.utils.getFlattenedTree(fixture);
-			assert.equal(axe.commons.text.visible(tree[0]), 'Hello Hi');
+			assert.equal(visibleVirtual(tree[0]), 'Hello Hi');
 		});
 
 		it('should not return elements with display: none', function () {
 			fixture.innerHTML = 'Hello<span style="display: none;"><span>Hi</span></span>';
 
 			var tree = axe.utils.getFlattenedTree(fixture);
-			assert.equal(axe.commons.text.visible(tree[0]), 'Hello');
+			assert.equal(visibleVirtual(tree[0]), 'Hello');
 		});
 
 		it('should trim the result', function () {
 			fixture.innerHTML = '   &nbsp;\u00A0    Hello  &nbsp;\r\n   Hi     \n \n &nbsp; \n   ';
 			var tree = axe.utils.getFlattenedTree(fixture);
-			assert.equal(axe.commons.text.visible(tree[0]), 'Hello Hi');
+			assert.equal(visibleVirtual(tree[0]), 'Hello Hi');
 		});
 
 		it('should ignore script and style tags', function () {
@@ -60,17 +61,16 @@ describe('text.visible', function () {
 				'Hello';
 
 			var tree = axe.utils.getFlattenedTree(fixture);
-			assert.equal(axe.commons.text.visible(tree[0]), 'Hello');
+			assert.equal(visibleVirtual(tree[0]), 'Hello');
 		});
 
-
 		it('should not take into account position of parents', function () {
 			fixture.innerHTML = '<div style="position: absolute; top: -9999px;">' +
 					'<div style="position: absolute; top: 10000px;">Hello</div>' +
 				'</div>';
 
 			var tree = axe.utils.getFlattenedTree(fixture);
-			assert.equal(axe.commons.text.visible(tree[0]), 'Hello');
+			assert.equal(visibleVirtual(tree[0]), 'Hello');
 		});
 
 		it('should correctly handle slotted elements', function () {
@@ -89,7 +89,7 @@ describe('text.visible', function () {
 				fixture.innerHTML = '<div><a>hello</a></div>';
 				makeShadowTree(fixture.firstChild);
 				var tree = axe.utils.getFlattenedTree(fixture.firstChild);
-				assert.equal(axe.commons.text.visible(tree[0]), 'Stuffhello');
+				assert.equal(visibleVirtual(tree[0]), 'Stuffhello');
 			}
 		});
 	});
@@ -99,7 +99,7 @@ describe('text.visible', function () {
 			fixture.innerHTML = 'Hello<span style="visibility: hidden;">Hi</span>';
 
 			var tree = axe.utils.getFlattenedTree(fixture);
-			assert.equal(axe.commons.text.visible(tree[0], true), 'Hello');
+			assert.equal(visibleVirtual(tree[0], true), 'Hello');
 		});
 
 		it('should know how visibility works', function () {
@@ -108,21 +108,20 @@ describe('text.visible', function () {
 				'</span>';
 
 			var tree = axe.utils.getFlattenedTree(fixture);
-			assert.equal(axe.commons.text.visible(tree[0], true), 'Hello Hi');
+			assert.equal(visibleVirtual(tree[0], true), 'Hello Hi');
 		});
 
-
 		it('should not return elements with display: none', function () {
 			fixture.innerHTML = 'Hello<span style="display: none;"><span>Hi</span></span>';
 
 			var tree = axe.utils.getFlattenedTree(fixture);
-			assert.equal(axe.commons.text.visible(tree[0], true), 'Hello');
+			assert.equal(visibleVirtual(tree[0], true), 'Hello');
 		});
 
 		it('should trim the result', function () {
 			fixture.innerHTML = '   &nbsp;\u00A0    Hello  &nbsp;\r\n   Hi     \n \n &nbsp; \n   ';
 			var tree = axe.utils.getFlattenedTree(fixture);
-			assert.equal(axe.commons.text.visible(tree[0], true), 'Hello Hi');
+			assert.equal(visibleVirtual(tree[0], true), 'Hello Hi');
 		});
 
 		it('should ignore script and style tags', function () {
@@ -130,30 +129,26 @@ describe('text.visible', function () {
 				'Hello';
 
 			var tree = axe.utils.getFlattenedTree(fixture);
-			assert.equal(axe.commons.text.visible(tree[0], true), 'Hello');
+			assert.equal(visibleVirtual(tree[0], true), 'Hello');
 		});
 
-
 		it('should not consider offscreen text as hidden (position)', function () {
 			fixture.innerHTML = '<div style="position: absolute; top: -9999px;">' +
 					'<div>Hello</div>' +
 				'</div>';
 
 			var tree = axe.utils.getFlattenedTree(fixture);
-			assert.equal(axe.commons.text.visible(tree[0], true), 'Hello');
+			assert.equal(visibleVirtual(tree[0], true), 'Hello');
 
 		});
 
-
 		it('should not consider offscreen text as hidden (text-indent)', function () {
 			fixture.innerHTML = '<div style="text-indent: -9999px;">' +
 					'Hello</div>';
 
 			var tree = axe.utils.getFlattenedTree(fixture);
-			assert.equal(axe.commons.text.visible(tree[0], true), 'Hello');
-
+			assert.equal(visibleVirtual(tree[0], true), 'Hello');
 		});
 	});
 
-
 });

From ebb2a5d545fae5f309dbc1efa2780e89d29e6597 Mon Sep 17 00:00:00 2001
From: Wilco Fiers <WilcoFiers@users.noreply.github.com>
Date: Mon, 7 Aug 2017 17:47:13 +0200
Subject: [PATCH 107/142] feat(aria): Support progressive ARIA 1.1 attributes /
 roles (#468)

Add support for role=feed, role=term, aria-placeholder, aria-modal,
aria-current, aria-keyshortcuts
---
 lib/commons/aria/index.js | 58 +++++++++++++++++++++++++++++++--------
 1 file changed, 46 insertions(+), 12 deletions(-)

diff --git a/lib/commons/aria/index.js b/lib/commons/aria/index.js
index 5805de6747..3a67810fe3 100644
--- a/lib/commons/aria/index.js
+++ b/lib/commons/aria/index.js
@@ -71,6 +71,9 @@ lookupTables.attributes = {
 		type: 'nmtoken',
 		values: ['true', 'false', 'spelling', 'grammar']
 	},
+	'aria-keyshortcuts': {
+		type: 'string'
+	},
 	'aria-label': {
 		type: 'string'
 	},
@@ -84,6 +87,10 @@ lookupTables.attributes = {
 		type: 'nmtoken',
 		values: ['off', 'polite', 'assertive']
 	},
+	'aria-modal': {
+		type: 'boolean',
+		values: ['true', 'false']
+	},
 	'aria-multiline': {
 		type: 'boolean',
 		values: ['true', 'false']
@@ -99,6 +106,9 @@ lookupTables.attributes = {
 	'aria-owns': {
 		type: 'idrefs'
 	},
+	'aria-placeholder': {
+		type: 'string'
+	},
 	'aria-posinset': {
 		type: 'int'
 	},
@@ -155,7 +165,7 @@ lookupTables.attributes = {
 lookupTables.globalAttributes = [
 	'aria-atomic', 'aria-busy', 'aria-controls', 'aria-current', 'aria-describedby',
 	'aria-disabled', 'aria-dropeffect', 'aria-flowto', 'aria-grabbed',
-	'aria-haspopup', 'aria-hidden', 'aria-invalid', 'aria-label',
+	'aria-haspopup', 'aria-hidden', 'aria-invalid', 'aria-keyshortcuts', 'aria-label',
 	'aria-labelledby', 'aria-live', 'aria-owns', 'aria-relevant'
 ];
 
@@ -172,7 +182,7 @@ lookupTables.role = {
 	'alertdialog': {
 		type: 'widget',
 		attributes: {
-			allowed: ['aria-expanded']
+			allowed: ['aria-expanded', 'aria-modal']
 		},
 		owned: null,
 		nameFrom: ['author'],
@@ -240,7 +250,8 @@ lookupTables.role = {
 	'columnheader': {
 		type: 'structure',
 		attributes: {
-			allowed: ['aria-expanded', 'aria-sort', 'aria-readonly', 'aria-selected', 'aria-required']
+			allowed: ['aria-colindex', 'aria-colspan', 'aria-expanded', 'aria-rowindex', 'aria-rowspan', 
+				'aria-required', 'aria-readonly', 'aria-selected', 'aria-sort']
 		},
 		owned: null,
 		nameFrom: ['author', 'contents'],
@@ -294,12 +305,12 @@ lookupTables.role = {
 		owned: null,
 		nameFrom: ['author'],
 		context: null,
-		implicit: ['dd']
+		implicit: ['dd', 'dfn']
 	},
 	'dialog': {
 		type: 'widget',
 		attributes: {
-			allowed: ['aria-expanded']
+			allowed: ['aria-expanded', 'aria-modal']
 		},
 		owned: null,
 		nameFrom: ['author'],
@@ -325,6 +336,17 @@ lookupTables.role = {
 		context: null,
 		implicit: ['body']
 	},
+	'feed': {
+		type: 'structure',
+		attributes: {
+			allowed: ['aria-expanded']
+		},
+		owned: { 
+			one: ['article']
+		},
+		nameFrom: ['author'],
+		context: null
+	},
 	'form': {
 		type: 'landmark',
 		attributes: {
@@ -350,7 +372,8 @@ lookupTables.role = {
 	'gridcell': {
 		type: 'widget',
 		attributes: {
-			allowed: ['aria-selected', 'aria-readonly', 'aria-expanded', 'aria-required']
+			allowed: ['aria-colindex', 'aria-colspan', 'aria-expanded', 'aria-rowindex', 
+				'aria-rowspan', 'aria-selected', 'aria-readonly', 'aria-required']
 		},
 		owned: null,
 		nameFrom: ['author', 'contents'],
@@ -620,7 +643,7 @@ lookupTables.role = {
 	'row': {
 		type: 'structure',
 		attributes: {
-			allowed: ['aria-level', 'aria-selected', 'aria-activedescendant', 'aria-expanded']
+			allowed: ['aria-activedescendant', 'aria-colcount', 'aria-expanded', 'aria-level', 'aria-selected', 'aria-rowcount']
 		},
 		owned: {
 			one: ['cell', 'columnheader', 'rowheader', 'gridcell']
@@ -644,7 +667,8 @@ lookupTables.role = {
 	'rowheader': {
 		type: 'structure',
 		attributes: {
-			allowed: ['aria-sort', 'aria-required', 'aria-readonly', 'aria-expanded', 'aria-selected']
+			allowed: ['aria-colindex', 'aria-colspan', 'aria-expanded', 'aria-rowindex', 'aria-rowspan', 
+				'aria-required', 'aria-readonly', 'aria-selected', 'aria-sort']
 		},
 		owned: null,
 		nameFrom: ['author', 'contents'],
@@ -673,7 +697,7 @@ lookupTables.role = {
 	'searchbox': {
 		type: 'widget',
 		attributes: {
-			allowed: ['aria-activedescendant', 'aria-autocomplete', 'aria-multiline', 'aria-readonly', 'aria-required']
+			allowed: ['aria-activedescendant', 'aria-autocomplete', 'aria-multiline', 'aria-readonly', 'aria-required', 'aria-placeholder']
 		},
 		owned: null,
 		nameFrom: ['author'],
@@ -787,6 +811,16 @@ lookupTables.role = {
 		nameFrom: ['author'],
 		context: null
 	},
+	'term': {
+		type: 'structure',
+		attributes: {
+			allowed: ['aria-expanded']
+		},
+		owned: null,
+		nameFrom: ['author', 'contents'],
+		context: null,
+		implicit: ['dt']
+	},
 	'text': {
 		type: 'structure',
 		owned: null,
@@ -796,7 +830,7 @@ lookupTables.role = {
 	'textbox': {
 		type: 'widget',
 		attributes: {
-			allowed: ['aria-activedescendant', 'aria-autocomplete', 'aria-multiline', 'aria-readonly', 'aria-required']
+			allowed: ['aria-activedescendant', 'aria-autocomplete', 'aria-multiline', 'aria-readonly', 'aria-required', 'aria-placeholder']
 		},
 		owned: null,
 		nameFrom: ['author'],
@@ -847,8 +881,8 @@ lookupTables.role = {
 	'treegrid': {
 		type: 'composite',
 		attributes: {
-			allowed: ['aria-activedescendant', 'aria-expanded', 'aria-level', 'aria-multiselectable',
-				'aria-readonly', 'aria-required']
+			allowed: ['aria-activedescendant', 'aria-colcount', 'aria-expanded', 'aria-level', 'aria-multiselectable',
+				'aria-readonly', 'aria-required', 'aria-rowcount']
 		},
 		owned: {
 			all: ['treeitem']

From 57ccbbd6fdd9245a34132cbd201e130e30a66893 Mon Sep 17 00:00:00 2001
From: Marcy Sutton <holla@marcysutton.com>
Date: Tue, 8 Aug 2017 14:34:09 -0700
Subject: [PATCH 108/142] Shadow DOM docs (#471)

* docs(API): change mentions of a11yCheck to axe.run

* docs: add Shadow DOM documentation

Closes https://github.com/dequelabs/axe-core/issues/401

* feat: add missing accessibleTextVirtual method

Closes https://github.com/dequelabs/axe-core/issues/472

* docs: document testUtils and a few commons

* docs: move core/test APIs to developer guide
---
 CONTRIBUTING.md                               |   7 +
 doc/API.md                                    |  96 ++++++-
 doc/developer-guide.md                        | 267 +++++++++++++++++-
 lib/checks/label/duplicate-img-label.js       |   2 +-
 ...ble-text.js => accessible-text-virtual.js} |   7 +-
 lib/core/utils/flattened-tree.js              |  12 +-
 test/commons/text/accessible-text.js          | 210 +++++++-------
 test/testutils.js                             |  20 ++
 8 files changed, 505 insertions(+), 116 deletions(-)
 rename lib/commons/text/{accessible-text.js => accessible-text-virtual.js} (95%)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 0fd3b4b33e..1e5a0b49d0 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -28,6 +28,13 @@ That having been said, we prefer:
 5. Use of 'use strict'
 6. Variables declared at the top of functions
 
+### Shadow DOM
+
+For any proposed changes to rules, checks, commons, or other APIs to be accepted
+in axe-core,your code must support Shadow DOM. See [API.md](./doc/API.md) and the
+[developer guide](./doc/developer-guide.md) for documentation on the available methods
+and test utilities.
+
 ### Testing
 
 We expect all code to be 100% covered by tests. We don't have or want code coverage metrics but we will review tests and suggest changes when we think the test(s) do(es) not adequately exercise the code/code changes.
diff --git a/doc/API.md b/doc/API.md
index d641edc1e9..bb7efc8eda 100644
--- a/doc/API.md
+++ b/doc/API.md
@@ -21,7 +21,10 @@
 	1. [API Name: axe.registerPlugin](#api-name-axeregisterplugin)
 	1. [API Name: axe.cleanup](#api-name-axecleanup)
 	1. [API Name: axe.a11yCheck](#api-name-axea11ycheck)
-1. [Section 3: Example Reference](#section-3-example-reference)
+	1. [Virtual DOM Utilities](#virtual-dom-utilities)
+		1. [API Name: axe.utils.querySelectorAll](#api-name-axeutilsqueryselectorall)
+	1. [Common Functions](#common-functions)
+1. [Section 3: Example Reference](#section-5-example-reference)
 
 ## Section 1: Introduction
 
@@ -450,7 +453,7 @@ This will either be null or an object which is an instance of Error. If you are
 
 #### Results Object
 
-The callback function passed in as the third parameter of `axe.a11yCheck` runs on the results object. This object has four components – a `passes` array, a `violations` array, an `incomplete` array and an `inapplicable` array.
+The callback function passed in as the third parameter of `axe.run` runs on the results object. This object has four components – a `passes` array, a `violations` array, an `incomplete` array and an `inapplicable` array.
 
 The `passes` array keeps track of all the passed tests, along with detailed information on each one. This leads to more efficient testing, especially when used in conjunction with manual testing, as the user can easily find out what tests have already been passed.
 
@@ -483,7 +486,7 @@ Each object returned in these arrays have the following properties:
 * `helpUrl` - URL that provides more information about the specifics of the violation. Links to a page on the Deque University site.
 * `id` - Unique identifier for the rule; [see the list of rules](rule-descriptions.md)
 * `impact` - How serious the violation is. Can be one of "minor", "moderate", "serious", or "critical" if the Rule failed or `null` if the check passed
-* `tags` - Array of tags that this rule is assigned. These tags can be used in the option structure to select which rules are run ([see `axe.a11yCheck` parameters below for more information](#a11ycheck-parameters)).
+* `tags` - Array of tags that this rule is assigned. These tags can be used in the option structure to select which rules are run ([see `axe.run` parameters for more information](#parameters-axerun)).
 * `nodes` - Array of all elements the Rule tested
 	* `html` - Snippet of HTML of the Element
 	* `impact` - How serious the violation is. Can be one of "minor", "moderate", "serious", or "critical" if the test failed or `null` if the check passed
@@ -608,6 +611,93 @@ In axe-core v1 the main method for axe was `axe.a11yCheck()`. This method was re
 - .a11yCheck requires a context object, and so will not fall back to the document root.
 - .a11yCheck does not return a Promise.
 
+### Virtual DOM Utilities
+
+Note: If you’re writing rules or checks, you’ll have both the `node` and `virtualNode` passed in.
+But if you need to query the flattened tree, the documented function below should help. See the
+[developer guide](./developer-guide.md) for more information.
+
+#### API Name: axe.utils.querySelectorAll
+
+##### Description
+
+A querySelectorAll implementation that works on the virtual DOM and Shadow DOM by manually walking the flattened tree instead of relying on DOM API methods which don’t step into Shadow DOM.
+
+Note: while there is no `axe.utils.querySelector` method, you can reproduce that behavior by accessing the first item returned in the array.
+
+##### Synopsis
+
+```javascript
+axe.utils.querySelectorAll(virtualNode, 'a[href]');
+```
+
+##### Parameters
+
+* `virtualNode` – object, the flattened DOM tree to query against. `axe._tree` is available for this purpose during an audit; see below.
+* `selector` – string, the CSS selector to use as a filter. For the most part, this should work seamlessly with `document.querySelectorAll`.
+
+##### Returns
+
+An Array of filtered HTML nodes.
+
+
+### Common Functions
+
+#### axe.commons.dom.getComposedParent
+
+Get an element's parent in the flattened tree
+
+##### Synopsis
+
+```javascript
+axe.commons.dom.getComposedParent(node)
+```
+
+##### Parameters
+* `element` – HTMLElement. The element for which you want to find a parent
+
+##### Returns
+
+A DOMNode for the parent
+
+
+#### axe.commons.dom.getRootNode
+
+Return the document or document fragment (shadow DOM)
+
+##### Synopsis
+
+```javascript
+axe.commons.dom.getRootNode(node)
+```
+
+##### Parameters
+* `element` – HTMLElement. The element for which you want to find the root node
+
+##### Returns
+
+The top-level document or shadow DOM document fragment
+
+
+#### axe.commons.dom.findUp
+
+Recusively walk up the DOM, checking for a node which matches a selector. Warning: this should be used sparingly for performance reasons.
+
+##### Synopsis
+
+```javascript
+axe.commons.dom.findUp(node, '.selector')
+```
+
+##### Parameters
+* `element` – HTMLElement. The starting element
+* `selector` – String. The target selector for the HTMLElement
+
+##### Returns
+
+Either the matching HTMLElement or `null` if there was no match.
+
+
 ## Section 3: Example Reference
 
 This package contains examples for [jasmine](examples/jasmine), [mocha](examples/mocha), [phantomjs](examples/phantomjs), [qunit](examples/qunit), [selenium using javascript](examples/selenium), and [generating HTML from the violations array](examples/html-handlebars.md). Each of these examples is in the [doc/examples](examples) folder. In each folder, there is a README.md file which contains specific information about each example.
diff --git a/doc/developer-guide.md b/doc/developer-guide.md
index 6d8da87670..7e0125af99 100644
--- a/doc/developer-guide.md
+++ b/doc/developer-guide.md
@@ -2,6 +2,22 @@
 
 aXe runs a series of tests to check for accessibility of content and functionality on a website. A test is made up of a series of Rules which are, themselves, made up of Checks. aXe executes these Rules asynchronously and, when the Rules are finished running, runs a callback function which is passed a Result structure. Since some Rules run on the page level while others do not, tests will also run in one of two ways. If a document is specified, the page level rules will run, otherwise they will not.
 
+1. [Getting Started](#getting-started)
+1. [Architecture Overview](#architecture-overview)
+	1. [Rules](#rules)
+	1. [Checks](#checks)
+	1. [Common Functions](#common-functions)
+	1. [Virtual Nodes](#virtual-nodes)
+	1. [Core Utilities](#core-utilities)
+1. [Virtual DOM APIs](#virtual-dom-apis)
+	1. [API Name: axe.utils.getFlattenedTree](#api-name-axeutilsgetflattenedtree)
+	1. [API Name: axe.utils.getNodeFromTree](#api-name-axeutilsgetnodefromtree)
+1. [Test Utilities](#test-utilities)
+	1. [Test Util Name: axe.testUtils.MockCheckContext](#test-util-name-axetestutilsmockcheckcontext)
+	1. [Test Util Name: axe.testUtils.shadowSupport](#test-util-name-axetestutilsshadowsupport)
+	1. [Test Util Name: axe.testUtils.fixtureSetup](#test-util-name-axetestutilsfixturesetup)
+	1. [Test Util Name: axe.testUtils.checkSetup](#test-util-name-axetestutilschecksetup)
+
 ## Getting Started
 
 ### Environment Pre-requisites
@@ -16,9 +32,9 @@ To build axe.js, simply run `grunt build`.  axe.js and axe.min.js are placed int
 
 ### Running Tests
 
-To run all tests from the command line you can run `grunt test`, which will run all unit and integration tests using PhantomJS.
+To run all tests from the command line you can run `grunt test`, which will run all unit and integration tests using PhantomJS and Selenium Webdriver.
 
-You can also load tests in any supported browser, which is helpful for debugging.  Tests require a local server to run, you must first start a local server to serve files.  You can use Grunt to start one by running `grunt connect watch`.  Once your local server is running you can load the following pages in any browser to run tests:
+You can also load tests in any supported browser, which is helpful for debugging.  Tests require a local server to run, you must first start a local server to serve files.  You can use Grunt to start one by running `grunt dev`.  Once your local server is running you can load the following pages in any browser to run tests:
 
 
 1.  [Core Tests](../test/core/)
@@ -41,7 +57,7 @@ After execution, a Check will return `true` or `false` depending on whether or n
 Rules are defined by JSON files in the [lib/rules directory](../lib/rules).  The JSON object is used to seed the [Rule object](../lib/core/base/rule.js#L30).  A valid Rule JSON consists of the following:
 
 * `id` - `String` A unique name of the Rule.
-* `selector` - **optional** `String` which is a CSS selector that specifies the elements of the page on which the Rule runs.  If omitted, the rule will run against every node.
+* `selector` - **optional** `String` which is a CSS selector that specifies the elements of the page on which the Rule runs. aXe-core will look inside of the light DOM and *open* [Shadow DOM](https://developer.mozilla.org/en-US/docs/Web/Web_Components/Shadow_DOM) trees for elements matching the provided selector. If omitted, the rule will run against every node.
 * `excludeHidden` - **optional** `Boolean` Whether the rule should exclude hidden elements.  Defaults to `true`.
 * `enabled` - **optional** `Boolean`  Whether the rule is enabled by default.  Defaults to `true`.
 * `pageLevel` - **optional** `Boolean`  Whether the rule is page level.  Page level rules will only run if given an entire `document` as context.
@@ -63,7 +79,12 @@ There is a Grunt target which will ensure each Rule has a valid format, which ca
 
 #### Matches Function
 
-Custom `matches` functions are executed against each node which matches the Rule's `selector` and receive a single parameter named `node`, which is the Node to test.  The function must return either `true` or `false`.  Common functions are provided as `commons`. [See the data-table matches function for an example.](../lib/rules/data-table-matches.js)
+Custom `matches` functions are executed against each node which matches the Rule's `selector` and receive two parameters:
+
+* `node` – node, the DOM Node to test
+* `virtualNode`– object, the virtual DOM representation of the node. See [virtualNode documentation](#virtual-nodes) for more.
+
+The matches function must return either `true` or `false`.  Common functions are provided as `commons`. [See the data-table matches function for an example.](../lib/rules/data-table-matches.js)
 
 ### Checks
 
@@ -87,6 +108,7 @@ The following variables are defined for `Check#evaluate`:
 
 * `node` - `HTMLElement`  The element that the Check is run against
 * `options` - `Mixed`  Any options specific to this Check that may be necessary.  If not specified by the user at run-time or configure-time; it will use `options` as defined by the Check's JSON file.
+* `virtualNode` – `Object`  The virtualNode object for use with Shadow DOM. See [virtualNode documentation](#virtual-nodes).
 * `this.data()` - `Function`  Free-form data that either the Check message requires or is presented as `data` in the CheckResult object.  Subsequent calls to `this.data()` will overwrite previous.  See [aria-valid-attr](../lib/checks/aria/valid-attr.js) for example usage.
 * `this.relatedNodes()` - `Function`  Array or NodeList of elements that are related to this Check.  For example the [duplicate-id](../lib/checks/shared/duplicate-id.js) Check will add all Elements which share the same ID.
 * `commons` - Common functions that may be used across multiple Checks.  See [Common Functions](#common-functions) for more information.
@@ -115,9 +137,9 @@ return results.filter(function (r) {
 });
 ```
 
-#### Pass and Fail Templates
+#### Pass, Fail and Incomplete Templates
 
-Occasionally, you may want to add additional information about why a Check passed or failed into its message.  For example, the [aria-valid-attr](../lib/checks/aria/valid-attr.json) will add information about any invalid ARIA attributes to its fail message.  The message uses the [doT.js](http://olado.github.io/doT/) and is compiled to a JavaScript function at build-time.  In the Check message, you have access to the `CheckResult` as `it`.
+Occasionally, you may want to add additional information about why a Check passed, failed or returned undefined into its message.  For example, the [aria-valid-attr](../lib/checks/aria/valid-attr.json) will add information about any invalid ARIA attributes to its fail message.  The message uses the [doT.js](http://olado.github.io/doT/) and is compiled to a JavaScript function at build-time.  In the Check message, you have access to the `CheckResult` as `it`.
 
 #### CheckResult
 
@@ -131,7 +153,54 @@ A CheckResult has the following properties:
 
 ### Common Functions
 
-Common functions are an internal library used by the rules and checks.  If you have code repeated across rules and checks, you can use these functions and contribute to them.  They are made available to every function as `commons`.  Documentation is available in [source code](../lib/commons/).
+Common functions are an internal library used by the rules and checks.  If you have code repeated across rules and checks, you can use these functions and contribute to them.  They are made available to every function as `commons`. Documentation is available in [source code](../lib/commons/).
+
+#### Commons and Shadow DOM
+
+To support Shadow DOM while maintaining backwards compatibility, commons functions that
+query DOM nodes must operate on an in-memory representation of the DOM using aXe-core’s
+built-in [API methods and utility functions](./API.md#virtual-dom-utilities).
+
+Commons functions should do the virtual tree lookup and call a `virtual` function
+including the rest of the commons code. The naming of this special function
+should contain the original commons function name with `Virtual` added to signify
+it expects to operate on a virtual DOM tree.
+
+Let’s look at an example:
+
+```javascript
+axe.commons.text.accessibleText = function (element, inLabelledbyContext) {
+  let virtualNode = axe.utils.getNodeFromTree(axe._tree[0], element); // throws an exception on purpose if axe._tree not correct
+  return axe.commons.text.accessibleTextVirtual(virtualNode, inLabelledbyContext);
+}
+
+axe.commons.text.accessibleTextVirtual = function (element, inLabelledbyContext) {
+  // rest of the commons code minus the virtual tree lookup, since it’s passed in
+}
+```
+
+`accessibleTextVirtual` would only be called directly if you’ve got a virtual node
+you can use. If you don’t already have one, call the `accessibleText` lookup function,
+which passes on a virtual DOM node with both the light DOM and Shadow DOM (if applicable).
+
+### Virtual Nodes
+
+To support Shadow DOM, aXe-core has the ability to handle virtual nodes in [rule matches](#matches-function)
+and [check evaluate](#check-evaluate) functions. The full set of API methods for Shadow DOM can be
+found in the [API documentation](./API.md#virtual-dom-utilities), but the general
+structure for a virtualNode is as follows:
+
+```javascript
+{
+  actualNode: <HTMLElement>,
+  children: <Array>,
+  shadowId: <String>
+}
+```
+
+- A virtualNode is an object containing an HTML DOM element (`actualNode`).
+- Children contains an array of child virtualNodes.
+- The shadowID indicates whether the node is in a shadow root and if it is, which one it is inside the boundary.
 
 ### Core Utilities
 
@@ -163,3 +232,187 @@ Elements returned by the DqElement class have the following methods and properti
 * `source` - `string` The generated HTML source code of the element
 * `element` - `DOMNode` The element which this object is based off or the containing frame, used for sorting.
 * `toJSON()` - Returns an object containing the selector and source properties
+
+
+## Virtual DOM APIs
+
+Note: You shouldn’t need the Shadow DOM APIs below unless you’re working on the axe-core
+engine, as rules and checks already have `virtualNode` objects passed in. However, these APIs
+will make it easier to work with the virtual DOM.
+
+### API Name: axe.utils.getFlattenedTree
+
+#### Description
+
+Recursvely return an array containing the virtual DOM tree for the node specified, excluding comment nodes
+and shadow DOM nodes `<content>` and `<slot>`. This method will return a flattened tree containing both
+light and shadow DOM, if applicable.
+
+#### Synopsis
+
+```javascript
+var element = document.body;
+axe.utils.getFlattenedTree(element, shadowId)
+```
+
+#### Parameters
+ - `node` – HTMLElement. The current HTML node for which you want a flattened DOM tree.
+ - `shadowId` – string(optional). ID of the shadow DOM that is the closest shadow ancestor of the node
+
+#### Returns
+
+An array of objects, where each object is a virtualNode:
+
+```javascript
+[{
+  actualNode: body,
+  children: [virtualNodes],
+  shadowId: undefined
+}]
+```
+
+### API Name: axe.utils.getNodeFromTree
+
+#### Description
+
+Recursively return a single node from a virtual DOM tree. This is commonly used in rules and checks where the node is readily available without querying the DOM.
+
+#### Synopsis
+
+```javascript
+axe.utils.getNodeFromTree(axe._tree[0], node);
+```
+
+#### Parameters
+
+  - `vNode` – object. The flattened DOM tree to fetch a virtual node from
+  - `node` – HTMLElement. The HTML DOM node for which you need a virtual representation
+
+#### Returns
+
+A virtualNode object:
+
+```javascript
+{
+  actualNode: div,
+  children: [virtualNodes],
+  shadowId: undefined
+}
+```
+
+## Test Utilities
+
+All tests must support Shadow DOM, so we created some test utilities to make this easier.
+
+### Test Util Name: MockCheckContext
+
+Create a check context for mocking and resetting data and relatedNodes in tests.
+
+#### Synopsis
+
+```javascript
+describe('region', function () {
+  var fixture = document.getElementById('fixture');
+
+  var checkContext = new axe.testUtils.MockCheckContext();
+
+  afterEach(function () {
+    fixture.innerHTML = '';
+    checkContext.reset();
+  });
+
+  it('should return true when all content is inside the region', function () {
+    assert.isTrue(checks.region.evaluate.apply(checkContext, checkArgs));
+    assert.equal(checkContext._relatedNodes.length, 0);
+  });
+});
+```
+
+#### Parameters
+
+None
+
+#### Returns
+
+An object containg the data, relatedNodes, and a way to reset them.
+
+```javascript
+{
+  data: (){},
+  relatedNodes: (){},
+  reset: (){}
+}
+```
+
+### Test Util Name: shadowSupport
+
+Provide an API for determining Shadow DOM v0 and v1 support in tests. PhantomJS doesn't have Shadow DOM support, while some browsers do.
+
+#### Synopsis
+
+```javascript
+(axe.testUtils.shadowSupport.v1 ? it : xit)('should test Shadow tree content', function () {
+  // The rest of the shadow DOM test
+});
+```
+
+#### Parameters
+
+None
+
+#### Returns
+
+An object containing booleans for the following Shadow DOM supports: `v0`, `v1`, or `undefined`.
+
+### Test Util Name: fixtureSetup
+
+Method for injecting content into a fixture and caching the flattened DOM tree (light and Shadow DOM together).
+
+#### Synopsis
+
+```javascript
+it('should return true if there is only one ' + type + ' element with the same name', function () {
+  axe.testUtils.fixtureSetup('<input type="' + type + '" id="target" name="uniqueyname">' +
+    '<input type="' + type + '" name="differentname">');
+
+  var node = fixture.querySelector('#target');
+  assert.isTrue(check.evaluate.call(checkContext, node));
+});
+```
+
+#### Parameters
+
+* `content` – Node|String. Stuff to go into the fixture (html or DOM node)
+
+#### Returns
+
+An HTML Element for the fixture
+
+### Test Util Name: checkSetup
+
+Create check arguments.
+
+#### Synopsis
+
+```javascript
+it('should return true when all content is inside the region', function () {
+  var checkArgs = checkSetup('<div id="target"><div role="main"><a href="a.html#mainheader">Click Here</a><div><h1 id="mainheader" tabindex="0">Introduction</h1></div></div></div>');
+
+  assert.isTrue(checks.region.evaluate.apply(checkContext, checkArgs));
+  assert.equal(checkContext._relatedNodes.length, 0);
+});
+```
+
+#### Parameters
+
+* `content` – String|Node. Stuff to go into the fixture (html or node)
+* `options` – Object. Options argument for the check (optional, default: {})
+* `target` – String. Target for the check, CSS selector (default: '#target')
+
+#### Returns
+
+An array with the DOM Node, options and virtualNode
+
+```javascript
+[node, options, virtualNode]
+```
diff --git a/lib/checks/label/duplicate-img-label.js b/lib/checks/label/duplicate-img-label.js
index 432f197ae8..e9bd2bfd96 100644
--- a/lib/checks/label/duplicate-img-label.js
+++ b/lib/checks/label/duplicate-img-label.js
@@ -12,5 +12,5 @@ const images = axe.utils.querySelectorAll(virtualNode, 'img')
 
 // See if any of the images duplicate the node's text
 return images.some(img =>
-	text === axe.commons.text.accessibleText(img).toLowerCase()
+	text === axe.commons.text.accessibleTextVirtual(img).toLowerCase()
 );
diff --git a/lib/commons/text/accessible-text.js b/lib/commons/text/accessible-text-virtual.js
similarity index 95%
rename from lib/commons/text/accessible-text.js
rename to lib/commons/text/accessible-text-virtual.js
index ed07a7df41..db9ce355d4 100644
--- a/lib/commons/text/accessible-text.js
+++ b/lib/commons/text/accessible-text-virtual.js
@@ -141,7 +141,12 @@ function nonEmptyText(t) {
  * @param {Boolean} inLabelledByContext True when in the context of resolving a labelledBy
  * @return {string}
  */
-text.accessibleText = function(element, inLabelledByContext) {
+text.accessibleText = function accessibleText(element, inLabelledByContext) {
+	let virtualNode = axe.utils.getNodeFromTree(axe._tree[0], element); // throws an exception on purpose if axe._tree not correct
+	return axe.commons.text.accessibleTextVirtual(virtualNode, inLabelledByContext);
+};
+
+text.accessibleTextVirtual = function accessibleTextVirtual(element, inLabelledByContext) {
 	let accessibleNameComputation;
 	const encounteredNodes = [];
 	if (element instanceof Node) {
diff --git a/lib/core/utils/flattened-tree.js b/lib/core/utils/flattened-tree.js
index 2fc6b192a6..0c5189f325 100644
--- a/lib/core/utils/flattened-tree.js
+++ b/lib/core/utils/flattened-tree.js
@@ -52,9 +52,8 @@ function getSlotChildren(node) {
 }
 
 /**
- * recursvely returns an array of the virtual DOM nodes at this level
- * excluding comment nodes and of course the shadow DOM nodes
- * <content> and <slot>
+ * Recursvely returns an array of the virtual DOM nodes at this level
+ * excluding comment nodes and the shadow DOM nodes <content> and <slot>
  *
  * @param {Node} node the current node
  * @param {String} shadowId, optional ID of the shadow DOM that is the closest shadow
@@ -120,6 +119,13 @@ axe.utils.getFlattenedTree = function (node, shadowId) {
 	}
 };
 
+
+/**
+ * Recursively return a single node from a virtual dom tree
+ *
+ * @param {Object} vNode The flattened, virtual DOM tree
+ * @param {Node}   node  The HTML DOM node
+ */
 axe.utils.getNodeFromTree = function (vNode, node) {
 	var found;
 
diff --git a/test/commons/text/accessible-text.js b/test/commons/text/accessible-text.js
index 2cbd9eef73..84c0ea89f9 100644
--- a/test/commons/text/accessible-text.js
+++ b/test/commons/text/accessible-text.js
@@ -1,4 +1,4 @@
-describe('text.accessibleText', function() {
+describe('text.accessibleTextVirtual', function() {
 	'use strict';
 
 	var fixture = document.getElementById('fixture');
@@ -9,6 +9,14 @@ describe('text.accessibleText', function() {
 		axe._tree = null;
 	});
 
+	it('is called through accessibleText with a DOM node', function() {
+ 		var accessibleText = axe.commons.text.accessibleText;
+ 		fixture.innerHTML = '<label><input type="button"></label>';
+ 		axe._tree = axe.utils.getFlattenedTree(fixture);
+ 		var target = fixture.querySelector('input');
+		assert.equal(accessibleText(target), '');
+	});
+
 	it('should match the first example from the ARIA spec', function() {
 		fixture.innerHTML = '<ul role="menubar">' +
 			' <!-- Rule 2A: "File" label via aria-labelledby -->' +
@@ -27,8 +35,8 @@ describe('text.accessibleText', function() {
 		var rule2a = axe.utils.querySelectorAll(axe._tree, '#rule2a')[0];
 		var rule2c = axe.utils.querySelectorAll(axe._tree, '#rule2c')[0];
 
-		assert.equal(axe.commons.text.accessibleText(rule2a), 'File');
-		assert.equal(axe.commons.text.accessibleText(rule2c), 'New');
+		assert.equal(axe.commons.text.accessibleTextVirtual(rule2a), 'File');
+		assert.equal(axe.commons.text.accessibleTextVirtual(rule2c), 'New');
 	});
 
 	it('should match the second example from the ARIA spec', function() {
@@ -50,8 +58,8 @@ describe('text.accessibleText', function() {
 
 		var rule2a = axe.utils.querySelectorAll(axe._tree, '#beep')[0];
 		var rule2b = axe.utils.querySelectorAll(axe._tree, '#flash')[0];
-		assert.equal(axe.commons.text.accessibleText(rule2a), 'Beep');
-		assert.equal(axe.commons.text.accessibleText(rule2b), 'Flash the screen 3 times');
+		assert.equal(axe.commons.text.accessibleTextVirtual(rule2a), 'Beep');
+		assert.equal(axe.commons.text.accessibleTextVirtual(rule2b), 'Flash the screen 3 times');
 	});
 
 
@@ -64,7 +72,7 @@ describe('text.accessibleText', function() {
 		axe._tree = axe.utils.getFlattenedTree(fixture);
 
 		var target = axe.utils.querySelectorAll(axe._tree, '#t1')[0];
-		assert.equal(axe.commons.text.accessibleText(target), 'This is a label');
+		assert.equal(axe.commons.text.accessibleTextVirtual(target), 'This is a label');
 	});
 
 	it('should use recusive aria-labelledby properly', function() {
@@ -76,7 +84,7 @@ describe('text.accessibleText', function() {
 		axe._tree = axe.utils.getFlattenedTree(fixture);
 
 		var target = axe.utils.querySelectorAll(axe._tree, '#t1')[0];
-		assert.equal(axe.commons.text.accessibleText(target), 'ARIA Label This is a label');
+		assert.equal(axe.commons.text.accessibleTextVirtual(target), 'ARIA Label This is a label');
 	});
 
 	it('should include hidden text referred to with aria-labelledby', function () {
@@ -88,7 +96,7 @@ describe('text.accessibleText', function() {
 		axe._tree = axe.utils.getFlattenedTree(fixture);
 
 		var target = axe.utils.querySelectorAll(axe._tree, '#t1')[0];
- 		assert.equal(axe.commons.text.accessibleText(target), 'This is a hidden secret');
+ 		assert.equal(axe.commons.text.accessibleTextVirtual(target), 'This is a hidden secret');
 	});
 
 	it('should allow setting the initial inLabelledbyContext value', function () {
@@ -96,8 +104,8 @@ describe('text.accessibleText', function() {
 		axe._tree = axe.utils.getFlattenedTree(fixture);
 
 		var target = axe.utils.querySelectorAll(axe._tree, '#lbl1')[0];
- 		assert.equal(axe.commons.text.accessibleText(target, false), '');
- 		assert.equal(axe.commons.text.accessibleText(target, true), 'hidden label');
+ 		assert.equal(axe.commons.text.accessibleTextVirtual(target, false), '');
+ 		assert.equal(axe.commons.text.accessibleTextVirtual(target, true), 'hidden label');
 	});
 
 	it('should use aria-label if present with no labelledby', function() {
@@ -109,7 +117,7 @@ describe('text.accessibleText', function() {
 		axe._tree = axe.utils.getFlattenedTree(fixture);
 
 		var target = axe.utils.querySelectorAll(axe._tree, '#t1')[0];
-		assert.equal(axe.commons.text.accessibleText(target), 'ARIA Label');
+		assert.equal(axe.commons.text.accessibleTextVirtual(target), 'ARIA Label');
 	});
 
 	it('should use alt on imgs with no ARIA', function() {
@@ -122,7 +130,7 @@ describe('text.accessibleText', function() {
 		axe._tree = axe.utils.getFlattenedTree(fixture);
 
 		var target = axe.utils.querySelectorAll(axe._tree, '#target')[0];
-		assert.equal(axe.commons.text.accessibleText(target), 'Alt text goes here');
+		assert.equal(axe.commons.text.accessibleTextVirtual(target), 'Alt text goes here');
 	});
 
 	it('should use alt on image inputs with no ARIA', function() {
@@ -135,7 +143,7 @@ describe('text.accessibleText', function() {
 		axe._tree = axe.utils.getFlattenedTree(fixture);
 
 		var target = axe.utils.querySelectorAll(axe._tree, '#target')[0];
-		assert.equal(axe.commons.text.accessibleText(target), 'Alt text goes here');
+		assert.equal(axe.commons.text.accessibleTextVirtual(target), 'Alt text goes here');
 	});
 
 	it('should use not use alt on text inputs with no ARIA', function() {
@@ -148,7 +156,7 @@ describe('text.accessibleText', function() {
 		axe._tree = axe.utils.getFlattenedTree(fixture);
 
 		var target = axe.utils.querySelectorAll(axe._tree, '#target')[0];
-		assert.equal(axe.commons.text.accessibleText(target), '');
+		assert.equal(axe.commons.text.accessibleTextVirtual(target), '');
 	});
 
 	it('should use HTML label if no ARIA information', function() {
@@ -160,7 +168,7 @@ describe('text.accessibleText', function() {
 		axe._tree = axe.utils.getFlattenedTree(fixture);
 
 		var target = axe.utils.querySelectorAll(axe._tree, '#t1')[0];
-		assert.equal(axe.commons.text.accessibleText(target), 'HTML Label');
+		assert.equal(axe.commons.text.accessibleTextVirtual(target), 'HTML Label');
 	});
 
 	it('should handle last ditch title attribute', function() {
@@ -172,7 +180,7 @@ describe('text.accessibleText', function() {
 		axe._tree = axe.utils.getFlattenedTree(fixture);
 
 		var target = axe.utils.querySelectorAll(axe._tree, '#t2label')[0];
-		assert.equal(axe.commons.text.accessibleText(target), 'This is This is a label of italics');
+		assert.equal(axe.commons.text.accessibleTextVirtual(target), 'This is This is a label of italics');
 	});
 
 	it('should handle totally empty elements', function() {
@@ -184,7 +192,7 @@ describe('text.accessibleText', function() {
 		axe._tree = axe.utils.getFlattenedTree(fixture);
 
 		var target = axe.utils.querySelectorAll(axe._tree, '#t2label')[0];
-		assert.equal(axe.commons.text.accessibleText(target), 'This is This is a label of');
+		assert.equal(axe.commons.text.accessibleTextVirtual(target), 'This is This is a label of');
 	});
 
 
@@ -197,7 +205,7 @@ describe('text.accessibleText', function() {
 		axe._tree = axe.utils.getFlattenedTree(fixture);
 
 		var target = axe.utils.querySelectorAll(axe._tree, '#t2label')[0];
-		assert.equal(axe.commons.text.accessibleText(target), 'This is This is a label of');
+		assert.equal(axe.commons.text.accessibleTextVirtual(target), 'This is This is a label of');
 	});
 
 	it('should only show each node once when label is before input', function() {
@@ -205,7 +213,7 @@ describe('text.accessibleText', function() {
 			'<input type="text" id="tb1"></div>';
 		axe._tree = axe.utils.getFlattenedTree(fixture);
 		var target = axe.utils.querySelectorAll(axe._tree, '#target')[0];
-		assert.equal(axe.commons.text.accessibleText(target), 'My form input');
+		assert.equal(axe.commons.text.accessibleTextVirtual(target), 'My form input');
 	});
 
 	it('should only show each node once when label follows input', function() {
@@ -214,7 +222,7 @@ describe('text.accessibleText', function() {
 			'<label for="tb1">My form input</label>';
 		axe._tree = axe.utils.getFlattenedTree(fixture);
 		var target = axe.utils.querySelectorAll(axe._tree, '#target')[0];
-		assert.equal(axe.commons.text.accessibleText(target), 'My form input');
+		assert.equal(axe.commons.text.accessibleTextVirtual(target), 'My form input');
 	});
 
 	it('should handle nested inputs in normal context', function() {
@@ -226,7 +234,7 @@ describe('text.accessibleText', function() {
 		axe._tree = axe.utils.getFlattenedTree(fixture);
 
 		var target = axe.utils.querySelectorAll(axe._tree, '#t2label')[0];
-		assert.equal(axe.commons.text.accessibleText(target), 'This is This is a label of everything');
+		assert.equal(axe.commons.text.accessibleTextVirtual(target), 'This is This is a label of everything');
 	});
 
 	it('should use handle nested inputs properly in labelledby context', function() {
@@ -238,7 +246,7 @@ describe('text.accessibleText', function() {
 		axe._tree = axe.utils.getFlattenedTree(fixture);
 
 		var target = axe.utils.querySelectorAll(axe._tree, '#t2')[0];
-		assert.equal(axe.commons.text.accessibleText(target), 'This is the value of everything');
+		assert.equal(axe.commons.text.accessibleTextVirtual(target), 'This is the value of everything');
 	});
 
 	it('should use ignore hidden inputs', function() {
@@ -250,7 +258,7 @@ describe('text.accessibleText', function() {
 		axe._tree = axe.utils.getFlattenedTree(fixture);
 
 		var target = axe.utils.querySelectorAll(axe._tree, '#t2')[0];
-		assert.equal(axe.commons.text.accessibleText(target), 'This is of everything');
+		assert.equal(axe.commons.text.accessibleTextVirtual(target), 'This is of everything');
 	});
 
 	it('should use handle inputs with no type as if they were text inputs', function() {
@@ -262,7 +270,7 @@ describe('text.accessibleText', function() {
 		axe._tree = axe.utils.getFlattenedTree(fixture);
 
 		var target = axe.utils.querySelectorAll(axe._tree, '#t2')[0];
-		assert.equal(axe.commons.text.accessibleText(target), 'This is the value of everything');
+		assert.equal(axe.commons.text.accessibleTextVirtual(target), 'This is the value of everything');
 	});
 
 	it('should use handle nested selects properly in labelledby context', function() {
@@ -276,7 +284,7 @@ describe('text.accessibleText', function() {
 		axe._tree = axe.utils.getFlattenedTree(fixture);
 
 		var target = axe.utils.querySelectorAll(axe._tree, '#t2')[0];
-		assert.equal(axe.commons.text.accessibleText(target), 'This is first third of everything');
+		assert.equal(axe.commons.text.accessibleTextVirtual(target), 'This is first third of everything');
 	});
 
 	it('should use handle nested textareas properly in labelledby context', function() {
@@ -288,7 +296,7 @@ describe('text.accessibleText', function() {
 		axe._tree = axe.utils.getFlattenedTree(fixture);
 
 		var target = axe.utils.querySelectorAll(axe._tree, '#t2')[0];
-		assert.equal(axe.commons.text.accessibleText(target), 'This is the value of everything');
+		assert.equal(axe.commons.text.accessibleTextVirtual(target), 'This is the value of everything');
 	});
 
 	it('should use handle ARIA labels properly in labelledby context', function() {
@@ -301,7 +309,7 @@ describe('text.accessibleText', function() {
 		axe._tree = axe.utils.getFlattenedTree(fixture);
 
 		var target = axe.utils.querySelectorAll(axe._tree, '#t2')[0];
-		assert.equal(axe.commons.text.accessibleText(target), 'This not a span is the value of everything');
+		assert.equal(axe.commons.text.accessibleTextVirtual(target), 'This not a span is the value of everything');
 	});
 
 	it('shoud properly fall back to title', function() {
@@ -309,7 +317,7 @@ describe('text.accessibleText', function() {
 		axe._tree = axe.utils.getFlattenedTree(fixture);
 
 		var target = axe.utils.querySelectorAll(axe._tree, 'a')[0];
-		assert.equal(axe.commons.text.accessibleText(target), 'Hello');
+		assert.equal(axe.commons.text.accessibleTextVirtual(target), 'Hello');
 	});
 
 	it('should give text even for role=presentation on anchors', function() {
@@ -317,7 +325,7 @@ describe('text.accessibleText', function() {
 		axe._tree = axe.utils.getFlattenedTree(fixture);
 
 		var target = axe.utils.querySelectorAll(axe._tree, 'a')[0];
-		assert.equal(axe.commons.text.accessibleText(target), 'Hello');
+		assert.equal(axe.commons.text.accessibleTextVirtual(target), 'Hello');
 	});
 
 	it('should give text even for role=presentation on buttons', function() {
@@ -325,21 +333,21 @@ describe('text.accessibleText', function() {
 		axe._tree = axe.utils.getFlattenedTree(fixture);
 
 		var target = axe.utils.querySelectorAll(axe._tree, 'button')[0];
-		assert.equal(axe.commons.text.accessibleText(target), 'Hello');
+		assert.equal(axe.commons.text.accessibleTextVirtual(target), 'Hello');
 	});
 
 	it('should give text even for role=presentation on summary', function() {
 		fixture.innerHTML = '<summary role="presentation">Hello</summary>';
 		axe._tree = axe.utils.getFlattenedTree(fixture);
 		var target = axe.utils.querySelectorAll(axe._tree, 'summary')[0];
-		assert.equal(axe.commons.text.accessibleText(target), 'Hello');
+		assert.equal(axe.commons.text.accessibleTextVirtual(target), 'Hello');
 	});
 
 	it('shoud properly fall back to title', function() {
 		fixture.innerHTML = '<a href="#" role="none" title="Hello"></a>';
 		axe._tree = axe.utils.getFlattenedTree(fixture);
 		var target = axe.utils.querySelectorAll(axe._tree, 'a')[0];
-		assert.equal(axe.commons.text.accessibleText(target), 'Hello');
+		assert.equal(axe.commons.text.accessibleTextVirtual(target), 'Hello');
 	});
 
 	it('should give text even for role=none on anchors', function() {
@@ -347,7 +355,7 @@ describe('text.accessibleText', function() {
 		axe._tree = axe.utils.getFlattenedTree(fixture);
 
 		var target = axe.utils.querySelectorAll(axe._tree, 'a')[0];
-		assert.equal(axe.commons.text.accessibleText(target), 'Hello');
+		assert.equal(axe.commons.text.accessibleTextVirtual(target), 'Hello');
 	});
 
 	it('should give text even for role=none on buttons', function() {
@@ -355,7 +363,7 @@ describe('text.accessibleText', function() {
 		axe._tree = axe.utils.getFlattenedTree(fixture);
 
 		var target = axe.utils.querySelectorAll(axe._tree, 'button')[0];
-		assert.equal(axe.commons.text.accessibleText(target), 'Hello');
+		assert.equal(axe.commons.text.accessibleTextVirtual(target), 'Hello');
 	});
 
 	it('should give text even for role=none on summary', function() {
@@ -363,7 +371,7 @@ describe('text.accessibleText', function() {
 		axe._tree = axe.utils.getFlattenedTree(fixture);
 
 		var target = axe.utils.querySelectorAll(axe._tree, 'summary')[0];
-		assert.equal(axe.commons.text.accessibleText(target), 'Hello');
+		assert.equal(axe.commons.text.accessibleTextVirtual(target), 'Hello');
 	});
 
 	it('should not add extra spaces around phrasing elements', function() {
@@ -371,7 +379,7 @@ describe('text.accessibleText', function() {
 		axe._tree = axe.utils.getFlattenedTree(fixture);
 
 		var target = axe.utils.querySelectorAll(axe._tree, 'a')[0];
-		assert.equal(axe.commons.text.accessibleText(target), 'HelloWorld');
+		assert.equal(axe.commons.text.accessibleTextVirtual(target), 'HelloWorld');
 	});
 
 	it('should add spaces around non-phrasing elements', function() {
@@ -379,7 +387,7 @@ describe('text.accessibleText', function() {
 		axe._tree = axe.utils.getFlattenedTree(fixture);
 
 		var target = axe.utils.querySelectorAll(axe._tree, 'a')[0];
-		assert.equal(axe.commons.text.accessibleText(target), 'Hello World');
+		assert.equal(axe.commons.text.accessibleTextVirtual(target), 'Hello World');
 	});
 
 	it('should not look at scripts', function() {
@@ -387,7 +395,7 @@ describe('text.accessibleText', function() {
 		axe._tree = axe.utils.getFlattenedTree(fixture);
 
 		var target = axe.utils.querySelectorAll(axe._tree, 'a')[0];
-		assert.equal(axe.commons.text.accessibleText(target), '');
+		assert.equal(axe.commons.text.accessibleTextVirtual(target), '');
 	});
 
 	it('should use <label> for input buttons', function() {
@@ -395,7 +403,7 @@ describe('text.accessibleText', function() {
 		axe._tree = axe.utils.getFlattenedTree(fixture);
 
 		var target = axe.utils.querySelectorAll(axe._tree, 'input')[0];
-		assert.equal(axe.commons.text.accessibleText(target), '');
+		assert.equal(axe.commons.text.accessibleTextVirtual(target), '');
 	});
 
 	(shadowSupport.v1 ? it : xit)('should only find aria-labelledby element in the same context ', function() {
@@ -410,7 +418,7 @@ describe('text.accessibleText', function() {
 
 		axe._tree = axe.utils.getFlattenedTree(fixture);
 		var target = axe.utils.querySelectorAll(axe._tree, '#t1')[0];
-		assert.equal(axe.commons.text.accessibleText(target), 'ARIA Label');
+		assert.equal(axe.commons.text.accessibleTextVirtual(target), 'ARIA Label');
 	});
 
 	(shadowSupport.v1 ? it : xit)('should find attributes within a shadow tree', function() {
@@ -421,7 +429,7 @@ describe('text.accessibleText', function() {
 
 		axe._tree = axe.utils.getFlattenedTree(fixture);
 		var target = axe.utils.querySelectorAll(axe._tree, 'input')[0];
-		assert.equal(axe.commons.text.accessibleText(target), 'I will be king');
+		assert.equal(axe.commons.text.accessibleTextVirtual(target), 'I will be king');
 	});
 
 	(shadowSupport.v1 ? it : xit)('should find attributes within a slot on the shadow tree', function() {
@@ -432,7 +440,7 @@ describe('text.accessibleText', function() {
 
 		axe._tree = axe.utils.getFlattenedTree(fixture);
 		var target = axe.utils.querySelectorAll(axe._tree, 'input')[0];
-		assert.equal(axe.commons.text.accessibleText(target), 'you will be queen');
+		assert.equal(axe.commons.text.accessibleTextVirtual(target), 'you will be queen');
 	});
 
 	(shadowSupport.v1 ? it : xit)('should find fallback content for shadow DOM', function() {
@@ -444,7 +452,7 @@ describe('text.accessibleText', function() {
 
 		axe._tree = axe.utils.getFlattenedTree(fixture);
 		var target = axe.utils.querySelectorAll(axe._tree, 'input')[0];
-		assert.equal(axe.commons.text.accessibleText(target), 'Fallback content heroes');
+		assert.equal(axe.commons.text.accessibleTextVirtual(target), 'Fallback content heroes');
 	});
 
 	describe('figure', function() {
@@ -455,7 +463,7 @@ describe('text.accessibleText', function() {
 			axe._tree = axe.utils.getFlattenedTree(fixture);
 
 			var target = axe.utils.querySelectorAll(axe._tree, 'figure')[0];
-			assert.equal(axe.commons.text.accessibleText(target), 'Hello');
+			assert.equal(axe.commons.text.accessibleTextVirtual(target), 'Hello');
 		});
 
 		it('should check aria-label', function() {
@@ -463,7 +471,7 @@ describe('text.accessibleText', function() {
 			axe._tree = axe.utils.getFlattenedTree(fixture);
 
 			var target = axe.utils.querySelectorAll(axe._tree, 'figure')[0];
-			assert.equal(axe.commons.text.accessibleText(target), 'Hello');
+			assert.equal(axe.commons.text.accessibleTextVirtual(target), 'Hello');
 		});
 
 		it('should check the figures figcaption', function() {
@@ -471,7 +479,7 @@ describe('text.accessibleText', function() {
 			axe._tree = axe.utils.getFlattenedTree(fixture);
 
 			var target = axe.utils.querySelectorAll(axe._tree, 'figure')[0];
-			assert.equal(axe.commons.text.accessibleText(target), 'Hello');
+			assert.equal(axe.commons.text.accessibleTextVirtual(target), 'Hello');
 		});
 
 		it('should check title on figure', function() {
@@ -479,7 +487,7 @@ describe('text.accessibleText', function() {
 			axe._tree = axe.utils.getFlattenedTree(fixture);
 
 			var target = axe.utils.querySelectorAll(axe._tree, 'figure')[0];
-			assert.equal(axe.commons.text.accessibleText(target), 'Hello');
+			assert.equal(axe.commons.text.accessibleTextVirtual(target), 'Hello');
 		});
 
 		it('should not visit innerText of figure', function() {
@@ -487,7 +495,7 @@ describe('text.accessibleText', function() {
 			axe._tree = axe.utils.getFlattenedTree(fixture);
 
 			var target = axe.utils.querySelectorAll(axe._tree, 'figure')[0];
-			assert.equal(axe.commons.text.accessibleText(target), '');
+			assert.equal(axe.commons.text.accessibleTextVirtual(target), '');
 		});
 
 		(shadowSupport.v1 ? it : xit)('should check within the composed (shadow) tree', function () {
@@ -499,7 +507,7 @@ describe('text.accessibleText', function() {
 			axe._tree = axe.utils.getFlattenedTree(fixture);
 
 			var target = axe.utils.querySelectorAll(axe._tree, 'figure')[0];
-			assert.equal(axe.commons.text.accessibleText(target), 'Hello');
+			assert.equal(axe.commons.text.accessibleTextVirtual(target), 'Hello');
 		});
 	});
 
@@ -510,7 +518,7 @@ describe('text.accessibleText', function() {
 			axe._tree = axe.utils.getFlattenedTree(fixture);
 
 			var target = axe.utils.querySelectorAll(axe._tree, 'img')[0];
-			assert.equal(axe.commons.text.accessibleText(target), 'Hello World');
+			assert.equal(axe.commons.text.accessibleTextVirtual(target), 'Hello World');
 		});
 
 		it('should work with aria-label attribute', function() {
@@ -518,7 +526,7 @@ describe('text.accessibleText', function() {
 			axe._tree = axe.utils.getFlattenedTree(fixture);
 
 			var target = axe.utils.querySelectorAll(axe._tree, 'img')[0];
-			assert.equal(axe.commons.text.accessibleText(target), 'Hello World');
+			assert.equal(axe.commons.text.accessibleTextVirtual(target), 'Hello World');
 		});
 
 		it('should work with alt attribute', function() {
@@ -526,7 +534,7 @@ describe('text.accessibleText', function() {
 			axe._tree = axe.utils.getFlattenedTree(fixture);
 
 			var target = axe.utils.querySelectorAll(axe._tree, 'img')[0];
-			assert.equal(axe.commons.text.accessibleText(target), 'Hello World');
+			assert.equal(axe.commons.text.accessibleTextVirtual(target), 'Hello World');
 		});
 
 		it('should work with title attribute', function() {
@@ -534,7 +542,7 @@ describe('text.accessibleText', function() {
 			axe._tree = axe.utils.getFlattenedTree(fixture);
 
 			var target = axe.utils.querySelectorAll(axe._tree, 'img')[0];
-			assert.equal(axe.commons.text.accessibleText(target), 'Hello World');
+			assert.equal(axe.commons.text.accessibleTextVirtual(target), 'Hello World');
 		});
 	});
 
@@ -544,7 +552,7 @@ describe('text.accessibleText', function() {
 			axe._tree = axe.utils.getFlattenedTree(fixture);
 
 			var target = axe.utils.querySelectorAll(axe._tree, 'input')[0];
-			assert.equal(axe.commons.text.accessibleText(target), 'Hello');
+			assert.equal(axe.commons.text.accessibleTextVirtual(target), 'Hello');
 		});
 
 		it('should find value for input type=reset', function() {
@@ -552,7 +560,7 @@ describe('text.accessibleText', function() {
 			axe._tree = axe.utils.getFlattenedTree(fixture);
 
 			var target = axe.utils.querySelectorAll(axe._tree, 'input')[0];
-			assert.equal(axe.commons.text.accessibleText(target), 'Hello');
+			assert.equal(axe.commons.text.accessibleTextVirtual(target), 'Hello');
 		});
 
 		it('should find value for input type=submit', function() {
@@ -560,7 +568,7 @@ describe('text.accessibleText', function() {
 			axe._tree = axe.utils.getFlattenedTree(fixture);
 
 			var target = axe.utils.querySelectorAll(axe._tree, 'input')[0];
-			assert.equal(axe.commons.text.accessibleText(target), 'Hello');
+			assert.equal(axe.commons.text.accessibleTextVirtual(target), 'Hello');
 		});
 
 		it('should provide a default value for input type="submit"', function() {
@@ -569,7 +577,7 @@ describe('text.accessibleText', function() {
 
 			var target = axe.utils.querySelectorAll(axe._tree, 'input')[0];
 			// IE inserts this for us, thanks!
-			assert.equal(axe.commons.text.accessibleText(target), target.value || 'Submit');
+			assert.equal(axe.commons.text.accessibleTextVirtual(target), target.value || 'Submit');
 		});
 
 		it('should provide a default value for input type="reset"', function() {
@@ -577,7 +585,7 @@ describe('text.accessibleText', function() {
 			axe._tree = axe.utils.getFlattenedTree(fixture);
 
 			var target = axe.utils.querySelectorAll(axe._tree, 'input')[0];
-			var defaultText = axe.commons.text.accessibleText(target);
+			var defaultText = axe.commons.text.accessibleTextVirtual(target);
 			assert.isString(defaultText);
 			assert.notEqual(defaultText.trim(), '');
 		});
@@ -587,7 +595,7 @@ describe('text.accessibleText', function() {
 			axe._tree = axe.utils.getFlattenedTree(fixture);
 
 			var target = axe.utils.querySelectorAll(axe._tree, 'input')[0];
-			assert.equal(axe.commons.text.accessibleText(target), 'Hello');
+			assert.equal(axe.commons.text.accessibleTextVirtual(target), 'Hello');
 		});
 
 		it('should find title for input type=reset', function() {
@@ -596,7 +604,7 @@ describe('text.accessibleText', function() {
 
 			var target = axe.utils.querySelectorAll(axe._tree, 'input')[0];
 			// IE does not use title; but will use default value instead
-			assert.equal(axe.commons.text.accessibleText(target), target.value || 'Hello');
+			assert.equal(axe.commons.text.accessibleTextVirtual(target), target.value || 'Hello');
 		});
 
 		it('should find title for input type=submit', function() {
@@ -605,7 +613,7 @@ describe('text.accessibleText', function() {
 
 			var target = axe.utils.querySelectorAll(axe._tree, 'input')[0];
 			// Again, default value takes precedence over title
-			assert.equal(axe.commons.text.accessibleText(target), target.value || 'Hello');
+			assert.equal(axe.commons.text.accessibleTextVirtual(target), target.value || 'Hello');
 		});
 	});
 
@@ -616,7 +624,7 @@ describe('text.accessibleText', function() {
 			axe._tree = axe.utils.getFlattenedTree(fixture);
 
 			var target = axe.utils.querySelectorAll(axe._tree, 'table')[0];
-			assert.equal(axe.commons.text.accessibleText(target), 'Hello World');
+			assert.equal(axe.commons.text.accessibleTextVirtual(target), 'Hello World');
 		});
 
 		it('should work with aria-label', function() {
@@ -624,7 +632,7 @@ describe('text.accessibleText', function() {
 			axe._tree = axe.utils.getFlattenedTree(fixture);
 
 			var target = axe.utils.querySelectorAll(axe._tree, 'table')[0];
-			assert.equal(axe.commons.text.accessibleText(target), 'Hello World');
+			assert.equal(axe.commons.text.accessibleTextVirtual(target), 'Hello World');
 		});
 
 		it('should work with the caption element', function() {
@@ -632,7 +640,7 @@ describe('text.accessibleText', function() {
 			axe._tree = axe.utils.getFlattenedTree(fixture);
 
 			var target = axe.utils.querySelectorAll(axe._tree, 'table')[0];
-			assert.equal(axe.commons.text.accessibleText(target), 'Hello World');
+			assert.equal(axe.commons.text.accessibleTextVirtual(target), 'Hello World');
 		});
 
 		it('should work with the title attribute', function() {
@@ -640,7 +648,7 @@ describe('text.accessibleText', function() {
 			axe._tree = axe.utils.getFlattenedTree(fixture);
 
 			var target = axe.utils.querySelectorAll(axe._tree, 'table')[0];
-			assert.equal(axe.commons.text.accessibleText(target), 'Hello World');
+			assert.equal(axe.commons.text.accessibleTextVirtual(target), 'Hello World');
 		});
 
 		it('should work with the summary attribute', function() {
@@ -648,7 +656,7 @@ describe('text.accessibleText', function() {
 			axe._tree = axe.utils.getFlattenedTree(fixture);
 
 			var target = axe.utils.querySelectorAll(axe._tree, 'table')[0];
-			assert.equal(axe.commons.text.accessibleText(target), 'Hello World');
+			assert.equal(axe.commons.text.accessibleTextVirtual(target), 'Hello World');
 		});
 
 		it('should prefer title attribute over summary attribute', function() {
@@ -656,7 +664,7 @@ describe('text.accessibleText', function() {
 			axe._tree = axe.utils.getFlattenedTree(fixture);
 
 			var target = axe.utils.querySelectorAll(axe._tree, 'table')[0];
-			assert.equal(axe.commons.text.accessibleText(target), 'Hello World');
+			assert.equal(axe.commons.text.accessibleTextVirtual(target), 'Hello World');
 		});
 	});
 
@@ -672,7 +680,7 @@ describe('text.accessibleText', function() {
 				axe._tree = axe.utils.getFlattenedTree(fixture);
 
 				var target = axe.utils.querySelectorAll(axe._tree, 'input')[0];
-				assert.equal(axe.commons.text.accessibleText(target), 'Hello World', type);
+				assert.equal(axe.commons.text.accessibleTextVirtual(target), 'Hello World', type);
 			});
 		});
 
@@ -683,7 +691,7 @@ describe('text.accessibleText', function() {
 				axe._tree = axe.utils.getFlattenedTree(fixture);
 
 				var target = axe.utils.querySelectorAll(axe._tree, 'input')[0];
-				assert.equal(axe.commons.text.accessibleText(target), 'Hello World', type);
+				assert.equal(axe.commons.text.accessibleTextVirtual(target), 'Hello World', type);
 			});
 		});
 
@@ -695,7 +703,7 @@ describe('text.accessibleText', function() {
 				axe._tree = axe.utils.getFlattenedTree(fixture);
 
 				var target = axe.utils.querySelectorAll(axe._tree, 'input')[0];
-				assert.equal(axe.commons.text.accessibleText(target), 'Hello World', type);
+				assert.equal(axe.commons.text.accessibleTextVirtual(target), 'Hello World', type);
 			});
 		});
 
@@ -707,7 +715,7 @@ describe('text.accessibleText', function() {
 				axe._tree = axe.utils.getFlattenedTree(fixture);
 
 				var target = axe.utils.querySelectorAll(axe._tree, 'input')[0];
-				assert.equal(axe.commons.text.accessibleText(target), 'Hello World', type);
+				assert.equal(axe.commons.text.accessibleTextVirtual(target), 'Hello World', type);
 			});
 		});
 
@@ -719,7 +727,7 @@ describe('text.accessibleText', function() {
 				axe._tree = axe.utils.getFlattenedTree(fixture);
 
 				var target = axe.utils.querySelectorAll(axe._tree, 'input')[0];
-				assert.equal(axe.commons.text.accessibleText(target), 'Hello World', type);
+				assert.equal(axe.commons.text.accessibleTextVirtual(target), 'Hello World', type);
 			});
 		});
 
@@ -730,7 +738,7 @@ describe('text.accessibleText', function() {
 				axe._tree = axe.utils.getFlattenedTree(fixture);
 
 				var target = axe.utils.querySelectorAll(axe._tree, 'input')[0];
-				assert.equal(axe.commons.text.accessibleText(target), 'Hello World', type);
+				assert.equal(axe.commons.text.accessibleTextVirtual(target), 'Hello World', type);
 			});
 		});
 
@@ -741,7 +749,7 @@ describe('text.accessibleText', function() {
 				axe._tree = axe.utils.getFlattenedTree(fixture);
 
 				var target = axe.utils.querySelectorAll(axe._tree, 'input')[0];
-				assert.equal(axe.commons.text.accessibleText(target), '');
+				assert.equal(axe.commons.text.accessibleTextVirtual(target), '');
 			});
 		});
 	});
@@ -754,7 +762,7 @@ describe('text.accessibleText', function() {
 			axe._tree = axe.utils.getFlattenedTree(fixture);
 
 			var target = axe.utils.querySelectorAll(axe._tree, 'textarea')[0];
-			assert.equal(axe.commons.text.accessibleText(target), 'Hello World');
+			assert.equal(axe.commons.text.accessibleTextVirtual(target), 'Hello World');
 		});
 
 		it('should find aria-label', function() {
@@ -762,7 +770,7 @@ describe('text.accessibleText', function() {
 			axe._tree = axe.utils.getFlattenedTree(fixture);
 
 			var target = axe.utils.querySelectorAll(axe._tree, 'textarea')[0];
-			assert.equal(axe.commons.text.accessibleText(target), 'Hello World');
+			assert.equal(axe.commons.text.accessibleTextVirtual(target), 'Hello World');
 		});
 
 		it('should find an implicit label', function() {
@@ -771,7 +779,7 @@ describe('text.accessibleText', function() {
 			axe._tree = axe.utils.getFlattenedTree(fixture);
 
 			var target = axe.utils.querySelectorAll(axe._tree, 'textarea')[0];
-			assert.equal(axe.commons.text.accessibleText(target), 'Hello World');
+			assert.equal(axe.commons.text.accessibleTextVirtual(target), 'Hello World');
 		});
 
 		it('should find an explicit label', function() {
@@ -780,7 +788,7 @@ describe('text.accessibleText', function() {
 			axe._tree = axe.utils.getFlattenedTree(fixture);
 
 			var target = axe.utils.querySelectorAll(axe._tree, 'textarea')[0];
-			assert.equal(axe.commons.text.accessibleText(target), 'Hello World');
+			assert.equal(axe.commons.text.accessibleTextVirtual(target), 'Hello World');
 		});
 
 		// not implemented yet, doesn't work accross ATs
@@ -789,7 +797,7 @@ describe('text.accessibleText', function() {
 			axe._tree = axe.utils.getFlattenedTree(fixture);
 
 			var target = axe.utils.querySelectorAll(axe._tree, 'textarea')[0];
-			assert.equal(axe.commons.text.accessibleText(target), 'Hello World');
+			assert.equal(axe.commons.text.accessibleTextVirtual(target), 'Hello World');
 		});
 
 		it('should find a title attribute', function() {
@@ -797,7 +805,7 @@ describe('text.accessibleText', function() {
 			axe._tree = axe.utils.getFlattenedTree(fixture);
 
 			var target = axe.utils.querySelectorAll(axe._tree, 'textarea')[0];
-			assert.equal(axe.commons.text.accessibleText(target), 'Hello World');
+			assert.equal(axe.commons.text.accessibleTextVirtual(target), 'Hello World');
 		});
 
 		it('should otherwise be empty string', function() {
@@ -805,7 +813,7 @@ describe('text.accessibleText', function() {
 			axe._tree = axe.utils.getFlattenedTree(fixture);
 
 			var target = axe.utils.querySelectorAll(axe._tree, 'textarea')[0];
-			assert.equal(axe.commons.text.accessibleText(target), '');
+			assert.equal(axe.commons.text.accessibleTextVirtual(target), '');
 		});
 	});
 
@@ -817,7 +825,7 @@ describe('text.accessibleText', function() {
 			axe._tree = axe.utils.getFlattenedTree(fixture);
 
 			var target = axe.utils.querySelectorAll(axe._tree, 'input')[0];
-			assert.equal(axe.commons.text.accessibleText(target), 'Hello World');
+			assert.equal(axe.commons.text.accessibleTextVirtual(target), 'Hello World');
 		});
 
 		it('should find aria-label', function() {
@@ -825,7 +833,7 @@ describe('text.accessibleText', function() {
 			axe._tree = axe.utils.getFlattenedTree(fixture);
 
 			var target = axe.utils.querySelectorAll(axe._tree, 'input')[0];
-			assert.equal(axe.commons.text.accessibleText(target), 'Hello World');
+			assert.equal(axe.commons.text.accessibleTextVirtual(target), 'Hello World');
 		});
 
 		it('should find an alt attribute', function() {
@@ -833,7 +841,7 @@ describe('text.accessibleText', function() {
 			axe._tree = axe.utils.getFlattenedTree(fixture);
 
 			var target = axe.utils.querySelectorAll(axe._tree, 'input')[0];
-			assert.equal(axe.commons.text.accessibleText(target), 'Hello World');
+			assert.equal(axe.commons.text.accessibleTextVirtual(target), 'Hello World');
 		});
 
 		// doesn't work consistently across ATs yet
@@ -842,7 +850,7 @@ describe('text.accessibleText', function() {
 			axe._tree = axe.utils.getFlattenedTree(fixture);
 
 			var target = axe.utils.querySelectorAll(axe._tree, 'input')[0];
-			assert.equal(axe.commons.text.accessibleText(target), 'Hello World');
+			assert.equal(axe.commons.text.accessibleTextVirtual(target), 'Hello World');
 		});
 
 		it('should find a title attribute', function() {
@@ -850,7 +858,7 @@ describe('text.accessibleText', function() {
 			axe._tree = axe.utils.getFlattenedTree(fixture);
 
 			var target = axe.utils.querySelectorAll(axe._tree, 'input')[0];
-			assert.equal(axe.commons.text.accessibleText(target), 'Hello World');
+			assert.equal(axe.commons.text.accessibleTextVirtual(target), 'Hello World');
 		});
 
 		it('should otherwise be empty string', function() {
@@ -858,7 +866,7 @@ describe('text.accessibleText', function() {
 			axe._tree = axe.utils.getFlattenedTree(fixture);
 
 			var target = axe.utils.querySelectorAll(axe._tree, 'input')[0];
-			assert.equal(axe.commons.text.accessibleText(target), '');
+			assert.equal(axe.commons.text.accessibleTextVirtual(target), '');
 		});
 	});
 
@@ -869,7 +877,7 @@ describe('text.accessibleText', function() {
 			axe._tree = axe.utils.getFlattenedTree(fixture);
 
 			var target = axe.utils.querySelectorAll(axe._tree, 'a')[0];
-			assert.equal(axe.commons.text.accessibleText(target), 'Hello World');
+			assert.equal(axe.commons.text.accessibleTextVirtual(target), 'Hello World');
 		});
 
 		it('should find aria-label', function() {
@@ -877,7 +885,7 @@ describe('text.accessibleText', function() {
 			axe._tree = axe.utils.getFlattenedTree(fixture);
 
 			var target = axe.utils.querySelectorAll(axe._tree, 'a')[0];
-			assert.equal(axe.commons.text.accessibleText(target), 'Hello World');
+			assert.equal(axe.commons.text.accessibleTextVirtual(target), 'Hello World');
 		});
 
 		it('should check subtree', function() {
@@ -885,7 +893,7 @@ describe('text.accessibleText', function() {
 			axe._tree = axe.utils.getFlattenedTree(fixture);
 
 			var target = axe.utils.querySelectorAll(axe._tree, 'a')[0];
-			assert.equal(axe.commons.text.accessibleText(target), 'Hello World');
+			assert.equal(axe.commons.text.accessibleTextVirtual(target), 'Hello World');
 		});
 
 		it('should find a title attribute', function() {
@@ -893,7 +901,7 @@ describe('text.accessibleText', function() {
 			axe._tree = axe.utils.getFlattenedTree(fixture);
 
 			var target = axe.utils.querySelectorAll(axe._tree, 'a')[0];
-			assert.equal(axe.commons.text.accessibleText(target), 'Hello World');
+			assert.equal(axe.commons.text.accessibleTextVirtual(target), 'Hello World');
 		});
 
 		it('should otherwise be empty string', function() {
@@ -901,7 +909,7 @@ describe('text.accessibleText', function() {
 			axe._tree = axe.utils.getFlattenedTree(fixture);
 
 			var target = axe.utils.querySelectorAll(axe._tree, 'a')[0];
-			assert.equal(axe.commons.text.accessibleText(target), '');
+			assert.equal(axe.commons.text.accessibleTextVirtual(target), '');
 		});
 	});
 
@@ -912,7 +920,7 @@ describe('text.accessibleText', function() {
 			axe._tree = axe.utils.getFlattenedTree(fixture);
 
 			var target = axe.utils.querySelectorAll(axe._tree, 'button')[0];
-			assert.equal(axe.commons.text.accessibleText(target), 'Hello World');
+			assert.equal(axe.commons.text.accessibleTextVirtual(target), 'Hello World');
 		});
 
 		it('should find aria-label', function() {
@@ -920,7 +928,7 @@ describe('text.accessibleText', function() {
 			axe._tree = axe.utils.getFlattenedTree(fixture);
 
 			var target = axe.utils.querySelectorAll(axe._tree, 'button')[0];
-			assert.equal(axe.commons.text.accessibleText(target), 'Hello World');
+			assert.equal(axe.commons.text.accessibleTextVirtual(target), 'Hello World');
 		});
 
 		it('should check subtree', function() {
@@ -928,7 +936,7 @@ describe('text.accessibleText', function() {
 			axe._tree = axe.utils.getFlattenedTree(fixture);
 
 			var target = axe.utils.querySelectorAll(axe._tree, 'button')[0];
-			assert.equal(axe.commons.text.accessibleText(target), 'Hello World');
+			assert.equal(axe.commons.text.accessibleTextVirtual(target), 'Hello World');
 		});
 
 		it('should find a title attribute', function() {
@@ -936,7 +944,7 @@ describe('text.accessibleText', function() {
 			axe._tree = axe.utils.getFlattenedTree(fixture);
 
 			var target = axe.utils.querySelectorAll(axe._tree, 'button')[0];
-			assert.equal(axe.commons.text.accessibleText(target), 'Hello World');
+			assert.equal(axe.commons.text.accessibleTextVirtual(target), 'Hello World');
 		});
 
 		it('should otherwise be empty string', function() {
@@ -944,7 +952,7 @@ describe('text.accessibleText', function() {
 			axe._tree = axe.utils.getFlattenedTree(fixture);
 
 			var target = axe.utils.querySelectorAll(axe._tree, 'button')[0];
-			assert.equal(axe.commons.text.accessibleText(target), '');
+			assert.equal(axe.commons.text.accessibleTextVirtual(target), '');
 		});
 	});
 
@@ -965,7 +973,7 @@ describe('text.accessibleText', function() {
 				axe._tree = axe.utils.getFlattenedTree(fixture);
 
 				var target = axe.utils.getNodeFromTree(axe._tree[0], elm);
-				var result = axe.commons.text.accessibleText(target);
+				var result = axe.commons.text.accessibleTextVirtual(target);
 				assert.equal(result, 'Hello World', tag);
 			});
 		});
@@ -979,7 +987,7 @@ describe('text.accessibleText', function() {
 				axe._tree = axe.utils.getFlattenedTree(fixture);
 
 				var target = axe.utils.getNodeFromTree(axe._tree[0], elm);
-				var result = axe.commons.text.accessibleText(target);
+				var result = axe.commons.text.accessibleTextVirtual(target);
 				assert.equal(result, 'Hello World', tag);
 			});
 		});
@@ -993,7 +1001,7 @@ describe('text.accessibleText', function() {
 				axe._tree = axe.utils.getFlattenedTree(fixture);
 
 				var target = axe.utils.getNodeFromTree(axe._tree[0], elm);
-				var result = axe.commons.text.accessibleText(target);
+				var result = axe.commons.text.accessibleTextVirtual(target);
 				assert.equal(result, 'Hello World', tag);
 			});
 		});
@@ -1004,7 +1012,7 @@ describe('text.accessibleText', function() {
 				axe._tree = axe.utils.getFlattenedTree(fixture);
 
 				var target = axe.utils.querySelectorAll(axe._tree, tag)[0];
-				assert.equal(axe.commons.text.accessibleText(target), '');
+				assert.equal(axe.commons.text.accessibleTextVirtual(target), '');
 			});
 		});
 	});
diff --git a/test/testutils.js b/test/testutils.js
index 762a394e35..708dc90e41 100644
--- a/test/testutils.js
+++ b/test/testutils.js
@@ -1,5 +1,10 @@
 var testUtils = {};
 
+/**
+ * Create a check context for mocking/resetting data and relatedNodes in tests
+ *
+ * @return Object
+ */
 testUtils.MockCheckContext = function () {
 	'use strict';
 	return {
@@ -18,6 +23,13 @@ testUtils.MockCheckContext = function () {
 	};
 };
 
+/**
+ * Provide an API for determining Shadow DOM v0 and v1 support in tests.
+ * PhantomJS doesn't have Shadow DOM support, while some browsers do.
+ *
+ * @param HTMLDocumentElement		The document of the current context
+ * @return Object
+ */
 testUtils.shadowSupport = (function(document) {
 	'use strict';
 	var v0 = document.body && typeof document.body.createShadowRoot === 'function',
@@ -34,6 +46,13 @@ testUtils.shadowSupport = (function(document) {
 
 })(document);
 
+/**
+ * Method for injecting content into a fixture and caching
+ * the flattened DOM tree (light and Shadow DOM together)
+ *
+ * @param Node|String 	Stuff to go into the fixture (html or DOM node)
+ * @return HTMLElement
+ */
 testUtils.fixtureSetup = function (content) {
 	'use strict';
 	var fixture = document.querySelector('#fixture');
@@ -51,6 +70,7 @@ testUtils.fixtureSetup = function (content) {
  * @param Node|String 	Stuff to go into the fixture (html or node)
  * @param Object  			Options argument for the check (optional, default: {})
  * @param String  			Target for the check, CSS selector (default: '#target')
+ * @return Array
  */
 testUtils.checkSetup = function (content, options, target) {
 	'use strict';

From 990e011bd027c92c24f8f75d977ed950ce99d57d Mon Sep 17 00:00:00 2001
From: Marcy Sutton <marcy.sutton@deque.com>
Date: Tue, 8 Aug 2017 15:24:32 -0700
Subject: [PATCH 109/142] chore: add changelog for 3.0.0-alpha-1

---
 CHANGELOG | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index a0555d8370..209ee7e6d6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -103,3 +103,18 @@ v2.3.1:
 	changes:
 		- Improvements to hidden-content rule
 		- Deduplicated langs in valid-lang options
+v3.0.0-alpha-1
+	date: 2017-08-08
+	changes:
+		- Shadow DOM support: rules and checks now supply a `virtualNode` in addition to the light DOM `node`. No <slot> styling support until supported by Chrome
+		- All commons and utilities refactored to support Shadow DOM
+		- Tests all refactored to support Shadow DOM
+		- API docs and developer guide now cover developing for Shadow DOM
+		- Fix for impact of incomplete nodes
+	additions:
+		- Commons virtual methods for handling virtual DOM
+		- New axe.utils.querySelectorAll method for querying the flattened tree
+		- New core APIs and test utilities for Shadow DOM development
+		- Support for ARIA 1.1: role=feed, role=term, aria-placeholder, aria-modal,
+    aria-current, aria-keyshortcuts 
+

From 81ee2e4cbb1be906a883d6da8fd0b9fd637fdf13 Mon Sep 17 00:00:00 2001
From: Matt Isner <isnerms@gmail.com>
Date: Wed, 9 Aug 2017 10:54:54 -0400
Subject: [PATCH 110/142] fix(checks/aria/required-children): add exception for
 native input combobox missing textbox

Remove textbox from the list of missing roles when checking a combobox node that is a native input element

https://github.com/dequelabs/axe-core/issues/160
---
 lib/checks/aria/required-children.js  | 9 +++++++++
 test/checks/aria/required-children.js | 6 ++++++
 2 files changed, 15 insertions(+)

diff --git a/lib/checks/aria/required-children.js b/lib/checks/aria/required-children.js
index 19bf438f53..be6d50702b 100644
--- a/lib/checks/aria/required-children.js
+++ b/lib/checks/aria/required-children.js
@@ -46,6 +46,15 @@ function missingRequiredChildren(node, childRoles, all) {
 		}
 	}
 
+	// combobox > textbox exception:
+	// remove textbox from missing roles if node is a native input
+	if (node.tagName === 'INPUT' && node.type === 'text') {
+		var textboxIndex = missing.indexOf('textbox');
+		if (textboxIndex >= 0) {
+			missing.splice(textboxIndex, 1);
+		}
+	}
+
 	if (missing.length) { return missing; }
 	if (!all && childRoles.length) { return childRoles; }
 	return null;
diff --git a/test/checks/aria/required-children.js b/test/checks/aria/required-children.js
index e63ff498b3..6938638c0f 100644
--- a/test/checks/aria/required-children.js
+++ b/test/checks/aria/required-children.js
@@ -97,6 +97,12 @@ describe('aria-required-children', function () {
 		assert.isTrue(checks['aria-required-children'].evaluate.apply(checkContext, params));
 	});
 
+	it('should pass a native input with role comboxbox when missing child is role textbox', function () {
+		fixture.innerHTML = '<input type="text" role="combobox" aria-owns="listbox" id="target"></div><p role="listbox" id="listbox">Nothing here.</p>';
+		var node = fixture.querySelector('#target');
+		assert.isTrue(checks['aria-required-children'].evaluate.call(checkContext, node));
+	});
+
 	it('should pass one indirectly aria-owned child when one required', function () {
 		var params = checkSetup('<div role="grid" id="target" aria-owns="r"></div><div id="r"><div role="row">Nothing here.</div></div>');
 		assert.isTrue(checks['aria-required-children'].evaluate.apply(checkContext, params));

From 311661cb8698bb792e41759b1c9f7ff4169bbe16 Mon Sep 17 00:00:00 2001
From: Marcy Sutton <marcy.sutton@deque.com>
Date: Wed, 9 Aug 2017 09:43:41 -0700
Subject: [PATCH 111/142] test: fix aria/required-children for Shadow DOM

---
 lib/checks/aria/required-children.js  | 2 +-
 test/checks/aria/required-children.js | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/lib/checks/aria/required-children.js b/lib/checks/aria/required-children.js
index be6d50702b..7453eee32d 100644
--- a/lib/checks/aria/required-children.js
+++ b/lib/checks/aria/required-children.js
@@ -31,7 +31,7 @@ function ariaOwns(nodes, role) {
 }
 
 function missingRequiredChildren(node, childRoles, all) {
-
+	//jshint maxstatements: 19
 	var i,
 	l = childRoles.length,
 	missing = [],
diff --git a/test/checks/aria/required-children.js b/test/checks/aria/required-children.js
index 6938638c0f..c522b9f4cf 100644
--- a/test/checks/aria/required-children.js
+++ b/test/checks/aria/required-children.js
@@ -98,9 +98,8 @@ describe('aria-required-children', function () {
 	});
 
 	it('should pass a native input with role comboxbox when missing child is role textbox', function () {
-		fixture.innerHTML = '<input type="text" role="combobox" aria-owns="listbox" id="target"></div><p role="listbox" id="listbox">Nothing here.</p>';
-		var node = fixture.querySelector('#target');
-		assert.isTrue(checks['aria-required-children'].evaluate.call(checkContext, node));
+		var params = checkSetup('<input type="text" role="combobox" aria-owns="listbox" id="target"></div><p role="listbox" id="listbox">Nothing here.</p>');
+		assert.isTrue(checks['aria-required-children'].evaluate.apply(checkContext, params));
 	});
 
 	it('should pass one indirectly aria-owned child when one required', function () {

From 9f7da56f6a9adb311265beac68ff45fc87c9beea Mon Sep 17 00:00:00 2001
From: Wilco Fiers <wilco.fiers@deque.com>
Date: Wed, 9 Aug 2017 10:43:56 +0200
Subject: [PATCH 112/142] feat: Add new ARIA 1.1 values for haspopup

---
 lib/commons/aria/index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/commons/aria/index.js b/lib/commons/aria/index.js
index 3a67810fe3..6d3fa943ea 100644
--- a/lib/commons/aria/index.js
+++ b/lib/commons/aria/index.js
@@ -60,8 +60,8 @@ lookupTables.attributes = {
 		values: ['true', 'false', 'undefined']
 	},
 	'aria-haspopup': {
-		type: 'boolean',
-		values: ['true', 'false']
+		type: 'nmtoken',
+		values: ['true', 'false', 'menu', 'listbox', 'tree', 'grid', 'dialog']
 	},
 	'aria-hidden': {
 		type: 'boolean',

From bb07c2d88d5e7251c347f4e6f00c871db13ae2ae Mon Sep 17 00:00:00 2001
From: Wilco Fiers <wilco.fiers@deque.com>
Date: Wed, 9 Aug 2017 10:49:58 +0200
Subject: [PATCH 113/142] feat: Add aria-orientation to additional roles

---
 lib/commons/aria/index.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/commons/aria/index.js b/lib/commons/aria/index.js
index 6d3fa943ea..b7a8423ae6 100644
--- a/lib/commons/aria/index.js
+++ b/lib/commons/aria/index.js
@@ -261,7 +261,7 @@ lookupTables.role = {
 	'combobox': {
 		type: 'composite',
 		attributes:  {
-			allowed: ['aria-expanded', 'aria-autocomplete', 'aria-required', 'aria-activedescendant']
+			allowed: ['aria-expanded', 'aria-autocomplete', 'aria-required', 'aria-activedescendant', 'aria-orientation']
 		},
 		owned: {
 			all: ['listbox', 'textbox']
@@ -443,7 +443,7 @@ lookupTables.role = {
 	'listbox': {
 		type: 'composite',
 		attributes: {
-			allowed: ['aria-activedescendant', 'aria-multiselectable', 'aria-required', 'aria-expanded']
+			allowed: ['aria-activedescendant', 'aria-multiselectable', 'aria-required', 'aria-expanded', 'aria-orientation']
 		},
 		owned: {
 			all: ['option']
@@ -503,7 +503,7 @@ lookupTables.role = {
 	'menu': {
 		type: 'composite',
 		attributes: {
-			allowed: ['aria-activedescendant', 'aria-expanded']
+			allowed: ['aria-activedescendant', 'aria-expanded', 'aria-orientation']
 		},
 		owned: {
 			one: ['menuitem', 'menuitemradio', 'menuitemcheckbox']
@@ -515,7 +515,7 @@ lookupTables.role = {
 	'menubar': {
 		type: 'composite',
 		attributes: {
-			allowed: ['aria-activedescendant', 'aria-expanded']
+			allowed: ['aria-activedescendant', 'aria-expanded', 'aria-orientation']
 		},
 		owned: null,
 		nameFrom: ['author'],
@@ -794,7 +794,7 @@ lookupTables.role = {
 	'tablist': {
 		type: 'composite',
 		attributes: {
-			allowed: ['aria-activedescendant', 'aria-expanded', 'aria-level', 'aria-multiselectable']
+			allowed: ['aria-activedescendant', 'aria-expanded', 'aria-level', 'aria-multiselectable', 'aria-orientation']
 		},
 		owned: {
 			all: ['tab']
@@ -870,7 +870,7 @@ lookupTables.role = {
 	'tree': {
 		type: 'composite',
 		attributes: {
-			allowed: ['aria-activedescendant', 'aria-multiselectable', 'aria-required', 'aria-expanded']
+			allowed: ['aria-activedescendant', 'aria-multiselectable', 'aria-required', 'aria-expanded', 'aria-orientation']
 		},
 		owned: {
 			all: ['treeitem']
@@ -882,7 +882,7 @@ lookupTables.role = {
 		type: 'composite',
 		attributes: {
 			allowed: ['aria-activedescendant', 'aria-colcount', 'aria-expanded', 'aria-level', 'aria-multiselectable',
-				'aria-readonly', 'aria-required', 'aria-rowcount']
+				'aria-readonly', 'aria-required', 'aria-rowcount', 'aria-orientation']
 		},
 		owned: {
 			all: ['treeitem']

From 645d1fa52f1bee7e452a3d9b5927b32005fa5a93 Mon Sep 17 00:00:00 2001
From: Wilco Fiers <wilco.fiers@deque.com>
Date: Wed, 9 Aug 2017 10:51:28 +0200
Subject: [PATCH 114/142] fix(aria): Treegrid should own rows, not treeitems

---
 lib/commons/aria/index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/commons/aria/index.js b/lib/commons/aria/index.js
index b7a8423ae6..2e844d8b14 100644
--- a/lib/commons/aria/index.js
+++ b/lib/commons/aria/index.js
@@ -885,7 +885,7 @@ lookupTables.role = {
 				'aria-readonly', 'aria-required', 'aria-rowcount', 'aria-orientation']
 		},
 		owned: {
-			all: ['treeitem']
+			one: ['rowgroup', 'row']
 		},
 		nameFrom: ['author'],
 		context: null
@@ -897,7 +897,7 @@ lookupTables.role = {
 		},
 		owned: null,
 		nameFrom: ['author', 'contents'],
-		context: ['treegrid', 'tree']
+		context: ['group', 'tree']
 	},
 	'widget': {
 		type: 'abstract'

From c8aca4f2a3eb18fdb6277d24bb5c5bc3b057f40d Mon Sep 17 00:00:00 2001
From: Marcy Sutton <marcy.sutton@deque.com>
Date: Wed, 9 Aug 2017 10:07:40 -0700
Subject: [PATCH 115/142] chore: update changelog for 3.0.0-alpha-1

---
 CHANGELOG | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 209ee7e6d6..abcab7f7d9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -110,11 +110,12 @@ v3.0.0-alpha-1
 		- All commons and utilities refactored to support Shadow DOM
 		- Tests all refactored to support Shadow DOM
 		- API docs and developer guide now cover developing for Shadow DOM
-		- Fix for impact of incomplete nodes
+		- Fix for impact of incomplete nodes (#356)
+		- Fix for combobox false positive (#160)
 	additions:
 		- Commons virtual methods for handling virtual DOM
 		- New axe.utils.querySelectorAll method for querying the flattened tree
 		- New core APIs and test utilities for Shadow DOM development
 		- Support for ARIA 1.1: role=feed, role=term, aria-placeholder, aria-modal,
-    aria-current, aria-keyshortcuts 
+    aria-current, aria-keyshortcuts, role=treegrid, aria-orientation, aria-haspopup
 

From fe9c5ef70aac8629f56cea68144d70a906260633 Mon Sep 17 00:00:00 2001
From: Marcy Sutton <marcy.sutton@deque.com>
Date: Thu, 10 Aug 2017 11:15:35 -0700
Subject: [PATCH 116/142] chore: fix  version for 3.0.0-alpha.1

---
 CHANGELOG    | 2 +-
 package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index abcab7f7d9..03f254cf71 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -103,7 +103,7 @@ v2.3.1:
 	changes:
 		- Improvements to hidden-content rule
 		- Deduplicated langs in valid-lang options
-v3.0.0-alpha-1
+v3.0.0-alpha.1
 	date: 2017-08-08
 	changes:
 		- Shadow DOM support: rules and checks now supply a `virtualNode` in addition to the light DOM `node`. No <slot> styling support until supported by Chrome
diff --git a/package.json b/package.json
index 274f2d793a..ecb8b05c19 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "axe-core",
   "description": "Accessibility engine for automated Web UI testing",
-  "version": "3.0.0-alpha-1",
+  "version": "3.0.0-alpha.1",
   "license": "MPL-2.0",
   "contributors": [
     {

From 25ddb47ec4eec565da330558ee061fd6e34a7c24 Mon Sep 17 00:00:00 2001
From: Wilco Fiers <WilcoFiers@users.noreply.github.com>
Date: Fri, 11 Aug 2017 12:39:46 +0200
Subject: [PATCH 117/142] feat: Add sri-history file and update process (#476)

---
 build/sri-update.js | 47 +++++++++++++++++++++++++++++++++++++++
 package.json        |  9 +++++---
 sri-history.json    | 54 +++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 107 insertions(+), 3 deletions(-)
 create mode 100644 build/sri-update.js
 create mode 100644 sri-history.json

diff --git a/build/sri-update.js b/build/sri-update.js
new file mode 100644
index 0000000000..b88c97cdf9
--- /dev/null
+++ b/build/sri-update.js
@@ -0,0 +1,47 @@
+var path = require('path');
+var fs = require('fs');
+var sriToolbox = require("sri-toolbox");
+
+// Check if we should be validating or updating 
+var validate = process.argv.some(function (arg) {
+	return arg === '--validate';
+});
+ 
+var root = path.join(__dirname, '..')
+var axeVersion = require('../package.json').version;
+var axeHistory = require('../sri-history.json');
+
+if (typeof axeHistory[axeVersion] !== 'object') {
+	axeHistory[axeVersion] = {}
+}
+var versionSRIs = axeHistory[axeVersion];
+
+// List all axe files (including minified and localized axe files)
+var axeFiles = fs.readdirSync(root).filter(function (file) {
+	return file.match(/^axe(\.[a-z.-]+)?\.js$/);
+});
+
+axeFiles.forEach(function (axeFile) {
+	var axeSource = fs.readFileSync(path.join(root, axeFile), 'utf-8');
+	var axeIntegrity = sriToolbox.generate({ algorithms: ["sha256"] }, axeSource);
+
+	if (!validate) {
+		// Update SRI
+		versionSRIs[axeFile] = axeIntegrity;
+
+	// Test if the SRI shouldn't be changed
+	} else if (versionSRIs[axeFile] && versionSRIs[axeFile] !== axeIntegrity) {
+		console.log(axeFile, 'did not match the SRI in sri-history.json')
+		process.exitCode = 1;
+	}
+});
+
+if (!validate) {
+	fs.writeFileSync(path.join(root, './sri-history.json'),
+		JSON.stringify(axeHistory, null, '\t'), 'utf-8');
+	console.log("Updated sri-history.json ")
+
+} else if (process.exitCode === 1) {
+	console.log('\nMake sure the package version and sri-history.json is updated ' +
+		'before publishing to NPM.\n');
+}
diff --git a/package.json b/package.json
index ecb8b05c19..6c7dcef9b3 100644
--- a/package.json
+++ b/package.json
@@ -50,7 +50,8 @@
     "build": "grunt",
     "test": "grunt test",
     "test-fast": "grunt test-fast",
-    "prepublishOnly": "grunt build"
+    "version": "node build/sri-update",
+    "prepublishOnly": "grunt build && node build/sri-update --validate"
   },
   "devDependencies": {
     "babel-plugin-transform-object-rest-spread": "^6.6.5",
@@ -79,6 +80,8 @@
     "mocha": "^3.2.0",
     "promise": "~7.1.1",
     "revalidator": "~0.3.1",
-    "selenium-webdriver": "~3.4.0"
-  }
+    "selenium-webdriver": "~3.4.0",
+    "sri-toolbox": "^0.2.0"
+  },
+  "dependencies": {}
 }
diff --git a/sri-history.json b/sri-history.json
new file mode 100644
index 0000000000..7bc1eeeb04
--- /dev/null
+++ b/sri-history.json
@@ -0,0 +1,54 @@
+{
+	"1.0.1": {
+		"axe.js": "sha256-F14wfpbaL6+ZafS2ufmz74/R6CD1L777gCOJVuLn5Ao=",
+		"axe.min.js": "sha256-GfbQgd6aKJKQT21HaQfVUuGEbMUfSKhi7RsWrrih7SM="
+	},
+	"1.1.0": {
+		"axe.js": "sha256-nG9+LLksY/HS6yG4x0iS08U7RAmTucy50uXQS5ndQnM=",
+		"axe.min.js": "sha256-5Lfk3/s+ieHttrDTOCVuepGjDgH2D1neTDDtXnJdIT0="
+	},
+	"1.1.1": {
+		"axe.js": "sha256-K0MLUClls79s14CT01F82LPc+ZubTBwt6fZDdN5iyFw=",
+		"axe.min.js": "sha256-UWXq259l36QypXwd2e4K2V1Lli2qHeSPmKfDXy+7uIM="
+	},
+	"2.0.5": {
+		"axe.js": "sha256-KVA5sj4tNmFLneuHPPbg4iEp3MBzsHvn3+s9CxfMrmc=",
+		"axe.min.js": "sha256-lt5eNq/L7IBUaoSUSAbQ7MEO02DThMGdVm/oxeA88gk="
+	},
+	"2.0.6": {
+		"axe.js": "sha256-cLV1ABoE5NjfwLaRAJYIstAJCmciDXZ55/TrQS5rR/M=",
+		"axe.min.js": "sha256-fnbwW70tA7/ya+5q5Oimc8wCRsdiv3WrU0MElp/euvY="
+	},
+	"2.0.7": {
+		"axe.js": "sha256-HjHe1xKQqP6i3eGpDlARb5HkFsZxvAslvr1JJhUlp60=",
+		"axe.min.js": "sha256-vo7Qs4YxFxzFEW5DG9u05JdAUCsFxx7dBIoBP5rzmKA="
+	},
+	"2.1.7": {
+		"axe.js": "sha256-kXUowSb3HQy6AChF4LYR4cvNxKEHCWqCcuiSxvY6E1s=",
+		"axe.min.js": "sha256-xJPQwkKDFmgwYDLqrt/esIHlc2HLUB2ogf9c1uS1BXA="
+	},
+	"2.2.0": {
+		"axe.js": "sha256-0iX4Q9QT3uHAo+oxS5NWsrU4DNZKB30JRf7m+jjZcX0=",
+		"axe.min.js": "sha256-3UsQJdfWbhtVd0QzcYi2VAJEfs8DMzxrRvr3h9WbMiE="
+	},
+	"2.2.1": {
+		"axe.js": "sha256-1kuZOWtoYszbvrtG7TYfl/FuO48uwZeFpN4aNnebABk=",
+		"axe.min.js": "sha256-WSHVQ1/IJaG9ZOydoFg+QXHLjOq8x/mhYkRAyN1yAdI="
+	},
+	"2.2.2": {
+		"axe.js": "sha256-jTirRblNTKinTlmCK3FqDG6POtZVbP/bJNdrXZhCuqk=",
+		"axe.min.js": "sha256-zpmYSLTgHx09UyYIvYrS5K6uj4VuBbspk54kHk5hPqo="
+	},
+	"2.2.3": {
+		"axe.js": "sha256-dV8RkE0hyyzj7qgValVkoP7Rtu8789BmbyeHZmidvqA=",
+		"axe.min.js": "sha256-BrNWjOcDL265Me8eKQosGWerJ6ju2g+G9+RvMWiBGOA="
+	},
+	"2.3.0": {
+		"axe.js": "sha256-rkyHB2lHjs+tissQLBUxuxIvWlzRbS4f4cdaH+TjQvo=",
+		"axe.min.js": "sha256-MGWkallV18uw6bSq6w8cjbGsf9v4rJtXP+NDtMEbO14="
+	},
+	"2.3.1": {
+		"axe.js": "sha256-63oq1xHBiOhX9jlvn5sJmoL8TwJ8JaLYIB91gyb74RI=",
+		"axe.min.js": "sha256-BGAllCBTUJjJXw3yOPMVai2Bj+1PVaEhK2na699nI/o="
+	}
+}
\ No newline at end of file

From fd607ddf0bfc9536b77017cee3a16c99f13c1c24 Mon Sep 17 00:00:00 2001
From: Dylan Barrell <dylan@barrell.com>
Date: Wed, 16 Aug 2017 13:33:16 -0400
Subject: [PATCH 118/142] Add University of Nebraska to the projects list

---
 doc/projects.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/projects.md b/doc/projects.md
index 15b10c33a3..d2248173a2 100644
--- a/doc/projects.md
+++ b/doc/projects.md
@@ -30,3 +30,4 @@ Add your project/integration to this file and submit a pull request.
 1. [Rocket Validator](https://rocketvalidator.com)
 1. [aXe Reports](https://github.com/louis-reed/axe-reports)
 1. [aXe-TestCafe](https://github.com/helen-dikareva/axe-testcafe)
+1. [Web Audit  University of Nebraska-Lincoln](https://webaudit.unl.edu/)

From 277fdb3c66b8a069ca043233c567d9e70c8c3d88 Mon Sep 17 00:00:00 2001
From: Romeeka Gayhart <rrgayhart@gmail.com>
Date: Fri, 18 Aug 2017 03:43:37 -0700
Subject: [PATCH 119/142] docs: Minor spelling fix (#490)

correct misspelling in CONTRIBUTING doc
---
 CONTRIBUTING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 1e5a0b49d0..6ed34eb678 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -2,7 +2,7 @@
 
 ## Contributor License Agreement
 
-In order to contribute, you must accept the [contributor licence agreement](https://cla-assistant.io/dequelabs/axe-core) (CLA). Acceptance of this agreement will be checked automatically and pull requests without a CLA cannot be merged.
+In order to contribute, you must accept the [contributor license agreement](https://cla-assistant.io/dequelabs/axe-core) (CLA). Acceptance of this agreement will be checked automatically and pull requests without a CLA cannot be merged.
 
 ## Contribution Guidelines
 

From 41853fea103bb11667560d95e543ee5642c241b8 Mon Sep 17 00:00:00 2001
From: Marcy Sutton <marcy.sutton@deque.com>
Date: Wed, 2 Aug 2017 17:44:17 -0700
Subject: [PATCH 120/142] docs: document help text and incomplete messages

---
 doc/rules.md | 66 ++++++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 56 insertions(+), 10 deletions(-)

diff --git a/doc/rules.md b/doc/rules.md
index 97e5a1ec76..b86f101f91 100644
--- a/doc/rules.md
+++ b/doc/rules.md
@@ -31,16 +31,62 @@ The actual testing of elements in axe-core is done by checks. A rule has one or
 | enabled              | Does the rule run by default
 | tags                 | Grouping for the rule, such as wcag2a, best-practice
 | metadata.description | Description of what a rule does
-| metadata.help        | Description of how to resolve an issue
+| metadata.help        | Short description of a violation, used in the aXe extension sidebar
 
 ## Check Properties
 
-| Prop. Name      | Description
-|-----------------|-----------------
-| id              | Unique identifier for the check
-| evaluate        | Evaluating function, returning a boolean value
-| options         | Configurable value for the check
-| after           | Cleanup function, run after check is done
-| metadata impact | "minor", "serious", "critical"
-| metadata pass   | Describes why the check passed
-| metadata fail   | Describes why the check failed
+| Prop. Name         | Description
+|--------------------|-----------------
+| id                 | Unique identifier for the check
+| evaluate           | Evaluating function, returning a boolean value
+| options            | Configurable value for the check
+| after              | Cleanup function, run after check is done
+| metadata impact    | "minor", "serious", "critical"
+| metadata pass      | Describes why the check passed
+| metadata fail      | Describes why the check failed
+| metadata incomplete| Describes why the check returned undefined
+
+Incomplete results occur when axe-core can’t produce a clear pass or fail result,
+giving users the opportunity to review it manually. Incomplete messages can take
+the form of a string, or an object with arbitrary keys matching the data returned
+from the check.
+
+Incomplete is optional for checks, while pass and fail are required.
+
+### Incomplete message string
+
+As one example, the audio and video caption checks return an incomplete string:
+```
+messages: {
+	pass: 'Why the check passed',
+	fail: 'Why the check failed',
+	incomplete: 'Why the check returned undefined'
+}
+```
+
+### Incomplete message object with missingData
+
+As another example, the color-contrast check returns missingData to aid in
+remediation. Here’s the message format:
+
+```
+messages: {
+	pass: 'Why the check passed',
+	fail: 'Why the check failed',
+	incomplete: {
+		bgImage: 'The background color could not be determined due to a background image',
+		default: 'fallback string'
+	}
+}
+```
+
+To wire up an incomplete message with a specific reason it returned undefined,
+the check needs matching data. Otherwise, it will fall back to the `default` message.
+Reasons are arbitrary for the check (such as 'bgImage') but they must match the
+data returned:
+
+```
+this.data({
+	missingData: 'bgImage'
+});
+```

From b7b7ebc3ce29174b9c1fbfd077dde3f919f3a719 Mon Sep 17 00:00:00 2001
From: Marcy Sutton <marcy.sutton@deque.com>
Date: Wed, 2 Aug 2017 18:01:32 -0700
Subject: [PATCH 121/142] docs: add incomplete to developer guide

---
 doc/developer-guide.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/developer-guide.md b/doc/developer-guide.md
index 7e0125af99..86cfa0d444 100644
--- a/doc/developer-guide.md
+++ b/doc/developer-guide.md
@@ -99,6 +99,7 @@ Similar to Rules, Checks are defined by JSON files in the [lib/checks directory]
 	* `messages` - `Object` These messages are displayed when the Check passes or fails
 		* `pass` - `String` [doT.js](http://olado.github.io/doT/) template string displayed when the Check passes
 		* `fail` - `String` [doT.js](http://olado.github.io/doT/) template string displayed when the Check fails
+		* `incomplete` – `String` [doT.js](http://olado.github.io/doT/) template string displayed when the Check is incomplete OR `Object` consisting of missingData for why it returned incomplete. Refer to [rules.md](./rules.md).
 
 #### Check `evaluate`
 

From b2523cd7022ac01ee1c177271b9cb860332c750e Mon Sep 17 00:00:00 2001
From: Marcy Sutton <marcy.sutton@deque.com>
Date: Mon, 7 Aug 2017 16:36:18 -0700
Subject: [PATCH 122/142] docs: incorporate feedback for incomplete checks

---
 doc/rules.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/rules.md b/doc/rules.md
index b86f101f91..53ab960ba2 100644
--- a/doc/rules.md
+++ b/doc/rules.md
@@ -44,14 +44,14 @@ The actual testing of elements in axe-core is done by checks. A rule has one or
 | metadata impact    | "minor", "serious", "critical"
 | metadata pass      | Describes why the check passed
 | metadata fail      | Describes why the check failed
-| metadata incomplete| Describes why the check returned undefined
+| metadata incomplete| Describes why the check didn’t complete
 
 Incomplete results occur when axe-core can’t produce a clear pass or fail result,
 giving users the opportunity to review it manually. Incomplete messages can take
 the form of a string, or an object with arbitrary keys matching the data returned
 from the check.
 
-Incomplete is optional for checks, while pass and fail are required.
+A pass message is required, while fail and incomplete are dependent on the check result.
 
 ### Incomplete message string
 

From 38ccda28ad32e5f0895e08886c15ba50de9a808e Mon Sep 17 00:00:00 2001
From: Marcy Sutton <marcy.sutton@deque.com>
Date: Mon, 7 Aug 2017 16:36:36 -0700
Subject: [PATCH 123/142] docs: add pass/fail template example

Closes https://github.com/dequelabs/axe-core/issues/475
---
 doc/developer-guide.md | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/doc/developer-guide.md b/doc/developer-guide.md
index 86cfa0d444..083e2d5669 100644
--- a/doc/developer-guide.md
+++ b/doc/developer-guide.md
@@ -99,7 +99,7 @@ Similar to Rules, Checks are defined by JSON files in the [lib/checks directory]
 	* `messages` - `Object` These messages are displayed when the Check passes or fails
 		* `pass` - `String` [doT.js](http://olado.github.io/doT/) template string displayed when the Check passes
 		* `fail` - `String` [doT.js](http://olado.github.io/doT/) template string displayed when the Check fails
-		* `incomplete` – `String` [doT.js](http://olado.github.io/doT/) template string displayed when the Check is incomplete OR `Object` consisting of missingData for why it returned incomplete. Refer to [rules.md](./rules.md).
+		* `incomplete` – `String|Object` – [doT.js](http://olado.github.io/doT/) template string displayed when the Check is incomplete OR an object with `missingData` on why it returned incomplete. Refer to [rules.md](./rules.md).
 
 #### Check `evaluate`
 
@@ -142,6 +142,17 @@ return results.filter(function (r) {
 
 Occasionally, you may want to add additional information about why a Check passed, failed or returned undefined into its message.  For example, the [aria-valid-attr](../lib/checks/aria/valid-attr.json) will add information about any invalid ARIA attributes to its fail message.  The message uses the [doT.js](http://olado.github.io/doT/) and is compiled to a JavaScript function at build-time.  In the Check message, you have access to the `CheckResult` as `it`.
 
+```javascript
+// aria-valid-attr check
+"messages": {
+  "pass": "ARIA attributes are used correctly for the defined role",
+  "fail": "ARIA attribute{{=it.data && it.data.length > 1 ? 's are' : ' is'}} not allowed:{{~it.data:value}} {{=value}}{{~}}"
+}
+```
+
+See [rules.md](./rules.md) for more information on writing rules and checks,
+including incomplete results.
+
 #### CheckResult
 
 When a Check is executed, its result is then added to a [CheckResult object](../lib/core/base/check-result.js).  Much like the RuleResult object, the CheckResult object only contains information that is required to determine whether a Check, and its parent Rule passed or failed.  `metadata` from the originating Check is combined later and will not be available until aXe reaches the reporting stage.

From 237ccff2b10f54649a2e065a8ec6d38a54aeca54 Mon Sep 17 00:00:00 2001
From: Brennan Payne <brennan.s.payne@gmail.com>
Date: Fri, 11 Aug 2017 12:18:16 -0500
Subject: [PATCH 124/142] Update API.md - Fix Typo

---
 doc/API.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/API.md b/doc/API.md
index bb7efc8eda..11bfd3d3a1 100644
--- a/doc/API.md
+++ b/doc/API.md
@@ -330,7 +330,7 @@ Additionally, there are a number or properties that allow configuration of diffe
 |-----------------|:-------:|:----------------------------:|
 | `runOnly`       | n/a     | Limit which rules are executed, based on names or tags
 | `rules`         | n/a     | Allow customizing a rule's properties (including { enable: false })
-| `reporter`      | `v1`    | Which reporter to use (see [Configutration](#api-name-axeconfigure))
+| `reporter`      | `v1`    | Which reporter to use (see [Configuration](#api-name-axeconfigure))
 | `xpath`         | `false` | Return xpath selectors for elements
 | `absolutePaths` | `false` | Use absolute paths when creating element selectors
 | `iframes`       | `true`  | Tell axe to run inside iframes

From 9b3d19910ac0c61c064311881d589e64e54c0a56 Mon Sep 17 00:00:00 2001
From: Marcy Sutton <marcy.sutton@deque.com>
Date: Tue, 15 Aug 2017 11:32:51 -0700
Subject: [PATCH 125/142] feat: add precommit hook on npm postinstall

---
 package.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 6c7dcef9b3..f37278c216 100644
--- a/package.json
+++ b/package.json
@@ -51,9 +51,11 @@
     "test": "grunt test",
     "test-fast": "grunt test-fast",
     "version": "node build/sri-update",
-    "prepublishOnly": "grunt build && node build/sri-update --validate"
+    "prepublishOnly": "grunt build && node build/sri-update --validate",
+    "postinstall": "ln -s -f node_modules/angular-precommit/index.js .git/hooks/commit-msg"
   },
   "devDependencies": {
+    "angular-precommit": "^1.0.3",
     "babel-plugin-transform-object-rest-spread": "^6.6.5",
     "babel-polyfill": "^6.7.4",
     "babel-preset-es2015": "^6.6.0",

From 16f2f76cac9282e35e2ff18e4b0353b0d942ec6f Mon Sep 17 00:00:00 2001
From: Marcy Sutton <marcy.sutton@deque.com>
Date: Tue, 15 Aug 2017 12:48:46 -0700
Subject: [PATCH 126/142] fix: copy precommit hook as file, not a link

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index f37278c216..66b84a9f1a 100644
--- a/package.json
+++ b/package.json
@@ -52,7 +52,7 @@
     "test-fast": "grunt test-fast",
     "version": "node build/sri-update",
     "prepublishOnly": "grunt build && node build/sri-update --validate",
-    "postinstall": "ln -s -f node_modules/angular-precommit/index.js .git/hooks/commit-msg"
+    "postinstall": "cd .git/hooks/ && cp ../../node_modules/angular-precommit/index.js commit-msg && cd ../../"
   },
   "devDependencies": {
     "angular-precommit": "^1.0.3",

From 1107783124c5d7c2195e2fedb005558208e8db18 Mon Sep 17 00:00:00 2001
From: Marcy Sutton <marcy.sutton@deque.com>
Date: Tue, 15 Aug 2017 13:14:04 -0700
Subject: [PATCH 127/142] fix: only run postinstall if .git exists

---
 bin/postinstall.sh | 8 ++++++++
 package.json       | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100755 bin/postinstall.sh

diff --git a/bin/postinstall.sh b/bin/postinstall.sh
new file mode 100755
index 0000000000..d6a0fb45b0
--- /dev/null
+++ b/bin/postinstall.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+if [ -d ".git" ]; then
+	if [ ! -f ".git/hooks/commit-msg" ]; then
+		echo "Installing pre-commit hook"
+		cd .git/hooks/ && cp ../../node_modules/angular-precommit/index.js commit-msg && cd ../../
+	fi
+fi
\ No newline at end of file
diff --git a/package.json b/package.json
index 66b84a9f1a..68bd753d8b 100644
--- a/package.json
+++ b/package.json
@@ -52,7 +52,7 @@
     "test-fast": "grunt test-fast",
     "version": "node build/sri-update",
     "prepublishOnly": "grunt build && node build/sri-update --validate",
-    "postinstall": "cd .git/hooks/ && cp ../../node_modules/angular-precommit/index.js commit-msg && cd ../../"
+    "postinstall": "./bin/postinstall.sh"
   },
   "devDependencies": {
     "angular-precommit": "^1.0.3",

From 674408f16e58f1f4fb712ea55f00348ecf178cad Mon Sep 17 00:00:00 2001
From: Marcy Sutton <marcy.sutton@deque.com>
Date: Tue, 15 Aug 2017 13:25:03 -0700
Subject: [PATCH 128/142] fix: try telling circle to skip .git/hooks

---
 bin/postinstall.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/postinstall.sh b/bin/postinstall.sh
index d6a0fb45b0..72db42e15a 100755
--- a/bin/postinstall.sh
+++ b/bin/postinstall.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-if [ -d ".git" ]; then
+if [ -d ".git/hooks" ]; then
 	if [ ! -f ".git/hooks/commit-msg" ]; then
 		echo "Installing pre-commit hook"
 		cd .git/hooks/ && cp ../../node_modules/angular-precommit/index.js commit-msg && cd ../../

From 508fae216232b9e7bc1981ecbeea196d4704da3a Mon Sep 17 00:00:00 2001
From: Marcy Sutton <holla@marcysutton.com>
Date: Mon, 21 Aug 2017 02:56:41 -0700
Subject: [PATCH 129/142] feat: allow link text from single-cell layout table
 (#495)

Closes https://dequesrc.atlassian.net/browse/WWD-547
---
 lib/commons/text/accessible-text-virtual.js | 12 ++++++++++--
 test/commons/text/accessible-text.js        | 16 ++++++++++++++++
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/lib/commons/text/accessible-text-virtual.js b/lib/commons/text/accessible-text-virtual.js
index db9ce355d4..002a313f8a 100644
--- a/lib/commons/text/accessible-text-virtual.js
+++ b/lib/commons/text/accessible-text-virtual.js
@@ -169,8 +169,16 @@ text.accessibleTextVirtual = function accessibleTextVirtual(element, inLabelledB
 		}, '');
 	}
 
+	function getLayoutTableText (element) {
+		// // check if layout table only has one cell
+		if (!axe.commons.table.isDataTable(element.actualNode) && axe.commons.table.getAllCells(element.actualNode).length === 1) {
+			return getInnerText(element, false, false).trim();
+		}
+		return '';
+	}
+
 	function checkNative (element, inLabelledByContext, inControlContext) {
-		// jshint maxstatements:30
+		// jshint maxstatements:30, maxcomplexity: 20
 		let returnText = '';
 		const { actualNode } = element;
 		const nodeName = actualNode.nodeName.toUpperCase();
@@ -197,7 +205,7 @@ text.accessibleTextVirtual = function accessibleTextVirtual(element, inLabelledB
 			}
 
 			returnText = (actualNode.getAttribute('title') ||
-					actualNode.getAttribute('summary') || '');
+					actualNode.getAttribute('summary') || getLayoutTableText(element) || '');
 
 			if (nonEmptyText(returnText)) {
 				return returnText;
diff --git a/test/commons/text/accessible-text.js b/test/commons/text/accessible-text.js
index 84c0ea89f9..d69f7faa86 100644
--- a/test/commons/text/accessible-text.js
+++ b/test/commons/text/accessible-text.js
@@ -911,6 +911,22 @@ describe('text.accessibleTextVirtual', function() {
 			var target = axe.utils.querySelectorAll(axe._tree, 'a')[0];
 			assert.equal(axe.commons.text.accessibleTextVirtual(target), '');
 		});
+
+		it('should use text from a table with a single cell and role=presentation', function() {
+			fixture.innerHTML = '<a href="example.html">' +
+				'<table role="presentation">' +
+					'<tr>' +
+						'<td>' +
+						'Descriptive Link Text' +
+						'</td>' +
+					'</tr>' +
+				'</table>' +
+			'</a>';
+			axe._tree = axe.utils.getFlattenedTree(fixture);
+
+			var target = axe.utils.querySelectorAll(axe._tree, 'a')[0];
+			assert.equal(axe.commons.text.accessibleTextVirtual(target), 'Descriptive Link Text');
+		});
 	});
 
 	describe('button', function() {

From 94008ff572d49b13489dc964194a8cda4b686396 Mon Sep 17 00:00:00 2001
From: Matt Isner <isner@users.noreply.github.com>
Date: Tue, 22 Aug 2017 04:53:40 -0400
Subject: [PATCH 130/142] fix: Use frame query that supports shadow dom (#492)

---
 lib/core/public/cleanup-plugins.js | 6 ++++--
 lib/core/public/plugins.js         | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/core/public/cleanup-plugins.js b/lib/core/public/cleanup-plugins.js
index 46b3fab118..a29f9cbca0 100644
--- a/lib/core/public/cleanup-plugins.js
+++ b/lib/core/public/cleanup-plugins.js
@@ -23,9 +23,11 @@ function cleanupPlugins(resolve, reject) {
     });
   });
 
-  axe.utils.toArray(document.querySelectorAll('frame, iframe')).forEach(function (frame) {
+  var flattenedTree = axe.utils.getFlattenedTree(document.body)
+
+  axe.utils.querySelectorAll(flattenedTree, 'iframe, frame').forEach(function (node) {
     q.defer(function (res, rej) {
-      return axe.utils.sendCommandToFrame(frame, {
+      return axe.utils.sendCommandToFrame(node.actualNode, {
         command: 'cleanup-plugin'
       }, res, rej);
     });
diff --git a/lib/core/public/plugins.js b/lib/core/public/plugins.js
index 65ba6253c1..ba71f9e40a 100644
--- a/lib/core/public/plugins.js
+++ b/lib/core/public/plugins.js
@@ -43,4 +43,4 @@ Plugin.prototype.add = function (impl) {
 axe.registerPlugin = function (plugin) {
 	'use strict';
 	axe.plugins[plugin.id] = new Plugin(plugin);
-};
\ No newline at end of file
+};

From 0467fa7d24391157ab28d6ba61a14b1a61095c72 Mon Sep 17 00:00:00 2001
From: Wilco Fiers <wilco.fiers@deque.com>
Date: Tue, 22 Aug 2017 16:09:21 +0200
Subject: [PATCH 131/142] chore: Fix lint problem in cleanup-plugin

---
 lib/core/public/cleanup-plugins.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/core/public/cleanup-plugins.js b/lib/core/public/cleanup-plugins.js
index a29f9cbca0..b3e6a0e876 100644
--- a/lib/core/public/cleanup-plugins.js
+++ b/lib/core/public/cleanup-plugins.js
@@ -23,7 +23,7 @@ function cleanupPlugins(resolve, reject) {
     });
   });
 
-  var flattenedTree = axe.utils.getFlattenedTree(document.body)
+  var flattenedTree = axe.utils.getFlattenedTree(document.body);
 
   axe.utils.querySelectorAll(flattenedTree, 'iframe, frame').forEach(function (node) {
     q.defer(function (res, rej) {

From 859f5da926060cfce62992a0444768b4d8139790 Mon Sep 17 00:00:00 2001
From: Marcy Sutton <holla@marcysutton.com>
Date: Tue, 29 Aug 2017 00:40:16 -0700
Subject: [PATCH 132/142] chore: remove accesslint from projects (#503)

---
 doc/projects.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/doc/projects.md b/doc/projects.md
index d2248173a2..d26e316bc0 100644
--- a/doc/projects.md
+++ b/doc/projects.md
@@ -19,7 +19,6 @@ Add your project/integration to this file and submit a pull request.
 1. [Vorlon.js Remote Debugger](https://github.com/MicrosoftDX/Vorlonjs)
 1. [Selenium IDE aXe Extension](https://github.com/bkardell/selenium-ide-axe)
 1. [gulp-axe-webdriver](https://github.com/felixzapata/gulp-axe-webdriver)
-1. [AccessLint](https://accesslint.com/)
 1. [Lighthouse](https://github.com/GoogleChrome/lighthouse)
 1. [Axegrinder](https://github.com/claflamme/axegrinder)
 1. [Ghost-Axe](https://www.npmjs.com/package/ghost-axe)

From 5a77c2fe14cdb75dcf6deb083c28e08dfdc57472 Mon Sep 17 00:00:00 2001
From: Marcy Sutton <marcy.sutton@deque.com>
Date: Mon, 28 Aug 2017 15:28:05 -0700
Subject: [PATCH 133/142] fix: expand tr support for color contrast

---
 lib/commons/color/get-background-color.js  | 22 +++++-----
 test/commons/color/get-background-color.js | 48 ++++++++++++++++++++--
 2 files changed, 55 insertions(+), 15 deletions(-)

diff --git a/lib/commons/color/get-background-color.js b/lib/commons/color/get-background-color.js
index 2d35d95eea..47e19e2a93 100644
--- a/lib/commons/color/get-background-color.js
+++ b/lib/commons/color/get-background-color.js
@@ -121,22 +121,22 @@ function elmPartiallyObscured(elm, bgElm, bgColor) {
  * @param {Element} elm
  */
 function includeMissingElements(elmStack, elm) {
-	const elementMap = {'TD': 'TR', 'INPUT': 'LABEL'};
+	const elementMap = {'TD': 'TR', 'TH': 'TR', 'INPUT': 'LABEL'};
 	const tagArray = elmStack.map((elm) => {
 		return elm.tagName;
 	});
 	let bgNodes = elmStack;
 	for (let candidate in elementMap) {
-		if (elementMap.hasOwnProperty(candidate)) {
-			// tagName matches key
-			if (elm.tagName === candidate) {
-				let ancestorMatch = axe.commons.dom.findUp(elm, elementMap[candidate]);
-				if (ancestorMatch && elmStack.indexOf(ancestorMatch) === -1) {
-					// found an ancestor not in elmStack, and it overlaps
-					let overlaps = axe.commons.dom.visuallyOverlaps(elm.getBoundingClientRect(), ancestorMatch);
-					if (overlaps) {
-						bgNodes.splice(elmStack.indexOf(elm) + 1, 0, ancestorMatch);
-					}
+		// check that TR or LABEL has paired nodeName from elementMap, but don't expect elm to be that candidate 
+		if (tagArray.includes(candidate)) {
+			// look up the tree for a matching candidate
+			let ancestorMatch = axe.commons.dom.findUp(elm, elementMap[candidate]);
+			if (ancestorMatch && elmStack.indexOf(ancestorMatch) === -1) {
+				// found an ancestor not in elmStack, and it overlaps
+				let overlaps = axe.commons.dom.visuallyOverlaps(elm.getBoundingClientRect(), ancestorMatch);
+				if (overlaps) {
+					// if target is in the elementMap, use its position. 
+					bgNodes.splice(tagArray.indexOf(candidate) + 1, 0, ancestorMatch);
 				}
 			}
 			// tagName matches value
diff --git a/test/commons/color/get-background-color.js b/test/commons/color/get-background-color.js
index 8a62a0264f..35723c2f3b 100644
--- a/test/commons/color/get-background-color.js
+++ b/test/commons/color/get-background-color.js
@@ -192,14 +192,54 @@ describe('color.getBackgroundColor', function () {
 		assert.deepEqual(bgNodes, [target]);
 	});
 
-	it('should count a TR as a background element', function () {
+	it('should count a TR as a background element for TD', function () {
 		fixture.innerHTML = '<div style="background-color:#007acc;">' +
 		'<table style="width:100%">' +
 			'<tr style="background-color:#f3f3f3; height:40px;" id="parent">' +
-        '<td style="color:#007acc" id="target">' +
+				'<td style="color:#007acc" id="target">' +
 					'Cell content</td>' +
-        '</tr>' +
-      '</table></div>';
+			'</tr>' +
+		'</table></div>';
+		var target = fixture.querySelector('#target'),
+				parent = fixture.querySelector('#parent');
+		var bgNodes = [];
+		var actual = axe.commons.color.getBackgroundColor(target, bgNodes);
+		var expected = new axe.commons.color.Color(243, 243, 243, 1);
+		assert.equal(actual.red, expected.red);
+		assert.equal(actual.green, expected.green);
+		assert.equal(actual.blue, expected.blue);
+		assert.equal(actual.alpha, expected.alpha);
+		assert.deepEqual(bgNodes, [parent]);
+	});
+
+	it('should count a TR as a background element for TH', function () {
+		fixture.innerHTML = '<div style="background-color:#007acc;">' +
+		'<table style="width:100%">' +
+			'<tr style="background-color:#f3f3f3; height:40px;" id="parent">' +
+				'<th style="color:#007acc" id="target">' +
+					'Header content</th>' +
+			'</tr>' +
+		'</table></div>';
+		var target = fixture.querySelector('#target'),
+				parent = fixture.querySelector('#parent');
+		var bgNodes = [];
+		var actual = axe.commons.color.getBackgroundColor(target, bgNodes);
+		var expected = new axe.commons.color.Color(243, 243, 243, 1);
+		assert.equal(actual.red, expected.red);
+		assert.equal(actual.green, expected.green);
+		assert.equal(actual.blue, expected.blue);
+		assert.equal(actual.alpha, expected.alpha);
+		assert.deepEqual(bgNodes, [parent]);
+	});
+
+	it('should count a TR as a background element for a child element', function () {
+		fixture.innerHTML = '<div style="background-color:#007acc;">' +
+		'<table style="width:100%">' +
+			'<tr style="background-color:#f3f3f3; height:40px;" id="parent">' +
+			'<td>' +
+					'<span style="color:#007acc" id="target">Cell content</span>' +
+			'</td></tr>' +
+		'</table></div>';
 		var target = fixture.querySelector('#target'),
 				parent = fixture.querySelector('#parent');
 		var bgNodes = [];

From 9402a7c4c05942207fc4f480b3acbbf70df03efa Mon Sep 17 00:00:00 2001
From: Matt Isner <isnerms@gmail.com>
Date: Tue, 22 Aug 2017 11:40:01 -0400
Subject: [PATCH 134/142] chore: ignore node_modules when linting

---
 Gruntfile.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index 54ad938d05..2f28d89f3b 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -329,7 +329,8 @@ module.exports = function (grunt) {
 				},
 				src: [
 					'lib/**/*.js', 'test/**/*.js', 'build/tasks/**/*.js',
-					'doc/**/*.js', '!doc/examples/jest+react/*.js', 'Gruntfile.js'
+					'doc/**/*.js', '!doc/examples/jest+react/*.js', 'Gruntfile.js',
+					'!**/node_modules/**/*.js'
 				]
 			}
 		}

From 7f66ee86ceca3f97a31578385a6dd11b969f8e12 Mon Sep 17 00:00:00 2001
From: Wilco Fiers <wilco.fiers@deque.com>
Date: Thu, 31 Aug 2017 15:02:20 +0200
Subject: [PATCH 135/142] fix: Ignore shadowRoots on elements that don't allow
 them

---
 lib/checks/.DS_Store              | Bin 0 -> 8196 bytes
 lib/core/utils/flattened-tree.js  |  18 ++++++++++--
 test/core/utils/flattened-tree.js |  46 ++++++++++++++++++++++++++++++
 3 files changed, 62 insertions(+), 2 deletions(-)
 create mode 100644 lib/checks/.DS_Store

diff --git a/lib/checks/.DS_Store b/lib/checks/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..6a583cd791c947cc0fa884746b4e83e310416d9d
GIT binary patch
literal 8196
zcmeHMTWl0n7(QPqFl(nUKr3aT*##mHX=JNVE=JhixDy(7X$utB*_}ffna(sjvs<8&
z)EF-$28|joPlgyT0UwM)d@y*wfW`+6Mj`PDFENq$<co=y|C}==&~D|;V3?E4`RAPf
za?bhYJ9FmWWsIS%WHmF^z!=l$64I!lszMQZag8fgVNW$lkUwK3X0m?9^F#jNIP0h*
zLLfpQLLfpQLLfrmMnHhhY*Dlc&V8kg>Ii`dftwNm@qS3sC1g63BTC9w2URi!ASqG+
zS?Hef0O^wqWjd52N=jFXsj>%zt_V{MD0k8)g*nM|C`Xi3?hMMEAsiWDh5|V{`6Z<}
zLt4qGju40t7>|J1J{of<Z+9tkzbb#vJ6@i)(cJu?WBWlWbrDsQswYpGs>N=p(Q9jJ
z4ZWteW^ZP{H<Ss?pyaoi#hfuOV_Q6L7JF<f*q`NYr^CzK-Co>k2E4dO7-v1tAp>=9
z=DTe^lr!quJvT6ImltI`6{D}mb}etH%`3T<-*<K3oKfFZ<YjX0GF{$n`*z-T?BI|L
z8XC&`E;HCqgK5U+F)fxe8it3PQ!P!&J6oEMG$n^uu1qy0m*3TL<cJp2w8o{IyYq)0
zdHUqrAAS7kXJ^m-@Z(PkErf3zRyPK{pDRJ<_~kAIUDff*(8W8~ch1r`_Syx{&De)|
z&Y12KFq^0uuBxZtIi&&D&lxicrc)?6gkG!T2xID-?iY%l<8*nx9oU|`t2f{WgV8|O
zsCsw%UNLBw!E%OC^7#%<vFtMMpokP|roeFfpa|o4^P*33VLGLj89Om;_Ppe6w=Y}1
z>Ynq{jTtj%)#>_fdNgie@3VPv=a6{DyG*~pUCVa+d&=TDI6Ui`1AGRWVlnB}Fek3}
zSv1@>&k}x?aavQF#yRo$9-(P3a;hy&lMeG2#PzICOEt{UaM5C2&mJH$7=9RZX_Fq`
z>6m%$7*<TVrJD74Pg$+O*b;WGsMF)U1#e)0ChdoPtJlQi_ljY+ntrf-kh?UcvtsPE
z>(Z?>rHR(HOZc=}mYArvaFhxQ(@R3Q3~_=rvPEnaomg46k9q7t_BeZyonmL$yX+kM
zntjhMvCHgt_6Pfu{l)%<hI-6K1Lj}>?!Ypnuo`QTMl0H|1zp&I46@jZ0yy@eAA>lE
z!x+W`co@g<1fIkTcnv3T60hSl-oYpM65rxGT);(K!mqfjrdBmd;7y~mRuaFF9Jlw0
zz=I)yk5(pdV#CG_^?LgaPv8sF6m9Eooh^C1dTrYkGK^us)jX8sQ|ywg8)cOw_BB*K
zPvo9EuTf9zBy#eD6EVk_Dz<|rt>-UDBn(XwPB<@GOwB6V5=y(YDWMyaB=LooIGr#i
zONxu;iWXfrs^umS%{6zEc8cV>Xs&A{Eu#%08tscI5a_j5fvEpV)34Y?_KTn>7$&0@
zGm*d&BIj}<=6Y--T5iQQbfXu$u?Kxb%zoIo9|sViO!PcN1bv9;`6wR4Q9Olb@GPFg
z^Ei%|@G@S(t9S!%;w_xQ8N7%0@c}->7dStLsGG+S^_xmWEoX|Z<GKB$8zuO)Zc*zx
z2uxD?29f`FPW=1-b)rP-2!RNJ|1$!p?#Ohs(F!JdkBVG7N!NXJi6ZPql$0)12@}yT
p({Ykl{xGEbWT;DrazsheQ2Eb)2#_Cx(fMEbGc`K@B`I%$>K`(GPf7p)

literal 0
HcmV?d00001

diff --git a/lib/core/utils/flattened-tree.js b/lib/core/utils/flattened-tree.js
index 0c5189f325..ec618bbcb1 100644
--- a/lib/core/utils/flattened-tree.js
+++ b/lib/core/utils/flattened-tree.js
@@ -51,6 +51,20 @@ function getSlotChildren(node) {
 	return retVal;
 }
 
+const possibleShadowRoots = ['article', 'aside', 'blockquote', 
+		'body', 'div', 'footer', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 
+		'header', 'main', 'nav', 'p', 'section', 'span'];
+axe.utils.isShadowRoot = function isShadowRoot (node) {
+	const nodeName = node.nodeName.toLowerCase();
+	if (node.shadowRoot) {
+		if (/^[a-z][a-z0-9_.-]*-[a-z0-9_.-]*$/.test(nodeName) ||
+				possibleShadowRoots.includes(nodeName)) {
+			return true;
+		}
+	}
+	return false;
+};
+
 /**
  * Recursvely returns an array of the virtual DOM nodes at this level
  * excluding comment nodes and the shadow DOM nodes <content> and <slot>
@@ -75,8 +89,8 @@ axe.utils.getFlattenedTree = function (node, shadowId) {
 		node = node.documentElement;
 	}
 	nodeName = node.nodeName.toLowerCase();
-	// for some reason Chrome's marquee element has an open shadow DOM
-	if (node.shadowRoot && nodeName !== 'marquee') {
+
+	if (axe.utils.isShadowRoot(node)) {
 		// generate an ID for this shadow root and overwrite the current
 		// closure shadowId with this value so that it cascades down the tree
 		retVal = virtualDOMfromNode(node, shadowId);
diff --git a/test/core/utils/flattened-tree.js b/test/core/utils/flattened-tree.js
index 279a4af8a6..4d29057588 100644
--- a/test/core/utils/flattened-tree.js
+++ b/test/core/utils/flattened-tree.js
@@ -66,6 +66,32 @@ function shadowIdAssertions () {
 
 }
 
+describe('isShadowRoot', function () {
+	'use strict';
+	var isShadowRoot = axe.utils.isShadowRoot;
+
+	it('returns false if the node has no shadowRoot', function () {
+		assert.isFalse(isShadowRoot({ nodeName: 'DIV', shadowRoot: undefined }));
+	});
+	it('returns true if the native element allows shadow DOM', function () {
+		assert.isTrue(isShadowRoot({ nodeName: 'DIV', shadowRoot: {} }));
+		assert.isTrue(isShadowRoot({ nodeName: 'H1', shadowRoot: {} }));
+		assert.isTrue(isShadowRoot({ nodeName: 'ASIDE', shadowRoot: {} }));
+	});
+	it('returns true if a custom element with shadowRoot', function () {
+		assert.isTrue(isShadowRoot({ nodeName: 'X-BUTTON', shadowRoot: {} }));
+		assert.isTrue(isShadowRoot({ nodeName: 'T1000-SCHWARZENEGGER', shadowRoot: {} }));
+	});
+	it('returns true if an invalid custom element with shadowRoot', function () {
+		assert.isFalse(isShadowRoot({ nodeName: '0-BUZZ', shadowRoot: {} }));
+		assert.isFalse(isShadowRoot({ nodeName: '--ELM--', shadowRoot: {} }));
+	});
+	it('returns false if the native element does not allow shadow DOM', function () {
+		assert.isFalse(isShadowRoot({ nodeName: 'IFRAME', shadowRoot: {} }));
+		assert.isFalse(isShadowRoot({ nodeName: 'STRONG', shadowRoot: {} }));
+	});
+});
+
 if (shadowSupport.v0) {
 	describe('flattened-tree shadow DOM v0', function () {
 		'use strict';
@@ -154,6 +180,26 @@ if (shadowSupport.v1) {
 			assert.isTrue(virtualDOM[0].children[2].children[1].children[0].children[0].actualNode.textContent === 'fallback content');
 			assert.isTrue(virtualDOM[0].children[2].children[1].children[0].children[1].actualNode.nodeName === 'LI');
 		});
+		it('calls isShadowRoot to identify a shadow root', function () {
+			var isShadowRoot = axe.utils.isShadowRoot;
+			fixture.innerHTML = '<div></div>';
+			var div = fixture.querySelector('div');
+			var shadowRoot = div.attachShadow({ mode: 'open' });
+			shadowRoot.innerHTML = '<h1>Just a man in the back</h1>';
+
+			// Test without isShqdowRoot overwritten
+			assert.equal(axe.utils.getFlattenedTree(div)[0].children.length, 1);
+
+			var called = false;
+			axe.utils.isShadowRoot = function () {
+				called = true;
+				return false;
+			};
+			// Test with isShadowRoot overwritten
+			assert.equal(axe.utils.getFlattenedTree(div)[0].children.length, 0);
+			assert.isTrue(called);
+			axe.utils.isShadowRoot = isShadowRoot;
+		});
 	});
 	describe('flattened-tree shadow DOM v1: boxed slots', function () {
 		'use strict';

From e1e067d8f4445042360b2bef957037d5cdd0b7db Mon Sep 17 00:00:00 2001
From: Marcy Sutton <marcy.sutton@deque.com>
Date: Tue, 15 Aug 2017 17:11:55 -0700
Subject: [PATCH 136/142] feat: add standard-version

Add tool for automating version bumps and changelog generation

Closes https://dequesrc.atlassian.net/browse/WWD-819
---
 CHANGELOG    | 121 --------------------------------
 CHANGELOG.md | 193 +++++++++++++++++++++++++++++++++++++++++++++++++++
 bower.json   |   6 +-
 package.json |   6 +-
 4 files changed, 200 insertions(+), 126 deletions(-)
 delete mode 100644 CHANGELOG
 create mode 100644 CHANGELOG.md

diff --git a/CHANGELOG b/CHANGELOG
deleted file mode 100644
index 03f254cf71..0000000000
--- a/CHANGELOG
+++ /dev/null
@@ -1,121 +0,0 @@
-v1.0.1:
-	date: 2015-06-10
-	changes:
-		- Initial public release
-v1.1.1:
-	date: 2015-09-04
-	changes:
-		- Adds Travis hooks
-		- Adds Sauce Labs
-		- Encodes HTML in descriptions
-		- Updates messages and help URLs
-v2.0.0:
-	date: 2016-03-01
-	changes:
-		- Adds support for AMD modules
-		- Fixes incompatibility with Webpack
-		- Improvements to rules and checks
-		- Help urls no longer hard-coded
-		- Improved error handling
-v2.0.3:
-	date: 2016-04-12
-	changes:
-		- Security improvements
-		- Build includes Babel/ES6
-		- Improvements to table rules
-		- aXe can be loaded in Node
-v2.0.4:
-	date: 2016-04-13
-	changes:
-		- Improvements to messaging for extensions
-v2.0.5:
-	date: 2016-04-20
-	changes:
-		- Support for UMD pattern
-		- Adds 508 tagging for table rules
-		- Fixes race condition for iframes
-		- Exclude actual nodes from array checking
-v2.0.7:
-	date: 2016-09-28
-	changes:
-		- Add TypeScript definition v1
-v2.1.7:
-	date: 2016-12-13
-	changes:
-		- Add promise-based axe.run API method in favor of axe.a11yCheck
-		- Move TypeScript definition to root of project
-		- Add Inapplicable and Can't Tell results
-		- New rule: frame-title-unique
-		- Improvements to table rules: td-has-header, th-has-data-cells
-		- Color contrast rule performance improvements using polyfilled elementsFromPoint
-		- Add better support for implicit roles
-		- DQElement supports xPath
-v2.1.8:
-	date: 2017-02-21
-	changes:
-		- Move from Snyk to Retire.js
-		- Make CI run test-fast task instead of parallel
-		- Add documentation on writing integration tests and rules
-		- Allow a larger list of languages for HTML-valid-lang rule
-		- Add support for [role=img] in image-alt rule
-		- Fix bug with innerHeight in get-background-color
-		- Improve dom.is-offscreen function
-		- Integrate optional performance timer
-		- Empty include defaults to document
-v2.2.0:
-	date: 2017-04-24
-	changes:
-		- Add configuration options for iframes: false, selectors: false, and elementRef: true
-		- Improve color-contrast rule for disabled elements
-		- Add webdriver task for testing mobile viewports
-		- Improve audio/video captioning rules
-		- Improve th-has-data-cells rule
-		- Expose incomplete reasons for color contrast rule as part of Needs Review
-		- Implement rule groupings as tags
-		- Allow building of axe in multiple languages
-		- Empty-heading rule has impact: moderate
-v2.2.1:
-	date: 2017-05-19
-	changes:
-		- Remove nodes from the color contrast incompleteData API to avoid circular references
-v2.2.2:
-	date: 2017-05-25
-	changes:
-		- Stabilize incompleteData API for backwards compatibility
-		- Change impact of duplicate-id rule to moderate
-v2.2.3:
-  date: 2017-06-01
-  changes:
-    - Removed the disable property from link-in-text-block
-v2.3.0:
-	date: 2017-06-14
-	changes:
-		- Overhaul of selectors API
-		- New experimental rule for hidden-content
-		- New rule for flagging aria-hidden="true" on document.body
-		- Color-contrast rule impact is now serious
-		- Color-contrast fixes for implicit labels and TR elements
-		- Color-contrast puts 1:1 ratio elements into Needs Review/incomplete
-		- List category mappings in docs
-		- Update axe.source to work with Firefox webdriver
-v2.3.1:
-	date: 2017-06-15
-	changes:
-		- Improvements to hidden-content rule
-		- Deduplicated langs in valid-lang options
-v3.0.0-alpha.1
-	date: 2017-08-08
-	changes:
-		- Shadow DOM support: rules and checks now supply a `virtualNode` in addition to the light DOM `node`. No <slot> styling support until supported by Chrome
-		- All commons and utilities refactored to support Shadow DOM
-		- Tests all refactored to support Shadow DOM
-		- API docs and developer guide now cover developing for Shadow DOM
-		- Fix for impact of incomplete nodes (#356)
-		- Fix for combobox false positive (#160)
-	additions:
-		- Commons virtual methods for handling virtual DOM
-		- New axe.utils.querySelectorAll method for querying the flattened tree
-		- New core APIs and test utilities for Shadow DOM development
-		- Support for ARIA 1.1: role=feed, role=term, aria-placeholder, aria-modal,
-    aria-current, aria-keyshortcuts, role=treegrid, aria-orientation, aria-haspopup
-
diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000000..ad04f06f1c
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,193 @@
+# Change Log
+
+All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
+
+<a name="3.0.0-alpha.1"></a>
+# [3.0.0-alpha.1](https://github.com/dequelabs/axe-core/compare/v2.3.1...v3.0.0-alpha.1) (2017-08-16)
+
+### Bug Fixes
+
+* add copyright banner back in to axe.js ([2aac29a](https://github.com/dequelabs/axe-core/commit/2aac29a))
+* Adjust if formatting ([2211d78](https://github.com/dequelabs/axe-core/commit/2211d78))
+* Align impact levels with Deque Way ([28f4477](https://github.com/dequelabs/axe-core/commit/28f4477))
+* Allow <track> to have no kind attribute ([f996d0f](https://github.com/dequelabs/axe-core/commit/f996d0f))
+* complete shadow support for color matches ([f0fe551](https://github.com/dequelabs/axe-core/commit/f0fe551))
+* **aria:** Allow implicit attribute values ([b949749](https://github.com/dequelabs/axe-core/commit/b949749))
+* Set relatedNodes on color/link-in-block rules ([#407](https://github.com/dequelabs/axe-core/issues/407)) ([7fde0fe](https://github.com/dequelabs/axe-core/commit/7fde0fe))
+* **aria:** Treegrid should own rows, not treeitems ([645d1fa](https://github.com/dequelabs/axe-core/commit/645d1fa))
+* Correct flattened tree algorithm to include the shadow host ([#405](https://github.com/dequelabs/axe-core/issues/405)) ([70985b0](https://github.com/dequelabs/axe-core/commit/70985b0))
+* Ensure all tests pass in Chrome ([0b0240f](https://github.com/dequelabs/axe-core/commit/0b0240f))
+* ensure document is fetched from correct node ([b28597c](https://github.com/dequelabs/axe-core/commit/b28597c))
+* Exclude `any` checks from output if one passed ([#466](https://github.com/dequelabs/axe-core/issues/466)) ([2dd3d68](https://github.com/dequelabs/axe-core/commit/2dd3d68))
+* get tests all passing ([#457](https://github.com/dequelabs/axe-core/issues/457)) ([4874327](https://github.com/dequelabs/axe-core/commit/4874327))
+* get virtualNode with getNodeFromTree  ([9bf2870](https://github.com/dequelabs/axe-core/commit/9bf2870))
+* getComposedParent should not return slot nodes ([#438](https://github.com/dequelabs/axe-core/issues/438)) ([0478cbd](https://github.com/dequelabs/axe-core/commit/0478cbd))
+* Have table rules use shadow DOM ([453be1b](https://github.com/dequelabs/axe-core/commit/453be1b))
+* help-same-as-label for shadow DOM ([dbbc544](https://github.com/dequelabs/axe-core/commit/dbbc544))
+* incomplete results should have impact ([fcc51eb](https://github.com/dequelabs/axe-core/commit/fcc51eb))
+* Let findUp work on shadow root children ([0252218](https://github.com/dequelabs/axe-core/commit/0252218))
+* Let findUp work on shadow root children ([#447](https://github.com/dequelabs/axe-core/issues/447)) ([0f98481](https://github.com/dequelabs/axe-core/commit/0f98481))
+* Minimise scrolling in getBackgroundColor ([f4551bb](https://github.com/dequelabs/axe-core/commit/f4551bb))
+* Pass all tests that use accessibleText ([7ea8d6b](https://github.com/dequelabs/axe-core/commit/7ea8d6b))
+* **checks/aria/required-children:** add exception for native input combobox missing textbox ([81ee2e4](https://github.com/dequelabs/axe-core/commit/81ee2e4))
+* use virtualNode in duplicate-img-label ([82e51bc](https://github.com/dequelabs/axe-core/commit/82e51bc))
+* **is-in-text-block:** Add Shadow DOM support ([a125f79](https://github.com/dequelabs/axe-core/commit/a125f79))
+* pass virtualNode to Rule.run ([4534e86](https://github.com/dequelabs/axe-core/commit/4534e86))
+* Properly output error stack ([56f1867](https://github.com/dequelabs/axe-core/commit/56f1867))
+* Remove log statements ([6a6bd73](https://github.com/dequelabs/axe-core/commit/6a6bd73))
+* Solve a few tests ([02daad1](https://github.com/dequelabs/axe-core/commit/02daad1))
+* Use getAttribute(id) over .id ([#374](https://github.com/dequelabs/axe-core/issues/374)) ([353b53f](https://github.com/dequelabs/axe-core/commit/353b53f))
+* Use testUtils in table tests ([364d5cd](https://github.com/dequelabs/axe-core/commit/364d5cd))
+* use virtualNode in title-only check ([5fb06e3](https://github.com/dequelabs/axe-core/commit/5fb06e3))
+* whitespace in hidden-content test ([99e8b73](https://github.com/dequelabs/axe-core/commit/99e8b73))
+
+
+### Features
+
+* Add aria-orientation to additional roles ([bb07c2d](https://github.com/dequelabs/axe-core/commit/bb07c2d))
+* add check testUtils ([6f53279](https://github.com/dequelabs/axe-core/commit/6f53279))
+* Add dom.getComposedParent function ([aac57c0](https://github.com/dequelabs/axe-core/commit/aac57c0))
+* Add Japanese localisation ([5f8c9c8](https://github.com/dequelabs/axe-core/commit/5f8c9c8))
+* Add new ARIA 1.1 values for haspopup ([9f7da56](https://github.com/dequelabs/axe-core/commit/9f7da56))
+* Add option restoreScroll ([d55f3cd](https://github.com/dequelabs/axe-core/commit/d55f3cd))
+* add S.C. 2.4.4 to link-name rule. Fixes [#369](https://github.com/dequelabs/axe-core/issues/369) ([70728e6](https://github.com/dequelabs/axe-core/commit/70728e6))
+* add SD support to color-contrast-matches ([b595b42](https://github.com/dequelabs/axe-core/commit/b595b42))
+* Add shadow DOM support to list checks ([#439](https://github.com/dequelabs/axe-core/issues/439)) ([d92c1a1](https://github.com/dequelabs/axe-core/commit/d92c1a1))
+* Add shadow DOM to duplicate-img-label check ([#443](https://github.com/dequelabs/axe-core/issues/443)) ([2c0b075](https://github.com/dequelabs/axe-core/commit/2c0b075))
+* Add shadow DOM to landmark check ([98f6023](https://github.com/dequelabs/axe-core/commit/98f6023))
+* add shadow support to aria-required-children ([f729e25](https://github.com/dequelabs/axe-core/commit/f729e25))
+* add shadow support to group-labelledby ([e2a9642](https://github.com/dequelabs/axe-core/commit/e2a9642))
+* Add sri-history file and update process ([#476](https://github.com/dequelabs/axe-core/issues/476)) ([25ddb47](https://github.com/dequelabs/axe-core/commit/25ddb47))
+* Allow hidden-content to work through shadow DOM bounds ([789d62e](https://github.com/dequelabs/axe-core/commit/789d62e))
+* fieldset check shadow DOM ([da148d3](https://github.com/dequelabs/axe-core/commit/da148d3))
+* Make explicit check consider shadow DOM ([#442](https://github.com/dequelabs/axe-core/issues/442)) ([9ddfc0f](https://github.com/dequelabs/axe-core/commit/9ddfc0f))
+* Make region check work with shadow DOM ([ecd222f](https://github.com/dequelabs/axe-core/commit/ecd222f))
+* Run text.accessibleText() on virtual elements ([#420](https://github.com/dequelabs/axe-core/issues/420)) ([414fcbe](https://github.com/dequelabs/axe-core/commit/414fcbe))
+* ShadowDOM support for media checks ([0f21574](https://github.com/dequelabs/axe-core/commit/0f21574))
+* **aria:** Support progressive ARIA 1.1 attributes / roles ([#468](https://github.com/dequelabs/axe-core/issues/468)) ([ebb2a5d](https://github.com/dequelabs/axe-core/commit/ebb2a5d))
+* **aria-required-parent:** add Shadow DOM support ([6ed29f0](https://github.com/dequelabs/axe-core/commit/6ed29f0))
+* **duplicate-id:** Add shadow DOM support ([439bc71](https://github.com/dequelabs/axe-core/commit/439bc71))
+* **link-in-text-block:** Add shadow DOM support ([46a2cca](https://github.com/dequelabs/axe-core/commit/46a2cca))
+* **shadow DOM:** Create commons virtual methods, for backward compatibility ([86a4c25](https://github.com/dequelabs/axe-core/commit/86a4c25))
+
+
+v3.0.0-alpha.1 (continued)
+	date: 2017-08-08
+	changes:
+		- Shadow DOM support: rules and checks now supply a `virtualNode` in addition to the light DOM `node`. No <slot> styling support until supported by Chrome
+		- All commons and utilities refactored to support Shadow DOM
+		- Tests all refactored to support Shadow DOM
+		- API docs and developer guide now cover developing for Shadow DOM
+		- Fix for impact of incomplete nodes (#356)
+		- Fix for combobox false positive (#160)
+	additions:
+		- Commons virtual methods for handling virtual DOM
+		- New axe.utils.querySelectorAll method for querying the flattened tree
+		- New core APIs and test utilities for Shadow DOM development
+		- Support for ARIA 1.1: role=feed, role=term, aria-placeholder, aria-modal,
+    aria-current, aria-keyshortcuts, role=treegrid, aria-orientation, aria-haspopup
+v2.3.1:
+	date: 2017-06-15
+	changes:
+		- Improvements to hidden-content rule
+		- Deduplicated langs in valid-lang options
+v2.3.0:
+	date: 2017-06-14
+	changes:
+		- Overhaul of selectors API
+		- New experimental rule for hidden-content
+		- New rule for flagging aria-hidden="true" on document.body
+		- Color-contrast rule impact is now serious
+		- Color-contrast fixes for implicit labels and TR elements
+		- Color-contrast puts 1:1 ratio elements into Needs Review/incomplete
+		- List category mappings in docs
+		- Update axe.source to work with Firefox webdriver
+v2.2.3:
+  date: 2017-06-01
+  changes:
+    - Removed the disable property from link-in-text-block
+v2.2.2:
+	date: 2017-05-25
+	changes:
+		- Stabilize incompleteData API for backwards compatibility
+		- Change impact of duplicate-id rule to moderate
+v2.2.1:
+	date: 2017-05-19
+	changes:
+		- Remove nodes from the color contrast incompleteData API to avoid circular references
+v2.2.0:
+	date: 2017-04-24
+	changes:
+		- Add configuration options for iframes: false, selectors: false, and elementRef: true
+		- Improve color-contrast rule for disabled elements
+		- Add webdriver task for testing mobile viewports
+		- Improve audio/video captioning rules
+		- Improve th-has-data-cells rule
+		- Expose incomplete reasons for color contrast rule as part of Needs Review
+		- Implement rule groupings as tags
+		- Allow building of axe in multiple languages
+		- Empty-heading rule has impact: moderate
+v2.1.8:
+	date: 2017-02-21
+	changes:
+		- Move from Snyk to Retire.js
+		- Make CI run test-fast task instead of parallel
+		- Add documentation on writing integration tests and rules
+		- Allow a larger list of languages for HTML-valid-lang rule
+		- Add support for [role=img] in image-alt rule
+		- Fix bug with innerHeight in get-background-color
+		- Improve dom.is-offscreen function
+		- Integrate optional performance timer
+		- Empty include defaults to document
+v2.1.7:
+	date: 2016-12-13
+	changes:
+		- Add promise-based axe.run API method in favor of axe.a11yCheck
+		- Move TypeScript definition to root of project
+		- Add Inapplicable and Can't Tell results
+		- New rule: frame-title-unique
+		- Improvements to table rules: td-has-header, th-has-data-cells
+		- Color contrast rule performance improvements using polyfilled elementsFromPoint
+		- Add better support for implicit roles
+		- DQElement supports xPath
+v2.0.7:
+	date: 2016-09-28
+	changes:
+		- Add TypeScript definition v1
+v2.0.5:
+	date: 2016-04-20
+	changes:
+		- Support for UMD pattern
+		- Adds 508 tagging for table rules
+		- Fixes race condition for iframes
+		- Exclude actual nodes from array checking
+v2.0.4:
+	date: 2016-04-13
+	changes:
+		- Improvements to messaging for extensions
+v2.0.3:
+	date: 2016-04-12
+	changes:
+		- Security improvements
+		- Build includes Babel/ES6
+		- Improvements to table rules
+		- aXe can be loaded in Node
+v2.0.0:
+	date: 2016-03-01
+	changes:
+		- Adds support for AMD modules
+		- Fixes incompatibility with Webpack
+		- Improvements to rules and checks
+		- Help urls no longer hard-coded
+		- Improved error handling
+v1.1.1:
+	date: 2015-09-04
+	changes:
+		- Adds Travis hooks
+		- Adds Sauce Labs
+		- Encodes HTML in descriptions
+		- Updates messages and help URLs
+v1.0.1:
+	date: 2015-06-10
+	changes:
+		- Initial public release
diff --git a/bower.json b/bower.json
index 1972a9eb87..0fde51bde0 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "axe-core",
-  "version": "2.1.7",
+  "version": "3.0.0-alpha.1",
   "contributors": [
     {
       "name": "David Sturley",
@@ -29,8 +29,8 @@
     }
   ],
   "repository": {
-    "type" : "git",
-    "url" : "https://github.com/dequelabs/axe-core.git"
+    "type": "git",
+    "url": "https://github.com/dequelabs/axe-core.git"
   },
   "main": "axe.js",
   "typings": "axe.d.ts",
diff --git a/package.json b/package.json
index 68bd753d8b..bacb9f8274 100644
--- a/package.json
+++ b/package.json
@@ -52,7 +52,8 @@
     "test-fast": "grunt test-fast",
     "version": "node build/sri-update",
     "prepublishOnly": "grunt build && node build/sri-update --validate",
-    "postinstall": "./bin/postinstall.sh"
+    "postinstall": "./bin/postinstall.sh",
+    "release": "standard-version"
   },
   "devDependencies": {
     "angular-precommit": "^1.0.3",
@@ -83,7 +84,8 @@
     "promise": "~7.1.1",
     "revalidator": "~0.3.1",
     "selenium-webdriver": "~3.4.0",
-    "sri-toolbox": "^0.2.0"
+    "sri-toolbox": "^0.2.0",
+    "standard-version": "^4.2.0"
   },
   "dependencies": {}
 }

From a1d12b85fb67b6f0b7cc9147710098fb9641a332 Mon Sep 17 00:00:00 2001
From: Marcy Sutton <marcy.sutton@deque.com>
Date: Fri, 1 Sep 2017 09:49:02 -0700
Subject: [PATCH 137/142] chore: ignore .DS_Store from git

---
 .gitignore           |   3 ++-
 lib/checks/.DS_Store | Bin 8196 -> 0 bytes
 2 files changed, 2 insertions(+), 1 deletion(-)
 delete mode 100644 lib/checks/.DS_Store

diff --git a/.gitignore b/.gitignore
index e06651b9f6..01c0ae77a4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,4 +9,5 @@ axe.*.js
 npm-shrinkwrap.json
 typings/axe-core/axe-core-tests.js
 doc/rule-descriptions.*.md
-package-lock.json
\ No newline at end of file
+package-lock.json
+.DS_Store
diff --git a/lib/checks/.DS_Store b/lib/checks/.DS_Store
deleted file mode 100644
index 6a583cd791c947cc0fa884746b4e83e310416d9d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8196
zcmeHMTWl0n7(QPqFl(nUKr3aT*##mHX=JNVE=JhixDy(7X$utB*_}ffna(sjvs<8&
z)EF-$28|joPlgyT0UwM)d@y*wfW`+6Mj`PDFENq$<co=y|C}==&~D|;V3?E4`RAPf
za?bhYJ9FmWWsIS%WHmF^z!=l$64I!lszMQZag8fgVNW$lkUwK3X0m?9^F#jNIP0h*
zLLfpQLLfpQLLfrmMnHhhY*Dlc&V8kg>Ii`dftwNm@qS3sC1g63BTC9w2URi!ASqG+
zS?Hef0O^wqWjd52N=jFXsj>%zt_V{MD0k8)g*nM|C`Xi3?hMMEAsiWDh5|V{`6Z<}
zLt4qGju40t7>|J1J{of<Z+9tkzbb#vJ6@i)(cJu?WBWlWbrDsQswYpGs>N=p(Q9jJ
z4ZWteW^ZP{H<Ss?pyaoi#hfuOV_Q6L7JF<f*q`NYr^CzK-Co>k2E4dO7-v1tAp>=9
z=DTe^lr!quJvT6ImltI`6{D}mb}etH%`3T<-*<K3oKfFZ<YjX0GF{$n`*z-T?BI|L
z8XC&`E;HCqgK5U+F)fxe8it3PQ!P!&J6oEMG$n^uu1qy0m*3TL<cJp2w8o{IyYq)0
zdHUqrAAS7kXJ^m-@Z(PkErf3zRyPK{pDRJ<_~kAIUDff*(8W8~ch1r`_Syx{&De)|
z&Y12KFq^0uuBxZtIi&&D&lxicrc)?6gkG!T2xID-?iY%l<8*nx9oU|`t2f{WgV8|O
zsCsw%UNLBw!E%OC^7#%<vFtMMpokP|roeFfpa|o4^P*33VLGLj89Om;_Ppe6w=Y}1
z>Ynq{jTtj%)#>_fdNgie@3VPv=a6{DyG*~pUCVa+d&=TDI6Ui`1AGRWVlnB}Fek3}
zSv1@>&k}x?aavQF#yRo$9-(P3a;hy&lMeG2#PzICOEt{UaM5C2&mJH$7=9RZX_Fq`
z>6m%$7*<TVrJD74Pg$+O*b;WGsMF)U1#e)0ChdoPtJlQi_ljY+ntrf-kh?UcvtsPE
z>(Z?>rHR(HOZc=}mYArvaFhxQ(@R3Q3~_=rvPEnaomg46k9q7t_BeZyonmL$yX+kM
zntjhMvCHgt_6Pfu{l)%<hI-6K1Lj}>?!Ypnuo`QTMl0H|1zp&I46@jZ0yy@eAA>lE
z!x+W`co@g<1fIkTcnv3T60hSl-oYpM65rxGT);(K!mqfjrdBmd;7y~mRuaFF9Jlw0
zz=I)yk5(pdV#CG_^?LgaPv8sF6m9Eooh^C1dTrYkGK^us)jX8sQ|ywg8)cOw_BB*K
zPvo9EuTf9zBy#eD6EVk_Dz<|rt>-UDBn(XwPB<@GOwB6V5=y(YDWMyaB=LooIGr#i
zONxu;iWXfrs^umS%{6zEc8cV>Xs&A{Eu#%08tscI5a_j5fvEpV)34Y?_KTn>7$&0@
zGm*d&BIj}<=6Y--T5iQQbfXu$u?Kxb%zoIo9|sViO!PcN1bv9;`6wR4Q9Olb@GPFg
z^Ei%|@G@S(t9S!%;w_xQ8N7%0@c}->7dStLsGG+S^_xmWEoX|Z<GKB$8zuO)Zc*zx
z2uxD?29f`FPW=1-b)rP-2!RNJ|1$!p?#Ohs(F!JdkBVG7N!NXJi6ZPql$0)12@}yT
p({Ykl{xGEbWT;DrazsheQ2Eb)2#_Cx(fMEbGc`K@B`I%$>K`(GPf7p)


From 80bb8254fafb5a50b2865a877f0c739471ea7990 Mon Sep 17 00:00:00 2001
From: Marcy Sutton <marcy.sutton@deque.com>
Date: Fri, 1 Sep 2017 10:24:27 -0700
Subject: [PATCH 138/142] chore: bump version to 3.0.0-alpha.2

---
 CHANGELOG.md | 18 ++++++++++++++++++
 bower.json   |  2 +-
 package.json |  2 +-
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ad04f06f1c..e6efa654fc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,24 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+<a name="3.0.0-alpha.2"></a>
+# [3.0.0-alpha.2](https://github.com/dequelabs/axe-core/compare/v3.0.0-alpha.1...v3.0.0-alpha.2) (2017-09-01)
+
+### Bug Fixes
+
+* copy precommit hook as file, not a link ([16f2f76](https://github.com/dequelabs/axe-core/commit/16f2f76))
+* expand tr support for color contrast ([5a77c2f](https://github.com/dequelabs/axe-core/commit/5a77c2f))
+* Ignore shadowRoots on elements that don't allow them ([7f66ee8](https://github.com/dequelabs/axe-core/commit/7f66ee8))
+* only run postinstall if .git exists ([1107783](https://github.com/dequelabs/axe-core/commit/1107783))
+* try telling circle to skip .git/hooks ([674408f](https://github.com/dequelabs/axe-core/commit/674408f))
+* Use frame query that supports shadow dom ([#492](https://github.com/dequelabs/axe-core/issues/492)) ([94008ff](https://github.com/dequelabs/axe-core/commit/94008ff))
+
+### Features
+
+* feat: Add sri-history file and update process ([25ddb47](https://github.com/dequelabs/axe-core/commit/25ddb47ec4eec565da330558ee061fd6e34a7c24))
+* feat: add standard-version ([e1e067d](https://github.com/dequelabs/axe-core/commit/e1e067d8f4445042360b2bef957037d5cdd0b7db))
+
+
 <a name="3.0.0-alpha.1"></a>
 # [3.0.0-alpha.1](https://github.com/dequelabs/axe-core/compare/v2.3.1...v3.0.0-alpha.1) (2017-08-16)
 
diff --git a/bower.json b/bower.json
index 0fde51bde0..f1c88d7bf6 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "axe-core",
-  "version": "3.0.0-alpha.1",
+  "version": "3.0.0-alpha.2",
   "contributors": [
     {
       "name": "David Sturley",
diff --git a/package.json b/package.json
index bacb9f8274..3292344782 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "axe-core",
   "description": "Accessibility engine for automated Web UI testing",
-  "version": "3.0.0-alpha.1",
+  "version": "3.0.0-alpha.2",
   "license": "MPL-2.0",
   "contributors": [
     {

From 4074132525c450e49ec06d8b727cd5e538e37504 Mon Sep 17 00:00:00 2001
From: Marcy Sutton <marcy.sutton@deque.com>
Date: Fri, 1 Sep 2017 10:47:01 -0700
Subject: [PATCH 139/142] chore: fix formatting of past changelog entries

---
 CHANGELOG.md | 268 ++++++++++++++++++++++++++++-----------------------
 1 file changed, 146 insertions(+), 122 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e6efa654fc..7f7464ec7e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,7 @@
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
 <a name="3.0.0-alpha.2"></a>
-# [3.0.0-alpha.2](https://github.com/dequelabs/axe-core/compare/v3.0.0-alpha.1...v3.0.0-alpha.2) (2017-09-01)
+## [3.0.0-alpha.2](https://github.com/dequelabs/axe-core/compare/v3.0.0-alpha.1...v3.0.0-alpha.2) (2017-09-01)
 
 ### Bug Fixes
 
@@ -21,7 +21,7 @@ All notable changes to this project will be documented in this file. See [standa
 
 
 <a name="3.0.0-alpha.1"></a>
-# [3.0.0-alpha.1](https://github.com/dequelabs/axe-core/compare/v2.3.1...v3.0.0-alpha.1) (2017-08-16)
+## [3.0.0-alpha.1](https://github.com/dequelabs/axe-core/compare/v2.3.1...v3.0.0-alpha.1) (2017-08-16)
 
 ### Bug Fixes
 
@@ -88,124 +88,148 @@ All notable changes to this project will be documented in this file. See [standa
 * **link-in-text-block:** Add shadow DOM support ([46a2cca](https://github.com/dequelabs/axe-core/commit/46a2cca))
 * **shadow DOM:** Create commons virtual methods, for backward compatibility ([86a4c25](https://github.com/dequelabs/axe-core/commit/86a4c25))
 
+<a name="2.3.1"></a>
+## [2.3.1](https://github.com/dequelabs/axe-core/compare/v2.3.0...v2.3.1) (2017-06-15)
 
-v3.0.0-alpha.1 (continued)
-	date: 2017-08-08
-	changes:
-		- Shadow DOM support: rules and checks now supply a `virtualNode` in addition to the light DOM `node`. No <slot> styling support until supported by Chrome
-		- All commons and utilities refactored to support Shadow DOM
-		- Tests all refactored to support Shadow DOM
-		- API docs and developer guide now cover developing for Shadow DOM
-		- Fix for impact of incomplete nodes (#356)
-		- Fix for combobox false positive (#160)
-	additions:
-		- Commons virtual methods for handling virtual DOM
-		- New axe.utils.querySelectorAll method for querying the flattened tree
-		- New core APIs and test utilities for Shadow DOM development
-		- Support for ARIA 1.1: role=feed, role=term, aria-placeholder, aria-modal,
-    aria-current, aria-keyshortcuts, role=treegrid, aria-orientation, aria-haspopup
-v2.3.1:
-	date: 2017-06-15
-	changes:
-		- Improvements to hidden-content rule
-		- Deduplicated langs in valid-lang options
-v2.3.0:
-	date: 2017-06-14
-	changes:
-		- Overhaul of selectors API
-		- New experimental rule for hidden-content
-		- New rule for flagging aria-hidden="true" on document.body
-		- Color-contrast rule impact is now serious
-		- Color-contrast fixes for implicit labels and TR elements
-		- Color-contrast puts 1:1 ratio elements into Needs Review/incomplete
-		- List category mappings in docs
-		- Update axe.source to work with Firefox webdriver
-v2.2.3:
-  date: 2017-06-01
-  changes:
-    - Removed the disable property from link-in-text-block
-v2.2.2:
-	date: 2017-05-25
-	changes:
-		- Stabilize incompleteData API for backwards compatibility
-		- Change impact of duplicate-id rule to moderate
-v2.2.1:
-	date: 2017-05-19
-	changes:
-		- Remove nodes from the color contrast incompleteData API to avoid circular references
-v2.2.0:
-	date: 2017-04-24
-	changes:
-		- Add configuration options for iframes: false, selectors: false, and elementRef: true
-		- Improve color-contrast rule for disabled elements
-		- Add webdriver task for testing mobile viewports
-		- Improve audio/video captioning rules
-		- Improve th-has-data-cells rule
-		- Expose incomplete reasons for color contrast rule as part of Needs Review
-		- Implement rule groupings as tags
-		- Allow building of axe in multiple languages
-		- Empty-heading rule has impact: moderate
-v2.1.8:
-	date: 2017-02-21
-	changes:
-		- Move from Snyk to Retire.js
-		- Make CI run test-fast task instead of parallel
-		- Add documentation on writing integration tests and rules
-		- Allow a larger list of languages for HTML-valid-lang rule
-		- Add support for [role=img] in image-alt rule
-		- Fix bug with innerHeight in get-background-color
-		- Improve dom.is-offscreen function
-		- Integrate optional performance timer
-		- Empty include defaults to document
-v2.1.7:
-	date: 2016-12-13
-	changes:
-		- Add promise-based axe.run API method in favor of axe.a11yCheck
-		- Move TypeScript definition to root of project
-		- Add Inapplicable and Can't Tell results
-		- New rule: frame-title-unique
-		- Improvements to table rules: td-has-header, th-has-data-cells
-		- Color contrast rule performance improvements using polyfilled elementsFromPoint
-		- Add better support for implicit roles
-		- DQElement supports xPath
-v2.0.7:
-	date: 2016-09-28
-	changes:
-		- Add TypeScript definition v1
-v2.0.5:
-	date: 2016-04-20
-	changes:
-		- Support for UMD pattern
-		- Adds 508 tagging for table rules
-		- Fixes race condition for iframes
-		- Exclude actual nodes from array checking
-v2.0.4:
-	date: 2016-04-13
-	changes:
-		- Improvements to messaging for extensions
-v2.0.3:
-	date: 2016-04-12
-	changes:
-		- Security improvements
-		- Build includes Babel/ES6
-		- Improvements to table rules
-		- aXe can be loaded in Node
-v2.0.0:
-	date: 2016-03-01
-	changes:
-		- Adds support for AMD modules
-		- Fixes incompatibility with Webpack
-		- Improvements to rules and checks
-		- Help urls no longer hard-coded
-		- Improved error handling
-v1.1.1:
-	date: 2015-09-04
-	changes:
-		- Adds Travis hooks
-		- Adds Sauce Labs
-		- Encodes HTML in descriptions
-		- Updates messages and help URLs
-v1.0.1:
-	date: 2015-06-10
-	changes:
-		- Initial public release
+### Bug fixes:
+
+* Improvements to hidden-content rule
+* Deduplicated langs in valid-lang options
+
+<a name="2.3.0"></a>
+## [2.3.0](https://github.com/dequelabs/axe-core/compare/v2.2.3...v2.3.0) (2017-06-14)
+
+### Bug fixes:
+
+* Overhaul of selectors API
+* New experimental rule for hidden-content
+* New rule for flagging aria-hidden="true" on document.body
+* Color-contrast rule impact is now serious
+* Color-contrast fixes for implicit labels and TR elements
+* Color-contrast puts 1:1 ratio elements into Needs Review/incomplete
+* List category mappings in docs
+* Update axe.source to work with Firefox webdriver
+
+<a name="2.2.3"></a>
+## [2.2.3](https://github.com/dequelabs/axe-core/compare/v2.2.2...v2.2.3) (2017-06-01)
+
+### Bug fixes:
+* Removed the disable property from link-in-text-block
+
+<a name="2.2.2"></a>
+## [2.2.2](https://github.com/dequelabs/axe-core/compare/2.2.1...v2.2.2) (2017-05-25)
+
+### Bug fixes
+* Stabilize incompleteData API for backwards compatibility
+* Change impact of duplicate-id rule to moderate
+
+<a name="2.2.2"></a>
+## [2.2.1](https://github.com/dequelabs/axe-core/compare/2.2.0...2.2.1) (2017-05-19)
+
+### Bug fixes
+* Remove nodes from the color contrast incompleteData API to avoid circular references
+
+<a name="2.2.0"></a>
+## 2.2.0 (2017-04-24)
+
+### Changes
+
+* Add configuration options for iframes: false, selectors: false, and elementRef: true
+* Improve color-contrast rule for disabled elements
+* Add webdriver task for testing mobile viewports
+* Improve audio/video captioning rules
+* Improve th-has-data-cells rule
+* Expose incomplete reasons for color contrast rule as part of Needs Review
+* Implement rule groupings as tags
+* Allow building of axe in multiple languages
+* Empty-heading rule has impact: moderate
+
+<a name="2.1.8"></a>
+## 2.1.8 (2017-05-21)
+
+### Changes
+
+* Move from Snyk to Retire.js
+* Make CI run test-fast task instead of parallel
+* Add documentation on writing integration tests and rules
+* Allow a larger list of languages for HTML-valid-lang rule
+* Add support for [role=img] in image-alt rule
+* Fix bug with innerHeight in get-background-color
+* Improve dom.is-offscreen function
+* Integrate optional performance timer
+* Empty include defaults to document
+
+<a name="2.1.7"></a>
+## 2.1.7 (2016-12-13)
+
+### Changes
+
+* Add promise-based axe.run API method in favor of axe.a11yCheck
+* Move TypeScript definition to root of project
+* Add Inapplicable and Can't Tell results
+* New rule: frame-title-unique
+* Improvements to table rules: td-has-header, th-has-data-cells
+* Color contrast rule performance improvements using polyfilled elementsFromPoint
+* Add better support for implicit roles
+* DQElement supports xPath
+
+<a name="2.0.7"></a>
+## 2.0.7 (2016-09-28)
+
+### Changes
+
+* Add TypeScript definition v1
+
+<a name="2.0.5"></a>
+## 2.0.5 (2016-04-20)
+
+### Changes
+* Support for UMD pattern
+* Adds 508 tagging for table rules
+* Fixes race condition for iframes
+* Exclude actual nodes from array checking
+
+<a name="2.0.5"></a>
+## 2.0.5 (2016-04-13)
+
+### Changes
+
+* Improvements to messaging for extensions
+
+<a name="2.0.3"></a>
+## 2.0.3 (2016-04-12)
+
+### Changes
+
+* Security improvements
+* Build includes Babel/ES6
+* Improvements to table rules
+* aXe can be loaded in Node
+
+<a name="2.0.0"></a>
+## 2.0.0 (2016-03-01)
+
+### Changes
+
+* Adds support for AMD modules
+* Fixes incompatibility with Webpack
+* Improvements to rules and checks
+* Help urls no longer hard-coded
+* Improved error handling
+
+<a name="1.1.1"></a>
+## 1.1.1 (2015-09-04)
+
+### Changes
+
+* Adds Travis hooks
+* Adds Sauce Labs
+* Encodes HTML in descriptions
+* Updates messages and help URLs
+
+<a name="1.0.1"></a>
+## 1.0.1 (2015-06-10)
+
+### Changes
+
+* Initial public release

From ff3df2d9b2c01c1ca0d12c1fcaf136528287fb6d Mon Sep 17 00:00:00 2001
From: Wilco Fiers <WilcoFiers@users.noreply.github.com>
Date: Wed, 6 Sep 2017 11:44:48 +0200
Subject: [PATCH 140/142] fix: RestoreScroll was running  out of sync (#508)

---
 lib/core/public/run-rules.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/core/public/run-rules.js b/lib/core/public/run-rules.js
index a358afaa26..1d7ad954df 100644
--- a/lib/core/public/run-rules.js
+++ b/lib/core/public/run-rules.js
@@ -28,18 +28,18 @@ function runRules(context, options, resolve, reject) {
 			axe.utils.collectResultsFromFrames(context, options, 'rules', null, res, rej);
 		});
 	}
+	let scrollState;
 	q.defer(function (res, rej) {
 		if (options.restoreScroll) {
-			const scrollState = axe.utils.getScrollState();
-			audit.run(context, options, res, rej);
-			axe.utils.setScrollState(scrollState);
-
-		} else {
-			audit.run(context, options, res, rej);
+			scrollState = axe.utils.getScrollState();
 		}
+		audit.run(context, options, res, rej);
 	});
 	q.then(function (data) {
 		try {
+			if (scrollState) {
+				axe.utils.setScrollState(scrollState);
+			}
 			if (options.performanceTimer) {
 				axe.utils.performanceTimer.auditEnd();
 			}

From 9b4d2eea4fcb2c48bab71e442da3a588b3893853 Mon Sep 17 00:00:00 2001
From: Marcy Sutton <holla@marcysutton.com>
Date: Wed, 6 Sep 2017 07:59:28 -0700
Subject: [PATCH 141/142] Additional ARIA 1.1. support and tests (#509)

* feat(ARIA 1.1): Allow row-index, setsize and posinset on more roles

* test(aria): aria-haspopup, aria-modal for 1.1

* style(test/aria): add line breaks for readability

* test(aria): add missing roles and properties
---
 lib/commons/aria/index.js                     |  12 +-
 .../rules/aria-allowed-attr/passes.html       | 200 +++++++++----
 .../rules/aria-allowed-attr/passes.json       |   2 +-
 .../rules/aria-roles/aria-roles.html          | 106 +++----
 .../rules/aria-roles/aria-roles.json          |   2 +-
 .../aria-valid-attr-value.html                | 280 +++++++++---------
 .../aria-valid-attr-value.json                |   3 +-
 .../aria-valid-attr/aria-valid-attr.html      |  43 +--
 .../aria-valid-attr/aria-valid-attr.json      |   3 +-
 9 files changed, 369 insertions(+), 282 deletions(-)

diff --git a/lib/commons/aria/index.js b/lib/commons/aria/index.js
index 2e844d8b14..3ffbf1b94a 100644
--- a/lib/commons/aria/index.js
+++ b/lib/commons/aria/index.js
@@ -200,7 +200,7 @@ lookupTables.role = {
 	'article': {
 		type: 'structure',
 		attributes: {
-			allowed: ['aria-expanded']
+			allowed: ['aria-expanded', 'aria-posinset', 'aria-setsize']
 		},
 		owned: null,
 		nameFrom: ['author'],
@@ -523,7 +523,9 @@ lookupTables.role = {
 	},
 	'menuitem': {
 		type: 'widget',
-		attributes: null,
+		attributes: {
+			allowed: ['aria-posinset', 'aria-setsize']
+		},
 		owned: null,
 		nameFrom: ['author', 'contents'],
 		context: ['menu', 'menubar'],
@@ -532,7 +534,7 @@ lookupTables.role = {
 	'menuitemcheckbox': {
 		type: 'widget',
 		attributes: {
-			allowed: ['aria-checked']
+			allowed: ['aria-checked', 'aria-posinset', 'aria-setsize']
 		},
 		owned: null,
 		nameFrom: ['author', 'contents'],
@@ -643,7 +645,7 @@ lookupTables.role = {
 	'row': {
 		type: 'structure',
 		attributes: {
-			allowed: ['aria-activedescendant', 'aria-colcount', 'aria-expanded', 'aria-level', 'aria-selected', 'aria-rowcount']
+			allowed: ['aria-activedescendant', 'aria-colcount', 'aria-expanded', 'aria-level', 'aria-selected', 'aria-rowcount', 'aria-rowindex']
 		},
 		owned: {
 			one: ['cell', 'columnheader', 'rowheader', 'gridcell']
@@ -773,7 +775,7 @@ lookupTables.role = {
 	'tab': {
 		type: 'widget',
 		attributes: {
-			allowed: ['aria-selected', 'aria-expanded']
+			allowed: ['aria-selected', 'aria-expanded', 'aria-setsize', 'aria-posinset']
 		},
 		owned: null,
 		nameFrom: ['author', 'contents'],
diff --git a/test/integration/rules/aria-allowed-attr/passes.html b/test/integration/rules/aria-allowed-attr/passes.html
index f8187f9dfa..e10c84d156 100644
--- a/test/integration/rules/aria-allowed-attr/passes.html
+++ b/test/integration/rules/aria-allowed-attr/passes.html
@@ -1,68 +1,138 @@
 
 <div role="dialog" aria-cats="meow" aria-scale="2.4" id="pass0">should not report on invalid attributes</div>
 
-<div role="alert" id="pass1" aria-expanded="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
-<div role="alertdialog" id="pass2" aria-expanded="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
-<div role="application" id="pass3" aria-expanded="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
-<div role="article" id="pass4" aria-expanded="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
-<div role="banner" id="pass5" aria-expanded="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
-<div role="button" id="pass6" aria-expanded="value" aria-pressed="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
-<div role="checkbox" id="pass7" aria-checked="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
-<div role="columnheader" id="pass8" aria-expanded="value" aria-sort="value" aria-readonly="value" aria-selected="value" aria-required="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
-<div role="combobox" id="pass9" aria-autocomplete="value" aria-required="value" aria-activedescendant="value" aria-expanded="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
-<div role="complementary" id="pass10" aria-expanded="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
-<div role="contentinfo" id="pass11" aria-expanded="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
-<div role="definition" id="pass12" aria-expanded="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
-<div role="dialog" id="pass13" aria-expanded="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
-<div role="directory" id="pass14" aria-expanded="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
-<div role="document" id="pass15" aria-expanded="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
-<div role="form" id="pass16" aria-expanded="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
-<div role="grid" id="pass17" aria-level="value" aria-multiselectable="value" aria-readonly="value" aria-activedescendant="value" aria-expanded="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
-<div role="gridcell" id="pass18" aria-selected="value" aria-readonly="value" aria-expanded="value" aria-required="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
-<div role="group" id="pass19" aria-activedescendant="value" aria-expanded="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
-<div role="heading" id="pass20" aria-level="value" aria-expanded="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
-<div role="img" id="pass21" aria-expanded="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
-<div role="link" id="pass22" aria-expanded="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
-<div role="list" id="pass23" aria-expanded="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
-<div role="listbox" id="pass24" aria-activedescendant="value" aria-multiselectable="value" aria-required="value" aria-expanded="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
-<div role="listitem" id="pass25" aria-level="value" aria-posinset="value" aria-setsize="value" aria-expanded="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
-<div role="log" id="pass26" aria-expanded="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
-<div role="main" id="pass27" aria-expanded="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
-<div role="marquee" id="pass28" aria-expanded="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
-<div role="math" id="pass29" aria-expanded="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
-<div role="menu" id="pass30" aria-activedescendant="value" aria-expanded="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
-<div role="menubar" id="pass31" aria-activedescendant="value" aria-expanded="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
-<div role="menuitemcheckbox" id="pass32" aria-checked="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
-<div role="menuitemradio" id="pass33" aria-selected="value" aria-posinset="value" aria-setsize="value" aria-checked="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
-<div role="navigation" id="pass34" aria-expanded="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
-<div role="note" id="pass35" aria-expanded="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
-<div role="option" id="pass36" aria-selected="value" aria-posinset="value" aria-setsize="value" aria-checked="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
-<div role="progressbar" id="pass37" aria-valuetext="value" aria-valuenow="value" aria-valuemax="value" aria-valuemin="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
-<div role="radio" id="pass38" aria-selected="value" aria-posinset="value" aria-setsize="value" aria-checked="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
-<div role="radiogroup" id="pass39" aria-activedescendant="value" aria-required="value" aria-expanded="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
-<div role="region" id="pass40" aria-expanded="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
-<div role="row" id="pass41" aria-level="value" aria-selected="value" aria-activedescendant="value" aria-expanded="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
-<div role="rowgroup" id="pass42" aria-activedescendant="value" aria-expanded="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
-<div role="rowheader" id="pass43" aria-sort="value" aria-required="value" aria-readonly="value" aria-expanded="value" aria-selected="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
-<div role="scrollbar" id="pass44" aria-valuetext="value" aria-controls="value" aria-orientation="value" aria-valuenow="value" aria-valuemax="value" aria-valuemin="value" aria-atomic="value" aria-busy="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
-<div role="search" id="pass45" aria-expanded="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
-<div role="separator" id="pass46" aria-expanded="value" aria-orientation="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
-<div role="slider" id="pass47" aria-valuetext="value" aria-orientation="value" aria-valuenow="value" aria-valuemax="value" aria-valuemin="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
-<div role="spinbutton" id="pass48" aria-valuetext="value" aria-required="value" aria-valuenow="value" aria-valuemax="value" aria-valuemin="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
-<div role="status" id="pass49" aria-expanded="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
-<div role="tab" id="pass50" aria-selected="value" aria-expanded="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
-<div role="tablist" id="pass51" aria-activedescendant="value" aria-expanded="value" aria-level="value" aria-multiselectable="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
-<div role="tabpanel" id="pass52" aria-expanded="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
-<div role="textbox" id="pass53" aria-activedescendant="value" aria-autocomplete="value" aria-multiline="value" aria-readonly="value" aria-required="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
-<div role="timer" id="pass54" aria-expanded="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
-<div role="toolbar" id="pass55" aria-activedescendant="value" aria-expanded="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
-<div role="tooltip" id="pass56" aria-expanded="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
-<div role="tree" id="pass57" aria-activedescendant="value" aria-multiselectable="value" aria-required="value" aria-expanded="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
-<div role="treegrid" id="pass58" aria-activedescendant="value" aria-expanded="value" aria-level="value" aria-multiselectable="value" aria-readonly="value" aria-required="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
-<div role="treeitem" id="pass59" aria-checked="value" aria-selected="value" aria-expanded="value" aria-level="value" aria-posinset="value" aria-setsize="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
-<div role="switch" id="pass60" aria-checked="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
-<div role="cell" id="pass61" aria-colindex="value" aria-colspan="value" aria-rowindex="value" aria-rowspan="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
-<div role="searchbox" id="pass62" aria-activedescendant="value" aria-autocomplete="value" aria-multiline="value" aria-readonly="value" aria-required="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
-<div role="text" id="pass63" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
-<div role="table" id="pass64" aria-colcount="value" aria-rowcount="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
-<input type="reset" id="pass65" value="Reset" aria-pressed="true"/>
+<div role="alert" id="pass1" aria-expanded="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-keyshortcuts="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
+
+<div role="alertdialog" id="pass2" aria-expanded="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-keyshortcuts="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value" aria-modal="value">ok</div>
+
+<div role="application" id="pass3" aria-expanded="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-keyshortcuts="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
+
+<div role="article" id="pass4" aria-expanded="value" aria-posinset="value" aria-setsize="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-keyshortcuts="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
+
+<div role="banner" id="pass5" aria-expanded="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-keyshortcuts="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
+
+<div role="button" id="pass6" aria-expanded="value" aria-pressed="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-keyshortcuts="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
+
+<div role="checkbox" id="pass7" aria-checked="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-keyshortcuts="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
+
+<div role="columnheader" id="pass8" aria-colindex="value" aria-colspan="value" aria-expanded="value" aria-rowindex="value" aria-rowspan="value" aria-sort="value" aria-readonly="value" aria-selected="value" aria-required="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-keyshortcuts="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
+
+<div role="combobox" id="pass9" aria-autocomplete="value" aria-required="value" aria-activedescendant="value" aria-expanded="value" aria-orientation="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-keyshortcuts="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
+
+<div role="complementary" id="pass10" aria-expanded="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-keyshortcuts="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
+
+<div role="contentinfo" id="pass11" aria-expanded="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-keyshortcuts="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
+
+<div role="definition" id="pass12" aria-expanded="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-keyshortcuts="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
+
+<div role="dialog" id="pass13" aria-expanded="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-keyshortcuts="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value" aria-modal="value">ok</div>
+
+<div role="directory" id="pass14" aria-expanded="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-keyshortcuts="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
+
+<div role="document" id="pass15" aria-expanded="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-keyshortcuts="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
+
+<div role="feed" id="pass16" aria-expanded="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-keyshortcuts="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
+
+<div role="form" id="pass17" aria-expanded="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-keyshortcuts="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
+
+<div role="grid" id="pass18" aria-level="value" aria-multiselectable="value" aria-readonly="value" aria-activedescendant="value" aria-expanded="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-keyshortcuts="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
+
+<div role="gridcell" id="pass19" aria-colindex="value" aria-colspan="value" aria-rowindex="value" aria-rowspan="value" aria-selected="value" aria-readonly="value" aria-expanded="value" aria-required="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-keyshortcuts="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
+
+<div role="group" id="pass20" aria-activedescendant="value" aria-expanded="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-keyshortcuts="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
+
+<div role="heading" id="pass21" aria-level="value" aria-expanded="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-keyshortcuts="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
+
+<div role="img" id="pass22" aria-expanded="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-keyshortcuts="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
+
+<div role="link" id="pass23" aria-expanded="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-keyshortcuts="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
+
+<div role="list" id="pass24" aria-expanded="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-keyshortcuts="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
+
+<div role="listbox" id="pass25" aria-activedescendant="value" aria-multiselectable="value" aria-required="value" aria-expanded="value" aria-orientation="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-keyshortcuts="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
+
+<div role="listitem" id="pass26" aria-level="value" aria-posinset="value" aria-setsize="value" aria-expanded="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-keyshortcuts="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
+
+<div role="log" id="pass27" aria-expanded="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-keyshortcuts="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
+
+<div role="main" id="pass28" aria-expanded="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-keyshortcuts="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
+
+<div role="marquee" id="pass29" aria-expanded="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-keyshortcuts="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
+
+<div role="math" id="pass30" aria-expanded="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-keyshortcuts="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
+
+<div role="menu" id="pass31" aria-activedescendant="value" aria-expanded="value" aria-orientation="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-keyshortcuts="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
+
+<div role="menubar" id="pass32" aria-activedescendant="value" aria-expanded="value" aria-orientation="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-keyshortcuts="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
+
+<div role="menuitem" id="pass33" aria-posinset="value" aria-setsize="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-keyshortcuts="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
+
+<div role="menuitemcheckbox" id="pass34" aria-checked="value" aria-posinset="value" aria-setsize="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-keyshortcuts="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
+
+<div role="menuitemradio" id="pass35" aria-selected="value" aria-posinset="value" aria-setsize="value" aria-checked="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-keyshortcuts="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
+
+<div role="navigation" id="pass36" aria-expanded="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-keyshortcuts="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
+
+<div role="note" id="pass37" aria-expanded="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-keyshortcuts="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
+
+<div role="option" id="pass38" aria-selected="value" aria-posinset="value" aria-setsize="value" aria-checked="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-keyshortcuts="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
+
+<div role="progressbar" id="pass39" aria-valuetext="value" aria-valuenow="value" aria-valuemax="value" aria-valuemin="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-keyshortcuts="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
+
+<div role="radio" id="pass40" aria-selected="value" aria-posinset="value" aria-setsize="value" aria-checked="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-keyshortcuts="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
+
+<div role="radiogroup" id="pass41" aria-activedescendant="value" aria-required="value" aria-expanded="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-keyshortcuts="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
+
+<div role="region" id="pass42" aria-expanded="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-keyshortcuts="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
+
+<div role="row" id="pass43" aria-colcount="value" aria-rowcount="value" aria-rowindex="value" aria-level="value" aria-selected="value" aria-activedescendant="value" aria-expanded="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-keyshortcuts="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
+
+<div role="rowgroup" id="pass44" aria-activedescendant="value" aria-expanded="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-keyshortcuts="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
+
+<div role="rowheader" id="pass45" aria-colindex="value" aria-colspan="value" aria-rowindex="value" aria-rowspan="value" aria-sort="value" aria-required="value" aria-readonly="value" aria-expanded="value" aria-selected="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-keyshortcuts="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
+
+<div role="scrollbar" id="pass46" aria-valuetext="value" aria-controls="value" aria-orientation="value" aria-valuenow="value" aria-valuemax="value" aria-valuemin="value" aria-atomic="value" aria-busy="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-keyshortcuts="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
+
+<div role="search" id="pass47" aria-expanded="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-keyshortcuts="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
+
+<div role="separator" id="pass48" aria-expanded="value" aria-orientation="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-keyshortcuts="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
+
+<div role="slider" id="pass49" aria-valuetext="value" aria-orientation="value" aria-valuenow="value" aria-valuemax="value" aria-valuemin="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-keyshortcuts="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
+
+<div role="spinbutton" id="pass50" aria-valuetext="value" aria-required="value" aria-valuenow="value" aria-valuemax="value" aria-valuemin="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-keyshortcuts="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
+
+<div role="status" id="pass51" aria-expanded="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-keyshortcuts="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
+
+<div role="tab" id="pass52" aria-selected="value" aria-expanded="value" aria-posinset="value" aria-setsize="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-keyshortcuts="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
+
+<div role="tablist" id="pass53" aria-activedescendant="value" aria-expanded="value" aria-level="value" aria-multiselectable="value" aria-orientation="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-keyshortcuts="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
+
+<div role="tabpanel" id="pass54" aria-expanded="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-keyshortcuts="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
+
+<div role="textbox" id="pass55" aria-activedescendant="value" aria-autocomplete="value" aria-multiline="value" aria-readonly="value" aria-required="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-keyshortcuts="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value" aria-placeholder="value">ok</div>
+
+<div role="timer" id="pass56" aria-expanded="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-keyshortcuts="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
+
+<div role="toolbar" id="pass57" aria-activedescendant="value" aria-expanded="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-keyshortcuts="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
+
+<div role="tooltip" id="pass58" aria-expanded="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-keyshortcuts="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
+
+<div role="tree" id="pass59" aria-activedescendant="value" aria-multiselectable="value" aria-required="value" aria-expanded="value" aria-orientation="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-keyshortcuts="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
+
+<div role="treegrid" id="pass60" aria-activedescendant="value" aria-colcount="value" aria-expanded="value" aria-level="value" aria-multiselectable="value" aria-orientation="value" aria-readonly="value" aria-required="value" aria-rowcount="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-keyshortcuts="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
+
+<div role="treeitem" id="pass61" aria-checked="value" aria-selected="value" aria-expanded="value" aria-level="value" aria-posinset="value" aria-setsize="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-keyshortcuts="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
+
+<div role="switch" id="pass62" aria-checked="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-keyshortcuts="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
+
+<div role="cell" id="pass63" aria-colindex="value" aria-colspan="value" aria-rowindex="value" aria-rowspan="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-keyshortcuts="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
+
+<div role="searchbox" id="pass64" aria-activedescendant="value" aria-autocomplete="value" aria-multiline="value" aria-readonly="value" aria-required="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-keyshortcuts="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value" aria-placeholder="value">ok</div>
+
+<div role="term" id="pass65" aria-expanded="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-keyshortcuts="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
+
+<div role="text" id="pass66" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-keyshortcuts="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
+
+<div role="table" id="pass67" aria-colcount="value" aria-rowcount="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-keyshortcuts="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
+
+<input type="reset" id="pass68" value="Reset" aria-pressed="true"/>
diff --git a/test/integration/rules/aria-allowed-attr/passes.json b/test/integration/rules/aria-allowed-attr/passes.json
index d7beec65bf..13ad56f7b0 100644
--- a/test/integration/rules/aria-allowed-attr/passes.json
+++ b/test/integration/rules/aria-allowed-attr/passes.json
@@ -11,6 +11,6 @@
 		["#pass43"], ["#pass44"], ["#pass45"], ["#pass46"], ["#pass47"], ["#pass48"], ["#pass49"],
 		["#pass50"], ["#pass51"], ["#pass52"], ["#pass53"], ["#pass54"], ["#pass55"], ["#pass56"],
 		["#pass57"], ["#pass58"], ["#pass59"], ["#pass60"], ["#pass61"], ["#pass62"], ["#pass63"],
-		["#pass64"], ["#pass65"]
+		["#pass64"], ["#pass65"], ["#pass66"], ["#pass67"], ["#pass68"]
 	]
 }
\ No newline at end of file
diff --git a/test/integration/rules/aria-roles/aria-roles.html b/test/integration/rules/aria-roles/aria-roles.html
index 563a345448..c27c2ea4b5 100644
--- a/test/integration/rules/aria-roles/aria-roles.html
+++ b/test/integration/rules/aria-roles/aria-roles.html
@@ -15,58 +15,60 @@
 	<div role="dialog" id="pass13">ok</div>
 	<div role="directory" id="pass14">ok</div>
 	<div role="document" id="pass15">ok</div>
-	<div role="form" id="pass16">ok</div>
-	<div role="grid" id="pass17">ok</div>
-	<div role="gridcell" id="pass18">ok</div>
-	<div role="group" id="pass19">ok</div>
-	<div role="heading" id="pass20">ok</div>
-	<div role="img" id="pass21">ok</div>
-	<div role="link" id="pass22">ok</div>
-	<div role="list" id="pass23">ok</div>
-	<div role="listbox" id="pass24">ok</div>
-	<div role="listitem" id="pass25">ok</div>
-	<div role="log" id="pass26">ok</div>
-	<div role="main" id="pass27">ok</div>
-	<div role="marquee" id="pass28">ok</div>
-	<div role="math" id="pass29">ok</div>
-	<div role="menu" id="pass30">ok</div>
-	<div role="menubar" id="pass31">ok</div>
-	<div role="menuitem" id="pass32">ok</div>
-	<div role="menuitemcheckbox" id="pass33">ok</div>
-	<div role="menuitemradio" id="pass34">ok</div>
-	<div role="navigation" id="pass35">ok</div>
-	<div role="note" id="pass36">ok</div>
-	<div role="option" id="pass37">ok</div>
-	<div role="presentation" id="pass38">ok</div>
-	<div role="progressbar" id="pass39">ok</div>
-	<div role="radio" id="pass40">ok</div>
-	<div role="radiogroup" id="pass41">ok</div>
-	<div role="region" id="pass42">ok</div>
-	<div role="row" id="pass43">ok</div>
-	<div role="rowgroup" id="pass44">ok</div>
-	<div role="rowheader" id="pass45">ok</div>
-	<div role="scrollbar" id="pass46">ok</div>
-	<div role="search" id="pass47">ok</div>
-	<div role="separator" id="pass48">ok</div>
-	<div role="slider" id="pass49">ok</div>
-	<div role="spinbutton" id="pass50">ok</div>
-	<div role="status" id="pass51">ok</div>
-	<div role="tab" id="pass52">ok</div>
-	<div role="tablist" id="pass53">ok</div>
-	<div role="tabpanel" id="pass54">ok</div>
-	<div role="textbox" id="pass55">ok</div>
-	<div role="timer" id="pass56">ok</div>
-	<div role="toolbar" id="pass57">ok</div>
-	<div role="tooltip" id="pass58">ok</div>
-	<div role="tree" id="pass59">ok</div>
-	<div role="treegrid" id="pass60">ok</div>
-	<div role="treeitem" id="pass61">ok</div>
-	<div role="switch" id="pass62">ok</div>
-	<div role="none" id="pass63">ok</div>
-	<div role="cell" id="pass64">ok</div>
-	<div role="searchbox" id="pass65">ok</div>
-	<div role="text" id="pass66">ok</div>
-	<div role="table" id="pass67">ok</div>
+	<div role="feed" id="pass16">ok</div>
+	<div role="form" id="pass17">ok</div>
+	<div role="grid" id="pass18">ok</div>
+	<div role="gridcell" id="pass19">ok</div>
+	<div role="group" id="pass20">ok</div>
+	<div role="heading" id="pass21">ok</div>
+	<div role="img" id="pass22">ok</div>
+	<div role="link" id="pass23">ok</div>
+	<div role="list" id="pass24">ok</div>
+	<div role="listbox" id="pass25">ok</div>
+	<div role="listitem" id="pass26">ok</div>
+	<div role="log" id="pass27">ok</div>
+	<div role="main" id="pass28">ok</div>
+	<div role="marquee" id="pass29">ok</div>
+	<div role="math" id="pass30">ok</div>
+	<div role="menu" id="pass31">ok</div>
+	<div role="menubar" id="pass32">ok</div>
+	<div role="menuitem" id="pass33">ok</div>
+	<div role="menuitemcheckbox" id="pass34">ok</div>
+	<div role="menuitemradio" id="pass35">ok</div>
+	<div role="navigation" id="pass36">ok</div>
+	<div role="note" id="pass37">ok</div>
+	<div role="option" id="pass38">ok</div>
+	<div role="presentation" id="pass39">ok</div>
+	<div role="progressbar" id="pass40">ok</div>
+	<div role="radio" id="pass41">ok</div>
+	<div role="radiogroup" id="pass42">ok</div>
+	<div role="region" id="pass43">ok</div>
+	<div role="row" id="pass44">ok</div>
+	<div role="rowgroup" id="pass45">ok</div>
+	<div role="rowheader" id="pass46">ok</div>
+	<div role="scrollbar" id="pass47">ok</div>
+	<div role="search" id="pass48">ok</div>
+	<div role="separator" id="pass49">ok</div>
+	<div role="slider" id="pass50">ok</div>
+	<div role="spinbutton" id="pass51">ok</div>
+	<div role="status" id="pass52">ok</div>
+	<div role="tab" id="pass53">ok</div>
+	<div role="tablist" id="pass54">ok</div>
+	<div role="tabpanel" id="pass55">ok</div>
+	<div role="term" id="pass56">ok</div>
+	<div role="textbox" id="pass57">ok</div>
+	<div role="timer" id="pass58">ok</div>
+	<div role="toolbar" id="pass59">ok</div>
+	<div role="tooltip" id="pass60">ok</div>
+	<div role="tree" id="pass61">ok</div>
+	<div role="treegrid" id="pass62">ok</div>
+	<div role="treeitem" id="pass63">ok</div>
+	<div role="switch" id="pass64">ok</div>
+	<div role="none" id="pass65">ok</div>
+	<div role="cell" id="pass66">ok</div>
+	<div role="searchbox" id="pass67">ok</div>
+	<div role="text" id="pass68">ok</div>
+	<div role="table" id="pass69">ok</div>
 </div>
 <div id="violation">
 	<!-- abstract roles -->
diff --git a/test/integration/rules/aria-roles/aria-roles.json b/test/integration/rules/aria-roles/aria-roles.json
index e420a015ae..e3d49f6ea4 100644
--- a/test/integration/rules/aria-roles/aria-roles.json
+++ b/test/integration/rules/aria-roles/aria-roles.json
@@ -15,6 +15,6 @@
 		["#pass43"], ["#pass44"], ["#pass45"], ["#pass46"], ["#pass47"], ["#pass48"], ["#pass49"],
 		["#pass50"], ["#pass51"], ["#pass52"], ["#pass53"], ["#pass54"], ["#pass55"], ["#pass56"],
 		["#pass57"], ["#pass58"], ["#pass59"], ["#pass60"], ["#pass61"], ["#pass62"], ["#pass63"],
-		["#pass64"], ["#pass65"], ["#pass66"], ["#pass67"]
+		["#pass64"], ["#pass65"], ["#pass66"], ["#pass67"], ["#pass68"], ["#pass69"]
 	]
 }
\ No newline at end of file
diff --git a/test/integration/rules/aria-valid-attr-value/aria-valid-attr-value.html b/test/integration/rules/aria-valid-attr-value/aria-valid-attr-value.html
index cbd34691ae..54be03617a 100644
--- a/test/integration/rules/aria-valid-attr-value/aria-valid-attr-value.html
+++ b/test/integration/rules/aria-valid-attr-value/aria-valid-attr-value.html
@@ -100,143 +100,151 @@ <h2>Possible False Positives</h2>
 
 	<div aria-haspopup="true" id="pass43">hi</div>
 	<div aria-haspopup="false" id="pass44">hi</div>
-
-	<div aria-hidden="false" id="pass45">hi</div>
-
-	<div aria-invalid="true" id="pass46">hi</div>
-	<div aria-invalid="false" id="pass47">hi</div>
-	<div aria-invalid="spelling" id="pass48">hi</div>
-	<div aria-invalid="grammar" id="pass49">hi</div>
-
-	<div aria-label="stuff" id="pass50">hi</div>
-
-	<div aria-labelledby="ref" id="pass51">hi</div>
-	<div aria-labelledby="ref ref2" id="pass52">hi</div>
-	<div aria-labelledby=" ref ref2 " id="pass53">hi</div>
-
-	<div aria-level="0" id="pass54">hi</div>
-	<div aria-level="1" id="pass55">hi</div>
-	<div aria-level="22" id="pass56">hi</div>
-	<div aria-level="-1" id="pass57">hi</div>
-	<div aria-level="-22" id="pass58">hi</div>
-	<div aria-level="+1" id="pass59">hi</div>
-	<div aria-level="+22" id="pass60">hi</div>
-
-	<div aria-live="off" id="pass61">hi</div>
-	<div aria-live="polite" id="pass62">hi</div>
-	<div aria-live="assertive" id="pass63">hi</div>
-
-	<div aria-multiline="true" id="pass64">hi</div>
-	<div aria-multiline="false" id="pass65">hi</div>
-
-	<div aria-multiselectable="true" id="pass66">hi</div>
-	<div aria-multiselectable="false" id="pass67">hi</div>
-
-	<div aria-orientation="horizontal" id="pass68">hi</div>
-	<div aria-orientation="vertical" id="pass69">hi</div>
-
-	<div aria-owns="ref" id="pass70">hi</div>
-	<div aria-owns="ref ref2" id="pass71">hi</div>
-	<div aria-owns=" ref ref2 " id="pass72">hi</div>
-
-	<div aria-posinset="0" id="pass73">hi</div>
-	<div aria-posinset="1" id="pass74">hi</div>
-	<div aria-posinset="22" id="pass75">hi</div>
-	<div aria-posinset="-1" id="pass76">hi</div>
-	<div aria-posinset="-22" id="pass77">hi</div>
-	<div aria-posinset="+1" id="pass78">hi</div>
-	<div aria-posinset="+22" id="pass79">hi</div>
-
-	<div aria-pressed="true" id="pass80">hi</div>
-	<div aria-pressed="false" id="pass81">hi</div>
-	<div aria-pressed="mixed" id="pass82">hi</div>
-	<div aria-pressed="undefined" id="pass83">hi</div>
-
-	<div aria-readonly="true" id="pass84">hi</div>
-	<div aria-readonly="false" id="pass85">hi</div>
-
-	<div aria-relevant="additions" id="pass86">hi</div>
-	<div aria-relevant="removals" id="pass87">hi</div>
-	<div aria-relevant="text" id="pass88">hi</div>
-	<div aria-relevant="all" id="pass89">hi</div>
-
-	<div aria-required="true" id="pass90">hi</div>
-	<div aria-required="false" id="pass91">hi</div>
-
-	<div aria-selected="true" id="pass92">hi</div>
-	<div aria-selected="false" id="pass93">hi</div>
-	<div aria-selected="undefined" id="pass94">hi</div>
-
-	<div aria-setsize="0" id="pass95">hi</div>
-	<div aria-setsize="1" id="pass96">hi</div>
-	<div aria-setsize="22" id="pass97">hi</div>
-	<div aria-setsize="-1" id="pass98">hi</div>
-	<div aria-setsize="-22" id="pass99">hi</div>
-	<div aria-setsize="+1" id="pass100">hi</div>
-	<div aria-setsize="+22" id="pass101">hi</div>
-
-	<div aria-sort="ascending" id="pass102">hi</div>
-	<div aria-sort="descending" id="pass103">hi</div>
-	<div aria-sort="other" id="pass104">hi</div>
-	<div aria-sort="none" id="pass105">hi</div>
-
-	<div aria-valuemax="0.1" id="pass106">hi</div>
-	<div aria-valuemax="1.1" id="pass107">hi</div>
-	<div aria-valuemax="12.22" id="pass108">hi</div>
-	<div aria-valuemax="1." id="pass109">hi</div>
-	<div aria-valuemax=".1" id="pass110">hi</div>
-	<div aria-valuemax="412" id="pass111">hi</div>
-	<div aria-valuemax="+0.1" id="pass112">hi</div>
-	<div aria-valuemax="+1.1" id="pass113">hi</div>
-	<div aria-valuemax="+12.22" id="pass114">hi</div>
-	<div aria-valuemax="+1." id="pass115">hi</div>
-	<div aria-valuemax="+.1" id="pass116">hi</div>
-	<div aria-valuemax="+412" id="pass117">hi</div>
-	<div aria-valuemax="-0.1" id="pass118">hi</div>
-	<div aria-valuemax="-1.1" id="pass119">hi</div>
-	<div aria-valuemax="-12.22" id="pass120">hi</div>
-	<div aria-valuemax="-1." id="pass121">hi</div>
-	<div aria-valuemax="-.1" id="pass122">hi</div>
-	<div aria-valuemax="-412" id="pass123">hi</div>
-
-	<div aria-valuemin="0.1" id="pass124">hi</div>
-	<div aria-valuemin="1.1" id="pass125">hi</div>
-	<div aria-valuemin="12.22" id="pass126">hi</div>
-	<div aria-valuemin="1." id="pass127">hi</div>
-	<div aria-valuemin=".1" id="pass128">hi</div>
-	<div aria-valuemin="412" id="pass129">hi</div>
-	<div aria-valuemin="+0.1" id="pass130">hi</div>
-	<div aria-valuemin="+1.1" id="pass131">hi</div>
-	<div aria-valuemin="+12.22" id="pass132">hi</div>
-	<div aria-valuemin="+1." id="pass133">hi</div>
-	<div aria-valuemin="+.1" id="pass134">hi</div>
-	<div aria-valuemin="+412" id="pass135">hi</div>
-	<div aria-valuemin="-0.1" id="pass136">hi</div>
-	<div aria-valuemin="-1.1" id="pass137">hi</div>
-	<div aria-valuemin="-12.22" id="pass138">hi</div>
-	<div aria-valuemin="-1." id="pass139">hi</div>
-	<div aria-valuemin="-.1" id="pass140">hi</div>
-	<div aria-valuemin="-412" id="pass141">hi</div>
+	<div aria-haspopup="menu" id="pass45">hi</div>
+	<div aria-haspopup="listbox" id="pass46">hi</div>
+	<div aria-haspopup="tree" id="pass47">hi</div>
+	<div aria-haspopup="grid" id="pass48">hi</div>
+	<div aria-haspopup="dialog" id="pass49">hi</div>
+
+	<div aria-hidden="false" id="pass50">hi</div>
+
+	<div aria-invalid="true" id="pass51">hi</div>
+	<div aria-invalid="false" id="pass52">hi</div>
+	<div aria-invalid="spelling" id="pass53">hi</div>
+	<div aria-invalid="grammar" id="pass54">hi</div>
+
+	<div aria-label="stuff" id="pass55">hi</div>
+
+	<div aria-labelledby="ref" id="pass56">hi</div>
+	<div aria-labelledby="ref ref2" id="pass57">hi</div>
+	<div aria-labelledby=" ref ref2 " id="pass58">hi</div>
+
+	<div aria-level="0" id="pass59">hi</div>
+	<div aria-level="1" id="pass60">hi</div>
+	<div aria-level="22" id="pass61">hi</div>
+	<div aria-level="-1" id="pass62">hi</div>
+	<div aria-level="-22" id="pass63">hi</div>
+	<div aria-level="+1" id="pass64">hi</div>
+	<div aria-level="+22" id="pass65">hi</div>
+
+	<div aria-live="off" id="pass66">hi</div>
+	<div aria-live="polite" id="pass67">hi</div>
+	<div aria-live="assertive" id="pass68">hi</div>
+
+	<div aria-modal="true" id="pass69">hi</div>
+	<div aria-modal="false" id="pass70">hi</div>
+
+	<div aria-multiline="true" id="pass71">hi</div>
+	<div aria-multiline="false" id="pass72">hi</div>
+
+	<div aria-multiselectable="true" id="pass73">hi</div>
+	<div aria-multiselectable="false" id="pass74">hi</div>
+
+	<div aria-orientation="horizontal" id="pass75">hi</div>
+	<div aria-orientation="vertical" id="pass76">hi</div>
+
+	<div aria-owns="ref" id="pass77">hi</div>
+	<div aria-owns="ref ref2" id="pass78">hi</div>
+	<div aria-owns=" ref ref2 " id="pass79">hi</div>
+
+	<div aria-posinset="0" id="pass80">hi</div>
+	<div aria-posinset="1" id="pass81">hi</div>
+	<div aria-posinset="22" id="pass82">hi</div>
+	<div aria-posinset="-1" id="pass83">hi</div>
+	<div aria-posinset="-22" id="pass84">hi</div>
+	<div aria-posinset="+1" id="pass85">hi</div>
+	<div aria-posinset="+22" id="pass86">hi</div>
+
+	<div aria-pressed="true" id="pass87">hi</div>
+	<div aria-pressed="false" id="pass88">hi</div>
+	<div aria-pressed="mixed" id="pass89">hi</div>
+	<div aria-pressed="undefined" id="pass90">hi</div>
+
+	<div aria-readonly="true" id="pass91">hi</div>
+	<div aria-readonly="false" id="pass92">hi</div>
+
+	<div aria-relevant="additions" id="pass93">hi</div>
+	<div aria-relevant="removals" id="pass94">hi</div>
+	<div aria-relevant="text" id="pass95">hi</div>
+	<div aria-relevant="all" id="pass96">hi</div>
+
+	<div aria-required="true" id="pass97">hi</div>
+	<div aria-required="false" id="pass98">hi</div>
+
+	<div aria-selected="true" id="pass99">hi</div>
+	<div aria-selected="false" id="pass100">hi</div>
+	<div aria-selected="undefined" id="pass101">hi</div>
+
+	<div aria-setsize="0" id="pass102">hi</div>
+	<div aria-setsize="1" id="pass103">hi</div>
+	<div aria-setsize="22" id="pass104">hi</div>
+	<div aria-setsize="-1" id="pass105">hi</div>
+	<div aria-setsize="-22" id="pass106">hi</div>
+	<div aria-setsize="+1" id="pass107">hi</div>
+	<div aria-setsize="+22" id="pass108">hi</div>
+
+	<div aria-sort="ascending" id="pass109">hi</div>
+	<div aria-sort="descending" id="pass110">hi</div>
+	<div aria-sort="other" id="pass111">hi</div>
+	<div aria-sort="none" id="pass112">hi</div>
+
+	<div aria-valuemax="0.1" id="pass113">hi</div>
+	<div aria-valuemax="1.1" id="pass114">hi</div>
+	<div aria-valuemax="12.22" id="pass115">hi</div>
+	<div aria-valuemax="1." id="pass116">hi</div>
+	<div aria-valuemax=".1" id="pass117">hi</div>
+	<div aria-valuemax="412" id="pass118">hi</div>
+	<div aria-valuemax="+0.1" id="pass119">hi</div>
+	<div aria-valuemax="+1.1" id="pass120">hi</div>
+	<div aria-valuemax="+12.22" id="pass121">hi</div>
+	<div aria-valuemax="+1." id="pass122">hi</div>
+	<div aria-valuemax="+.1" id="pass123">hi</div>
+	<div aria-valuemax="+412" id="pass124">hi</div>
+	<div aria-valuemax="-0.1" id="pass125">hi</div>
+	<div aria-valuemax="-1.1" id="pass126">hi</div>
+	<div aria-valuemax="-12.22" id="pass127">hi</div>
+	<div aria-valuemax="-1." id="pass128">hi</div>
+	<div aria-valuemax="-.1" id="pass129">hi</div>
+	<div aria-valuemax="-412" id="pass130">hi</div>
+
+	<div aria-valuemin="0.1" id="pass131">hi</div>
+	<div aria-valuemin="1.1" id="pass132">hi</div>
+	<div aria-valuemin="12.22" id="pass133">hi</div>
+	<div aria-valuemin="1." id="pass134">hi</div>
+	<div aria-valuemin=".1" id="pass135">hi</div>
+	<div aria-valuemin="412" id="pass136">hi</div>
+	<div aria-valuemin="+0.1" id="pass137">hi</div>
+	<div aria-valuemin="+1.1" id="pass138">hi</div>
+	<div aria-valuemin="+12.22" id="pass139">hi</div>
+	<div aria-valuemin="+1." id="pass140">hi</div>
+	<div aria-valuemin="+.1" id="pass141">hi</div>
+	<div aria-valuemin="+412" id="pass142">hi</div>
+	<div aria-valuemin="-0.1" id="pass143">hi</div>
+	<div aria-valuemin="-1.1" id="pass144">hi</div>
+	<div aria-valuemin="-12.22" id="pass145">hi</div>
+	<div aria-valuemin="-1." id="pass146">hi</div>
+	<div aria-valuemin="-.1" id="pass147">hi</div>
+	<div aria-valuemin="-412" id="pass148">hi</div>
 	<!-- VALUENOW -->
-	<div aria-valuenow="0.1" id="pass142">hi</div>
-	<div aria-valuenow="1.1" id="pass143">hi</div>
-	<div aria-valuenow="12.22" id="pass144">hi</div>
-	<div aria-valuenow="1." id="pass145">hi</div>
-	<div aria-valuenow=".1" id="pass146">hi</div>
-	<div aria-valuenow="412" id="pass147">hi</div>
-	<div aria-valuenow="+0.1" id="pass148">hi</div>
-	<div aria-valuenow="+1.1" id="pass149">hi</div>
-	<div aria-valuenow="+12.22" id="pass150">hi</div>
-	<div aria-valuenow="+1." id="pass151">hi</div>
-	<div aria-valuenow="+.1" id="pass152">hi</div>
-	<div aria-valuenow="+412" id="pass153">hi</div>
-	<div aria-valuenow="-0.1" id="pass154">hi</div>
-	<div aria-valuenow="-1.1" id="pass155">hi</div>
-	<div aria-valuenow="-12.22" id="pass156">hi</div>
-	<div aria-valuenow="-1." id="pass157">hi</div>
-	<div aria-valuenow="-.1" id="pass158">hi</div>
-	<div aria-valuenow="-412" id="pass159">hi</div>
-	<div aria-valuetext="stuff" id="pass160">hi</div>
+	<div aria-valuenow="0.1" id="pass149">hi</div>
+	<div aria-valuenow="1.1" id="pass150">hi</div>
+	<div aria-valuenow="12.22" id="pass151">hi</div>
+	<div aria-valuenow="1." id="pass152">hi</div>
+	<div aria-valuenow=".1" id="pass153">hi</div>
+	<div aria-valuenow="412" id="pass154">hi</div>
+	<div aria-valuenow="+0.1" id="pass155">hi</div>
+	<div aria-valuenow="+1.1" id="pass156">hi</div>
+	<div aria-valuenow="+12.22" id="pass157">hi</div>
+	<div aria-valuenow="+1." id="pass158">hi</div>
+	<div aria-valuenow="+.1" id="pass159">hi</div>
+	<div aria-valuenow="+412" id="pass160">hi</div>
+	<div aria-valuenow="-0.1" id="pass161">hi</div>
+	<div aria-valuenow="-1.1" id="pass162">hi</div>
+	<div aria-valuenow="-12.22" id="pass163">hi</div>
+	<div aria-valuenow="-1." id="pass164">hi</div>
+	<div aria-valuenow="-.1" id="pass165">hi</div>
+	<div aria-valuenow="-412" id="pass166">hi</div>
+	<div aria-valuetext="stuff" id="pass167">hi</div>
 
 	<div id="ref">Hi</div>
 	<div id="ref2">Hi2</div>
diff --git a/test/integration/rules/aria-valid-attr-value/aria-valid-attr-value.json b/test/integration/rules/aria-valid-attr-value/aria-valid-attr-value.json
index b168b90a9a..3bbbfbe1d4 100644
--- a/test/integration/rules/aria-valid-attr-value/aria-valid-attr-value.json
+++ b/test/integration/rules/aria-valid-attr-value/aria-valid-attr-value.json
@@ -30,6 +30,7 @@
 		["#pass133"], ["#pass134"], ["#pass135"], ["#pass136"], ["#pass137"], ["#pass138"], ["#pass139"],
 		["#pass140"], ["#pass141"], ["#pass142"], ["#pass143"], ["#pass144"], ["#pass145"], ["#pass146"],
 		["#pass147"], ["#pass148"], ["#pass149"], ["#pass150"], ["#pass151"], ["#pass152"], ["#pass153"],
-		["#pass154"], ["#pass155"], ["#pass156"], ["#pass157"], ["#pass158"], ["#pass159"], ["#pass160"]
+		["#pass154"], ["#pass155"], ["#pass156"], ["#pass157"], ["#pass158"], ["#pass159"], ["#pass160"],
+		["#pass161"], ["#pass162"], ["#pass163"], ["#pass164"], ["#pass165"], ["#pass166"], ["#pass167"]
 	]
 }
diff --git a/test/integration/rules/aria-valid-attr/aria-valid-attr.html b/test/integration/rules/aria-valid-attr/aria-valid-attr.html
index 796afc4dfa..d0b8f4cc6b 100644
--- a/test/integration/rules/aria-valid-attr/aria-valid-attr.html
+++ b/test/integration/rules/aria-valid-attr/aria-valid-attr.html
@@ -27,25 +27,28 @@ <h2>Possible False Positives</h2>
 	<div id="pass13" aria-haspopup="stuff">hi</div>
 	<div id="pass14" aria-hidden="stuff">hi</div>
 	<div id="pass15" aria-invalid="stuff">hi</div>
-	<div id="pass16" aria-label="stuff">hi</div>
-	<div id="pass17" aria-labelledby="stuff">hi</div>
-	<div id="pass18" aria-level="stuff">hi</div>
-	<div id="pass19" aria-live="stuff">hi</div>
-	<div id="pass20" aria-multiline="stuff">hi</div>
-	<div id="pass21" aria-multiselectable="stuff">hi</div>
-	<div id="pass22" aria-orientation="stuff">hi</div>
-	<div id="pass23" aria-owns="stuff">hi</div>
-	<div id="pass24" aria-posinset="stuff">hi</div>
-	<div id="pass25" aria-pressed="stuff">hi</div>
-	<div id="pass26" aria-readonly="stuff">hi</div>
-	<div id="pass27" aria-relevant="stuff">hi</div>
-	<div id="pass28" aria-required="stuff">hi</div>
-	<div id="pass29" aria-selected="stuff">hi</div>
-	<div id="pass30" aria-setsize="stuff">hi</div>
-	<div id="pass31" aria-sort="stuff">hi</div>
-	<div id="pass32" aria-valuemax="stuff">hi</div>
-	<div id="pass33" aria-valuemin="stuff">hi</div>
-	<div id="pass34" aria-valuenow="stuff">hi</div>
-	<div id="pass35" aria-valuetext="stuff">hi</div>
+	<div id="pass16" aria-keyshortcuts="stuff">hi</div>
+	<div id="pass17" aria-label="stuff">hi</div>
+	<div id="pass18" aria-labelledby="stuff">hi</div>
+	<div id="pass19" aria-level="stuff">hi</div>
+	<div id="pass20" aria-live="stuff">hi</div>
+	<div id="pass21" aria-modal="stuff">hi</div>
+	<div id="pass22" aria-multiline="stuff">hi</div>
+	<div id="pass23" aria-multiselectable="stuff">hi</div>
+	<div id="pass24" aria-placeholder="stuff">hi</div>
+	<div id="pass25" aria-orientation="stuff">hi</div>
+	<div id="pass26" aria-owns="stuff">hi</div>
+	<div id="pass27" aria-posinset="stuff">hi</div>
+	<div id="pass28" aria-pressed="stuff">hi</div>
+	<div id="pass29" aria-readonly="stuff">hi</div>
+	<div id="pass30" aria-relevant="stuff">hi</div>
+	<div id="pass31" aria-required="stuff">hi</div>
+	<div id="pass32" aria-selected="stuff">hi</div>
+	<div id="pass33" aria-setsize="stuff">hi</div>
+	<div id="pass34" aria-sort="stuff">hi</div>
+	<div id="pass35" aria-valuemax="stuff">hi</div>
+	<div id="pass36" aria-valuemin="stuff">hi</div>
+	<div id="pass37" aria-valuenow="stuff">hi</div>
+	<div id="pass38" aria-valuetext="stuff">hi</div>
 
 </div>
diff --git a/test/integration/rules/aria-valid-attr/aria-valid-attr.json b/test/integration/rules/aria-valid-attr/aria-valid-attr.json
index 5ebde74b6f..201a16b117 100644
--- a/test/integration/rules/aria-valid-attr/aria-valid-attr.json
+++ b/test/integration/rules/aria-valid-attr/aria-valid-attr.json
@@ -10,6 +10,7 @@
 		["#pass8"], ["#pass9"], ["#pass10"], ["#pass11"], ["#pass12"], ["#pass13"], ["#pass14"],
 		["#pass15"], ["#pass16"], ["#pass17"], ["#pass18"], ["#pass19"], ["#pass20"], ["#pass21"],
 		["#pass22"], ["#pass23"], ["#pass24"], ["#pass25"], ["#pass26"], ["#pass27"], ["#pass28"],
-		["#pass29"], ["#pass30"], ["#pass31"], ["#pass32"], ["#pass33"], ["#pass34"], ["#pass35"]
+		["#pass29"], ["#pass30"], ["#pass31"], ["#pass32"], ["#pass33"], ["#pass34"], ["#pass35"],
+		["#pass36"], ["#pass37"], ["#pass38"]
 	]
 }

From 29e54dfb7c822a4d334bcf114374722049ff2fec Mon Sep 17 00:00:00 2001
From: Marcy Sutton <marcy.sutton@deque.com>
Date: Wed, 6 Sep 2017 11:35:28 -0700
Subject: [PATCH 142/142] chore: bump version to 3.0.0-alpha.3

---
 CHANGELOG.md | 9 +++++++++
 axe.d.ts     | 2 +-
 bower.json   | 2 +-
 package.json | 2 +-
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7f7464ec7e..6a0cbee6fc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,15 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+<a name="3.0.0-alpha.3"></a>
+## [3.0.0-alpha.3](https://github.com/dequelabs/axe-core/compare/v3.0.0-alpha.2...v3.0.0-alpha.3) (2017-09-06)
+
+### Bug fixes:
+
+* Additional ARIA 1.1. support and tests (#509) ([9b4d2ee](https://github.com/dequelabs/axe-core/commit/9b4d2eea4fcb2c48bab71e442da3a588b3893853))
+* fix: RestoreScroll was running  out of sync (#508) ([ff3df2d](https://github.com/dequelabs/axe-core/commit/ff3df2d9b2c01c1ca0d12c1fcaf136528287fb6d))
+
+
 <a name="3.0.0-alpha.2"></a>
 ## [3.0.0-alpha.2](https://github.com/dequelabs/axe-core/compare/v3.0.0-alpha.1...v3.0.0-alpha.2) (2017-09-01)
 
diff --git a/axe.d.ts b/axe.d.ts
index 258cf3dc9c..3d05f13c08 100644
--- a/axe.d.ts
+++ b/axe.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for axe-core 2.3.1
+// Type definitions for axe-core 3.0.0
 // Project: https://github.com/dequelabs/axe-core
 // Definitions by: Marcy Sutton <https://github.com/marcysutton>
 
diff --git a/bower.json b/bower.json
index f1c88d7bf6..c218362212 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "axe-core",
-  "version": "3.0.0-alpha.2",
+  "version": "3.0.0-alpha.3",
   "contributors": [
     {
       "name": "David Sturley",
diff --git a/package.json b/package.json
index 3292344782..21fea34606 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "axe-core",
   "description": "Accessibility engine for automated Web UI testing",
-  "version": "3.0.0-alpha.2",
+  "version": "3.0.0-alpha.3",
   "license": "MPL-2.0",
   "contributors": [
     {