Bug 1644188 - [devtools] Unregister service worker in all resourceWatcher/targetList tests. r=jdescottes

Not doing that, makes the browser_resources_sources.js test to fail because
of pending SW's target which comes with unexpected sources.

Differential Revision: https://phabricator.services.mozilla.com/D98460

devtools/shared/resources/tests/browser_resources_console_messages.js

@@ -102,6 +102,12 @@ async function testTabConsoleMessagesResources(executeInIframe) {
 
   targetList.destroy();
   await client.close();
+
+  await SpecialPowers.spawn(tab.linkedBrowser, [], async () => {
+    // registrationPromise is set by the test page.
+    const registration = await content.wrappedJSObject.registrationPromise;
+    registration.unregister();
+  });
 }
 
 async function testTabConsoleMessagesResourcesWithIgnoreExistingResources(
@@ -163,6 +169,12 @@ async function testTabConsoleMessagesResourcesWithIgnoreExistingResources(
 
   await targetList.destroy();
   await client.close();
+
+  await SpecialPowers.spawn(tab.linkedBrowser, [], async () => {
+    // registrationPromise is set by the test page.
+    const registration = await content.wrappedJSObject.registrationPromise;
+    registration.unregister();
+  });
 }
 
 async function logExistingMessages(browser, executeInIframe) {

devtools/shared/resources/tests/browser_resources_console_messages_workers.js

@@ -213,6 +213,12 @@ add_task(async function() {
 
   targetList.destroy();
   await client.close();
+
+  await SpecialPowers.spawn(tab.linkedBrowser, [], async () => {
+    // registrationPromise is set by the test page.
+    const registration = await content.wrappedJSObject.registrationPromise;
+    registration.unregister();
+  });
 });
 
 function checkStartWorkerLogMessage(resource, expectedUrl) {

devtools/shared/resources/tests/browser_resources_sources.js

@@ -130,6 +130,12 @@ add_task(async function() {
 
   await targetList.stopListening();
   await client.close();
+
+  await SpecialPowers.spawn(tab.linkedBrowser, [], async () => {
+    // registrationPromise is set by the test page.
+    const registration = await content.wrappedJSObject.registrationPromise;
+    registration.unregister();
+  });
 });
 
 async function assertResources(resources, expected) {

devtools/shared/resources/tests/browser_target_list_browser_workers.js

@@ -23,7 +23,7 @@ add_task(async function() {
 
   const client = await createLocalClient();
   const mainRoot = client.mainRoot;
-  await addTab(FISSION_TEST_URL);
+  const tab = await addTab(FISSION_TEST_URL);
 
   info("Test TargetList against workers via the parent process target");
 
@@ -182,6 +182,12 @@ add_task(async function() {
   await unregisterAllServiceWorkers(client);
 
   await client.close();
+
+  await SpecialPowers.spawn(tab.linkedBrowser, [], async () => {
+    // registrationPromise is set by the test page.
+    const registration = await content.wrappedJSObject.registrationPromise;
+    registration.unregister();
+  });
 });
 
 function sortFronts(f1, f2) {

devtools/shared/resources/tests/browser_target_list_frames.js

@@ -159,5 +159,10 @@ async function testTabFrames(mainRoot) {
   targetList.destroy();
   await waitForAllTargetsToBeAttached(targetList);
 
+  await SpecialPowers.spawn(tab.linkedBrowser, [], async () => {
+    // registrationPromise is set by the test page.
+    const registration = await content.wrappedJSObject.registrationPromise;
+    registration.unregister();
+  });
   BrowserTestUtils.removeTab(tab);
 }

devtools/shared/resources/tests/browser_target_list_getAllTargets.js

@@ -23,7 +23,7 @@ add_task(async function() {
   const client = await createLocalClient();
   const mainRoot = client.mainRoot;
 
-  await addTab(FISSION_TEST_URL);
+  const tab = await addTab(FISSION_TEST_URL);
 
   // Instantiate a worker in the parent process
   // eslint-disable-next-line no-unused-vars
@@ -100,4 +100,9 @@ add_task(async function() {
   await waitForAllTargetsToBeAttached(targetList);
 
   await client.close();
+  await SpecialPowers.spawn(tab.linkedBrowser, [], async () => {
+    // registrationPromise is set by the test page.
+    const registration = await content.wrappedJSObject.registrationPromise;
+    registration.unregister();
+  });
 });

devtools/shared/resources/tests/browser_target_list_service_workers.js

@@ -63,10 +63,10 @@ add_task(async function() {
   );
 
   info("Unregister the worker and wait until onDestroyed is called.");
-  SpecialPowers.spawn(tab.linkedBrowser, [], function() {
-    const win = content.wrappedJSObject;
-    // win.registration is set by the test page.
-    win.registration.unregister();
+  await SpecialPowers.spawn(tab.linkedBrowser, [], async () => {
+    // registrationPromise is set by the test page.
+    const registration = await content.wrappedJSObject.registrationPromise;
+    registration.unregister();
   });
   await waitUntil(() => targets.length === 0);
 

devtools/shared/resources/tests/browser_target_list_service_workers_navigation.js

@@ -348,10 +348,11 @@ async function watchServiceWorkerTargets({
 
 async function unregisterServiceWorker(tab, expectedPageUrl) {
   await waitForRegistrationReady(tab, expectedPageUrl);
-  await SpecialPowers.spawn(tab.linkedBrowser, [], () =>
-    // win.registration is set by the test page.
-    content.wrappedJSObject.registration.unregister()
-  );
+  await SpecialPowers.spawn(tab.linkedBrowser, [], async () => {
+    // registrationPromise is set by the test page.
+    const registration = await content.wrappedJSObject.registrationPromise;
+    registration.unregister();
+  });
 }
 
 /**
@@ -363,7 +364,7 @@ async function waitForRegistrationReady(tab, expectedPageUrl) {
       try {
         const win = content.wrappedJSObject;
         const isExpectedUrl = win.location.href === _url;
-        const hasRegistration = !!win.registration;
+        const hasRegistration = !!win.registrationPromise;
         return isExpectedUrl && hasRegistration;
       } catch (e) {
         return false;

devtools/shared/resources/tests/fission_document.html

@@ -17,10 +17,8 @@
   const sharedWorker = new SharedWorker("https://example.com/browser/devtools/shared/resources/tests/test_worker.js#shared-worker");
 
   if (!params.has("noServiceWorker")) {
-    (async function () {
-      // Expose a reference to the registration so that tests can unregister it.
-      window.registration = await navigator.serviceWorker.register("https://example.com/browser/devtools/shared/resources/tests/test_service_worker.js#service-worker");
-    })();
+    // Expose a reference to the registration so that tests can unregister it.
+    window.registrationPromise = navigator.serviceWorker.register("https://example.com/browser/devtools/shared/resources/tests/test_service_worker.js#service-worker");
   }
 
   /* exported logMessageInWorker */

devtools/shared/resources/tests/sources.html

@@ -15,7 +15,7 @@
       // Assign the worker to a global variable in order to avoid
       // having it be GCed.
       this.worker = new Worker("worker-sources.js");
-      navigator.serviceWorker.register("service-worker-sources.js");
+      window.registrationPromise = navigator.serviceWorker.register("service-worker-sources.js");
     </script>
      <script src="sources.js"></script>
   </body>

devtools/shared/resources/tests/test_sw_page.html

@@ -12,10 +12,8 @@
 <script>
 "use strict";
 
-(async function () {
-  // Expose a reference to the registration so that tests can unregister it.
-  window.registration = await navigator.serviceWorker.register("test_sw_page_worker.js");
-})();
+// Expose a reference to the registration so that tests can unregister it.
+window.registrationPromise = navigator.serviceWorker.register("test_sw_page_worker.js");
 </script>
 </body>
 </html>