mirror of
https://github.com/servo/servo.git
synced 2025-10-01 17:19:16 +01:00
Auto merge of #13419 - Coder206:swPromise, r=jdm
ServiceWorkerContainer::Promise <!-- Please describe your changes on the following line: --> <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [x] These changes fix #13409 (github issue number if applicable). <!-- Either: --> - [ ] There are tests for these changes <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/13419) <!-- Reviewable:end -->
This commit is contained in:
commit
0d46c7c708
4 changed files with 83 additions and 51 deletions
|
@ -14,39 +14,39 @@ test(function (){
|
|||
assert_true('serviceWorker' in navigator);
|
||||
}, "Test: Asserts ServiceWorkerContainer in Navigator");
|
||||
|
||||
test(function() {
|
||||
var sw_reg = register_sw('sw.js');
|
||||
assert_class_string(sw_reg, "ServiceWorkerRegistration");
|
||||
assert_class_string(sw_reg.active, "ServiceWorker");
|
||||
assert_class_string(navigator.serviceWorker.controller, "ServiceWorker");
|
||||
promise_test(function() {
|
||||
return register_sw('sw.js').then(function(sw_reg) {
|
||||
assert_class_string(sw_reg, "ServiceWorkerRegistration");
|
||||
assert_class_string(sw_reg.active, "ServiceWorker");
|
||||
assert_class_string(navigator.serviceWorker.controller, "ServiceWorker");
|
||||
});
|
||||
}, "Test: Asserts Active Service Worker and its Registration");
|
||||
|
||||
test(function() {
|
||||
var sw_reg = register_sw('resources/sw.js', './');
|
||||
assert_equals(sw_reg.scope, location.href.replace("service-worker-registration.html", ""));
|
||||
promise_test(function() {
|
||||
return register_sw('resources/sw.js', './').then(function(sw_reg) {
|
||||
assert_equals(sw_reg.scope, location.href.replace("service-worker-registration.html", ""));
|
||||
});
|
||||
}, "Test: Service Worker Registration property scope Url when no scope");
|
||||
|
||||
test(function() {
|
||||
var sw_reg = register_sw('resources/sw.js', '/some/nested/cache/directory');
|
||||
var expected_scope_url = location.protocol + '//' + location.host + '/some/nested/cache/directory';
|
||||
assert_equals(sw_reg.scope, expected_scope_url);
|
||||
promise_test(function() {
|
||||
return register_sw('resources/sw.js', '/some/nested/cache/directory').then(function(sw_reg) {
|
||||
var expected_scope_url = location.protocol + '//' + location.host + '/some/nested/cache/directory';
|
||||
assert_equals(sw_reg.scope, expected_scope_url);
|
||||
});
|
||||
}, "Test: Service Worker Registration property scope when provided a scope");
|
||||
|
||||
test(function () {
|
||||
assert_throws(new TypeError(),
|
||||
function() { var sw_reg = register_sw('./in%5Csome%5fdir/sw.js'); },
|
||||
"Invalid URL Path");
|
||||
promise_test(function (p) {
|
||||
promise_rejects(p, new TypeError(), register_sw('./in%5Csome%5fdir/sw.js'));
|
||||
}, "Test: Throws Error when Invalid Url Path");
|
||||
|
||||
test(function () {
|
||||
assert_throws(new TypeError(),
|
||||
function() { var sw_reg = register_sw('sw.js', './mal%5fformed/sco%5Cpe/'); },
|
||||
"Invalid URL Path");
|
||||
promise_test(function (p) {
|
||||
return promise_rejects(p, new TypeError(), register_sw('sw.js', './mal%5fformed/sco%5Cpe/'));
|
||||
}, "Test: Throws Error when Invalid Scope");
|
||||
|
||||
test(function() {
|
||||
var sw_reg = register_sw('resources/sw.js');
|
||||
assert_equals(sw_reg.active.scriptURL, location.href.replace("service-worker-registration.html", "resources/sw.js"));
|
||||
promise_test(function() {
|
||||
return register_sw('resources/sw.js').then(function(sw_reg) {
|
||||
assert_equals(sw_reg.active.scriptURL, location.href.replace("service-worker-registration.html", "resources/sw.js"));
|
||||
});
|
||||
}, "Test: Active Service Worker ScriptURL property");
|
||||
|
||||
</script>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue