From 64b722ad6fd5e96d6be25ebc4007af52e2178cca Mon Sep 17 00:00:00 2001
From: Ben Kelly <ben@wanderview.com>
Date: Wed, 6 Apr 2016 13:27:22 -0700
Subject: [PATCH] Bug 1256428 P7 Fix wpt update.https.html to expect TypeError
 per current spec. r=jdm

---
 .../service-worker/update.https.html          | 22 +++++++++----------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/testing/web-platform/mozilla/tests/service-workers/service-worker/update.https.html b/testing/web-platform/mozilla/tests/service-workers/service-worker/update.https.html
index 5870b400a6d1..8b41e52d8b87 100644
--- a/testing/web-platform/mozilla/tests/service-workers/service-worker/update.https.html
+++ b/testing/web-platform/mozilla/tests/service-workers/service-worker/update.https.html
@@ -2,6 +2,7 @@
 <title>Service Worker: Registration update()</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
+<script src="resources/testharness-helpers.js"></script>
 <script src="resources/test-helpers.sub.js"></script>
 <script>
 promise_test(function(t) {
@@ -108,19 +109,16 @@ promise_test(function(t) {
       .then(function(frame) {
           iframe = frame;
 
-          return Promise.all([registration.unregister(),
-                              registration.update()]);
+          return assert_promise_rejects(
+              Promise.all([registration.unregister(), registration.update()]),
+              new TypeError(),
+              'Calling update() while the uninstalling flag is set' +
+              'should return a promise that rejects with an ' +
+              'InvalidStateError.');
         })
-      .then(
-        unreached_fulfillment(t),
-        function(e) {
-          assert_throws('InvalidStateError', function() { throw e; },
-                        'Calling update() while the uninstalling flag is set' +
-                        'should return a promise that rejects with an ' +
-                        'InvalidStateError.');
-
-          iframe.remove();
-          return t.done();
+      .then(function() {
+        iframe.remove();
+        return t.done();
         });
   }, 'Update a registration.');
 </script>