Observe window events only for non-persistent notifications

Differential Revision: https://phabricator.services.mozilla.com/D201627 bugzilla-url: https://bugzilla.mozilla.org/show_bug.cgi?id=1879934 gecko-commit: 3dd0aa903d7f26c03fb8d966e0c1d4a3bd7f684e gecko-reviewers: asuth
Tobias710219 · Mar 3, 2024 · 57dcf26 · 57dcf26
1 parent 0a24e44
commit 57dcf26
Show file tree

Hide file tree

Showing 4 changed files with 64 additions and 10 deletions.
diff --git a/notifications/resources/helpers.js b/notifications/resources/helpers.js
@@ -12,9 +12,24 @@ async function getActiveServiceWorker(script) {
   return reg;
 }
 
-
 async function closeAllNotifications() {
   for (const n of await registration.getNotifications()) {
     n.close();
   }
 }
+
+async function trySettingPermission(perm) {
+  try {
+    await test_driver.set_permission({ name: "notifications" }, perm);
+  } catch {
+    // Not all implementations support this yet, but the permission may already be set to be able to continue
+  }
+
+  // Using Notification.permission instead of permissions.query() as
+  // some implementation without set_permission support overrides
+  // Notification.permission.
+  const permission = Notification.permission === "default" ? "prompt" : Notification.permission;
+  if (permission !== perm) {
+    throw new Error(`Should have the permission ${perm} to continue`);
+  }
+}
diff --git a/notifications/resources/shownotification-window-iframe.html b/notifications/resources/shownotification-window-iframe.html
@@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<script>
+  async function showNotification() {
+    const registration = await navigator.serviceWorker.ready;
+    await registration.showNotification('foo');
+  }
+</script>
diff --git a/notifications/shownotification-window.https.html b/notifications/shownotification-window.https.html
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="resources/helpers.js"></script>
+<iframe id="iframe" src="resources/shownotification-window-iframe.html"></iframe>
+<script>
+/** @type {ServiceWorkerRegistration} */
+let registration;
+
+promise_setup(async (t) => {
+  await trySettingPermission("granted");
+  registration = await getActiveServiceWorker("noop-sw.js");
+  await closeAllNotifications();
+});
+
+promise_test(async (t) => {
+  t.add_cleanup(closeAllNotifications);
+
+  if (iframe.contentDocument.readyState !== "complete") {
+    await new Promise(resolve => iframe.onload = resolve);
+  }
+
+  await iframe.contentWindow.showNotification();
+  let notifications = await registration.getNotifications();
+  assert_equals(notifications.length, 1, "Should persist the notification");
+
+  iframe.contentWindow.location.reload();
+  // Wait for some time for potential notification close requests to be sent
+  await new Promise(resolve => iframe.onload = resolve);
+  notifications = await registration.getNotifications();
+  assert_equals(notifications.length, 1, "Should keep the notification");
+}, 'Refreshing window does not clear persistent notifications');
+</script>
+</body>
diff --git a/notifications/shownotification-without-permission.https.window.js b/notifications/shownotification-without-permission.https.window.js
@@ -8,20 +8,14 @@
 let registration;
 
 promise_setup(async () => {
+  await trySettingPermission("prompt");
   registration = await getActiveServiceWorker("noop-sw.js");
+  await closeAllNotifications();
 });
 
-promise_test(async (t) => {
+promise_test(async t => {
   t.add_cleanup(closeAllNotifications);
 
-  try {
-    await test_driver.set_permission({ name: "notifications" }, "prompt");
-  } catch {
-    // Not all implementations support this yet, but it may already be "prompt" to be able to continue
-  }
-
-  assert_equals(Notification.permission, "default", "Should have the default permission to continue");
-
   await promise_rejects_js(t, TypeError, registration.showNotification(""), "Should throw TypeError");
   const notifications = await registration.getNotifications();
   assert_equals(notifications.length, 0, "Should return zero notification");