Chromium Code Reviews Chromium Code Reviews
Issue 835673006:
Use caller's document url to resolve scriptURL/patternURL in registerServiceWorker/getRegistration (Closed)
Base URL: https://chromium.googlesource.com/chromium/blink.git@master| Index: LayoutTests/http/tests/serviceworker/registration-iframe.html |
| diff --git a/LayoutTests/http/tests/serviceworker/registration-iframe.html b/LayoutTests/http/tests/serviceworker/registration-iframe.html |
| new file mode 100644 |
| index 0000000000000000000000000000000000000000..e9932e7ea8e3ef1fa525ccbc2cda9846d7549cf2 |
| --- /dev/null |
| +++ b/LayoutTests/http/tests/serviceworker/registration-iframe.html |
| @@ -0,0 +1,105 @@ |
| +<!DOCTYPE html> |
| +<meta charset="utf-8"> |
| +<title>Service Worker: Registration for iframe</title> |
| +<script src="../resources/testharness.js"></script> |
| +<script src="../resources/testharnessreport.js"></script> |
| +<script src="resources/test-helpers.js"></script> |
| +<script> |
| +// Set script url and scope url relative to the calling frame's document's url |
|
falken
2015/02/26 07:16:16
nit: please end sentences with '.'
|
| +// Assert the implementation parses the urls against the calling frame's |
| +// document's url |
| +async_test(function(t) { |
| + var step = t.step_func.bind(t); |
|
falken
2015/02/26 07:16:16
I believe the promise-chain means we don't need to
|
| + var url = 'resources/blank.html'; |
| + var scope = 'resources/registration-for-iframe-from-calling-frame'; |
| + var parsed_scope = normalizeURL(scope); |
| + var script = 'resources/empty-worker.js'; |
| + var parsed_script = normalizeURL(script); |
| + var frame; |
| + var registration; |
| + |
| + service_worker_unregister(t, scope) |
| + .then(step(function() { return with_iframe(url); })) |
| + .then(step(function(f) { |
| + frame = f; |
| + return frame.contentWindow.navigator.serviceWorker.register( |
| + script, |
| + { scope: scope }); |
| + })) |
| + .then(step(function(r) { |
| + registration = r; |
| + return wait_for_state(t, r.installing, 'activated'); |
| + })) |
| + .then(step(function() { |
| + assert_equals( |
| + registration.scope, parsed_scope, |
| + 'registration\'s scope must be the scope parsed against calling ' + |
| + 'document\'s url'); |
| + assert_equals( |
| + registration.active.scriptURL, parsed_script, |
| + 'worker\'s script must be the url parsed against calling ' + |
| + 'document\'s url'); |
| + unload_iframe(frame); |
| + return service_worker_unregister_and_done(t, scope); |
| + })) |
| + .catch(unreached_rejection(t)); |
| + }, 'Subframe\'s container\'s register method should use calling frame\'s ' + |
| + 'document\'s url as a base url for parsing its script url and scope url - ' + |
| + 'normal case'); |
| + |
| +// Set script url and scope url relative to the iframe's document's url |
| +// Assert the implementation throws a NetworkError exception |
| +async_test(function(t) { |
| + var step = t.step_func.bind(t); |
| + var url = 'resources/blank.html'; |
| + var scope = 'registration-for-iframe-from-calling-frame'; |
| + var script = 'empty-worker.js'; |
| + var frame; |
| + var registration; |
| + |
| + service_worker_unregister(t, scope) |
| + .then(step(function() { return with_iframe(url); })) |
| + .then(step(function(f) { |
| + frame = f; |
| + return frame.contentWindow.navigator.serviceWorker.register( |
| + script, |
| + { scope: scope }); |
| + })) |
| + .catch(step(function(e) { |
|
falken
2015/02/26 07:16:17
I don't think this works-- if register succeeds, t
|
| + assert_equals(e.name, 'NetworkError'); |
| + unload_iframe(frame); |
| + return service_worker_unregister_and_done(t, scope); |
| + })) |
| + .catch(unreached_rejection(t)); |
| + }, 'Subframe\'s container\'s register method should use calling frame\'s ' + |
| + 'document\'s url as a base url for parsing its script url and scope url - ' + |
| + 'error case'); |
| + |
| +// Set the scope url to a non-subdirectory of the script url. |
| +// Assert the implementation throws a SecurityError exception |
| +async_test(function(t) { |
| + var step = t.step_func.bind(t); |
| + var url = 'resources/blank.html'; |
| + var scope = 'registration-for-iframe-from-calling-frame'; |
| + var parsed_scope = normalizeURL(scope); |
|
falken
2015/02/26 07:16:17
nit: unused variable
|
| + var script = 'resources/empty-worker.js'; |
| + var parsed_script = normalizeURL(script); |
|
falken
2015/02/26 07:16:16
unused variable
|
| + var frame; |
| + var registration; |
| + |
| + service_worker_unregister(t, scope) |
| + .then(step(function() { return with_iframe(url); })) |
| + .then(step(function(f) { |
| + frame = f; |
| + return frame.contentWindow.navigator.serviceWorker.register( |
| + script, |
| + { scope: scope }); |
| + })) |
| + .catch(step(function(e) { |
| + assert_equals(e.name, 'SecurityError'); |
|
falken
2015/02/26 07:16:16
Test this in the two-arg then(p, q) also.
|
| + unload_iframe(frame); |
| + return service_worker_unregister_and_done(t, scope); |
| + })) |
| + .catch(unreached_rejection(t)); |
| + }, 'A scope url should start with the given script url'); |
| +</script> |
