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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/WebKit/LayoutTests/http/tests/serviceworker/activation.html

Issue 2119143002: service worker: Wait for inflight requests before activating (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: nhiroki-san Created 4 years, 5 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
Download patch
« content/browser/service_worker/service_worker_version.cc ('K') | « content/browser/service_worker/service_worker_version.cc ('k') | third_party/WebKit/LayoutTests/http/tests/serviceworker/resources/mint-new-worker.php » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/LayoutTests/http/tests/serviceworker/activation.html
diff --git a/third_party/WebKit/LayoutTests/http/tests/serviceworker/activation.html b/third_party/WebKit/LayoutTests/http/tests/serviceworker/activation.html
new file mode 100644
index 0000000000000000000000000000000000000000..5722c8dfdf3fe88a0b19f16907d2d5a307847636
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/http/tests/serviceworker/activation.html
@@ -0,0 +1,163 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<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>
+
+// Registers, waits for activation, then unregisters on a dummy scope.
+//
+// This helper can be used in tests that assert that activation doesn't happen.
+// It would not be sufficient to check the .waiting/.active properties once,
+// since activation could be scheduled and just hasn't happened yet. Since this
+// helper shows that activation of another registration completed, we can be
+// sure that activation really will not happen.
+function wait_for_activation_on_dummy_scope(t) {
+ var dummy_scope = '/there/is/no/there/there';
+ navigator.serviceWorker.register('resources/empty-worker.js', { scope: dummy_scope })
nhiroki 2016/07/13 04:48:43 Can you wrap at 80 columns?
falken 2016/07/14 13:52:08 Done.
falken 2016/07/14 13:52:08 OMG more importantly this didn't return anything s
+ .then(r => {
+ registration = r;
+ return wait_for_state(t, registration.installing, 'active');
+ })
+ .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
+// |registration.active.postMessage('go')|.
+function setup_activation_test(t, scope, worker_url) {
+ var registration;
+ var iframe;
+
+ return navigator.serviceWorker.getRegistration(scope)
+ .then(r => {
+ if (r)
+ return r.unregister();
+ })
+ .then(() => {
+ // Create an in-scope iframe. Do this prior to registration to avoid
+ // racing between an update triggered by navigation and the update()
+ // call below.
+ return with_iframe(scope);
+ })
+ .then(f => {
+ iframe = f;
+
+ // Register.
nhiroki 2016/07/13 04:48:43 This comment seems useless.
falken 2016/07/14 13:52:08 Moved "Create an active worker" up here.
+ return navigator.serviceWorker.register(worker_url, { scope: scope });
+ })
+ .then(r => {
+ registration = r;
+ add_result_callback(() => registration.unregister);
+
+ // Create an active worker.
+ return wait_for_state(t, r.installing, 'activated');
+ })
+ .then(() => {
+ // Check that the frame was claimed.
+ assert_not_equals(iframe.contentWindow.navigator.serviceWorker.controller, null);
nhiroki 2016/07/13 04:48:43 ditto(80 columns)
falken 2016/07/14 13:52:07 Done.
+
+ // 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();
+ })
+ .then(() => {
+ // Wait for a waiting worker.
+ return wait_for_state(t, registration.installing, 'installed');
+ })
+ .then(() => {
+ return wait_for_activation_on_dummy_scope(t);
+ })
+ .then(() => {
+ assert_not_equals(registration.waiting, null);
+ assert_not_equals(registration.active, null);
+ return Promise.resolve({registration: registration, iframe: iframe});
+ });
+}
+
+promise_test(t => {
+ var scope = 'resources/no-controllee';
+ var worker_url = 'resources/mint-new-worker.php';
+ 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);
+ })
+ .then(() => {
+ // 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();
+ return reached_active;
+ })
+ .then(() => {
+ 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 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));
+ })
+ .then(() => {
+ // Finish the request.
+ new_worker = registration.waiting;
+ var reached_active = wait_for_state(t, new_worker, 'activating');
+ registration.active.postMessage('go');
+ return reached_active;
+ })
+ .then(() => {
+ 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 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;
+ var reached_active = wait_for_state(t, new_worker, 'activating');
+ registration.active.postMessage('go');
+ return reached_active;
+ })
+ .then(() => {
+ assert_equals(registration.active, new_worker);
+ });
+ }, 'skipWaiting bypasses no controllee requirement');
+</script>
« content/browser/service_worker/service_worker_version.cc ('K') | « content/browser/service_worker/service_worker_version.cc ('k') | third_party/WebKit/LayoutTests/http/tests/serviceworker/resources/mint-new-worker.php » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698