Bug 1456024 [wpt PR 10568] - service worker: Add importScripts() to worker interception test., a=testonly

Automatic update from web-platform-testsservice worker: Add importScripts() to worker interception test.

Also remove the Firefox-specific comment as they fixed the mentioned
bug.

Bug: 829720
Change-Id: I76727361ff9c7d61931fbf018035917ac5aa71d8
Reviewed-on: https://chromium-review.googlesource.com/1023616
Reviewed-by: Hiroki Nakagawa <[email protected]>
Commit-Queue: Matt Falkenhagen <[email protected]>
Cr-Commit-Position: refs/heads/master@{#552629}

--

wpt-commits: d187735e321696e116dd64ff544c254d7fa361b3
wpt-pr: 10568

Author: mfalken

testing/web-platform/meta/MANIFEST.json

@@ -599497,11 +599497,11 @@
    "support"
   ],
   "service-workers/service-worker/resources/worker-interception-redirect-serviceworker.js": [
-   "05a2f3a4ad034b9cece10b5abc7ffff71bfcb4aa",
+   "ebf3c26bd9a176cf535549dc42637c92e29de4f0",
    "support"
   ],
   "service-workers/service-worker/resources/worker-interception-redirect-webworker.js": [
-   "615f6dd41ee6f9f141132a48544f976ce0403d27",
+   "262e33ee28cd9a7b9081d30c438ad75f59bd84c9",
    "support"
   ],
   "service-workers/service-worker/resources/worker-load-interceptor.js": [
@@ -599657,7 +599657,7 @@
    "testharness"
   ],
   "service-workers/service-worker/worker-interception-redirect.https.html": [
-   "8654d94e9797ac332bedcadeed61837ccf13b944",
+   "2e5bd64ed27fb4cc63aba9859565d506a829871e",
    "testharness"
   ],
   "service-workers/service-worker/worker-interception.https.html": [

testing/web-platform/tests/service-workers/service-worker/resources/worker-interception-redirect-serviceworker.js

@@ -31,9 +31,18 @@ self.addEventListener('fetch', evt => {
     return;
   }
 
-  // (3) The worker does a fetch() to simple.txt. Indicate that this service
+  // (3) The worker does an importScripts() to import-scripts-echo.py. Indicate
+  // that this service worker handled the request.
+  if (evt.request.url.indexOf('import-scripts-echo.py') != -1) {
+    const msg = encodeURIComponent(`${name} saw importScripts from the worker`);
+    evt.respondWith(fetch(`import-scripts-echo.py?msg=${msg}`));
+    return;
+  }
+
+  // (4) The worker does a fetch() to simple.txt. Indicate that this service
   // worker handled the request.
   if (evt.request.url.indexOf('simple.txt') != -1) {
     evt.respondWith(new Response(`${name} saw the fetch from the worker`));
+    return;
   }
 });

testing/web-platform/tests/service-workers/service-worker/resources/worker-interception-redirect-webworker.js

@@ -18,11 +18,23 @@ let greeting = '%GREETING_TEXT%';
 if (!greeting)
   greeting = 'the shared worker script was served from network';
 
+// Call importScripts() which fills |echo_output| with a string indicating
+// whether a service worker intercepted the importScripts() request.
+let echo_output;
+const import_scripts_msg = encodeURIComponent(
+    'importScripts: served from network');
+const import_scripts_url =
+    new URL(`import-scripts-echo.py?msg=${import_scripts_msg}`, resources_url);
+importScripts(import_scripts_url);
+const import_scripts_greeting = echo_output;
+
 self.onconnect = async function(e) {
   const port = e.ports[0];
   port.start();
   port.postMessage(greeting);
 
+  port.postMessage(import_scripts_greeting);
+
   const fetch_url = new URL('simple.txt', resources_url);
   const response = await fetch(fetch_url);
   const text = await response.text();

testing/web-platform/tests/service-workers/service-worker/worker-interception-redirect.https.html

@@ -32,8 +32,8 @@
 // 3. The request is redirected to scope2 or out-of-scope.
 // 4. The worker posts message to the page describing where the final response
 //   was served from (service worker or network).
-// 5. The worker does a fetch(), and posts back the response, which describes
-//   where the fetch response was served from.
+// 5. The worker does an importScripts() and fetch(), and posts back the
+//   responses, which describe where the responses where served from.
 //
 // Currently this only tests shared worker but dedicated worker tests should be
 // added in a future patch.
@@ -109,7 +109,8 @@
 
 function worker_redirect_test(worker_url,
                               expected_main_resource_message,
-                              expected_subresource_message,
+                              expected_import_scripts_message,
+                              expected_fetch_message,
                               description) {
   promise_test(async t => {
     // Create a frame to load the worker from. This way we can remove the frame
@@ -126,43 +127,44 @@
     const data = await get_message_from_worker(w);
     assert_equals(data, expected_main_resource_message);
 
-    // The worker does a fetch() after it starts up. Expect a message from the
-    // worker indicating which service worker provided the response for the
-    // fetch(), if any.
-    //
-    // Note: for some reason, Firefox would pass all these tests if a
-    // postMessage ping/pong step is added before the fetch(). I.e., if the
-    // page does postMessage() and the worker does fetch() in response to the
-    // ping, the fetch() is properly intercepted. See
-    // https://bugzilla.mozilla.org/show_bug.cgi?id=1452528. (Chrome can't pass
-    // the tests either way.)
-    const message = get_message_from_worker(w);
-    const data2 = await message;
-    assert_equals(data2, expected_subresource_message);
+    // The worker does an importScripts(). Expect a message from the worker
+    // indicating which service worker provided the response for the
+    // importScripts(), if any.
+    const import_scripts_message = await get_message_from_worker(w);
+    assert_equals(import_scripts_message, expected_import_scripts_message);
+
+    // The worker does a fetch(). Expect a message from the worker indicating
+    // which service worker provided the response for the fetch(), if any.
+    const fetch_message = await get_message_from_worker(w);
+    assert_equals(fetch_message, expected_fetch_message);
   }, description);
 }
 
 worker_redirect_test(
     build_worker_url('network', 'scope2'),
     'the shared worker script was served from network',
+    'sw1 saw importScripts from the worker',
     'fetch(): sw1 saw the fetch from the worker',
     'request to sw1 scope gets network redirect to sw2 scope');
 
 worker_redirect_test(
     build_worker_url('network', 'out-scope'),
     'the shared worker script was served from network',
+    'sw1 saw importScripts from the worker',
     'fetch(): sw1 saw the fetch from the worker',
     'request to sw1 scope gets network redirect to out-of-scope');
 
 worker_redirect_test(
     build_worker_url('serviceworker', 'scope2'),
     'sw2 saw the request for the worker script',
+    'sw2 saw importScripts from the worker',
     'fetch(): sw2 saw the fetch from the worker',
     'request to sw1 scope gets service-worker redirect to sw2 scope');
 
 worker_redirect_test(
     build_worker_url('serviceworker', 'out-scope'),
     'the shared worker script was served from network',
+    'sw1 saw importScripts from the worker',
     'fetch(): sw1 saw the fetch from the worker',
     'request to sw1 scope gets service-worker redirect to out-of-scope');
 </script>