Upstream service worker `fetch` test to WPT

third_party/WebKit/LayoutTests/external/wpt/service-workers/service-worker/fetch-request-fallback.https.html

Index: third_party/WebKit/LayoutTests/external/wpt/service-workers/service-worker/fetch-request-fallback.https.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/service-workers/service-worker/fetch-request-fallback.https.html b/third_party/WebKit/LayoutTests/external/wpt/service-workers/service-worker/fetch-request-fallback.https.html
index 57934d535ada97b263bcc1a19b2a9e1f3101f38a..6f3fde81e6608cf4fda55d79935e09014ebae33d 100644
--- a/third_party/WebKit/LayoutTests/external/wpt/service-workers/service-worker/fetch-request-fallback.https.html
+++ b/third_party/WebKit/LayoutTests/external/wpt/service-workers/service-worker/fetch-request-fallback.https.html
@@ -5,31 +5,37 @@
 <script src="/common/get-host-info.sub.js"></script>
 <script src="resources/test-helpers.sub.js?pipe=sub"></script>
 <script>
-var expected_urls = [];
-
-function xhr_fail_test(frame, url) {
-  expected_urls.push(url);
+function assert_resolves(promise, description) {
   return new Promise(function(resolve, reject) {
-      frame.contentWindow.xhr(url)
-        .then(function(){
-            reject(url + ' should fail.');
-          })
-        .catch(function(){
-            resolve();
-          });
+      promise

[Marijn Kruisselbrink, 2017/05/04 00:28:25]

Is this any different from promise.catch(t.unreached_func(description)), or
promise.catch(() => assert_unreached(description)) if you want to avoid needing
the Test?

[mike3, 2017/05/05 18:56:12]

No difference. I'll use that approach.

+        .then(
+          function() { resolve(); },
+          function() { reject(description); });
     });
 }
 
-function xhr_succeed_test(frame, url) {
-  expected_urls.push(url);
+function assert_rejects(promise, description) {

[Marijn Kruisselbrink, 2017/05/04 00:28:25]

assert_rejects is pretty much promise_rejects(t, null, promise, description)
right? Might as well use that one then? (also promise_rejects was deliberately
not called assert_promise_rejects, as unlike all assert_* methods, it doesn't
synchronously assert anything).

[mike3, 2017/05/05 18:56:12]

Acknowledged.

   return new Promise(function(resolve, reject) {
-      frame.contentWindow.xhr(url)
-        .then(function(){
-            resolve();
-          })
-        .catch(function(){
-            reject(url + ' should succeed.');
-          });
+      promise
+        .then(
+          function() { reject(description); },
+          function() { resolve(); });
+    });
+}
+
+function get_fetched_urls(worker) {
+  return new Promise(function(resolve) {
+      var channel = new MessageChannel();
+      channel.port1.onmessage = function(msg) { resolve(msg); };
+      worker.postMessage({port: channel.port2}, [channel.port2]);
+    });
+}
+
+function check_urls(worker, expected_requests, description) {
+  return get_fetched_urls(worker)
+    .then(function(msg) {
+        var requests = msg.data.requests;
+        assert_object_equals(requests, expected_requests, description);
     });
 }
 
@@ -40,8 +46,10 @@ async_test(function(t) {
     var host_info = get_host_info();
     var BASE_URL = host_info['HTTPS_ORIGIN'] +
                    path + 'resources/fetch-access-control.py?';
+    var BASE_PNG_URL = BASE_URL + 'PNGIMAGE&';
     var OTHER_BASE_URL = host_info['HTTPS_REMOTE_ORIGIN'] +
                          path + 'resources/fetch-access-control.py?';
+    var OTHER_BASE_PNG_URL = OTHER_BASE_URL + 'PNGIMAGE&';
     var REDIRECT_URL = host_info['HTTPS_ORIGIN'] +
                        path + 'resources/redirect.py?Redirect=';
     var frame;
@@ -53,59 +61,226 @@ async_test(function(t) {
         })
       .then(function() { return with_iframe(SCOPE); })
       .then(function(f) {
+          t.add_cleanup(function() {
+              f.remove();
+            });
           frame = f;
-          return xhr_succeed_test(frame, BASE_URL);
+          return check_urls(
+              worker,
+              [{
+                url: host_info['HTTPS_ORIGIN'] + path + SCOPE,
+                mode: 'navigate'
+              }],
+              'The SW must intercept the request for a main resource.');
         })
-      .then(function(f) {
-          return xhr_fail_test(frame, OTHER_BASE_URL);
+      .then(function() {
+          return assert_resolves(
+              frame.contentWindow.xhr(BASE_URL),
+              'SW fallbacked same origin XHR should succeed.');
         })
-      .then(function(f) {
-          return xhr_succeed_test(frame, OTHER_BASE_URL + 'ACAOrigin=*');
+      .then(function() {
+          return check_urls(
+              worker,
+              [{ url: BASE_URL, mode: 'cors' }],
+              'The SW must intercept the request of same origin XHR.');
         })
-      .then(function(f) {
-          return xhr_succeed_test(frame,
-                                  REDIRECT_URL + encodeURIComponent(BASE_URL));
+      .then(function() {
+          return assert_rejects(
+              frame.contentWindow.xhr(OTHER_BASE_URL),
+              'SW fallbacked CORS-unsupported other origin XHR should fail.');
         })
       .then(function() {
-          return xhr_fail_test(
-              frame,
-              REDIRECT_URL + encodeURIComponent(OTHER_BASE_URL));
+          return check_urls(
+              worker,
+              [{ url: OTHER_BASE_URL, mode: 'cors' }],
+              'The SW must intercept the request of CORS-unsupported other ' +
+              'origin XHR.');
         })
       .then(function() {
-          return xhr_succeed_test(
-              frame,
-              REDIRECT_URL +
-              encodeURIComponent(OTHER_BASE_URL + 'ACAOrigin=*'));
+          return assert_resolves(
+              frame.contentWindow.xhr(OTHER_BASE_URL + 'ACAOrigin=*'),
+              'SW fallbacked CORS-supported other origin XHR should succeed.');
         })
       .then(function() {
-          return new Promise(function(resolve) {
-              var channel = new MessageChannel();
-              channel.port1.onmessage = t.step_func(function(msg) {
-                  frame.remove();
-                  resolve(msg);
-                });
-              worker.postMessage({port: channel.port2}, [channel.port2]);
-            });
+          return check_urls(
+              worker,
+              [{ url: OTHER_BASE_URL + 'ACAOrigin=*', mode: 'cors' }],
+              'The SW must intercept the request of CORS-supported other ' +
+              'origin XHR.');
+        })
+      .then(function() {
+          return assert_resolves(
+              frame.contentWindow.xhr(
+                  REDIRECT_URL + encodeURIComponent(BASE_URL)),
+              'SW fallbacked redirected XHR should succeed.');
+        })
+      .then(function() {
+          return check_urls(
+              worker,
+              [{
+                url: REDIRECT_URL + encodeURIComponent(BASE_URL),
+                mode: 'cors'
+              }],
+              'The SW must intercept only the first request of redirected ' +
+              'XHR.');
+        })
+      .then(function() {
+          return assert_rejects(
+              frame.contentWindow.xhr(
+                REDIRECT_URL + encodeURIComponent(OTHER_BASE_URL)),
+              'SW fallbacked XHR which is redirected to CORS-unsupported ' +
+              'other origin should fail.');
+        })
+      .then(function() {
+          return check_urls(
+              worker,
+              [{
+                url: REDIRECT_URL + encodeURIComponent(OTHER_BASE_URL),
+                mode: 'cors'
+              }],
+              'The SW must intercept only the first request for XHR which is' +
+              ' redirected to CORS-unsupported other origin.');
+        })
+      .then(function() {
+          return assert_resolves(
+              frame.contentWindow.xhr(
+                  REDIRECT_URL +
+                  encodeURIComponent(OTHER_BASE_URL + 'ACAOrigin=*')),
+              'SW fallbacked XHR which is redirected to CORS-supported other ' +
+              'origin should succeed.');
+        })
+      .then(function() {
+          return check_urls(
+              worker,
+              [{
+                url: REDIRECT_URL +
+                     encodeURIComponent(OTHER_BASE_URL + 'ACAOrigin=*'),
+                mode: 'cors'
+              }],
+              'The SW must intercept only the first request for XHR which is ' +
+              'redirected to CORS-supported other origin.');
+        })
+      .then(function() {
+          return assert_resolves(
+              frame.contentWindow.load_image(BASE_PNG_URL, ''),
+              'SW fallbacked image request should succeed.');
+        })
+      .then(function() {
+          return check_urls(
+              worker,
+              [{ url: BASE_PNG_URL, mode: 'no-cors' }],
+              'The SW must intercept the request for image.');
+        })
+      .then(function() {
+          return assert_resolves(
+              frame.contentWindow.load_image(OTHER_BASE_PNG_URL, ''),
+              'SW fallbacked other origin image request should succeed.');
+        })
+      .then(function() {
+          return check_urls(
+              worker,
+              [{ url: OTHER_BASE_PNG_URL, mode: 'no-cors' }],
+              'The SW must intercept the request for other origin image.')
+        })
+      .then(function() {
+          return assert_rejects(
+              frame.contentWindow.load_image(OTHER_BASE_PNG_URL, 'anonymous'),
+              'SW fallbacked CORS-unsupported other origin image request ' +
+              'should fail.');
+        })
+      .then(function() {
+          return check_urls(
+              worker,
+              [{ url: OTHER_BASE_PNG_URL, mode: 'cors' }],
+              'The SW must intercept the request for CORS-unsupported other ' +
+              'origin image.')
+        })
+      .then(function() {
+          return assert_resolves(
+              frame.contentWindow.load_image(
+                  OTHER_BASE_PNG_URL + 'ACAOrigin=*', 'anonymous'),
+              'SW fallbacked CORS-supported other origin image request should' +
+              ' succeed.');
+        })
+      .then(function() {
+          return check_urls(
+              worker,
+              [{ url: OTHER_BASE_PNG_URL + 'ACAOrigin=*', mode: 'cors' }],
+              'The SW must intercept the request for CORS-supported other ' +
+              'origin image.')
+        })
+      .then(function() {
+          return assert_resolves(
+              frame.contentWindow.load_image(
+                  REDIRECT_URL + encodeURIComponent(BASE_PNG_URL), ''),
+              'SW fallbacked redirected image request should succeed.');
         })
-      .then(function(msg) {
-          var requests = msg.data.requests;
-          assert_equals(requests.length, expected_urls.length + 1,
-                        'The count of the requests which are passed to the ' +
-                        'ServiceWorker must be correct.');
-          assert_equals(requests[0].url, new URL(SCOPE, location).toString(),
-                        'The first request to the SW must be the request for ' +
-                        'the page.');
-          assert_equals(requests[0].mode, 'navigate',
-                        'The mode of the first request to the SW must be ' +
-                        'navigate');
-          for (var i = 0; i < expected_urls.length; ++i) {
-            assert_equals(requests[i + 1].url, expected_urls[i],
-                          'The URL of the request which was passed from XHR ' +
-                          'to the ServiceWorker must be correct.');
-            assert_equals(requests[i + 1].mode, 'cors',
-                          'The mode of the request which was passed from XHR ' +
-                          'to the ServiceWorker must be cors.');
-          }
+      .then(function() {
+          return check_urls(
+              worker,
+              [{
+                url: REDIRECT_URL + encodeURIComponent(BASE_PNG_URL),
+                mode: 'no-cors'
+              }],
+              'The SW must intercept only the first request for redirected ' +
+              'image resource.');
+        })
+      .then(function() {
+          return assert_resolves(
+              frame.contentWindow.load_image(
+                  REDIRECT_URL + encodeURIComponent(OTHER_BASE_PNG_URL), ''),
+              'SW fallbacked image request which is redirected to other ' +
+              'origin should succeed.');
+        })
+      .then(function() {
+          return check_urls(
+              worker,
+              [{
+                url: REDIRECT_URL + encodeURIComponent(OTHER_BASE_PNG_URL),
+                mode: 'no-cors'
+              }],
+              'The SW must intercept only the first request for image ' +
+              'resource which is redirected to other origin.');
+        })
+      .then(function() {
+          return assert_rejects(
+              frame.contentWindow.load_image(
+                  REDIRECT_URL + encodeURIComponent(OTHER_BASE_PNG_URL),
+                  'anonymous'),
+              'SW fallbacked image request which is redirected to ' +
+              'CORS-unsupported other origin should fail.');
+        })
+      .then(function() {
+          return check_urls(
+              worker,
+              [{
+                url: REDIRECT_URL + encodeURIComponent(OTHER_BASE_PNG_URL),
+                mode: 'cors'
+              }],
+              'The SW must intercept only the first request for image ' +
+              'resource which is redirected to CORS-unsupported other origin.');
+        })
+      .then(function() {
+          return assert_resolves(
+              frame.contentWindow.load_image(
+                  REDIRECT_URL +
+                  encodeURIComponent(OTHER_BASE_PNG_URL + 'ACAOrigin=*'),
+                  'anonymous'),
+              'SW fallbacked image request which is redirected to ' +
+              'CORS-supported other origin should succeed.');
+        })
+      .then(function() {
+          return check_urls(
+              worker,
+              [{
+                url: REDIRECT_URL +
+                     encodeURIComponent(OTHER_BASE_PNG_URL + 'ACAOrigin=*'),
+                mode: 'cors'
+              }],
+              'The SW must intercept only the first request for image ' +
+              'resource which is redirected to CORS-supported other origin.');
+        })
+      .then(function() {
           service_worker_unregister_and_done(t, SCOPE);
         })
       .catch(unreached_rejection(t));