Skip to content

Commit 02daad1

Browse files
committed
fix: Solve a few tests
# Conflicts: # test/testutils.js
1 parent 0252218 commit 02daad1

File tree

2 files changed

+11
-14
lines changed

2 files changed

+11
-14
lines changed

lib/checks/label/explicit.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
if (node.getAttribute('id')) {
2+
const root = axe.commons.dom.getRootNode(node);
23
const id = axe.commons.utils.escapeSelector(node.getAttribute('id'));
3-
const label = document.querySelector(`label[for="${id}"]`);
4+
const label = root.querySelector(`label[for="${id}"]`);
45

56
if (label) {
67
return !!axe.commons.text.accessibleText(label);

test/checks/shared/button-has-visible-text.js

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ describe('button-has-visible-text', function () {
22
'use strict';
33

44
var fixture = document.getElementById('fixture');
5-
5+
var checkSetup = axe.testUtils.checkSetup;
66
var checkContext = {
77
_data: null,
88
data: function (d) {
@@ -16,32 +16,28 @@ describe('button-has-visible-text', function () {
1616
});
1717

1818
it('should return false if button element is empty', function () {
19-
fixture.innerHTML = '<button></button>';
19+
var checkArgs = checkSetup('<button></button>', 'button');
2020

21-
var node = fixture.querySelector('button');
22-
assert.isFalse(checks['button-has-visible-text'].evaluate.call(checkContext, node));
21+
assert.isFalse(checks['button-has-visible-text'].evaluate.apply(checkContext, checkArgs));
2322
});
2423

2524
it('should return true if a button element has text', function () {
26-
fixture.innerHTML = '<button>Name</button>';
25+
var checkArgs = checkSetup('<button>Name</button>', 'button');
2726

28-
var node = fixture.querySelector('button');
29-
assert.isTrue(checks['button-has-visible-text'].evaluate.call(checkContext, node));
27+
assert.isTrue(checks['button-has-visible-text'].evaluate.apply(checkContext, checkArgs));
3028
assert.deepEqual(checkContext._data, 'Name');
3129
});
3230

3331
it('should return true if ARIA button has text', function () {
34-
fixture.innerHTML = '<div role="button">Text</div>';
32+
var checkArgs = checkSetup('<div role="button">Text</div>>', '[role=button]');
3533

36-
var node = fixture.querySelector('div');
37-
assert.isTrue(checks['button-has-visible-text'].evaluate.call(checkContext, node));
34+
assert.isTrue(checks['button-has-visible-text'].evaluate.apply(checkContext, checkArgs));
3835
assert.deepEqual(checkContext._data, 'Text');
3936
});
4037

4138
it('should return false if ARIA button has no text', function () {
42-
fixture.innerHTML = '<div role="button"></div>';
39+
var checkArgs = checkSetup('<div role="button"></div>>', '[role=button]');
4340

44-
var node = fixture.querySelector('div');
45-
assert.isFalse(checks['button-has-visible-text'].evaluate.call(checkContext, node));
41+
assert.isFalse(checks['button-has-visible-text'].evaluate.apply(checkContext, checkArgs));
4642
});
4743
});

0 commit comments

Comments
 (0)