third_party/WebKit/LayoutTests/http/tests/serviceworker/chromium/reclaim-registration-after-iframe-deletion.html - Issue 1893363003: ServiceWorker: Refer to the current provider in ServiceWorkerRegistration

Side by Side Diff: third_party/WebKit/LayoutTests/http/tests/serviceworker/chromium/reclaim-registration-after-iframe-deletion.html

Issue 1893363003: ServiceWorker: Refer to the current provider in ServiceWorkerRegistration (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 8 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 unified diff | Download patch

OLD	NEW
(Empty)
	1 <!DOCTYPE html>

	2 <meta charset="utf-8">

	3 <title>Service Worker: Reclaiming registration after removal of iframe</title>

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

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

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

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

	8 <script>

	9 promise_test(function(t) {

	10 var url = 'resources/blank.html';

	11 var scope = 'resources/reclam-registration-after-iframe-deletion';
	nhiroki 2016/04/20 03:42:16 s/reclam/reclaim/ BTW, "reclaim-registration" mig s/reclam/reclaim/ BTW, "reclaim-registration" might not correctly explain the behavior of this test because this does not call register() but unregister() after the iframe is removed. How about renaming it to something else, for example, "unregister-on-detached-frame"? shimazu 2016/04/21 03:57:50 Done. Show quoted text On 2016/04/20 03:42:16, nhiroki wrote: > s/reclam/reclaim/ > > BTW, "reclaim-registration" might not correctly explain the behavior of this > test because this does not call register() but unregister() after the iframe is > removed. How about renaming it to something else, for example, > "unregister-on-detached-frame"? Done.
	12 var script = 'resources/empty-worker.js';

	13 var frame;

	14 var registration;

	15

	16 return service_worker_unregister(t, scope)

	17 .then(function() {

	18 return with_iframe(url, {auto_remove: false});

	19 })

	20 .then(function(f) {

	21 frame = f;

	22 return frame.contentWindow.navigator.serviceWorker.register(

	23 script,

	24 { scope: scope });

	25 })

	26 .then(function(r) {

	27 add_completion_callback(

	28 service_worker_unregister.bind(null, t, scope));
	nhiroki 2016/04/20 03:42:15 This couldn't work because "service_worker_unregis This couldn't work because "service_worker_unregister" consists of multiple async operations (getRegistration and unregister) and add_completion_callback does not wait for the completion of them. Instead, how about like this? .then(function() { ... // Register on the main frame. return navigator.serviceWorker.register(...); }) .then(function(r) { add_completion_callback(function() { r.unregister(); }); // Get a registration on the iframe. return frame.contentWindow.navigator.serviceWorker.getRegistration(); }) .then(function(r) { frame.remove(); assert_promise_rejects(r.unregister(), ...); }) shimazu 2016/04/21 03:57:50 Done. Show quoted text On 2016/04/20 03:42:15, nhiroki wrote: > This couldn't work because "service_worker_unregister" consists of multiple > async operations (getRegistration and unregister) and add_completion_callback > does not wait for the completion of them. > > Instead, how about like this? > > .then(function() { > ... > // Register on the main frame. > return navigator.serviceWorker.register(...); > }) > .then(function(r) { > add_completion_callback(function() { r.unregister(); }); > > // Get a registration on the iframe. > return frame.contentWindow.navigator.serviceWorker.getRegistration(); > }) > .then(function(r) { > frame.remove(); > assert_promise_rejects(r.unregister(), ...); > }) Done.
	29 registration = r;

	30 frame.remove();

	31 })

	32 .then(function() {
	nhiroki 2016/04/20 03:42:16 Maybe we don't have to separate these operations i Maybe we don't have to separate these operations into two .then blocks (we can just remove line 31 and 32). shimazu 2016/04/21 03:57:50 Done. Show quoted text On 2016/04/20 03:42:16, nhiroki wrote: > Maybe we don't have to separate these operations into two .then blocks (we can > just remove line 31 and 32). Done.
	33 return assert_promise_rejects(
	nhiroki 2016/04/20 03:42:16 'return' is not necessary. 'return' is not necessary. shimazu 2016/04/21 03:57:50 assert_promise_rejects() returns Promise object co Show quoted text On 2016/04/20 03:42:16, nhiroki wrote: > 'return' is not necessary. assert_promise_rejects() returns Promise object containing the result of 'registration.unregister()'. I think it's better to return the Promise to promise_test. How is it? nhiroki 2016/04/21 08:23:30 Ah, sorry! I wrongly assumed that assert_promise_r Show quoted text On 2016/04/21 03:57:50, makoto wrote: > On 2016/04/20 03:42:16, nhiroki wrote: > > 'return' is not necessary. > > assert_promise_rejects() returns Promise object containing the result of > 'registration.unregister()'. I think it's better to return the Promise to > promise_test. How is it? Ah, sorry! I wrongly assumed that assert_promise_rejects returns nothing like other assert variants. Keeping 'returns' looks good.
	34 registration.unregister(),

	35 'InvalidStateError',

	36 'Unregistration on a detached iframe should throw an exception'

	37 );

	38 });

	39 }, 'unregistration to should be finished successfully');
	nhiroki 2016/04/20 03:42:16 There is an extra space between "to" and "should". There is an extra space between "to" and "should". shimazu 2016/04/21 03:57:50 Done. Show quoted text On 2016/04/20 03:42:16, nhiroki wrote: > There is an extra space between "to" and "should". Done.
	40 </script>

OLD	NEW

« no previous file with comments | « no previous file | third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerRegistration.h » ('j') | no next file with comments »