wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-09-09 01:08:39 +09:00
Code Issues Projects Releases Packages Wiki Activity

Bug 1288768 - Better error reporting for network errors in workers

Browse source
This commit is contained in:
janekptacijarabaci 2018-04-04 21:36:41 +02:00 • committed by Roy Tam
commit 6509b677d3
8 changed files with 7 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

7
dom/security/test/csp/file_child-src_worker-redirect.html
View file

@ -23,11 +23,8 @@
);
worker.onerror = function(error) {
var msg = error.message;
if (msg.match(/^NetworkError/) || msg.match(/Failed to load worker script/)) {
// this means CSP blocked it
msg = "blocked";
}
// this means CSP blocked it
var msg = !("message" in error) ? "blocked" : e.message;
window.parent.postMessage({id:page_id, message:msg}, 'http://mochi.test:8888');
error.preventDefault();
};

6
dom/security/test/general/test_block_script_wrong_mime.html
View file

@ -53,9 +53,6 @@ function testWorker([mime, shouldLoad]) {
};
worker.onerror = (error) => {
ok(!shouldLoad, `worker with wrong mime '${mime}' should be blocked`);
let msg = error.message;
ok(msg.match(/^NetworkError/) || msg.match(/Failed to load worker script/),
"should gets correct error message");
error.preventDefault();
resolve();
}
@ -74,9 +71,6 @@ function testWorkerImportScripts([mime, shouldLoad]) {
};
worker.onerror = (error) => {
ok(!shouldLoad, `worker/importScripts with wrong mime '${mime}' should be blocked`);
let msg = error.message;
ok(msg.match(/^NetworkError/) || msg.match(/Failed to load worker script/),
"should gets correct error message");
error.preventDefault();
resolve();
}

1
dom/workers/test/test_404.html
View file

@ -25,7 +25,6 @@ Tests of DOM Worker Threads
worker.onerror = function(event) {
is(event.target, worker);
is(event.message, 'NetworkError: Failed to load worker script at "nonexistent_worker.js"');
event.preventDefault();
SimpleTest.finish();
};

1
dom/workers/test/test_bug1036484.html
View file

@ -25,7 +25,6 @@ function test(script) {
worker.onerror = function(event) {
is(event.target, worker);
ok(event.message.startsWith("NetworkError: Failed to load worker script"))
event.preventDefault();
runTests();
};

8
dom/workers/test/test_loadError.html
View file

@ -13,15 +13,13 @@
<script class="testbody" type="text/javascript">
"use strict";
var loadErrorMessage = 'SecurityError: Failed to load worker script at "about:blank"';
function nextTest() {
(function(){
function workerfunc() {
var subworker = new Worker("about:blank");
subworker.onerror = function(e) {
e.preventDefault();
postMessage(e.message);
postMessage("ERROR");
}
}
var b = new Blob([workerfunc+'workerfunc();']);
@ -37,7 +35,7 @@ function nextTest() {
return;
}
w.onmessage = function(e) {
is(e.data, loadErrorMessage,
is(e.data, "ERROR",
"Should catch the error when loading inner script");
if (++i < 2) callworker(i);
else SimpleTest.finish();
@ -54,8 +52,6 @@ try {
var worker = new Worker("about:blank");
worker.onerror = function(e) {
e.preventDefault();
is(e.message, loadErrorMessage,
"Should get the right error from the toplevel script");
nextTest();
}

2
testing/web-platform/tests/workers/Worker_cross_origin_security_err.htm
View file

@ -8,7 +8,7 @@ async_test(function(t) {
try {
var w = new Worker("ftp://example.org/support/WorkerBasic.js");
w.onerror = t.step_func_done(function(e) {
assert_true(e instanceof ErrorEvent);
assert_true(e instanceof Event);
});
} catch (e) {
t.step_func_done(function(e) { assert_true(true); });

2
testing/web-platform/tests/workers/constructors/SharedWorker/same-origin.html
View file

@ -16,7 +16,7 @@ function testSharedWorkerHelper(t, script) {
try {
var worker = new SharedWorker(script, '');
worker.onerror = t.step_func_done(function(e) {
assert_true(e instanceof ErrorEvent);
assert_true(e instanceof Event);
});
} catch (e) {
t.step_func_done(function(e) { assert_true(true); });

2
testing/web-platform/tests/workers/constructors/Worker/same-origin.html
View file

@ -14,7 +14,7 @@ function testSharedWorkerHelper(t, script) {
try {
var worker = new SharedWorker(script, '');
worker.onerror = t.step_func_done(function(e) {
assert_true(e instanceof ErrorEvent);
assert_true(e instanceof Event);
});
} catch (e) {
t.step_func_done(function(e) { assert_true(true); });