summaryrefslogtreecommitdiffstats
path: root/dom/security
diff options
context:
space:
mode:
authorjanekptacijarabaci <janekptacijarabaci@seznam.cz>2018-04-04 21:36:41 +0200
committerjanekptacijarabaci <janekptacijarabaci@seznam.cz>2018-04-04 21:36:41 +0200
commit9f7f0f1172d67ab29e4f72eb1b34ab6f4bb231b1 (patch)
treed97bd3b77a6ee48cbaab34ab929aff7df4befd64 /dom/security
parentaea1fd640e01b5e36fb5e9f435681d8d4501d6f5 (diff)
downloadUXP-9f7f0f1172d67ab29e4f72eb1b34ab6f4bb231b1.tar
UXP-9f7f0f1172d67ab29e4f72eb1b34ab6f4bb231b1.tar.gz
UXP-9f7f0f1172d67ab29e4f72eb1b34ab6f4bb231b1.tar.lz
UXP-9f7f0f1172d67ab29e4f72eb1b34ab6f4bb231b1.tar.xz
UXP-9f7f0f1172d67ab29e4f72eb1b34ab6f4bb231b1.zip
Bug 1288768 - Better error reporting for network errors in workers
Diffstat (limited to 'dom/security')
-rw-r--r--dom/security/test/csp/file_child-src_worker-redirect.html7
-rw-r--r--dom/security/test/general/test_block_script_wrong_mime.html6
2 files changed, 2 insertions, 11 deletions
diff --git a/dom/security/test/csp/file_child-src_worker-redirect.html b/dom/security/test/csp/file_child-src_worker-redirect.html
index 188f173b8..b0029935c 100644
--- a/dom/security/test/csp/file_child-src_worker-redirect.html
+++ b/dom/security/test/csp/file_child-src_worker-redirect.html
@@ -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();
};
diff --git a/dom/security/test/general/test_block_script_wrong_mime.html b/dom/security/test/general/test_block_script_wrong_mime.html
index f4da9c577..34d4b621b 100644
--- a/dom/security/test/general/test_block_script_wrong_mime.html
+++ b/dom/security/test/general/test_block_script_wrong_mime.html
@@ -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();
}