| OLD | NEW |
|---|
| 1 <!DOCTYPE html> | 1 <!DOCTYPE html> |
| 2 <title>Service Worker: postMessage to ServiceWorkerClient</title> | 2 <title>Service Worker: postMessage to ServiceWorkerClient</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('postMessage from ServiceWorker to ServiceWorkerClient'); | 7 var t = async_test('postMessage from ServiceWorker to ServiceWorkerClient'); |
| 8 t.step(function() { | 8 t.step(function() { |
| 9 var scope = 'resources/blank.html' | 9 var scope = 'resources/blank.html' |
| 10 service_worker_unregister_and_register( | 10 service_worker_unregister_and_register( |
| 11 t, 'resources/postmessage-to-client-worker.js', scope) | 11 t, 'resources/postmessage-to-client-worker.js', scope) |
| 12 .then(function(registration) { | 12 .then(function(registration) { |
| 13 return wait_for_update(t, registration); | 13 return wait_for_state(t, registration.installing, 'activated'); |
| 14 }) | |
| 15 .then(function(sw) { | |
| 16 return wait_for_state(t, sw, 'activated'); | |
| 17 }) | 14 }) |
| 18 .then(function() { return with_iframe(scope); }) | 15 .then(function() { return with_iframe(scope); }) |
| 19 .then(function(frame) { | 16 .then(function(frame) { |
| 20 var w = frame.contentWindow; | 17 var w = frame.contentWindow; |
| 21 w.onmessage = t.step_func(onMessage); | 18 w.onmessage = t.step_func(onMessage); |
| 22 w.navigator.serviceWorker.controller.postMessage('ping'); | 19 w.navigator.serviceWorker.controller.postMessage('ping'); |
| 23 }) | 20 }) |
| 24 .catch(unreached_rejection(t)); | 21 .catch(unreached_rejection(t)); |
| 25 | 22 |
| 26 var result = []; | 23 var result = []; |
| 27 var expected = ['Sending message via clients']; | 24 var expected = ['Sending message via clients']; |
| 28 | 25 |
| 29 function onMessage(e) { | 26 function onMessage(e) { |
| 30 var message = e.data; | 27 var message = e.data; |
| 31 if (message === 'quit') { | 28 if (message === 'quit') { |
| 32 assert_array_equals(result, expected, | 29 assert_array_equals(result, expected, |
| 33 'Worker should post back expected messages.'); | 30 'Worker should post back expected messages.'); |
| 34 service_worker_unregister_and_done(t, scope); | 31 service_worker_unregister_and_done(t, scope); |
| 35 } else { | 32 } else { |
| 36 result.push(message); | 33 result.push(message); |
| 37 } | 34 } |
| 38 } | 35 } |
| 39 }); | 36 }); |
| 40 </script> | 37 </script> |
| 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