| OLD | NEW |
|---|
| 1 <!DOCTYPE html> | 1 <!DOCTYPE html> |
| 2 <title>Service Worker: Activation occurs after registration</title> | 2 <title>Service Worker: Activation occurs after registration</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 <body> | 6 <body> |
| 7 <script> | 7 <script> |
| 8 var t = async_test('activation occurs after registration'); | 8 var t = async_test('activation occurs after registration'); |
| 9 t.step(function() { | 9 t.step(function() { |
| 10 var scope = 'resources/blank.html'; | 10 var scope = 'resources/blank.html'; |
| 11 var registration; | 11 var registration; |
| 12 | 12 |
| 13 service_worker_unregister_and_register( | 13 service_worker_unregister_and_register( |
| 14 t, 'resources/empty-worker.js', scope) | 14 t, 'resources/empty-worker.js', scope) |
| 15 .then(function(r) { | 15 .then(function(r) { |
| 16 registration = r; | 16 registration = r; |
| 17 return wait_for_update(t, registration); | |
| 18 }) | |
| 19 .then(function(worker) { | |
| 20 assert_equals( | 17 assert_equals( |
| 21 worker.state, | 18 r.installing.state, |
| 22 'installing', | 19 'installing', |
| 23 'worker should be in the "installing" state upon registration'); | 20 'worker should be in the "installing" state upon registration'); |
| 24 return wait_for_state(t, worker, 'activated'); | 21 return wait_for_state(t, r.installing, 'activated'); |
| 25 }) | 22 }) |
| 26 .then(function() { | 23 .then(function() { |
| 27 service_worker_unregister_and_done(t, scope); | 24 service_worker_unregister_and_done(t, scope); |
| 28 }) | 25 }) |
| 29 .catch(unreached_rejection(t)); | 26 .catch(unreached_rejection(t)); |
| 30 }); | 27 }); |
| 31 </script> | 28 </script> |
| 32 </body> | 29 </body> |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 776373003:
ServiceWorker cleanup: remove wait_for_update() in favor of r.installing in most tests (Closed)
Base URL: svn://svn.chromium.org/blink/trunk