OLD | NEW |
1 <!DOCTYPE html> | 1 <!DOCTYPE html> |
2 <title>Service Worker: registration end-to-end</title> | 2 <title>Service Worker: registration end-to-end</title> |
3 <script src="../resources/testharness.js"></script> | 3 <script src="../resources/testharness.js"></script> |
4 <script src="../resources/testharnessreport.js"></script> | 4 <script src="../resources/testharnessreport.js"></script> |
5 <script src="resources/test-helpers.js"></script> | 5 <script src="resources/test-helpers.js"></script> |
6 <script> | 6 <script> |
7 var t = async_test('Registration: end-to-end'); | 7 var t = async_test('Registration: end-to-end'); |
8 t.step(function() { | 8 t.step(function() { |
9 | 9 |
10 var scope = '/in-scope/'; | 10 var scope = '/in-scope/'; |
11 var serviceWorkerStates = []; | 11 var serviceWorkerStates = []; |
12 var lastServiceWorkerState = ''; | 12 var lastServiceWorkerState = ''; |
13 var receivedMessageFromPort = ''; | 13 var receivedMessageFromPort = ''; |
14 var currentChangeCount = 0; | 14 var currentChangeCount = 0; |
15 | 15 |
16 assert_true(navigator.serviceWorker instanceof ServiceWorkerContainer); | 16 assert_true(navigator.serviceWorker instanceof ServiceWorkerContainer); |
17 assert_equals(typeof navigator.serviceWorker.register, 'function'); | 17 assert_equals(typeof navigator.serviceWorker.register, 'function'); |
18 assert_equals(typeof navigator.serviceWorker.unregister, 'function'); | 18 assert_equals(typeof navigator.serviceWorker.unregister, 'function'); |
19 | 19 |
20 navigator.serviceWorker.oncurrentchange = function() { | 20 navigator.serviceWorker.oncurrentchange = function() { |
21 ++currentChangeCount; | 21 ++currentChangeCount; |
22 }; | 22 }; |
23 | 23 |
24 service_worker_unregister_and_register( | 24 service_worker_unregister_and_register( |
25 t, 'resources/end-to-end-worker.js', scope).then(t.step_func(onRegister)
); | 25 t, 'resources/end-to-end-worker.js', scope) |
| 26 .then(function(registration) { |
| 27 return wait_for_update(t, registration); |
| 28 }) |
| 29 .then(onRegister) |
| 30 .catch(unreached_rejection(t)); |
26 | 31 |
27 function sendMessagePort(worker, from) { | 32 function sendMessagePort(worker, from) { |
28 var messageChannel = new MessageChannel(); | 33 var messageChannel = new MessageChannel(); |
29 worker.postMessage({from:from, port:messageChannel.port2}, [messageChann
el.port2]); | 34 worker.postMessage({from:from, port:messageChannel.port2}, [messageChann
el.port2]); |
30 return messageChannel.port1; | 35 return messageChannel.port1; |
31 } | 36 } |
32 | 37 |
33 function onRegister(sw) { | 38 function onRegister(sw) { |
34 serviceWorkerStates.push(sw.state); | 39 serviceWorkerStates.push(sw.state); |
35 lastServiceWorkerState = sw.state; | 40 lastServiceWorkerState = sw.state; |
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
87 }); | 92 }); |
88 })); | 93 })); |
89 navigator.serviceWorker.unregister(scope); | 94 navigator.serviceWorker.unregister(scope); |
90 sawRedundant.then(t.step_func(function() { | 95 sawRedundant.then(t.step_func(function() { |
91 t.done(); | 96 t.done(); |
92 })); | 97 })); |
93 })); | 98 })); |
94 } | 99 } |
95 }); | 100 }); |
96 </script> | 101 </script> |
OLD | NEW |