third_party/WebKit/LayoutTests/http/tests/serviceworker/skip-waiting-installed.html - Issue 2900183002: Upstream service wrkr "skipWaiting" tests to WPT

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

Issue 2900183002: Upstream service wrkr "skipWaiting" tests to WPT (Closed)

Patch Set: Improve assertion message Created 3 years, 7 months 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

« no previous file with comments | « third_party/WebKit/LayoutTests/http/tests/serviceworker/skip-waiting.html ('k') | third_party/WebKit/LayoutTests/http/tests/serviceworker/skip-waiting-using-registration.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/LayoutTests/http/tests/serviceworker/skip-waiting-installed.html

diff --git a/third_party/WebKit/LayoutTests/http/tests/serviceworker/skip-waiting-installed.html b/third_party/WebKit/LayoutTests/http/tests/serviceworker/skip-waiting-installed.html

deleted file mode 100644

index e7b1a192434489df6694f1355a0b70092e41f547..0000000000000000000000000000000000000000

--- a/third_party/WebKit/LayoutTests/http/tests/serviceworker/skip-waiting-installed.html

+++ /dev/null

@@ -1,62 +0,0 @@

-<!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 saw_message = new Promise(function(resolve) {

- onmessage = function(e) {

- var message = e.data;

- assert_equals(

- message, 'PASS',

- 'skipWaiting promise should be resolved after activated');

- resolve();

- };

- });

- var saw_controllerchanged = new Promise(function(resolve) {

- oncontrollerchanged = function() {

- assert_equals(

- frame_sw.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_state(t, registration.installing, '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) {

- service_worker = registration.installing;

- return wait_for_state(t, service_worker, '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([saw_message, saw_controllerchanged]);

- })

- .then(function() {

- frame.remove();

- return service_worker_unregister_and_done(t, scope);

- });

- }, 'Test skipWaiting when a installed worker is waiting');

-</script>