Fix error reporting within fake XHR server handlers in tests
And fix removal of Bluebird lines from stack traces
This commit is contained in:
parent
38d031ecbe
commit
25f29d92f2
1 changed files with 4 additions and 4 deletions
|
@ -123,10 +123,10 @@ function Reporter(runner) {
|
||||||
|
|
||||||
runner.on('fail', function(test, err){
|
runner.on('fail', function(test, err){
|
||||||
// Remove internal code references
|
// Remove internal code references
|
||||||
err.stack = err.stack.replace(/.+(?:zotero-unit\/|\/Task\.jsm|\/bluebird\.js).+\n?/g, "");
|
err.stack = err.stack.replace(/.+(?:zotero-unit\/|\/Task\.jsm|zotero\/bluebird\/).+\n?/g, "");
|
||||||
|
|
||||||
// Strip "From previous event:" block if it's all internals
|
// Strip "From previous event:" block if it's all internals
|
||||||
if (err.stack.indexOf('From previous event:') != -1) {
|
if (err.stack.includes('From previous event:')) {
|
||||||
err.stack = err.stack
|
err.stack = err.stack
|
||||||
// Drop first line, because it contains the error message
|
// Drop first line, because it contains the error message
|
||||||
.replace(/^.+\n/, '')
|
.replace(/^.+\n/, '')
|
||||||
|
@ -145,8 +145,8 @@ function Reporter(runner) {
|
||||||
// Trigger bell if interactive
|
// Trigger bell if interactive
|
||||||
+ (Zotero.automatedTest ? "" : "\x07")
|
+ (Zotero.automatedTest ? "" : "\x07")
|
||||||
+ " " + test.title + "\n"
|
+ " " + test.title + "\n"
|
||||||
+ indentStr + " " + err.toString() + " at\n"
|
+ indentStr + " " + err.message + " at\n"
|
||||||
+ err.stack.replace(/^/gm, indentStr + " "));
|
+ err.stack.replace(/^/gm, indentStr + " ").trim() + "\n\n");
|
||||||
|
|
||||||
if (ZoteroUnit.bail) {
|
if (ZoteroUnit.bail) {
|
||||||
aborted = true;
|
aborted = true;
|
||||||
|
|
Loading…
Add table
Reference in a new issue