From a216f40084db20012640e53913b8efc1d78fdb95 Mon Sep 17 00:00:00 2001
From: Patrick Kettner <patrickkettner@gmail.com>
Date: Tue, 19 Mar 2024 10:44:44 -0700
Subject: [PATCH] updates

---
 webextensions/browser.runtime.html            |  5 +++
 .../resources/runtime/tests/getBrowserInfo.js |  3 ++
 .../resources/runtime/tests/getFrameId.js     |  3 ++
 webextensions/resources/runtime/util.js       | 31 +++++++++----------
 4 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/webextensions/browser.runtime.html b/webextensions/browser.runtime.html
index c58dfc8df016a40..5851c317d0e18ee 100644
--- a/webextensions/browser.runtime.html
+++ b/webextensions/browser.runtime.html
@@ -6,7 +6,12 @@
 <script>
   const asyncTests = {};
 
+  // Test are executed by the extensions inside of their background script
+  // or in a content script. The results are sent back to the test runner
+  // via postMessage.
   window.addEventListener("message", async ({data}) => {
+    // WPTTestResults is a bool set on the test runner being run by
+    // the extension.
     if (data.WPTTestResults) {
       const {name} = data
 
diff --git a/webextensions/resources/runtime/tests/getBrowserInfo.js b/webextensions/resources/runtime/tests/getBrowserInfo.js
index a27e9fcb0d99d01..4370529f2787395 100644
--- a/webextensions/resources/runtime/tests/getBrowserInfo.js
+++ b/webextensions/resources/runtime/tests/getBrowserInfo.js
@@ -1,4 +1,7 @@
 asyncTests({
+  "getBrowserInfo is a function": async () => {
+    return getType(browser.runtime?.getBrowserInfo) === 'Function'
+  },
   "getBrowserInfo returns a Promise": async () => {
     try {
       return getType(browser.runtime?.getBrowserInfo()) === 'Promise'
diff --git a/webextensions/resources/runtime/tests/getFrameId.js b/webextensions/resources/runtime/tests/getFrameId.js
index 43fd0266bb40e26..ab7565e8d19e8f7 100644
--- a/webextensions/resources/runtime/tests/getFrameId.js
+++ b/webextensions/resources/runtime/tests/getFrameId.js
@@ -1,3 +1,6 @@
 emitTestResult(`browser.runtime.getFrameId works`, (() => {
+  if (typeof(browser.runtime.getFrameId) !== 'function') {
+    return false
+  }
   return typeof(browser.runtime.getFrameId(self)) === 'number'
 })())
diff --git a/webextensions/resources/runtime/util.js b/webextensions/resources/runtime/util.js
index 3df3b5b996b8b09..a653a95b8bbdb14 100644
--- a/webextensions/resources/runtime/util.js
+++ b/webextensions/resources/runtime/util.js
@@ -24,24 +24,23 @@ function isForeground() {
   return 'window' in globalThis
 }
 
-function requestIframeTest() {
+function requestIframeTest(testName) {
+  console.log('requesting iframe test: ', testName)
   return new Promise((resolve, reject) => {
-    const iframe = document.querySelector('iframe');
-    if (!iframe.dataset.loaded) {
-      iframe.src = chrome.runtime.getURL('utility_page.html');
-      iframe.dataset.loaded = true;
-      iframe.onload = () => {
-        resolve(iframe);
-      };
-    } else {
-      return resolve(iframe);
+    const iframe = document.createElement('iframe');
+    iframe.id = testName.replace(/\s/g, '_');
+    iframe.src = chrome.runtime.getURL(`utility_page.html?${testName}`);
+    iframe.dataset.loaded = true;
+    iframe.onload = () => {
+      resolve(iframe);
     }
+    document.body.appendChild(iframe);
   })
 }
 
-function emitAsyncTest(name, result) {
-  const _thisTest = tests[name];
-  emitTestResult(name, null, true, result)
+function emitAsyncTest(testName, result) {
+  const _thisTest = tests[testName];
+  emitTestResult(testName, null, true, result)
 }
 
 let tests = {};
@@ -51,7 +50,6 @@ window.addEventListener("message", async (event) => {
   // we do not run the test until a signal is sent from outside the iframe to
   // inside of the iframe.
   if (insideIframe) {
-  console.log(`event - ${event.data} - ${location.href}`)
     const testName = event.data
     // if a lookup testName in our tests object, and then execute the
     // relevant test function.
@@ -65,7 +63,7 @@ window.addEventListener("message", async (event) => {
 
 async function asyncTests(_tests) {
   // for every test, we call emitAsyncTest with the test name this will start
-  // WPT's async_test, which won't completly // resolve until we call it again
+  // WPT's async_test, which won't completly resolve until we call it again
   // with the same test name and test result
   for (const _test in _tests) {
     if (!(_test in tests)) {
@@ -79,10 +77,11 @@ async function asyncTests(_tests) {
   }
   if (!insideIframe) {
     // ensure that the iframe where we will actually execute the test is loaded
-    const iframe = await requestIframeTest()
     // send a test name to the iframe via postMessage, which will trigger
     // that test to be run
+
     for (const _test in _tests) {
+      const iframe = await requestIframeTest(_test)
       iframe.contentWindow.postMessage(_test, '*')
     }
   }