Chromium Code Reviews Chromium Code Reviews
Issue 765323002:
ServiceWorker: Add support for .skipWaiting and controllerchange event(3/3) (Closed)
Base URL: https://chromium.googlesource.com/chromium/blink.git@master| Index: LayoutTests/http/tests/serviceworker/skip-waiting-installed.html |
| diff --git a/LayoutTests/http/tests/serviceworker/skip-waiting-installed.html b/LayoutTests/http/tests/serviceworker/skip-waiting-installed.html |
| new file mode 100644 |
| index 0000000000000000000000000000000000000000..b032eece3e42074f5d1fa79d0a5d66d56a60e724 |
| --- /dev/null |
| +++ b/LayoutTests/http/tests/serviceworker/skip-waiting-installed.html |
| @@ -0,0 +1,67 @@ |
| +<!DOCTYPE html> |
| +<title>Service Worker: Skip waiting installed worker</title> |
| +<script src="../resources/testharness.js"></script> |
| +<script src="../resources/testharnessreport.js"></script> |
| +<script src="resources/test-helpers.js"></script> |
| +<script> |
| + |
| +promise_test(function(t) { |
| + var scope = 'resources/blank.html'; |
| + var url1 = 'resources/empty.js'; |
| + var url2 = 'resources/skip-waiting-installed-worker.js'; |
| + var frame, frame_sw, service_worker, onmessage, oncontrollerchanged; |
| + var promise1 = new Promise(function(resolve) { |
|
falken
2014/12/01 07:48:28
can you give a more descriptive name like "saw_mes
xiang
2014/12/03 00:07:25
Done.
|
| + onmessage = function(e) { |
| + var message = e.data; |
| + assert_equals( |
| + message, 'PASS', |
| + 'skipWaiting promise should be resolved after activated'); |
| + resolve(); |
| + }; |
| + }); |
| + var promise2 = new Promise(function(resolve) { |
|
falken
2014/12/01 07:48:28
"saw_controlledchanged"?
xiang
2014/12/03 00:07:25
Done.
|
| + oncontrollerchanged = function() { |
| + assert_equals( |
| + iframeContainer.controller.scriptURL, normalizeURL(url2), |
| + 'Controller scriptURL should change to the second one'); |
| + resolve(); |
| + }; |
| + }); |
| + return service_worker_unregister_and_register(t, url1, scope) |
| + .then(function(registration) { |
| + return wait_for_update(t, registration); |
| + }) |
| + .then(function(sw) { |
| + return wait_for_state(t, sw, 'activated'); |
| + }) |
| + .then(function() { |
| + return with_iframe(scope); |
| + }) |
| + .then(function(f) { |
| + frame = f; |
| + frame_sw = f.contentWindow.navigator.serviceWorker; |
| + assert_equals( |
| + frame_sw.controller.scriptURL, normalizeURL(url1), |
| + 'Document controller scriptURL should equal to the first one'); |
| + frame_sw.oncontrollerchange = t.step_func(oncontrollerchanged); |
| + return navigator.serviceWorker.register(url2, {scope: scope}); |
| + }) |
| + .then(function(registration) { |
| + return wait_for_update(t, registration); |
| + }) |
| + .then(function(sw) { |
| + service_worker = sw; |
| + return wait_for_state(t, sw, 'installed'); |
| + }) |
| + .then(function() { |
| + var channel = new MessageChannel(); |
| + channel.port1.onmessage = t.step_func(onmessage); |
| + service_worker.postMessage({port: channel.port2}, [channel.port2]); |
| + return Promise.all([promise1, promise2]); |
| + }) |
| + .then(function() { |
|
falken
2014/12/01 07:48:28
remove frame
xiang
2014/12/03 00:07:25
Done.
|
| + return service_worker_unregister_and_done(t, scope); |
| + }) |
| + }, 'Test skipWaiting when a installed worker is waiting'); |
| + |
| +</script> |
