refactor(check): undo recent split of checks

Recombine checks "no-focusable-content-for-aria-text" and "no-focusable-content-for-nested-interactive" back into "no-focusable-content".

lib/checks/keyboard/no-focusable-content-for-nested-interactive-evaluate.js → lib/checks/keyboard/no-focusable-content-evaluate.js

@@ -25,7 +25,7 @@ function usesUnreliableHidingStrategy(vNode) {
   return !isNaN(tabIndex) && tabIndex < 0 && vNode.attr('aria-hidden') === 'true';
 }
 
-function noFocusableContentForNestedInteractiveEvaluate(node, options, virtualNode) {
+function noFocusableContentEvaluate(node, options, virtualNode) {
   if (!virtualNode.children) {
     return undefined;
   }
@@ -47,4 +47,4 @@ function noFocusableContentForNestedInteractiveEvaluate(node, options, virtualNo
   }
 }
 
-export default noFocusableContentForNestedInteractiveEvaluate;
+export default noFocusableContentEvaluate;

lib/checks/keyboard/no-focusable-content-for-aria-text.json → lib/checks/keyboard/no-focusable-content.json

@@ -1,6 +1,6 @@
 {
-  "id": "no-focusable-content-for-aria-text",
-  "evaluate": "no-focusable-content-for-aria-text-evaluate",
+  "id": "no-focusable-content",
+  "evaluate": "no-focusable-content-evaluate",
   "metadata": {
     "impact": "serious",
     "messages": {

lib/core/base/metadata-function-map.js

@@ -97,8 +97,7 @@ import focusableNoNameEvaluate from '../../checks/keyboard/focusable-no-name-eva
 import focusableNotTabbableEvaluate from '../../checks/keyboard/focusable-not-tabbable-evaluate';
 import landmarkIsTopLevelEvaluate from '../../checks/keyboard/landmark-is-top-level-evaluate';
 import noFocusableContentForFrameEvaluate from '../../checks/keyboard/frame-focusable-content-evaluate';
-import noFocusableContentForAriaTextEvaluate from '../../checks/keyboard/no-focusable-content-for-aria-text-evaluate';
-import noFocusableContentForNestedInteractiveEvaluate from '../../checks/keyboard/no-focusable-content-for-nested-interactive-evaluate';
+import noFocusableContentEvaluate from '../../checks/keyboard/no-focusable-content-evaluate';
 import tabindexEvaluate from '../../checks/keyboard/tabindex-evaluate';
 
 // label
@@ -276,8 +275,7 @@ const metadataFunctionMap = {
   'focusable-not-tabbable-evaluate': focusableNotTabbableEvaluate,
   'landmark-is-top-level-evaluate': landmarkIsTopLevelEvaluate,
   'no-focusable-content-for-frame-evaluate': noFocusableContentForFrameEvaluate,
-  'no-focusable-content-for-aria-text-evaluate': noFocusableContentForAriaTextEvaluate,
-  'no-focusable-content-for-nested-interactive-evaluate': noFocusableContentForNestedInteractiveEvaluate,
+  'no-focusable-content-evaluate': noFocusableContentEvaluate,
   'tabindex-evaluate': tabindexEvaluate,
 
   // label

lib/rules/aria-text.json

@@ -7,6 +7,6 @@
     "help": "\"role=text\" should have no focusable descendants"
   },
   "all": [],
-  "any": ["no-focusable-content-for-aria-text"],
+  "any": ["no-focusable-content"],
   "none": []
 }

lib/rules/nested-interactive.json

@@ -8,6 +8,6 @@
     "help": "Ensure interactive controls are not nested"
   },
   "all": [],
-  "any": ["no-focusable-content-for-nested-interactive"],
+  "any": ["no-focusable-content"],
   "none": []
 }

test/checks/keyboard/no-focusable-content-for-aria-text.js → test/checks/keyboard/no-focusable-content.js

@@ -1,8 +1,8 @@
-describe('no-focusable-content-for-aria-text tests', function() {
+describe('no-focusable-content tests', function() {
   var fixture = document.querySelector('#fixture');
   var queryFixture = axe.testUtils.queryFixture;
-  var noFocusableContentForAriaText = axe.testUtils.getCheckEvaluate(
-    'no-focusable-content-for-aria-text'
+  var noFocusableContent = axe.testUtils.getCheckEvaluate(
+    'no-focusable-content'
   );
 
   afterEach(function() {
@@ -11,31 +11,31 @@ describe('no-focusable-content-for-aria-text tests', function() {
 
   it('should return true if element has no focusable content', function() {
     var vNode = queryFixture('<button id="target"><span>Hello</span></button>');
-    assert.isTrue(noFocusableContentForAriaText(null, null, vNode));
+    assert.isTrue(noFocusableContent(null, null, vNode));
   });
 
   it('should return true if element is empty', function() {
     var vNode = queryFixture('<button id="target"></button>');
-    assert.isTrue(noFocusableContentForAriaText(null, null, vNode));
+    assert.isTrue(noFocusableContent(null, null, vNode));
   });
 
   it('should return true if element only has text content', function() {
     var vNode = queryFixture('<button id="target">Hello</button>');
-    assert.isTrue(noFocusableContentForAriaText(null, null, vNode));
+    assert.isTrue(noFocusableContent(null, null, vNode));
   });
 
   it('should return false if element has focusable content', function() {
     var vNode = queryFixture(
       '<button id="target"><span tabindex="0">Hello</span></button>'
     );
-    assert.isFalse(noFocusableContentForAriaText(null, null, vNode));
+    assert.isFalse(noFocusableContent(null, null, vNode));
   });
 
   it('should return false if element has natively focusable content', function() {
     var vNode = queryFixture(
       '<button id="target"><a href="foo.html">Hello</a></button>'
     );
-    assert.isFalse(noFocusableContentForAriaText(null, null, vNode));
+    assert.isFalse(noFocusableContent(null, null, vNode));
   });
 
 });