From dc25f67ba16e885b2136cbae85b265d79efc07ac Mon Sep 17 00:00:00 2001
From: Patrick Hulce <patrick.hulce@gmail.com>
Date: Sun, 25 Nov 2018 21:54:15 -0600
Subject: [PATCH 1/2] tests: add smoketest for slow service worker

---
 .../test/fixtures/offline-ready-sw.js         |  6 ++++-
 .../test/fixtures/offline-ready.html          | 22 +++++++++++++++----
 .../offline-local/offline-expectations.js     | 13 +++++++++++
 3 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/lighthouse-cli/test/fixtures/offline-ready-sw.js b/lighthouse-cli/test/fixtures/offline-ready-sw.js
index 43dd5ac0e6c9..011715dc6bd9 100644
--- a/lighthouse-cli/test/fixtures/offline-ready-sw.js
+++ b/lighthouse-cli/test/fixtures/offline-ready-sw.js
@@ -24,7 +24,11 @@ const RUNTIME = 'runtime';
 
 // The install handler takes care of precaching the resources we always need.
 self.addEventListener('install', event => {
-  self.skipWaiting();
+  if (self.location.search.includes('slow')) {
+    event.waitUntil(new Promise(resolve => setTimeout(resolve, 5000)));
+  } else {
+    self.skipWaiting();
+  }
 
   const populateCaches = caches.open(PRECACHE)
       .then(cache => cache.addAll(PRECACHE_URLS));
diff --git a/lighthouse-cli/test/fixtures/offline-ready.html b/lighthouse-cli/test/fixtures/offline-ready.html
index bac166961949..5f3ed31c5611 100644
--- a/lighthouse-cli/test/fixtures/offline-ready.html
+++ b/lighthouse-cli/test/fixtures/offline-ready.html
@@ -24,18 +24,32 @@ <h4>
 </h4>
 
 <script>
-  if ('serviceWorker' in navigator) {
-    navigator.serviceWorker.register('/offline-ready-sw.js').then(function(registration) {
+  function sleep(ms) {
+    return new Promise(resolve => setTimeout(resolve, ms))
+  }
+
+  async function registerServiceWorker(qs = '') {
+    if (!('serviceWorker' in navigator)) return
+
+    try {
+      const registration = await navigator.serviceWorker.register(`/offline-ready-sw.js${qs}`)
       console.log('service worker registration complete');
 
       registration.addEventListener('statechange',  e => {
         console.log('sw registration is now', e.target.state);
       });
-    }).catch(function(e) {
+    } catch (e) {
       console.error('service worker is not so cool.', e);
       throw e;
-    });
+    }
   }
+
+  if (window.location.search.includes('slow')) {
+    setTimeout(() => registerServiceWorker('?delay=5000&slow'), 500);
+  } else {
+    registerServiceWorker();
+  }
+
 </script>
 
 <!--
diff --git a/lighthouse-cli/test/smokehouse/offline-local/offline-expectations.js b/lighthouse-cli/test/smokehouse/offline-local/offline-expectations.js
index 12f3f23f3883..0ceff683716d 100644
--- a/lighthouse-cli/test/smokehouse/offline-local/offline-expectations.js
+++ b/lighthouse-cli/test/smokehouse/offline-local/offline-expectations.js
@@ -156,4 +156,17 @@ module.exports = [
       },
     },
   },
+
+  {
+    requestedUrl: 'http://localhost:10503/offline-ready.html?slow',
+    finalUrl: 'http://localhost:10503/offline-ready.html?slow',
+    audits: {
+      'service-worker': {
+        score: 1,
+      },
+      'works-offline': {
+        score: 1,
+      },
+    },
+  },
 ];

From 45560f2ab5960b77b7acbb09e14b1b264920d04d Mon Sep 17 00:00:00 2001
From: Patrick Hulce <patrick.hulce@gmail.com>
Date: Mon, 26 Nov 2018 14:07:18 -0600
Subject: [PATCH 2/2] remove setTimeouts

---
 lighthouse-cli/test/fixtures/offline-ready.html | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/lighthouse-cli/test/fixtures/offline-ready.html b/lighthouse-cli/test/fixtures/offline-ready.html
index 5f3ed31c5611..7cc1d772e5e3 100644
--- a/lighthouse-cli/test/fixtures/offline-ready.html
+++ b/lighthouse-cli/test/fixtures/offline-ready.html
@@ -24,10 +24,6 @@ <h4>
 </h4>
 
 <script>
-  function sleep(ms) {
-    return new Promise(resolve => setTimeout(resolve, ms))
-  }
-
   async function registerServiceWorker(qs = '') {
     if (!('serviceWorker' in navigator)) return
 
@@ -45,7 +41,7 @@ <h4>
   }
 
   if (window.location.search.includes('slow')) {
-    setTimeout(() => registerServiceWorker('?delay=5000&slow'), 500);
+    window.addEventListener('load', () => registerServiceWorker('?delay=5000&slow'));
   } else {
     registerServiceWorker();
   }