diff --git a/spec/helpers/nodeDefineJasmineUnderTest.js b/spec/helpers/nodeDefineJasmineUnderTest.js index 7e4021a9..fd51c24a 100644 --- a/spec/helpers/nodeDefineJasmineUnderTest.js +++ b/spec/helpers/nodeDefineJasmineUnderTest.js @@ -16,7 +16,9 @@ return path.join(__dirname, '../../', 'src/', file); }); - const files = src_files.flatMap(g => glob.sync(g)); + const files = src_files.flatMap(g => + glob.sync(g, { windowsPathsNoEscape: true }) + ); files.forEach(function(resolvedFile) { require(resolvedFile); }); diff --git a/src/core/ClearStack.js b/src/core/ClearStack.js index 3be593c4..23b6da78 100644 --- a/src/core/ClearStack.js +++ b/src/core/ClearStack.js @@ -70,7 +70,9 @@ getJasmineRequireObj().clearStack = function(j$) { const SAFARI = global.navigator && - /^((?!chrome|android).)*safari/i.test(global.navigator.userAgent); + /(^((?!chrome|android).)*safari)|(^((?!chrome|android|firefox).)+$)/i.test( + global.navigator.userAgent + ); if (NODE_JS) { // Unlike browsers, Node doesn't require us to do a periodic setTimeout