From c3d3876fd790193b5ba8c3c3c3fc0a396eaf8a47 Mon Sep 17 00:00:00 2001
From: Andrey Lushnikov <lushnikov@chromium.org>
Date: Thu, 13 Feb 2020 13:07:43 -0800
Subject: [PATCH] test: fix service worker test

Do the following to ensure SW is active and serves requests:
- in ServiceWorker, claim all clients once activated
- in page, await activation promise instead of a registration
---
 test/assets/serviceworkers/fetchdummy/sw.html | 1 +
 test/assets/serviceworkers/fetchdummy/sw.js   | 4 ++++
 test/interception.spec.js                     | 3 +--
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/test/assets/serviceworkers/fetchdummy/sw.html b/test/assets/serviceworkers/fetchdummy/sw.html
index b25d12fa4c..7042b2f9e6 100644
--- a/test/assets/serviceworkers/fetchdummy/sw.html
+++ b/test/assets/serviceworkers/fetchdummy/sw.html
@@ -1,5 +1,6 @@
 <script>
   window.registrationPromise = navigator.serviceWorker.register('sw.js');
+  window.activationPromise = new Promise(resolve => navigator.serviceWorker.oncontrollerchange = resolve);
 
   async function fetchDummy(name) {
     const response = await fetch(name);
diff --git a/test/assets/serviceworkers/fetchdummy/sw.js b/test/assets/serviceworkers/fetchdummy/sw.js
index 4ee29afdcb..ad4a3bea1c 100644
--- a/test/assets/serviceworkers/fetchdummy/sw.js
+++ b/test/assets/serviceworkers/fetchdummy/sw.js
@@ -9,3 +9,7 @@ self.addEventListener('fetch', event => {
   const response = new Response(blob, { "status" : 200 , "statusText" : "OK" });
   event.respondWith(response);
 });
+
+self.addEventListener('activate', event => {
+  event.waitUntil(clients.claim());
+});
diff --git a/test/interception.spec.js b/test/interception.spec.js
index cd33b1c96e..ed8ce6a872 100644
--- a/test/interception.spec.js
+++ b/test/interception.spec.js
@@ -570,8 +570,7 @@ module.exports.describe = function({testRunner, expect, defaultBrowserOptions, p
   describe('service worker', function() {
     it('should intercept after a service worker', async({browser, page, server, context}) => {
       await page.goto(server.PREFIX + '/serviceworkers/fetchdummy/sw.html');
-      await page.evaluate(() => window.registrationPromise);
-      await page.reload();
+      await page.evaluate(() => window.activationPromise);
 
       // Sanity check.
       const swResponse = await page.evaluate(() => fetchDummy('foo'));