Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(126)

Unified Diff: LayoutTests/http/tests/serviceworker/skip-waiting-installed.html

Issue 723923002: ServiceWorker: Add support for .skipWaiting and controllerchange event(1/3) (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: webcallback->skipwaitingcallbacks, test re-write Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..6cb4d00f043fd6f86d17376dd26b2d4daa566c63
--- /dev/null
+++ b/LayoutTests/http/tests/serviceworker/skip-waiting-installed.html
@@ -0,0 +1,66 @@
+<!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 iframeContainer, serviceWorker, onMessage, onControllerChanged;
+ var promise1 = new Promise(function(resolve) {
+ 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) {
+ 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(frame) {
+ iframeContainer = frame.contentWindow.navigator.serviceWorker;
+ assert_equals(
+ iframeContainer.controller.scriptURL, normalizeURL(url1),
+ 'Document controller scriptURL should equal to the first one');
+ iframeContainer.oncontrollerchange = t.step_func(onControllerChanged);
+ return navigator.serviceWorker.register(url2, {scope: scope});
+ })
+ .then(function(registration) {
+ return wait_for_update(t, registration);
+ })
+ .then(function(sw) {
+ serviceWorker = sw;
+ return wait_for_state(t, sw, 'installed');
+ })
+ .then(function() {
+ var channel = new MessageChannel();
+ channel.port1.onmessage = t.step_func(onMessage);
+ serviceWorker.postMessage({port: channel.port2}, [channel.port2]);
+ return Promise.all([promise1, promise2]);
+ })
+ .then(function() {
+ return service_worker_unregister_and_done(t, scope);
+ })
+ }, 'Test skipWaiting when a installed worker is waiting');
+
+</script>

Powered by Google App Engine
This is Rietveld 408576698