Merge pull request #84 from PolymerElements/fix-flaky-test

Don't run tests until the page is under SW control
PolymerElements · Dec 16, 2015 · fb5a32d · fb5a32d
2 parents 4cfa76a + 3a52a11
commit fb5a32d
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 11 deletions.
diff --git a/test/controlled-promise.js b/test/controlled-promise.js
@@ -0,0 +1,17 @@
+// Provides an equivalent to navigator.serviceWorker.ready that waits for the page to be controlled,
+// as opposed to waiting for the active service worker.
+// See https://github.com/slightlyoff/ServiceWorker/issues/799
+window._controlledPromise = new Promise(function(resolve) {
+  // Resolve with the registration, to match the .ready promise's behavior.
+  var resolveWithRegistration = function() {
+    navigator.serviceWorker.getRegistration().then(function(registration) {
+      resolve(registration);
+    });
+  };
+
+  if (navigator.serviceWorker.controller) {
+    resolveWithRegistration();
+  } else {
+    navigator.serviceWorker.addEventListener('controllerchange', resolveWithRegistration);
+  }
+});
diff --git a/test/platinum-sw-cache/index.html b/test/platinum-sw-cache/index.html
@@ -15,6 +15,7 @@
 
     <script src="../../../webcomponentsjs/webcomponents-lite.js"></script>
     <script src="../../../web-component-tester/browser.js"></script>
+    <script src="../controlled-promise.js"></script>
 
     <link rel="import" href="../../platinum-sw-register.html">
     <link rel="import" href="../../platinum-sw-cache.html">
@@ -32,7 +33,7 @@
 
         suite('Precaching', function() {
           test('precache results in Cache Storage API entries', function() {
-            return navigator.serviceWorker.ready.then(function() {
+            return window._controlledPromise.then(function() {
               return window.fetch(swc.cacheConfigFile).then(function(response) {
                 return response.json();
               }).then(function(config) {

diff --git a/test/platinum-sw-fetch/index.html b/test/platinum-sw-fetch/index.html
@@ -15,6 +15,7 @@
 
     <script src="../../../webcomponentsjs/webcomponents-lite.js"></script>
     <script src="../../../web-component-tester/browser.js"></script>
+    <script src="../controlled-promise.js"></script>
 
     <link rel="import" href="../../platinum-sw-register.html">
     <link rel="import" href="../../platinum-sw-import-script.html">
@@ -34,23 +35,23 @@
     <script>
       suite('Service Worker Fetch Handlers', function() {
         test('the same-origin custom fetch handler is used when the path matches', function() {
-          return navigator.serviceWorker.ready.then(function() {
-            return window.fetch('customFetch').then(function(response) {
-              assert.equal(response.status, 203, 'Custom response status doesn\'t match');
-            });
+          return window._controlledPromise.then(function() {
+            return window.fetch('customFetch');
+          }).then(function(response) {
+            assert.equal(response.status, 203, 'Custom response status doesn\'t match');
           });
         });
 
         test('the same-origin custom fetch handler isn\'t used when the path doesn\t match', function() {
-          return navigator.serviceWorker.ready.then(function() {
+          return window._controlledPromise.then(function() {
             return window.fetch('dummyUrlThatShould404').then(function(response) {
               assert.equal(response.status, 404, 'Expected response status doesn\'t match');
             });
           });
         });
 
         test('the cross-origin fetch handler is used when the path and origin matches', function() {
-          return navigator.serviceWorker.ready.then(function() {
+          return window._controlledPromise.then(function() {
             return window.fetch('https://matching.domain/path/to/customFetch').then(function(response) {
               assert.equal(response.status, 410, 'Custom response status doesn\'t match');
             });

diff --git a/test/platinum-sw-import-script/index.html b/test/platinum-sw-import-script/index.html
@@ -15,6 +15,7 @@
 
     <script src="../../../webcomponentsjs/webcomponents-lite.js"></script>
     <script src="../../../web-component-tester/browser.js"></script>
+    <script src="../controlled-promise.js"></script>
 
     <link rel="import" href="../../platinum-sw-register.html">
     <link rel="import" href="../../platinum-sw-import-script.html">
@@ -27,10 +28,8 @@
 
     <script>
       suite('Importing Service Worker Scripts', function() {
-        // TODO: postMessage/message events are in flux in the Service Worker spec, so this may
-        // need to change in the future.
         test('message handler is registered via imported script', function(done) {
-          return navigator.serviceWorker.ready.then(function(registration) {
+          return window._controlledPromise.then(function(registration) {
             var message = 'hello';
             var messageChannel = new MessageChannel();
             messageChannel.port1.onmessage = function(event) {

diff --git a/test/platinum-sw-register/index.html b/test/platinum-sw-register/index.html
@@ -15,6 +15,7 @@
 
     <script src="../../../webcomponentsjs/webcomponents-lite.js"></script>
     <script src="../../../web-component-tester/browser.js"></script>
+    <script src="../controlled-promise.js"></script>
 
     <link rel="import" href="../../platinum-sw-register.html">
   </head>
@@ -27,7 +28,7 @@
 
       suite('Registration & Installation', function() {
         test('creates an active service worker', function() {
-          return navigator.serviceWorker.ready.then(function(registration) {
+          return window._controlledPromise.then(function(registration) {
             assert.ok(registration.active);
           });
         });