mirror of
https://github.com/servo/servo.git
synced 2025-09-16 01:48:22 +01:00
Update web-platform-tests to revision e1942ace5be3a3962f204e630e9969acd70e3952
This commit is contained in:
parent
e6cf68704e
commit
69d6c85949
108 changed files with 3217 additions and 530 deletions
|
@ -1,29 +1,19 @@
|
|||
self.onmessage = function (evt) {
|
||||
if (evt.data == "xhr") {
|
||||
var xhr = new XMLHttpRequest();
|
||||
xhr.open("GET", "synthesized-response.txt", true);
|
||||
xhr.responseType = "text";
|
||||
xhr.send();
|
||||
xhr.onload = function (evt) {
|
||||
postMessage(xhr.responseText);
|
||||
};
|
||||
xhr.onerror = function() {
|
||||
postMessage("XHR failed!");
|
||||
};
|
||||
} else if (evt.data == "fetch") {
|
||||
fetch("synthesized-response.txt")
|
||||
.then(function(response) {
|
||||
return response.text();
|
||||
})
|
||||
.then(function(data) {
|
||||
postMessage(data);
|
||||
})
|
||||
.catch(function(error) {
|
||||
postMessage("Fetch failed!");
|
||||
});
|
||||
} else if (evt.data == "importScripts") {
|
||||
importScripts("synthesized-response.js");
|
||||
} else {
|
||||
throw "Unexpected message! " + evt.data;
|
||||
}
|
||||
self.onmessage = evt => {
|
||||
if (evt.data == "xhr") {
|
||||
const xhr = new XMLHttpRequest();
|
||||
xhr.open("GET", "synthesized-response.txt", true);
|
||||
xhr.responseType = "text";
|
||||
xhr.send();
|
||||
xhr.onload = evt => postMessage(xhr.responseText);
|
||||
xhr.onerror = () => postMessage("XHR failed!");
|
||||
} else if (evt.data == "fetch") {
|
||||
fetch("synthesized-response.txt")
|
||||
.then(response => response.text())
|
||||
.then(data => postMessage(data))
|
||||
.catch(error => postMessage("Fetch failed!"));
|
||||
} else if (evt.data == "importScripts") {
|
||||
importScripts("synthesized-response.js");
|
||||
} else {
|
||||
postMessage("Unexpected message! " + evt.data);
|
||||
}
|
||||
};
|
||||
|
|
|
@ -1,55 +1,51 @@
|
|||
<script src="/common/get-host-info.sub.js"></script>
|
||||
<script src="/resources/testharness.js"></script>
|
||||
<script src="test-helpers.sub.js?pipe=sub"></script>
|
||||
<script>
|
||||
var host_info = get_host_info();
|
||||
|
||||
function boilerplate_test(url, msg) {
|
||||
return new Promise(function(resolve, reject) {
|
||||
var worker = new Worker(url);
|
||||
worker.onmessage = function(e) { resolve(e.data) };
|
||||
worker.onerror = function(e) { reject(e) };
|
||||
worker.postMessage(msg);
|
||||
})
|
||||
.then(function(data) {
|
||||
assert_equals(data, "This load was successfully intercepted.");
|
||||
});
|
||||
async function boilerplate_test(url, msg) {
|
||||
const worker = new Worker(url);
|
||||
const data = await new Promise((resolve, reject) => {
|
||||
worker.onmessage = e => resolve(e.data);
|
||||
worker.onerror = e =>reject(e);
|
||||
worker.postMessage(msg);
|
||||
});
|
||||
assert_equals(data, "This load was successfully intercepted.");
|
||||
}
|
||||
|
||||
function xhr_test() {
|
||||
return boilerplate_test("load_worker.js", "xhr");
|
||||
return boilerplate_test("load_worker.js", "xhr");
|
||||
}
|
||||
|
||||
function fetch_test() {
|
||||
return boilerplate_test("load_worker.js", "fetch");
|
||||
return boilerplate_test("load_worker.js", "fetch");
|
||||
}
|
||||
|
||||
function importScripts_test() {
|
||||
return boilerplate_test("load_worker.js", "importScripts");
|
||||
return boilerplate_test("load_worker.js", "importScripts");
|
||||
}
|
||||
|
||||
function nested_worker_xhr_test() {
|
||||
return boilerplate_test("nested_load_worker.js", "xhr");
|
||||
return boilerplate_test("nested_load_worker.js", "xhr");
|
||||
}
|
||||
|
||||
function nested_worker_fetch_test() {
|
||||
return boilerplate_test("nested_load_worker.js", "fetch");
|
||||
return boilerplate_test("nested_load_worker.js", "fetch");
|
||||
}
|
||||
|
||||
function nested_worker_importScripts_test() {
|
||||
return boilerplate_test("nested_load_worker.js", "importScripts");
|
||||
return boilerplate_test("nested_load_worker.js", "importScripts");
|
||||
}
|
||||
|
||||
window.addEventListener('message', function(evt) {
|
||||
var port = evt.ports[0];
|
||||
xhr_test()
|
||||
window.addEventListener('message', evt => {
|
||||
const port = evt.ports[0];
|
||||
xhr_test()
|
||||
.then(fetch_test)
|
||||
.then(importScripts_test)
|
||||
.then(nested_worker_xhr_test)
|
||||
.then(nested_worker_fetch_test)
|
||||
.then(nested_worker_importScripts_test)
|
||||
.then(function() { port.postMessage({results: 'finish'}); })
|
||||
.catch(function(e) { port.postMessage({results: 'failure:' + e}); });
|
||||
});
|
||||
.then(() => port.postMessage({results: 'finish'}))
|
||||
.catch(e => port.postMessage({results: 'failure:' + e}));
|
||||
});
|
||||
|
||||
</script>
|
||||
|
|
|
@ -5,131 +5,81 @@
|
|||
<script src="resources/test-helpers.sub.js"></script>
|
||||
<body>
|
||||
<script>
|
||||
promise_test(function(t) {
|
||||
var worker_url = 'resources/dummy-synthesized-worker.js';
|
||||
var service_worker = 'resources/dummy-worker-interceptor.js';
|
||||
var scope = worker_url;
|
||||
|
||||
return service_worker_unregister_and_register(t, service_worker, scope)
|
||||
.then(function(r) {
|
||||
t.add_cleanup(function() {
|
||||
return service_worker_unregister(t, scope);
|
||||
});
|
||||
async function setup_service_worker(t, script_url, scope) {
|
||||
const r =
|
||||
await service_worker_unregister_and_register(t, script_url, scope);
|
||||
t.add_cleanup(() => service_worker_unregister(t, scope));
|
||||
await wait_for_state(t, r.installing, 'activated');
|
||||
}
|
||||
|
||||
return wait_for_state(t, r.installing, 'activated');
|
||||
})
|
||||
.then(function() {
|
||||
return new Promise(function(resolve, reject) {
|
||||
var w = new Worker(worker_url);
|
||||
w.onmessage = function(e) {
|
||||
resolve(e.data);
|
||||
}
|
||||
promise_test(async t => {
|
||||
const worker_url = 'resources/dummy-synthesized-worker.js';
|
||||
const service_worker = 'resources/dummy-worker-interceptor.js';
|
||||
const scope = worker_url;
|
||||
|
||||
w.onerror = function(e) {
|
||||
reject(e.message);
|
||||
}
|
||||
});
|
||||
})
|
||||
.then(function(data) {
|
||||
assert_equals(data, 'worker loading intercepted by service worker');
|
||||
});
|
||||
}, 'Verify worker script from uncontrolled document is intercepted by Service Worker');
|
||||
await setup_service_worker(t, service_worker, scope);
|
||||
const w = new Worker(worker_url);
|
||||
const data = await new Promise((resolve, reject) => {
|
||||
w.onmessage = e => resolve(e.data);
|
||||
w.onerror = e => reject(e.message);
|
||||
});
|
||||
assert_equals(data, 'worker loading intercepted by service worker');
|
||||
}, 'Verify worker script from uncontrolled document is intercepted by ' +
|
||||
'Service Worker');
|
||||
|
||||
promise_test(function(t) {
|
||||
var worker_url = 'resources/dummy-same-origin-worker.js';
|
||||
var service_worker = 'resources/dummy-worker-interceptor.js';
|
||||
var scope = worker_url;
|
||||
promise_test(async t => {
|
||||
const worker_url = 'resources/dummy-same-origin-worker.js';
|
||||
const service_worker = 'resources/dummy-worker-interceptor.js';
|
||||
const scope = worker_url;
|
||||
|
||||
return service_worker_unregister_and_register(t, service_worker, scope)
|
||||
.then(function(r) {
|
||||
t.add_cleanup(function() {
|
||||
return service_worker_unregister(t, scope);
|
||||
});
|
||||
await setup_service_worker(t, service_worker, scope);
|
||||
const w = new Worker(worker_url);
|
||||
const data = await new Promise((resolve, reject) => {
|
||||
w.onmessage = e => resolve(e.data);
|
||||
w.onerror = e => reject(e.message);
|
||||
});
|
||||
assert_equals(data, 'dummy-worker-script loaded');
|
||||
}, 'Verify worker script intercepted by same-origin response succeeds');
|
||||
|
||||
return wait_for_state(t, r.installing, 'activated');
|
||||
})
|
||||
.then(function() {
|
||||
return new Promise(function(resolve, reject) {
|
||||
var w = new Worker(worker_url);
|
||||
w.onmessage = function(e) {
|
||||
resolve(e.data);
|
||||
}
|
||||
promise_test(async t => {
|
||||
const worker_url = 'resources/dummy-cors-worker.js';
|
||||
const service_worker = 'resources/dummy-worker-interceptor.js';
|
||||
const scope = worker_url;
|
||||
|
||||
w.onerror = function(e) {
|
||||
reject(e.message);
|
||||
}
|
||||
});
|
||||
})
|
||||
.then(function(data) {
|
||||
assert_equals(data, 'dummy-worker-script loaded');
|
||||
});
|
||||
}, 'Verify worker script intercepted by same-origin response succeeds');
|
||||
await setup_service_worker(t, service_worker, scope);
|
||||
const w = new Worker(worker_url);
|
||||
const watcher = new EventWatcher(t, w, ['message', 'error']);
|
||||
await watcher.wait_for('error');
|
||||
}, 'Verify worker script intercepted by cors response fails');
|
||||
|
||||
promise_test(function(t) {
|
||||
var worker_url = 'resources/dummy-cors-worker.js';
|
||||
var service_worker = 'resources/dummy-worker-interceptor.js';
|
||||
var scope = worker_url;
|
||||
promise_test(async t => {
|
||||
const worker_url = 'resources/dummy-no-cors-worker.js';
|
||||
const service_worker = 'resources/dummy-worker-interceptor.js';
|
||||
const scope = worker_url;
|
||||
|
||||
return service_worker_unregister_and_register(t, service_worker, scope)
|
||||
.then(function(r) {
|
||||
return wait_for_state(t, r.installing, 'activated');
|
||||
})
|
||||
.then(function() {
|
||||
var w = new Worker(worker_url);
|
||||
var watcher = new EventWatcher(t, w, ['message', 'error']);
|
||||
return watcher.wait_for('error');
|
||||
});
|
||||
}, 'Verify worker script intercepted by cors response fails');
|
||||
await setup_service_worker(t, service_worker, scope);
|
||||
const w = new Worker(worker_url);
|
||||
const watcher = new EventWatcher(t, w, ['message', 'error']);
|
||||
await watcher.wait_for('error');
|
||||
}, 'Verify worker script intercepted by no-cors cross-origin response fails');
|
||||
|
||||
promise_test(function(t) {
|
||||
var worker_url = 'resources/dummy-no-cors-worker.js';
|
||||
var service_worker = 'resources/dummy-worker-interceptor.js';
|
||||
var scope = worker_url;
|
||||
promise_test(async t => {
|
||||
const subdoc_url = 'resources/worker-interception-iframe.https.html?bypass';
|
||||
const service_worker = 'resources/worker-load-interceptor.js';
|
||||
const scope = 'resources/';
|
||||
|
||||
return service_worker_unregister_and_register(t, service_worker, scope)
|
||||
.then(function(r) {
|
||||
t.add_cleanup(function() {
|
||||
return service_worker_unregister(t, scope);
|
||||
});
|
||||
|
||||
return wait_for_state(t, r.installing, 'activated');
|
||||
})
|
||||
.then(function() {
|
||||
var w = new Worker(worker_url);
|
||||
var watcher = new EventWatcher(t, w, ['message', 'error']);
|
||||
return watcher.wait_for('error');
|
||||
});
|
||||
}, 'Verify worker script intercepted by no-cors cross-origin response fails');
|
||||
|
||||
promise_test(function(t) {
|
||||
var subdoc_url = 'resources/worker-interception-iframe.https.html?bypass';
|
||||
var service_worker = 'resources/worker-load-interceptor.js';
|
||||
var scope = 'resources/';
|
||||
|
||||
return service_worker_unregister_and_register(t, service_worker, scope)
|
||||
.then(function(r) {
|
||||
t.add_cleanup(function() {
|
||||
return service_worker_unregister(t, scope);
|
||||
});
|
||||
|
||||
return wait_for_state(t, r.installing, 'activated');
|
||||
})
|
||||
.then(function() { return with_iframe(subdoc_url); })
|
||||
.then(function(frame) {
|
||||
return new Promise(function(resolve, reject) {
|
||||
var channel = new MessageChannel();
|
||||
channel.port1.onmessage = function(e) {
|
||||
frame.remove();
|
||||
resolve(e.data);
|
||||
}
|
||||
|
||||
frame.contentWindow.postMessage("GO", "*", [channel.port2]);
|
||||
});
|
||||
})
|
||||
.then(function(data) {
|
||||
assert_equals(data.results, 'finish');
|
||||
});
|
||||
}, 'Verify worker loads from controlled document are intercepted by Service Worker');
|
||||
await setup_service_worker(t, service_worker, scope);
|
||||
const frame = await with_iframe(subdoc_url);
|
||||
t.add_cleanup(() => frame.remove());
|
||||
const data = await new Promise((resolve, reject) => {
|
||||
const channel = new MessageChannel();
|
||||
channel.port1.onmessage = e => resolve(e.data);
|
||||
frame.contentWindow.postMessage("GO", "*", [channel.port2]);
|
||||
});
|
||||
assert_equals(data.results, 'finish');
|
||||
}, 'Verify worker loads from controlled document are intercepted by Service ' +
|
||||
'Worker');
|
||||
|
||||
</script>
|
||||
</body>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue