fix: Solve a few tests

# Conflicts: # test/testutils.js
dequelabs · Jul 18, 2017 · 02daad1 · 02daad1
1 parent 0252218
commit 02daad1
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 14 deletions.
diff --git a/lib/checks/label/explicit.js b/lib/checks/label/explicit.js
@@ -1,6 +1,7 @@
 if (node.getAttribute('id')) {
+	const root = axe.commons.dom.getRootNode(node);
 	const id = axe.commons.utils.escapeSelector(node.getAttribute('id'));
-	const label = document.querySelector(`label[for="${id}"]`);
+	const label = root.querySelector(`label[for="${id}"]`);
 
 	if (label) {
 		return !!axe.commons.text.accessibleText(label);

diff --git a/test/checks/shared/button-has-visible-text.js b/test/checks/shared/button-has-visible-text.js
@@ -2,7 +2,7 @@ describe('button-has-visible-text', function () {
 	'use strict';
 
 	var fixture = document.getElementById('fixture');
-
+	var checkSetup = axe.testUtils.checkSetup;
 	var checkContext = {
 		_data: null,
 		data: function (d) {
@@ -16,32 +16,28 @@ describe('button-has-visible-text', function () {
 	});
 
 	it('should return false if button element is empty', function () {
-		fixture.innerHTML = '<button></button>';
+		var checkArgs = checkSetup('<button></button>', 'button');
 
-		var node = fixture.querySelector('button');
-		assert.isFalse(checks['button-has-visible-text'].evaluate.call(checkContext, node));
+		assert.isFalse(checks['button-has-visible-text'].evaluate.apply(checkContext, checkArgs));
 	});
 
 	it('should return true if a button element has text', function () {
-		fixture.innerHTML = '<button>Name</button>';
+		var checkArgs = checkSetup('<button>Name</button>', 'button');
 
-		var node = fixture.querySelector('button');
-		assert.isTrue(checks['button-has-visible-text'].evaluate.call(checkContext, node));
+		assert.isTrue(checks['button-has-visible-text'].evaluate.apply(checkContext, checkArgs));
 		assert.deepEqual(checkContext._data, 'Name');
 	});
 
 	it('should return true if ARIA button has text', function () {
-		fixture.innerHTML = '<div role="button">Text</div>';
+		var checkArgs = checkSetup('<div role="button">Text</div>>', '[role=button]');
 
-		var node = fixture.querySelector('div');
-		assert.isTrue(checks['button-has-visible-text'].evaluate.call(checkContext, node));
+		assert.isTrue(checks['button-has-visible-text'].evaluate.apply(checkContext, checkArgs));
 		assert.deepEqual(checkContext._data, 'Text');
 	});
 
 	it('should return false if ARIA button has no text', function () {
-		fixture.innerHTML = '<div role="button"></div>';
+		var checkArgs = checkSetup('<div role="button"></div>>', '[role=button]');
 
-		var node = fixture.querySelector('div');
-		assert.isFalse(checks['button-has-visible-text'].evaluate.call(checkContext, node));
+		assert.isFalse(checks['button-has-visible-text'].evaluate.apply(checkContext, checkArgs));
 	});
 });