Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-28 04:35:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1265771 P2 Expand navigate-window.https.html wpt test to cover uncontrolled windows. r=bz

Browse Source
This commit is contained in:
Ben Kelly 2016-04-22 00:50:13 -07:00
parent ad90cd164e
commit 9216655d15
1 changed files with 54 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
testing/web-platform/tests/service-workers/service-worker/navigate-window.https.html
View File

@ -29,6 +29,11 @@ function navigate_window(win, url) {
return wait_for_message('LOADED').then(_ => win); return wait_for_message('LOADED').then(_ => win);
} }
function reload_window(win) {
win.location.reload();
return wait_for_message('LOADED').then(_ => win);
}
function go_back(win) { function go_back(win) {
win.history.back(); win.history.back();
return wait_for_message('PAGESHOW').then(_ => win); return wait_for_message('PAGESHOW').then(_ => win);
@ -61,24 +66,39 @@ function validate_window(win, url, opts) {
// opened window in this case. // opened window in this case.
assert_equals(win.navigator.serviceWorker.controller, reg.active, assert_equals(win.navigator.serviceWorker.controller, reg.active,
'window should be controlled by service worker'); 'window should be controlled by service worker');
return get_clients(win, reg.active); return get_clients(win, reg.active, opts);
}) })
.then(resultList => { .then(resultList => {
assert_equals(resultList.length, 1, 'there should only be one client'); // We should always see our controlled window.
assert_equals(resultList[0].url, url, var expected = [
'client should be our opened window'); { url: url, frameType: 'auxiliary' }
assert_equals(resultList[0].frameType, 'auxiliary', ];
'window.open() should create a client with an auxiliary frame type'); // If we are including uncontrolled windows, then we might see the
// test window itself and the test harness.
if (opts.includeUncontrolled) {
expected.push({ url: BASE_URL + 'navigate-window.https.html',
frameType: 'auxiliary' });
expected.push({ url: host_info['HTTPS_ORIGIN'] + '/testharness_runner.html',
frameType: 'top-level' });
}
assert_equals(resultList.length, expected.length,
'expected number of clients');
for (var i = 0; i < resultList.length; ++i) {
assert_equals(resultList[i].url, expected[i].url,
'client should have expected url');
assert_equals(resultList[i].frameType, expected[i].frameType,
' client should have expected frame type');
}
return win; return win;
}) })
} }
async_test(function(t) { promise_test(function(t) {
var worker = BASE_URL + 'resources/navigate-window-worker.js'; var worker = BASE_URL + 'resources/navigate-window-worker.js';
var scope = BASE_URL + 'resources/loaded.html?navigate-window'; var scope = BASE_URL + 'resources/loaded.html?navigate-window-controlled';
var url1 = scope + '&q=1'; var url1 = scope + '&q=1';
var url2 = scope + '&q=2'; var url2 = scope + '&q=2';
service_worker_unregister_and_register(t, worker, scope) return service_worker_unregister_and_register(t, worker, scope)
.then(reg => wait_for_state(t, reg.installing, 'activated') ) .then(reg => wait_for_state(t, reg.installing, 'activated') )
.then(___ => with_window(url1)) .then(___ => with_window(url1))
.then(win => validate_window(win, url1, { includeUncontrolled: false })) .then(win => validate_window(win, url1, { includeUncontrolled: false }))
@ -88,10 +108,34 @@ async_test(function(t) {
.then(win => validate_window(win, url1, { includeUncontrolled: false })) .then(win => validate_window(win, url1, { includeUncontrolled: false }))
.then(win => go_forward(win)) .then(win => go_forward(win))
.then(win => validate_window(win, url2, { includeUncontrolled: false })) .then(win => validate_window(win, url2, { includeUncontrolled: false }))
.then(win => reload_window(win))
.then(win => validate_window(win, url2, { includeUncontrolled: false }))
.then(win => win.close()) .then(win => win.close())
.catch(unreached_rejection(t)) .catch(unreached_rejection(t))
.then(___ => service_worker_unregister_and_done(t, scope)) .then(___ => service_worker_unregister(t, scope))
}, 'Clients.matchAll() should not show an old window as controlled after ' + }, 'Clients.matchAll() should not show an old window as controlled after ' +
'it navigates.'); 'it navigates.');
promise_test(function(t) {
var worker = BASE_URL + 'resources/navigate-window-worker.js';
var scope = BASE_URL + 'resources/loaded.html?navigate-window-uncontrolled';
var url1 = scope + '&q=1';
var url2 = scope + '&q=2';
return service_worker_unregister_and_register(t, worker, scope)
.then(reg => wait_for_state(t, reg.installing, 'activated') )
.then(___ => with_window(url1))
.then(win => validate_window(win, url1, { includeUncontrolled: true }))
.then(win => navigate_window(win, url2))
.then(win => validate_window(win, url2, { includeUncontrolled: true }))
.then(win => go_back(win))
.then(win => validate_window(win, url1, { includeUncontrolled: true }))
.then(win => go_forward(win))
.then(win => validate_window(win, url2, { includeUncontrolled: true }))
.then(win => reload_window(win))
.then(win => validate_window(win, url2, { includeUncontrolled: true }))
.then(win => win.close())
.catch(unreached_rejection(t))
.then(___ => service_worker_unregister(t, scope))
}, 'Clients.matchAll() should not show an old window after it navigates.');
</script> </script>
</body> </body>