Bump axe-core version

openedx-unsupported · Mar 19, 2019 · 1cbb48e · 1cbb48e
1 parent fb4104f
commit 1cbb48e
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/lib/custom_a11y_rules.js b/lib/custom_a11y_rules.js
@@ -57,7 +57,7 @@ var customRules = {
             'metadata': {
                 'description': 'Ensures the first link on the page is a skip link',
                 'help': 'The page should have a skip link as its first link',
-                'helpUrl': 'https://dequeuniversity.com/rules/axe/1.1/skip-link'
+                'helpUrl': 'https://dequeuniversity.com/rules/axe/3.2/skip-link'
             }
         },
         {
@@ -116,7 +116,8 @@ var customRules = {
                     'fail': 'all <nav> elements MUST have aria-label or aria-labelledby attribute'
                 }
             },
-            evaluate: function(node, options) {
+            evaluate: function(node, option) {
+                axe._tree = axe.utils.getFlattenedTree(node);
                 return axe.commons.aria.label(node) !== null;
             }
         },
@@ -132,6 +133,7 @@ var customRules = {
                 }
             },
             evaluate: function(node, options) {
+                axe._tree = axe.utils.getFlattenedTree(node);
                 var label = axe.commons.aria.label(node) || '',
                     words = label.toLowerCase().split(' ');
                 return words.indexOf('nav') < 0 && words.indexOf('navigation') < 0;
@@ -170,6 +172,9 @@ var customRules = {
                     rel = node.getAttribute('rel') || '';
                 if (href.startsWith('#') && href.length > 1 && rel !== 'leanModal') {
                     linkTarget = document.querySelector(href);
+                    if (!linkTarget) {
+                        return false;
+                    }
                     return axe.commons.dom.isFocusable(linkTarget);
                 } else {
                     return true;

diff --git a/package.json b/package.json
@@ -23,7 +23,7 @@
   },
   "homepage": "https://github.com/edx/edx-custom-a11y-rules#readme",
   "devDependencies": {
-    "axe-core": "~1.1.0",
+    "axe-core": "~3.2.2",
     "jasmine-core": "^2.3.4",
     "jshint": "^2.8.0",
     "karma": "^0.13.10",

diff --git a/test/fixtures/skip-link-fail.html b/test/fixtures/skip-link-fail.html
@@ -1,3 +1,2 @@
-{# This will fail despite the href being OK because "main-content" div isn't focusable. #}
-<a href="#main-content">Skip to main content</a>
+<a href="#not-a-real-element">Skip to main content</a>
 <div id="main-content">Main content</div>
diff --git a/test/spec/rules_spec.js b/test/spec/rules_spec.js
@@ -32,7 +32,7 @@ describe('Rules Spec', function () {
                 axe.configure(rules);
                 jasmine.getFixtures().fixturesPath = '/base/';
                 loadFixtures('test/fixtures/' + fixture);
-                axe.a11yCheck(document, {}, function (r) { results = r; done(); });
+                axe.run(document, function (err, result) { results = result; done(); });
             });
 
             it(fixture + ', should ' + expectedResult, function () {