(tech-debt): wait for iframes to be ready in tests (#3060)

* add missing iframe loading waits * add testutils where needed
dequelabs · Jul 2, 2021 · 988d536 · 988d536
1 parent 42738b5
commit 988d536
Show file tree

Hide file tree

Showing 12 changed files with 47 additions and 31 deletions.
diff --git a/test/integration/full/aria-hidden-body/fail.html b/test/integration/full/aria-hidden-body/fail.html
@@ -24,6 +24,7 @@
     <h2>Some title.</h2>
     <a href="http://www.deque.com">Deque</a>
     <div id="mocha"></div>
+    <script src="/test/testutils.js"></script>
     <script src="fail.js"></script>
     <script src="/test/integration/adapter.js"></script>
   </body>

diff --git a/test/integration/full/aria-hidden-body/fail.js b/test/integration/full/aria-hidden-body/fail.js
@@ -2,14 +2,16 @@ describe('aria-hidden on body test ' + window.location.pathname, function() {
   'use strict';
   var results;
   before(function(done) {
-    axe.run(
-      { runOnly: { type: 'rule', values: ['aria-hidden-body'] } },
-      function(err, r) {
-        assert.isNull(err);
-        results = r;
-        done();
-      }
-    );
+    axe.testUtils.awaitNestedLoad(function() {
+      axe.run(
+        { runOnly: { type: 'rule', values: ['aria-hidden-body'] } },
+        function(err, r) {
+          assert.isNull(err);
+          results = r;
+          done();
+        }
+      );
+    });
   });
 
   describe('violations', function() {

diff --git a/test/integration/full/aria-hidden-body/pass.html b/test/integration/full/aria-hidden-body/pass.html
@@ -24,6 +24,7 @@
     <h2>Some title.</h2>
     <a href="http://www.deque.com">Deque</a>
     <div id="mocha"></div>
+    <script src="/test/testutils.js"></script>
     <script src="pass.js"></script>
     <script src="/test/integration/adapter.js"></script>
     <iframe src="frames/frame-hidden-body.html"></iframe>

diff --git a/test/integration/full/aria-hidden-body/pass.js b/test/integration/full/aria-hidden-body/pass.js
@@ -2,14 +2,16 @@ describe('aria-hidden on body test ' + window.location.pathname, function() {
   'use strict';
   var results;
   before(function(done) {
-    axe.run(
-      { runOnly: { type: 'rule', values: ['aria-hidden-body'] } },
-      function(err, r) {
-        assert.isNull(err);
-        results = r;
-        done();
-      }
-    );
+    axe.testUtils.awaitNestedLoad(function() {
+      axe.run(
+        { runOnly: { type: 'rule', values: ['aria-hidden-body'] } },
+        function(err, r) {
+          assert.isNull(err);
+          results = r;
+          done();
+        }
+      );
+    });
   });
 
   describe('violations', function() {

diff --git a/test/integration/full/bypass/aria-header.html b/test/integration/full/bypass/aria-header.html
@@ -23,6 +23,7 @@
     <div role="heading">This header will make the test pass.</div>
     <a href="http://www.deque.com">stuff</a>
     <div id="mocha"></div>
+    <script src="/test/testutils.js"></script>
     <script src="pass-tests.js"></script>
     <script src="/test/integration/adapter.js"></script>
   </body>

diff --git a/test/integration/full/bypass/fail.html b/test/integration/full/bypass/fail.html
@@ -23,6 +23,7 @@
   <body>
     <a href="http://www.deque.com">stuff</a>
     <div id="mocha"></div>
+    <script src="/test/testutils.js"></script>
     <script src="fail.js"></script>
     <script src="/test/integration/adapter.js"></script>
   </body>

diff --git a/test/integration/full/bypass/fail.js b/test/integration/full/bypass/fail.js
@@ -5,15 +5,17 @@ describe('bypass fail test', function() {
     var mocha = document.getElementById('mocha'),
       html = mocha.innerHTML;
     mocha.innerHTML = '';
-    axe.run({ runOnly: { type: 'rule', values: ['bypass'] } }, function(
-      err,
-      r
-    ) {
-      assert.isNull(err);
+    axe.testUtils.awaitNestedLoad(function() {
+      axe.run({ runOnly: { type: 'rule', values: ['bypass'] } }, function(
+        err,
+        r
+      ) {
+        assert.isNull(err);
 
-      results = r;
-      mocha.innerHTML = html;
-      done();
+        results = r;
+        mocha.innerHTML = html;
+        done();
+      });
     });
   });
 

diff --git a/test/integration/full/bypass/header1.html b/test/integration/full/bypass/header1.html
@@ -24,6 +24,7 @@
     <h2>This header will make the test pass.</h2>
     <a href="http://www.deque.com">stuff</a>
     <div id="mocha"></div>
+    <script src="/test/testutils.js"></script>
     <script src="pass-tests.js"></script>
     <script src="/test/integration/adapter.js"></script>
   </body>

diff --git a/test/integration/full/bypass/header2.html b/test/integration/full/bypass/header2.html
@@ -24,6 +24,7 @@
     <h1>This header will make the test pass.</h1>
     <a href="http://www.deque.com">stuff</a>
     <div id="mocha"></div>
+    <script src="/test/testutils.js"></script>
     <script src="pass-tests.js"></script>
     <script src="/test/integration/adapter.js"></script>
   </body>

diff --git a/test/integration/full/bypass/pass-tests.js b/test/integration/full/bypass/pass-tests.js
@@ -2,13 +2,15 @@ describe('bypass aria header test ' + window.location.pathname, function() {
   'use strict';
   var results;
   before(function(done) {
-    axe.run({ runOnly: { type: 'rule', values: ['bypass'] } }, function(
-      err,
-      r
-    ) {
-      assert.isNull(err);
-      results = r;
-      done();
+    axe.testUtils.awaitNestedLoad(function() {
+      axe.run({ runOnly: { type: 'rule', values: ['bypass'] } }, function(
+        err,
+        r
+      ) {
+        assert.isNull(err);
+        results = r;
+        done();
+      });
     });
   });
 

diff --git a/test/integration/full/bypass/region.html b/test/integration/full/bypass/region.html
@@ -24,6 +24,7 @@
     <div role="main">This header will make the test pass.</div>
     <a href="http://www.deque.com">stuff</a>
     <div id="mocha"></div>
+    <script src="/test/testutils.js"></script>
     <script src="pass-tests.js"></script>
     <script src="/test/integration/adapter.js"></script>
   </body>

diff --git a/test/integration/full/bypass/skip-link.html b/test/integration/full/bypass/skip-link.html
@@ -25,6 +25,7 @@
     <div>Test.</div>
     <a href="http://www.deque.com">stuff</a>
     <div id="mocha"></div>
+    <script src="/test/testutils.js"></script>
     <script src="pass-tests.js"></script>
     <script src="/test/integration/adapter.js"></script>
   </body>