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

2021-12-07 17:03:40 -08:00
parent b8dabf96ff ce7460d8d4
commit 75e3e14861
5 changed files with 35 additions and 4 deletions
--- a/src/core/StackTrace.js
+++ b/src/core/StackTrace.js
@@ -36,7 +36,7 @@ getJasmineRequireObj().StackTrace = function(j$) {
    // e.g. "run@http://localhost:8888/__jasmine__/jasmine.js:4320:27"
    // or "http://localhost:8888/__jasmine__/jasmine.js:4320:27"
    {
-      re: /^(([^@\s]+)@)?([^\s]+)$/,
+      re: /^(?:(([^@\s]+)@)|@)?([^\s]+)$/,
      fnIx: 2,
      fileLineColIx: 3,
      style: 'webkit'