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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: LayoutTests/http/tests/serviceworker/register-same-scope-different-script-url.html

Issue 480943002: Service Worker: Add tests for same-scope new script registration (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 4 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
« no previous file with comments | « no previous file | LayoutTests/http/tests/serviceworker/resources/test-helpers.js » ('j') | LayoutTests/http/tests/serviceworker/unregister-then-register-new-script.html » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: LayoutTests/http/tests/serviceworker/register-same-scope-different-script-url.html
diff --git a/LayoutTests/http/tests/serviceworker/register-same-scope-different-script-url.html b/LayoutTests/http/tests/serviceworker/register-same-scope-different-script-url.html
new file mode 100644
index 0000000000000000000000000000000000000000..1ced7d90d481b23ce89b0bee3920e670ef42a23e
--- /dev/null
+++ b/LayoutTests/http/tests/serviceworker/register-same-scope-different-script-url.html
@@ -0,0 +1,252 @@
+<!DOCTYPE html>
+<script src="../resources/testharness.js"></script>
+<script src="../resources/testharnessreport.js"></script>
+<script src="resources/test-helpers.js"></script>
+<script>
+var script1 = normalizeURL('resources/empty-worker.js');
+var script2 = normalizeURL('resources/empty-worker.js?new');
+
+// FIXME: The spec is in flux, this test's asserts may not be as per-spec.
+async_test(function(t) {
+ var scope = 'scope/register-new-script-concurrently';
+ var registration;
+ var register_promise1;
+ var register_promise2;
+
+ navigator.serviceWorker.unregister(scope)
+ .then(function() {
+ register_promise1 = navigator.serviceWorker.register(script1, {scope: scope});
+ register_promise2 = navigator.serviceWorker.register(script2, {scope: scope});
nhiroki 2014/08/21 09:26:03 nit: Can you wrap at 80-columns?
falken 2014/08/21 09:42:56 Done.
+ return register_promise1;
+ })
+ .then(function(r) {
+ registration = r;
+ return wait_for_update(t, registration);
+ })
+ .then(function() {
+ assert_equals(registration.installing.scriptURL, script1,
+ 'on first update, first script should be installing');
+ assert_equals(registration.waiting, null,
+ 'on first update, waiting should be null');
+ assert_equals(registration.active, null,
+ 'on first update, active should be null');
+ return register_promise2;
+ })
+ .then(function(r) {
+ assert_equals(r, registration);
+ return wait_for_update(t, registration);
+ })
+ .then(function() {
+ assert_equals(registration.installing.scriptURL, script2,
+ 'on second update, second script should be installing');
+ assert_equals(registration.waiting, null,
+ 'on second update, waiting should be null');
+ assert_equals(registration.active.scriptURL, script1,
+ 'on second update, first script should be active');
+ return registration.unregister();
+ })
+ .then(function() {
+ t.done();
+ })
+ .catch(unreached_rejection(t));
+ }, 'Register different scripts concurrently');
+
+async_test(function(t) {
+ var scope = 'scope/register-then-register-new-script';
+ var registration;
+
+ service_worker_unregister_and_register(t, script1, scope)
+ .then(function(r) {
+ registration = r;
+ return wait_for_update(t, registration);
+ })
+ .then(function() {
+ return wait_for_state(t, registration.installing, 'activated');
+ })
+ .then(function() {
+ assert_equals(registration.installing, null,
+ 'on activated, installing should be null');
+ assert_equals(registration.waiting, null,
+ 'on activated, waiting should be null');
+ assert_equals(registration.active.scriptURL, script1,
+ 'on activated, the first script should be active');
+ return navigator.serviceWorker.register(script2, {scope:scope});
+ })
+ .then(function(r) {
+ assert_equals(r, registration,
+ 'register() should resolve to the same registration');
+ return wait_for_update(t, registration);
+ })
+ .then(function() {
+ assert_equals(registration.installing.scriptURL, script2,
+ 'on update, the second script should be installing');
+ assert_equals(registration.waiting, null,
+ 'on update waiting should be null');
+ assert_equals(registration.active.scriptURL, script1,
+ 'on update, the first script should be active');
+ return wait_for_state(t, registration.installing, 'installed');
+ })
+ .then(function() {
+ assert_equals(registration.installing, null,
+ 'on installed, installing should be null');
+ assert_equals(registration.waiting.scriptURL, script2,
+ 'on installed, the second script should be waiting');
+ assert_equals(registration.active.scriptURL, script1,
+ 'on installed, the first script should be active');
+ return registration.unregister();
+ })
+ .then(function() {
+ t.done();
+ })
+ .catch(unreached_rejection(t));
+ }, 'Register then register new script URL');
+
+async_test(function(t) {
+ var scope = 'scope/register-then-register-new-script-404';
+ var registration;
+
+ service_worker_unregister_and_register(t, script1, scope)
+ .then(function(r) {
+ registration = r;
+ return wait_for_update(t, registration);
+ })
+ .then(function() {
+ return wait_for_state(t, registration.installing, 'activated');
+ })
+ .then(function() {
+ assert_equals(registration.installing, null,
+ 'on activated, installing should be null');
+ assert_equals(registration.waiting, null,
+ 'on activated, waiting should be null');
+ assert_equals(registration.active.scriptURL, script1,
+ 'on activated, the first script should be active');
+ return navigator.serviceWorker.register('this-will-404.js',
+ {scope:scope});
+ })
+ .then(
+ function() { assert_unreached('register should reject'); },
+ function(error) {
+ assert_equals(registration.installing, null,
+ 'on rejected, installing should be null');
+ assert_equals(registration.waiting, null,
+ 'on rejected, waiting should be null');
+ assert_equals(registration.active.scriptURL, script1,
+ 'on rejected, the first script should be active');
+ return registration.unregister();
+ })
+ .then(function() {
+ t.done();
+ })
+ .catch(unreached_rejection(t));
+ }, 'Register then register new script URL that 404s');
+
+async_test(function(t) {
+ var scope = 'scope/register-then-register-new-script-reject-install';
+ var reject_script = normalizeURL('resources/reject-install-worker.js');
+ var registration;
+
+ service_worker_unregister_and_register(t, script1, scope)
+ .then(function(r) {
+ registration = r;
+ return wait_for_update(t, registration);
+ })
+ .then(function() {
+ return wait_for_state(t, registration.installing, 'activated');
+ })
+ .then(function() {
+ assert_equals(registration.installing, null,
+ 'on activated, installing should be null');
+ assert_equals(registration.waiting, null,
+ 'on activated, waiting should be null');
+ assert_equals(registration.active.scriptURL, script1,
+ 'on activated, the first script should be active');
+ return navigator.serviceWorker.register(reject_script, {scope:scope});
+ })
+ .then(function(r) {
+ assert_equals(r, registration,
+ 'register() should resolve to the same registration');
+ return wait_for_update(t, registration);
+ })
+ .then(function() {
+ assert_equals(registration.installing.scriptURL, reject_script,
+ 'on update, the second script should be installing');
+ assert_equals(registration.waiting, null,
+ 'on update, waiting should be null');
+ assert_equals(registration.active.scriptURL, script1,
+ 'on update, the first script should be active');
+ return wait_for_state(t, registration.installing, 'redundant');
+ })
+ .then(function() {
+ assert_equals(registration.installing, null,
+ 'on redundant, installing should be null');
+ assert_equals(registration.waiting, null,
+ 'on redundant, waiting should be null');
+ assert_equals(registration.active.scriptURL, script1,
+ 'on redundant, the first script should be active');
+ return registration.unregister();
+ })
+ .then(function() {
+ t.done();
+ })
+ .catch(unreached_rejection(t));
+ }, 'Register then register new script that does not install');
+
+async_test(function(t) {
+ var scope = 'scope/register-new-script-controller';
+ var iframe;
+ var registration;
+
+ service_worker_unregister_and_register(t, script1, scope)
+ .then(function(r) {
+ registration = r;
+ return wait_for_update(t, registration);
+ })
+ .then(function(installing_worker) {
+ return wait_for_state(t, installing_worker, 'activated');
nhiroki 2014/08/21 09:26:03 nit: installing_worker -> registration.installing
falken 2014/08/21 09:42:57 Done.
+ })
+ .then(function() {
+ return with_iframe(scope);
+ })
+ .then(function(frame) {
+ iframe = frame;
+ return navigator.serviceWorker.register(script2, { scope: scope })
+ })
+ .then(function() {
+ return wait_for_update(t, registration);
+ })
+ .then(function(installing_worker) {
nhiroki 2014/08/21 09:26:03 nit: 'installing_worker' is never used.
falken 2014/08/21 09:42:56 Done.
+ return wait_for_state(t, registration.installing, 'installed');
+ })
+ .then(function() {
+ var sw_container = iframe.contentWindow.navigator.serviceWorker;
+ assert_equals(sw_container.controller.scriptURL, normalizeURL(script1),
nhiroki 2014/08/21 09:26:03 nit: |script1| was already normalized at line 6.
falken 2014/08/21 09:42:57 Good point. Done.
+ 'the old version should control the old doc');
+ return with_iframe(scope);
+ })
+ .then(function(frame) {
+ var sw_container = frame.contentWindow.navigator.serviceWorker;
+ assert_equals(sw_container.controller.scriptURL, normalizeURL(script1),
nhiroki 2014/08/21 09:26:03 ditto (normalizeURL).
falken 2014/08/21 09:42:56 Done.
+ 'the old version should control a new doc');
+ var active_seen = wait_for_state(t,
+ registration.waiting,
+ 'activated');
+ unload_iframe(frame);
+ unload_iframe(iframe);
+ return active_seen;
+ })
+ .then(function() {
+ return with_iframe(scope);
+ })
+ .then(function(frame) {
+ var sw_container = frame.contentWindow.navigator.serviceWorker;
+ assert_equals(sw_container.controller.scriptURL, normalizeURL(script2),
nhiroki 2014/08/21 09:26:03 ditto (normalizeURL).
falken 2014/08/21 09:42:57 Done.
+ 'the new version should control a new doc');
+ unload_iframe(frame);
+ return registration.unregister();
+ })
+ .then(function() {
+ t.done();
+ })
+ .catch(unreached_rejection(t));
+ }, 'Register same-scope new script url effect on controller');
+</script>
« no previous file with comments | « no previous file | LayoutTests/http/tests/serviceworker/resources/test-helpers.js » ('j') | LayoutTests/http/tests/serviceworker/unregister-then-register-new-script.html » ('J')

Powered by Google App Engine
This is Rietveld 408576698