Fixed post-merge test failures
This commit is contained in:
@@ -2066,7 +2066,10 @@ getJasmineRequireObj().Env = function(j$) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function callerCallerFilename() {
|
function callerCallerFilename() {
|
||||||
return new j$.StackTrace(new Error()).frames[3].file;
|
const frames = new j$.StackTrace(new Error()).frames;
|
||||||
|
// frames[3] should always exist except in Jasmine's own tests, which bypass
|
||||||
|
// the global it/describe layer, but don't crash if it doesn't.
|
||||||
|
return frames[3] && frames[3].file;
|
||||||
}
|
}
|
||||||
|
|
||||||
return Env;
|
return Env;
|
||||||
|
|||||||
@@ -195,7 +195,7 @@ describe('SuiteBuilder', function() {
|
|||||||
duration: null,
|
duration: null,
|
||||||
properties: null,
|
properties: null,
|
||||||
parentSuiteId: null,
|
parentSuiteId: null,
|
||||||
filename: undefined,
|
filename: undefined
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -931,7 +931,10 @@ getJasmineRequireObj().Env = function(j$) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function callerCallerFilename() {
|
function callerCallerFilename() {
|
||||||
return new j$.StackTrace(new Error()).frames[3].file;
|
const frames = new j$.StackTrace(new Error()).frames;
|
||||||
|
// frames[3] should always exist except in Jasmine's own tests, which bypass
|
||||||
|
// the global it/describe layer, but don't crash if it doesn't.
|
||||||
|
return frames[3] && frames[3].file;
|
||||||
}
|
}
|
||||||
|
|
||||||
return Env;
|
return Env;
|
||||||
|
|||||||
Reference in New Issue
Block a user