admin/jasmine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/safari-15' into 4.0

Browse Source
This commit is contained in:
Steve Gravrock
2021-12-07 17:03:40 -08:00
parent b8dabf96ff ce7460d8d4
commit 75e3e14861
5 changed files with 35 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
spec/core/StackTraceSpec.js
View File

@@ -95,7 +95,7 @@ describe('StackTrace', function() {
]);
});
it('understands Safari/Firefox/Phantom-OS X style traces', function() {
it('understands Safari <=14/Firefox/Phantom-OS X style traces', function() {
var error = {
message: 'nope',
stack:
@@ -122,6 +122,33 @@ describe('StackTrace', function() {
]);
});
it('understands Safari 15 style traces', function() {
var error = {
message: 'nope',
stack:
'@http://localhost:8888/__spec__/core/FooSpec.js:164:24\n' +
'attempt@http://localhost:8888/__jasmine__/jasmine.js:8074:44\n'
};
var result = new jasmineUnderTest.StackTrace(error);
expect(result.message).toBeFalsy();
expect(result.style).toEqual('webkit');
expect(result.frames).toEqual([
{
raw: '@http://localhost:8888/__spec__/core/FooSpec.js:164:24',
func: undefined,
file: 'http://localhost:8888/__spec__/core/FooSpec.js',
line: 164
},
{
raw: 'attempt@http://localhost:8888/__jasmine__/jasmine.js:8074:44',
func: 'attempt',
file: 'http://localhost:8888/__jasmine__/jasmine.js',
line: 8074
}
]);
});
it('does not mistake gibberish for Safari/Firefox/Phantom-OS X style traces', function() {
var error = {
message: 'nope',