Bug 1273920 P2 Fix register-wait-forever-in-install-worker.https.html to expect new unified service worker job queue behavior. r=asuth

This commit is contained in:
Ben Kelly 2016-05-24 14:08:20 -07:00
parent d021f226db
commit 748fae34c5
2 changed files with 39 additions and 4 deletions

View File

@ -10,13 +10,39 @@ promise_test(function(t) {
var bad_script = 'resources/wait-forever-in-install-worker.js';
var good_script = 'resources/empty-worker.js';
var scope = 'resources/wait-forever-in-install-worker';
var other_scope = 'resources/wait-forever-in-install-worker-other';
var registration;
var registerPromise;
return navigator.serviceWorker.register(bad_script, {scope: scope})
.then(function(registration) {
.then(function(r) {
registration = r;
assert_equals(registration.installing.scriptURL,
normalizeURL(bad_script));
return navigator.serviceWorker.register(good_script, {scope: scope});
// This register job should not start until the first
// register for the same scope completes.
registerPromise =
navigator.serviceWorker.register(good_script, {scope: scope});
// In order to test that the above register does not complete
// we will perform a register() on a different scope. The
// assumption here is that the previous register call would
// have completed in the same timeframe if it was able to do
// so.
return navigator.serviceWorker.register(good_script,
{scope: other_scope});
})
.then(function(registration) {
.then(function(swr) {
return swr.unregister();
})
.then(function() {
assert_equals(registration.installing.scriptURL,
normalizeURL(bad_script));
registration.installing.postMessage('STOP_WAITING');
return registerPromise;
})
.then(function(swr) {
assert_equals(registration.installing.scriptURL,
normalizeURL(good_script));
return wait_for_state(t, registration.installing, 'activated');

View File

@ -1,3 +1,12 @@
var waitUntilResolve;
self.addEventListener('install', function(event) {
event.waitUntil(new Promise(function() {}));
event.waitUntil(new Promise(function(resolve) {
waitUntilResolve = resolve;
}));
});
self.addEventListener('message', function(event) {
if (event.data === 'STOP_WAITING') {
waitUntilResolve();
}
});