third_party/WebKit/LayoutTests/imported/wpt/service-workers/service-worker/activation.https.html - Issue 2415873002: Import w3c tests for the service workers

Unified Diff: third_party/WebKit/LayoutTests/imported/wpt/service-workers/service-worker/activation.https.html

Issue 2415873002: Import w3c tests for the service workers (Closed)

Patch Set: Created 4 years, 2 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

« third_party/WebKit/LayoutTests/W3CImportExpectations ('K') | « third_party/WebKit/LayoutTests/imported/wpt/service-workers/service-worker/activation-after-registration.https.html ('k') | third_party/WebKit/LayoutTests/imported/wpt/service-workers/service-worker/active.https.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/LayoutTests/imported/wpt/service-workers/service-worker/activation.https.html

diff --git a/third_party/WebKit/LayoutTests/http/tests/serviceworker/activation.html b/third_party/WebKit/LayoutTests/imported/wpt/service-workers/service-worker/activation.https.html

similarity index 77%

copy from third_party/WebKit/LayoutTests/http/tests/serviceworker/activation.html

copy to third_party/WebKit/LayoutTests/imported/wpt/service-workers/service-worker/activation.https.html

index fd52c80e51881a0104bc3fe195f6db98d0eec3f2..75fdff813ed26ed6ce7fbfd7fa86186a540484f0 100644

--- a/third_party/WebKit/LayoutTests/http/tests/serviceworker/activation.html

+++ b/third_party/WebKit/LayoutTests/imported/wpt/service-workers/service-worker/activation.https.html

@@ -1,11 +1,10 @@

<!DOCTYPE html>

<title>service worker: activation</title>

-<script src="../resources/testharness.js"></script>

-<script src="../resources/testharnessreport.js"></script>

-<script src="resources/test-helpers.js"></script>

+<script src="/resources/testharness.js"></script>

+<script src="/resources/testharnessreport.js"></script>

+<script src="resources/test-helpers.sub.js"></script>

// Registers, waits for activation, then unregisters on a dummy scope.

// This helper can be used in tests that assert that activation doesn't happen.

@@ -24,7 +23,6 @@ function wait_for_activation_on_dummy_scope(t) {

})

.then(() => registration.unregister());

}

// Returns {registration, iframe}, where |registration| has an active and

// waiting worker. The active worker controls |iframe| and has an inflight

// message event that can be finished by calling

@@ -32,7 +30,6 @@ function wait_for_activation_on_dummy_scope(t) {

function setup_activation_test(t, scope, worker_url) {

var registration;

var iframe;

return navigator.serviceWorker.getRegistration(scope)

.then(r => {

if (r)

@@ -46,24 +43,20 @@ function setup_activation_test(t, scope, worker_url) {

})

.then(f => {

iframe = f;

// Create an active worker.

return navigator.serviceWorker.register(worker_url, { scope: scope });

})

.then(r => {

registration = r;

add_result_callback(() => registration.unregister());

return wait_for_state(t, r.installing, 'activated');

})

.then(() => {

// Check that the frame was claimed.

assert_not_equals(

iframe.contentWindow.navigator.serviceWorker.controller, null);

// Create an in-flight request.

registration.active.postMessage('wait');

// Now there is both a controllee and an in-flight request.

// Initiate an update.

return registration.update();

@@ -81,19 +74,16 @@ function setup_activation_test(t, scope, worker_url) {

return Promise.resolve({registration: registration, iframe: iframe});

});

}

promise_test(t => {

var scope = 'resources/no-controllee';

- var worker_url = 'resources/mint-new-worker.php';

+ var worker_url = 'resources/mint-new-worker.py';

var registration;

var iframe;

var new_worker;

return setup_activation_test(t, scope, worker_url)

.then(result => {

registration = result.registration;

iframe = result.iframe;

// Finish the in-flight request.

registration.active.postMessage('go');

return wait_for_activation_on_dummy_scope(t);

@@ -102,7 +92,6 @@ promise_test(t => {

// The new worker is still waiting. Remove the frame and it should

// activate.

new_worker = registration.waiting;

assert_equals(new_worker.state, 'installed');

var reached_active = wait_for_state(t, new_worker, 'activating');

iframe.remove();

@@ -112,19 +101,16 @@ promise_test(t => {

assert_equals(new_worker, registration.active);

});

}, 'loss of controllees triggers activation');

promise_test(t => {

var scope = 'resources/no-request';

- var worker_url = 'resources/mint-new-worker.php';

+ var worker_url = 'resources/mint-new-worker.py';

var registration;

var iframe;

var new_worker;

return setup_activation_test(t, scope, worker_url)

.then(result => {

registration = result.registration;

iframe = result.iframe;

// Remove the iframe.

iframe.remove();

return new Promise(resolve => setTimeout(resolve, 0));

@@ -140,17 +126,14 @@ promise_test(t => {

assert_equals(registration.active, new_worker);

});

}, 'finishing a request triggers activation');

promise_test(t => {

var scope = 'resources/skip-waiting';

- var worker_url = 'resources/mint-new-worker.php?skip-waiting';

+ var worker_url = 'resources/mint-new-worker.py?skip-waiting';

var registration;

var new_worker;

return setup_activation_test(t, scope, worker_url)

.then(result => {

registration = result.registration;

// Finish the request. The iframe does not need to be removed because

// skipWaiting() was called.

new_worker = registration.waiting;

@@ -162,4 +145,35 @@ promise_test(t => {

assert_equals(registration.active, new_worker);

});

}, 'skipWaiting bypasses no controllee requirement');

+// This test is not really about activation, but otherwise is very

+// similar to the other tests here.

+promise_test(t => {

+ var scope = 'resources/unregister';

+ var worker_url = 'resources/mint-new-worker.py';

+ var registration;

+ var iframe;

+ var new_worker;

+ return setup_activation_test(t, scope, worker_url)

+ .then(result => {

+ registration = result.registration;

+ iframe = result.iframe;

+ // Remove the iframe.

+ iframe.remove();

+ return registration.unregister();

+ })

+ .then(() => {

+ // The unregister operation should wait for the active worker to

+ // finish processing its events before clearing the registration.

+ new_worker = registration.waiting;

+ var reached_redundant = wait_for_state(t, new_worker, 'redundant');

+ registration.active.postMessage('go');

+ return reached_redundant;

+ })

+ .then(() => {

+ assert_equals(registration.installing, null);

+ assert_equals(registration.waiting, null);

+ assert_equals(registration.active, null);

+ });

+ }, 'finishing a request triggers unregister');

</script>