From b172af6d6e5ede519bd9551491e0f12ba2f7c84f Mon Sep 17 00:00:00 2001
From: Steven Lambert <2433219+straker@users.noreply.github.com>
Date: Tue, 16 Sep 2025 15:37:22 -0600
Subject: [PATCH] ci: fix isolated-env test

---
 .../full/isolated-env/isolated-env.html       |  5 +++--
 .../full/isolated-env/isolated-env.js         | 19 ++++++++++++++-----
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/test/integration/full/isolated-env/isolated-env.html b/test/integration/full/isolated-env/isolated-env.html
index c9c60b5650..78482faf56 100644
--- a/test/integration/full/isolated-env/isolated-env.html
+++ b/test/integration/full/isolated-env/isolated-env.html
@@ -116,6 +116,9 @@ <h2>Ok</h2>
       </main>
       <footer></footer>
 
+      <script src="/test/testutils.js"></script>
+      <script src="isolated-env.js"></script>
+
       <iframe
         id="isolated-frame"
         title="foo"
@@ -130,8 +133,6 @@ <h2>Ok</h2>
       <p>Paragraph with a <a href="#">link</a>.</p>
     </div>
     <div id="mocha"></div>
-    <script src="/test/testutils.js"></script>
-    <script src="isolated-env.js"></script>
     <script src="/test/integration/adapter.js"></script>
   </body>
 </html>
diff --git a/test/integration/full/isolated-env/isolated-env.js b/test/integration/full/isolated-env/isolated-env.js
index f10b448583..61838fd7b5 100644
--- a/test/integration/full/isolated-env/isolated-env.js
+++ b/test/integration/full/isolated-env/isolated-env.js
@@ -1,4 +1,8 @@
 /* global chai */
+var messages = [];
+window.addEventListener('message', function (msg) {
+  messages.push(msg.data);
+});
 
 describe('isolated-env test', function () {
   'use strict';
@@ -40,11 +44,16 @@ describe('isolated-env test', function () {
     });
 
     var isloadedPromise = new Promise(function (resolve, reject) {
-      window.addEventListener('message', function (msg) {
-        if (msg.data === 'axe-loaded') {
-          resolve();
-        }
-      });
+      if (messages.includes('axe-loaded')) {
+        resolve();
+      } else {
+        window.addEventListener('message', function (msg) {
+          if (msg.data === 'axe-loaded') {
+            resolve();
+          }
+        });
+      }
+
       setTimeout(function () {
         reject(new Error('axe-loaded message not called'));
       }, 5000);