From d29d6cc86e5692dbbc97b90ee3ff5ee3251e7ba1 Mon Sep 17 00:00:00 2001
From: Wilco Fiers <wilco.fiers@deque.com>
Date: Tue, 11 Jul 2017 16:20:57 +0200
Subject: [PATCH 1/6] feat: Run accessibleText on virtual elements

---
 lib/commons/text/accessible-text.js  | 158 +++++++------
 test/commons/text/accessible-text.js | 333 ++++++++++++++++++---------
 2 files changed, 309 insertions(+), 182 deletions(-)

diff --git a/lib/commons/text/accessible-text.js b/lib/commons/text/accessible-text.js
index 6c6eb3dcf9..2f92e5faa0 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,29 @@ 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;
-		}
-	}
-	ref = dom.findUp(element, 'label');
-	return ref;
+function findLabel({ actualNode }) {
+	const id = axe.utils.escapeSelector(actualNode.id);
+	const ref = id && document.querySelector('label[for="' + id + '"]');
+
+	return ref || dom.findUp(actualNode, '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 +50,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 +74,14 @@ 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());
+function checkDescendant({ actualNode }, nodeName) {
+	var candidate = actualNode.querySelector(nodeName.toLowerCase());
 	if (candidate) {
 		return text.accessibleText(candidate);
 	}
@@ -102,25 +96,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 +133,31 @@ function nonEmptyText(t) {
  * @return {string}
  */
 text.accessibleText = function(element, inLabelledByContext) {
-	//todo: implement shadowDOM
-	var accessibleNameComputation;
-	var encounteredNodes = [];
+	let accessibleNameComputation;
+	const encounteredNodes = [];
 
 	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 +180,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 +189,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,18 +207,22 @@ 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) {
+		const { actualNode } = element;
+		if (!inLabelledByContext && actualNode.hasAttribute('aria-labelledby')) {
+			return text.sanitize(dom.idrefs(actualNode, 'aria-labelledby').map(label => {
+				if (actualNode === label) {
 					encounteredNodes.pop();
 				} //let element be encountered twice
-				return accessibleNameComputation(l, true, element !== l);
+
+				// TODO: Not sure if this works
+				var out = accessibleNameComputation(label, true, actualNode !== label);
+				return out;
 			}).join(' '));
 		}
 
-		if (!(inControlContext && isEmbeddedControl(element)) && element.hasAttribute('aria-label')) {
-			return text.sanitize(element.getAttribute('aria-label'));
+		if (!(inControlContext && isEmbeddedControl(element)) && 
+				actualNode.hasAttribute('aria-label')) {
+			return text.sanitize(actualNode.getAttribute('aria-label'));
 		}
 
 		return '';
@@ -240,20 +238,27 @@ text.accessibleText = function(element, inLabelledByContext) {
 	 * @return {string}
 	 */
 	accessibleNameComputation = function (element, inLabelledByContext, inControlContext) {
-		'use strict';
+		// TODO: Make sure I don't have to do this
+		let returnText;
+		if (element instanceof Node) {
+			element = axe.utils.getNodeFromTree(axe._tree[0], element);
+		}
+
+		if (element.actualNode instanceof Node !== true) {
+			throw new Error('Invalid argument. Virtual Node must be provided');
+		}
 
-		var returnText;
 		// If the node was already checked or is null, skip
-		if (element === null || (encounteredNodes.indexOf(element) !== -1)) {
+		if (!element || encounteredNodes.includes(element)) {
 			return '';
 
 		//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 +281,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 +294,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/commons/text/accessible-text.js b/test/commons/text/accessible-text.js
index 504856ee1e..3484a9721b 100644
--- a/test/commons/text/accessible-text.js
+++ b/test/commons/text/accessible-text.js
@@ -5,6 +5,7 @@ describe('text.accessibleText', function() {
 
 	afterEach(function() {
 		fixture.innerHTML = '';
+		axe._tree = null;
 	});
 
 	it('should match the first example from the ARIA spec', function() {
@@ -20,11 +21,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,10 +45,11 @@ describe('text.accessibleText', function() {
 			'    times' +
 			'  </label>' +
 			'</fieldset>';
+		axe._tree = axe.utils.getFlattenedTree(fixture);
 
-		var rule2a = fixture.querySelector('#beep');
-		var rule2b = fixture.querySelector('#flash');
-		assert.equal(axe.commons.text.accessibleText(rule2a), 'Beep');
+		// 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 +60,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 +72,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 +84,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 +105,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 +118,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 +131,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 +144,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 +156,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 +168,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 +180,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 +193,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 +211,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 +222,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 +234,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 +246,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 +258,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 +272,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 +284,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,80 +297,103 @@ 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), '');
 	});
 
@@ -355,31 +402,41 @@ describe('text.accessibleText', function() {
 		it('shoud 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() {
 			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() {
 			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() {
 			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), '');
 		});
 	});
@@ -388,29 +445,33 @@ describe('text.accessibleText', 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 +479,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 +522,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 +551,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 +607,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 +618,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 +630,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 +642,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 +654,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 +665,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 +676,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 +689,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 +752,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 +804,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 +847,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 +894,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 +910,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 +924,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 +939,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 48fca9d665aff5ac298567c2d97baefe039fd639 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 2/6] fix: Pass all tests that use accessibleText

---
 lib/commons/text/accessible-text.js        | 27 ++++----
 test/checks/forms/fieldset.js              | 74 +++++++++++-----------
 test/checks/forms/labelledby.js            | 30 ++++-----
 test/checks/keyboard/focusable-no-name.js  | 11 ++--
 test/checks/label/explicit.js              |  9 +--
 test/checks/label/implicit.js              |  9 +--
 test/checks/shared/aria-labelledby.js      | 14 ++--
 test/checks/shared/has-visible-text.js     |  7 +-
 test/checks/tables/same-caption-summary.js |  9 +--
 test/checks/visibility/hidden-content.js   |  9 +--
 test/testutils.js                          | 20 ++++++
 11 files changed, 120 insertions(+), 99 deletions(-)

diff --git a/lib/commons/text/accessible-text.js b/lib/commons/text/accessible-text.js
index 2f92e5faa0..ad378d2e65 100644
--- a/lib/commons/text/accessible-text.js
+++ b/lib/commons/text/accessible-text.js
@@ -20,10 +20,14 @@ var phrasingElements = ['A', 'EM', 'STRONG', 'SMALL', 'MARK', 'ABBR', 'DFN', 'I'
  * @return {HTMLElement} The label element, or null if none is found
  */
 function findLabel({ actualNode }) {
+	let label;
 	const id = axe.utils.escapeSelector(actualNode.id);
-	const ref = id && document.querySelector('label[for="' + id + '"]');
-
-	return ref || dom.findUp(actualNode, 'label');
+	if (id) {
+		label = document.querySelector('label[for="' + id + '"]');
+	} else {
+		label = dom.findUp(actualNode, 'label');
+	}
+	return axe.utils.getNodeFromTree(axe._tree[0], label);
 }
 
 function isButton({ actualNode }) {
@@ -135,6 +139,9 @@ function nonEmptyText(t) {
 text.accessibleText = function(element, inLabelledByContext) {
 	let accessibleNameComputation;
 	const encounteredNodes = [];
+	if (element instanceof Node) {
+		element = axe.utils.getNodeFromTree(axe._tree[0], element);
+	}
 
 	function getInnerText (element, inLabelledByContext, inControlContext) {
 		return element.children.reduce((returnText, child) => {
@@ -214,9 +221,8 @@ text.accessibleText = function(element, inLabelledByContext) {
 					encounteredNodes.pop();
 				} //let element be encountered twice
 
-				// TODO: Not sure if this works
-				var out = accessibleNameComputation(label, true, actualNode !== label);
-				return out;
+				const vLabel = axe.utils.getNodeFromTree(axe._tree[0], label);
+				return accessibleNameComputation(vLabel, true, actualNode !== label);
 			}).join(' '));
 		}
 
@@ -240,12 +246,11 @@ text.accessibleText = function(element, inLabelledByContext) {
 	accessibleNameComputation = function (element, inLabelledByContext, inControlContext) {
 		// TODO: Make sure I don't have to do this
 		let returnText;
-		if (element instanceof Node) {
-			element = axe.utils.getNodeFromTree(axe._tree[0], element);
-		}
-
 		if (element.actualNode instanceof Node !== true) {
-			throw new Error('Invalid argument. Virtual Node must be provided');
+			/* global console */
+			var e = new Error('Invalid argument. Virtual Node must be provided');
+			console.error(e);
+			throw e;
 		}
 
 		// If the node was already checked or is null, skip
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..677c8f4d65 100644
--- a/test/checks/keyboard/focusable-no-name.js
+++ b/test/checks/keyboard/focusable-no-name.js
@@ -2,37 +2,38 @@ describe('focusable-no-name', function () {
 	'use strict';
 
 	var fixture = document.getElementById('fixture');
+	var fixtureSetup = axe.testUtils.fixtureSetup;
 
 	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>';
+		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>';
+		fixtureSetup('<a href="#" title="Hello"></a>');
 		var node = fixture.querySelector('a');
 		assert.isFalse(checks['focusable-no-name'].evaluate(node));
 	});
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/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..06a150774e 100644
--- a/test/checks/tables/same-caption-summary.js
+++ b/test/checks/tables/same-caption-summary.js
@@ -2,13 +2,14 @@ describe('same-caption-summary', function () {
 	'use strict';
 
 	var fixture = document.getElementById('fixture');
+	var fixtureSetup = axe.testUtils.fixtureSetup;
 
 	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 +17,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 +25,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,7 +33,7 @@ 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));
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/testutils.js b/test/testutils.js
index d7cab92b85..50a9ce6422 100644
--- a/test/testutils.js
+++ b/test/testutils.js
@@ -16,4 +16,24 @@ 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;
+};
+
+testUtils.checkSetup = function (content, options, target) {
+	'use strict';
+	var fixture = testUtils.fixtureSetup(content, target);
+	var node = fixture.querySelector(target || '#target');
+	var virtualNode = axe.utils.getNodeFromTree(axe._tree[0], node);
+	return [virtualNode.actualNode, options, virtualNode];
+};
+
 axe.testUtils = testUtils;
\ No newline at end of file

From 0314c426689a3b5064c57573eada9737550179a7 Mon Sep 17 00:00:00 2001
From: Wilco Fiers <wilco.fiers@deque.com>
Date: Wed, 12 Jul 2017 14:08:53 +0200
Subject: [PATCH 3/6] feat: Add findElmsInContext method

---
 lib/commons/dom/find-elms-in-context.js  | 26 ++++++++++++
 test/commons/.jshintrc                   |  1 +
 test/commons/dom/find-elms-in-context.js | 53 ++++++++++++++++++++++++
 3 files changed, 80 insertions(+)
 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..a71b659744
--- /dev/null
+++ b/lib/commons/dom/find-elms-in-context.js
@@ -0,0 +1,26 @@
+/* global axe, dom */
+/**
+ * Find a elements reference 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/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');
+  });
+});

From 19a9ff80374f85f5fa80408a6346fb77bb468b93 Mon Sep 17 00:00:00 2001
From: Wilco Fiers <wilco.fiers@deque.com>
Date: Wed, 12 Jul 2017 14:09:17 +0200
Subject: [PATCH 4/6] test: accessibleText with shadow DOM

---
 lib/commons/text/accessible-text.js  | 42 +++++++++++++++-------------
 test/commons/text/accessible-text.js | 36 +++++++++++++++++++++---
 2 files changed, 54 insertions(+), 24 deletions(-)

diff --git a/lib/commons/text/accessible-text.js b/lib/commons/text/accessible-text.js
index ad378d2e65..ffde54e06d 100644
--- a/lib/commons/text/accessible-text.js
+++ b/lib/commons/text/accessible-text.js
@@ -21,9 +21,10 @@ var phrasingElements = ['A', 'EM', 'STRONG', 'SMALL', 'MARK', 'ABBR', 'DFN', 'I'
  */
 function findLabel({ actualNode }) {
 	let label;
-	const id = axe.utils.escapeSelector(actualNode.id);
-	if (id) {
-		label = document.querySelector('label[for="' + id + '"]');
+	if (actualNode.id) {
+		label = dom.findElmsInContext({
+			elm: 'label', attr: 'for', value: actualNode.id, context: actualNode
+		})[0];
 	} else {
 		label = dom.findUp(actualNode, 'label');
 	}
@@ -214,24 +215,29 @@ text.accessibleText = function(element, inLabelledByContext) {
 	}
 
 	function checkARIA (element, inLabelledByContext, inControlContext) {
+		let returnText = '';
 		const { actualNode } = element;
 		if (!inLabelledByContext && actualNode.hasAttribute('aria-labelledby')) {
-			return text.sanitize(dom.idrefs(actualNode, 'aria-labelledby').map(label => {
-				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);
+			// 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)) && 
+		if (!returnText && !(inControlContext && isEmbeddedControl(element)) && 
 				actualNode.hasAttribute('aria-label')) {
 			return text.sanitize(actualNode.getAttribute('aria-label'));
 		}
 
-		return '';
+		return returnText;
 	}
 
 	/**
@@ -244,19 +250,15 @@ text.accessibleText = function(element, inLabelledByContext) {
 	 * @return {string}
 	 */
 	accessibleNameComputation = function (element, inLabelledByContext, inControlContext) {
-		// TODO: Make sure I don't have to do this
 		let returnText;
-		if (element.actualNode instanceof Node !== true) {
-			/* global console */
-			var e = new Error('Invalid argument. Virtual Node must be provided');
-			console.error(e);
-			throw e;
-		}
-
 		// If the node was already checked or is null, skip
 		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.actualNode, true)) {
 			return '';
diff --git a/test/commons/text/accessible-text.js b/test/commons/text/accessible-text.js
index 3484a9721b..10e5c04f3a 100644
--- a/test/commons/text/accessible-text.js
+++ b/test/commons/text/accessible-text.js
@@ -2,6 +2,7 @@ describe('text.accessibleText', function() {
 	'use strict';
 
 	var fixture = document.getElementById('fixture');
+	var shadowSupport = axe.testUtils.shadowSupport;
 
 	afterEach(function() {
 		fixture.innerHTML = '';
@@ -397,9 +398,24 @@ describe('text.accessibleText', function() {
 		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');
+	});
+
 	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>';
 			axe._tree = axe.utils.getFlattenedTree(fixture);
@@ -408,7 +424,7 @@ describe('text.accessibleText', function() {
 			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>';
 			axe._tree = axe.utils.getFlattenedTree(fixture);
 
@@ -416,7 +432,7 @@ describe('text.accessibleText', function() {
 			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>';
 			axe._tree = axe.utils.getFlattenedTree(fixture);
 
@@ -424,7 +440,7 @@ describe('text.accessibleText', function() {
 			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>';
 			axe._tree = axe.utils.getFlattenedTree(fixture);
 
@@ -439,6 +455,18 @@ describe('text.accessibleText', function() {
 			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() {

From 55d6aa1b84c386f00f249ad1cffb91a03cb51f50 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 5/6] 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
---
 lib/commons/dom/find-elms-in-context.js    |  2 +-
 lib/commons/text/accessible-text.js        |  9 +++--
 test/checks/keyboard/focusable-no-name.js  | 16 +++++++--
 test/checks/tables/same-caption-summary.js | 18 +++++++++-
 test/commons/text/accessible-text.js       | 38 ++++++++++++++++++++--
 5 files changed, 74 insertions(+), 9 deletions(-)

diff --git a/lib/commons/dom/find-elms-in-context.js b/lib/commons/dom/find-elms-in-context.js
index a71b659744..f9b784c400 100644
--- a/lib/commons/dom/find-elms-in-context.js
+++ b/lib/commons/dom/find-elms-in-context.js
@@ -1,6 +1,6 @@
 /* global axe, dom */
 /**
- * Find a elements reference from a given context
+ * Find elements referenced from a given context
  * 
  * @param object {
  *    context:  Node | virtual node    Element in the same context
diff --git a/lib/commons/text/accessible-text.js b/lib/commons/text/accessible-text.js
index ffde54e06d..ed07a7df41 100644
--- a/lib/commons/text/accessible-text.js
+++ b/lib/commons/text/accessible-text.js
@@ -85,6 +85,10 @@ function formValueText({ actualNode }) {
 	return '';
 }
 
+/**
+ * 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) {
@@ -153,9 +157,8 @@ text.accessibleText = function(element, inLabelledByContext) {
 				if (!phrasingElements.includes(actualNode.nodeName.toUpperCase())) {
 					returnText += ' ';
 				}
-				returnText += accessibleNameComputation(
-					child, inLabelledByContext, inControlContext
-				);
+				returnText += accessibleNameComputation(child, inLabelledByContext,
+						inControlContext);
 			}
 			return returnText;
 		}, '');
diff --git a/test/checks/keyboard/focusable-no-name.js b/test/checks/keyboard/focusable-no-name.js
index 677c8f4d65..70191cc18b 100644
--- a/test/checks/keyboard/focusable-no-name.js
+++ b/test/checks/keyboard/focusable-no-name.js
@@ -3,6 +3,7 @@ describe('focusable-no-name', function () {
 
 	var fixture = document.getElementById('fixture');
 	var fixtureSetup = axe.testUtils.fixtureSetup;
+	var shadowSupport = axe.testUtils.shadowSupport;
 
 	afterEach(function () {
 		fixture.innerHTML = '';
@@ -26,16 +27,27 @@ 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));
 	});
 
+	(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/tables/same-caption-summary.js b/test/checks/tables/same-caption-summary.js
index 06a150774e..1e77f9945b 100644
--- a/test/checks/tables/same-caption-summary.js
+++ b/test/checks/tables/same-caption-summary.js
@@ -3,6 +3,7 @@ describe('same-caption-summary', function () {
 
 	var fixture = document.getElementById('fixture');
 	var fixtureSetup = axe.testUtils.fixtureSetup;
+	var shadowSupport = axe.testUtils.shadowSupport;
 
 	afterEach(function () {
 		fixture.innerHTML = '';
@@ -37,8 +38,23 @@ describe('same-caption-summary', function () {
 		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/commons/text/accessible-text.js b/test/commons/text/accessible-text.js
index 10e5c04f3a..2cbd9eef73 100644
--- a/test/commons/text/accessible-text.js
+++ b/test/commons/text/accessible-text.js
@@ -48,9 +48,9 @@ describe('text.accessibleText', function() {
 			'</fieldset>';
 		axe._tree = axe.utils.getFlattenedTree(fixture);
 
-		// var rule2a = axe.utils.querySelectorAll(axe._tree, '#beep')[0];
+		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(rule2a), 'Beep');
 		assert.equal(axe.commons.text.accessibleText(rule2b), 'Flash the screen 3 times');
 	});
 
@@ -413,6 +413,40 @@ describe('text.accessibleText', function() {
 		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('should check aria-labelledby', function() {

From 95848848ff55d04bf178fbe5d7c110fb8eaa8eb8 Mon Sep 17 00:00:00 2001
From: Wilco Fiers <wilco.fiers@deque.com>
Date: Mon, 17 Jul 2017 12:14:15 +0200
Subject: [PATCH 6/6] test: Fix a few broken tests

---
 test/checks/lists/only-listitems.js        |  4 ++--
 test/checks/lists/structured-dlitems.js    |  2 +-
 test/checks/tables/same-caption-summary.js | 16 ++++++++--------
 3 files changed, 11 insertions(+), 11 deletions(-)

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/tables/same-caption-summary.js b/test/checks/tables/same-caption-summary.js
index 1e77f9945b..f56dfedd2c 100644
--- a/test/checks/tables/same-caption-summary.js
+++ b/test/checks/tables/same-caption-summary.js
@@ -43,18 +43,18 @@ describe('same-caption-summary', function () {
 	(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>';
+			'<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);
+		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