feat(rule-matches): depreacte window-is-top-matches for is-intiator-m…

…atches (#2531)
dequelabs · Sep 28, 2020 · db2be93 · db2be93
1 parent e4edffc
commit db2be93
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 5 deletions.
diff --git a/lib/core/base/metadata-function-map.js b/lib/core/base/metadata-function-map.js
@@ -145,6 +145,7 @@ import headingMatches from '../../rules/heading-matches';
 import htmlNamespaceMatches from '../../rules/html-namespace-matches';
 import identicalLinksSamePurposeMatches from '../../rules/identical-links-same-purpose-matches';
 import insertedIntoFocusOrderMatches from '../../rules/inserted-into-focus-order-matches';
+import isInitiatorMatches from '../../rules/is-initiator-matches';
 import labelContentNameMismatchMatches from '../../rules/label-content-name-mismatch-matches';
 import labelMatches from '../../rules/label-matches';
 import landmarkHasBodyContextMatches from '../../rules/landmark-has-body-context-matches';
@@ -310,6 +311,7 @@ const metadataFunctionMap = {
 	'html-namespace-matches': htmlNamespaceMatches,
 	'identical-links-same-purpose-matches': identicalLinksSamePurposeMatches,
 	'inserted-into-focus-order-matches': insertedIntoFocusOrderMatches,
+	'is-initiator-matches': isInitiatorMatches,
 	'label-content-name-mismatch-matches': labelContentNameMismatchMatches,
 	'label-matches': labelMatches,
 	'landmark-has-body-context-matches': landmarkHasBodyContextMatches,

diff --git a/lib/rules/bypass-matches.js b/lib/rules/bypass-matches.js
@@ -1,8 +1,8 @@
-import windowIsTopMatches from './window-is-top-matches';
+import isInitiatorMatches from './is-initiator-matches';
 
-function bypassMatches(node) {
+function bypassMatches(node, virtualNode, context) {
 	// the top level window should have an anchor
-	if (windowIsTopMatches(node)) {
+	if (isInitiatorMatches(node, virtualNode, context)) {
 		return !!node.querySelector('a[href]');
 	}
 

diff --git a/lib/rules/document-title.json b/lib/rules/document-title.json
@@ -1,7 +1,7 @@
 {
 	"id": "document-title",
 	"selector": "html",
-	"matches": "window-is-top-matches",
+	"matches": "is-initiator-matches",
 	"tags": ["cat.text-alternatives", "wcag2a", "wcag242", "ACT"],
 	"metadata": {
 		"description": "Ensures each HTML document contains a non-empty <title> element",

diff --git a/lib/rules/html-has-lang.json b/lib/rules/html-has-lang.json
@@ -1,7 +1,7 @@
 {
 	"id": "html-has-lang",
 	"selector": "html",
-	"matches": "window-is-top-matches",
+	"matches": "is-initiator-matches",
 	"tags": ["cat.language", "wcag2a", "wcag311", "ACT"],
 	"metadata": {
 		"description": "Ensures every HTML document has a lang attribute",

diff --git a/lib/rules/is-initiator-matches.js b/lib/rules/is-initiator-matches.js
@@ -0,0 +1,5 @@
+function isInitiatorMatches(node, virtualNode, context) {
+	return context.initiator;
+}
+
+export default isInitiatorMatches;
diff --git a/lib/rules/window-is-top-matches.js b/lib/rules/window-is-top-matches.js
@@ -1,3 +1,4 @@
+// @deprecated
 function windowIsTopMatches(node) {
 	return (
 		node.ownerDocument.defaultView.self === node.ownerDocument.defaultView.top

diff --git a/test/rule-matches/is-initiator-matches.js b/test/rule-matches/is-initiator-matches.js
@@ -0,0 +1,24 @@
+describe('is-initiator-matches', function() {
+	'use strict';
+
+	var rule;
+
+	beforeEach(function() {
+		rule = axe._audit.rules.find(function(rule) {
+			return rule.id === 'html-has-lang';
+		});
+	});
+
+	afterEach(function() {
+		var fixture = document.getElementById('fixture');
+		fixture.innerHTML = '';
+	});
+
+	it('should return true if the context is the initiator', function() {
+		assert.isTrue(rule.matches(null, null, { initiator: true }));
+	});
+
+	it('should return false if the context is not the initiator', function() {
+		assert.isFalse(rule.matches(null, null, { initiator: false }));
+	});
+});