summaryrefslogtreecommitdiffstats
path: root/js/xpconnect/tests/chrome
diff options
context:
space:
mode:
authorjanekptacijarabaci <janekptacijarabaci@seznam.cz>2018-03-17 16:59:17 +0100
committerjanekptacijarabaci <janekptacijarabaci@seznam.cz>2018-03-17 16:59:17 +0100
commit4a4b951bfcf0e0b2323ea94735a1c9db7d08ecd7 (patch)
tree41611e0a309fe5ea4b5a99f18f9770bd3600b9f7 /js/xpconnect/tests/chrome
parent566f1ff8e70f67181fc933a016011f062749170f (diff)
downloadUXP-4a4b951bfcf0e0b2323ea94735a1c9db7d08ecd7.tar
UXP-4a4b951bfcf0e0b2323ea94735a1c9db7d08ecd7.tar.gz
UXP-4a4b951bfcf0e0b2323ea94735a1c9db7d08ecd7.tar.lz
UXP-4a4b951bfcf0e0b2323ea94735a1c9db7d08ecd7.tar.xz
UXP-4a4b951bfcf0e0b2323ea94735a1c9db7d08ecd7.zip
Simplify Error Xray code
Diffstat (limited to 'js/xpconnect/tests/chrome')
-rw-r--r--js/xpconnect/tests/chrome/test_xrayToJS.xul11
1 files changed, 3 insertions, 8 deletions
diff --git a/js/xpconnect/tests/chrome/test_xrayToJS.xul b/js/xpconnect/tests/chrome/test_xrayToJS.xul
index 2f4e70f47..8e6b0f8a4 100644
--- a/js/xpconnect/tests/chrome/test_xrayToJS.xul
+++ b/js/xpconnect/tests/chrome/test_xrayToJS.xul
@@ -220,11 +220,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=933681
// There is no TypedArray constructor, looks like.
is(window.TypedArray, undefined, "If this ever changes, add to this test!");
for (var c of errorObjectClasses) {
- gPrototypeProperties[c] = ["constructor", "name",
- // We don't actually resolve these empty data properties
- // onto the Xray prototypes, but we list them here to make
- // the test happy.
- "lineNumber", "columnNumber", "fileName", "message", "stack"];
+ gPrototypeProperties[c] = ["constructor", "name", "message", "stack"];
gConstructorProperties[c] = constructorProps([]);
}
// toString and toSource only live on the parent proto (Error.prototype).
@@ -791,8 +787,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=933681
// We only invoke testXray with Error, because that function isn't set up
// to deal with dependent classes and fixing it up is more trouble than
// it's worth.
- testXray('Error', new iwin.Error('some error message'), new iwin.Error(),
- ['fileName', 'lineNumber', 'columnNumber', 'message']);
+ testXray('Error', new iwin.Error('some error message'), new iwin.Error());
// Make sure that the dependent classes have their prototypes set up correctly.
for (let c of errorObjectClasses.filter(x => x != "Error")) {
@@ -806,7 +801,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=933681
e.wrappedJSObject[name] = goodReplacement;
is(e[name], goodReplacement, name + " property ok after replacement: " + goodReplacement);
e.wrappedJSObject[name] = faultyReplacement;
- is(e[name], undefined, name + " property censored after suspicious replacement");
+ is(e[name], name == 'message' ? "" : undefined, name + " property skipped after suspicious replacement");
}
testProperty('message', x => x == 'some message', 'some other message', 42);
testProperty('fileName', x => x == '', 'otherFilename.html', new iwin.Object());