Bug 1394102 - FetchEvent Request.signal should be aborted when the corrisponding nsIChannel is canceled - test, r=bkelly

testing/web-platform/tests/fetch/api/abort/serviceworker-intercepted.https.html

@@ -94,6 +94,36 @@
     await promise_rejects(t, "AbortError", reader.read());
     await promise_rejects(t, "AbortError", reader.closed);
   }, "Stream errors once aborted.");
+
+  promise_test(async t => {
+    const scope = SCOPE + "?q=aborted-signal";
+    await setupRegistration(t, scope);
+    const iframe = await with_iframe(scope);
+    const w = iframe.contentWindow;
+
+    const testReady = new Promise(resolve => {
+      w.navigator.serviceWorker.addEventListener('message', event => {
+        resolve(event.data);
+      }, { once: true });
+    });
+
+    const controller = new w.AbortController();
+    const signal = controller.signal;
+
+    w.fetch('data.json?signal', { signal });
+
+    assert_true((await testReady) == "ready", "");
+    controller.abort();
+
+    const aborted = new Promise(resolve => {
+      w.navigator.serviceWorker.addEventListener('message', event => {
+        resolve(event.data);
+      }, { once: true });
+    });
+
+    assert_true((await aborted) == "aborted", "");
+  }, "FetchEvent.request.signal must be aborted.");
+
 </script>
 </body>
 </html>

testing/web-platform/tests/fetch/api/resources/sw-intercept.js

@@ -5,6 +5,16 @@ async function broadcast(msg) {
 }
 
 addEventListener('fetch', event => {
-  event.waitUntil(broadcast(event.request.url));
-  event.respondWith(fetch(event.request));
+  if (event.request.url.endsWith('?signal')) {
+    event.respondWith(new Promise((resolve, reject) => {
+      event.request.signal.onabort = () => {
+        broadcast("aborted");
+        reject();
+      };
+      event.waitUntil(broadcast("ready"));
+    }));
+  } else {
+    event.waitUntil(broadcast(event.request.url));
+    event.respondWith(fetch(event.request));
+  }
 });