diff --git a/lib/jasmine-core/jasmine.js b/lib/jasmine-core/jasmine.js index 5220ab23..e6b932ef 100644 --- a/lib/jasmine-core/jasmine.js +++ b/lib/jasmine-core/jasmine.js @@ -32,20 +32,10 @@ var getJasmineRequireObj = (function(jasmineGlobal) { module.exports && typeof exports !== 'undefined' ) { - if (typeof global !== 'undefined') { - jasmineGlobal = global; - } else { - jasmineGlobal = {}; - } + // Node jasmineRequire = exports; } else { - if ( - typeof window !== 'undefined' && - typeof window.toString === 'function' && - window.toString() === '[object GjsGlobal]' - ) { - jasmineGlobal = window; - } + // Browser jasmineRequire = jasmineGlobal.jasmineRequire = {}; } @@ -56,7 +46,7 @@ var getJasmineRequireObj = (function(jasmineGlobal) { getJasmineRequire().core = function(jRequire) { const j$ = { private: {} }; - jRequire.base(j$, jasmineGlobal); + jRequire.base(j$, globalThis); j$.private.util = jRequire.util(j$); j$.private.errors = jRequire.errors(); j$.private.formatErrorMsg = jRequire.formatErrorMsg(j$); diff --git a/src/core/requireCore.js b/src/core/requireCore.js index 3eb5f03f..4fbe9abd 100644 --- a/src/core/requireCore.js +++ b/src/core/requireCore.js @@ -8,20 +8,10 @@ var getJasmineRequireObj = (function(jasmineGlobal) { module.exports && typeof exports !== 'undefined' ) { - if (typeof global !== 'undefined') { - jasmineGlobal = global; - } else { - jasmineGlobal = {}; - } + // Node jasmineRequire = exports; } else { - if ( - typeof window !== 'undefined' && - typeof window.toString === 'function' && - window.toString() === '[object GjsGlobal]' - ) { - jasmineGlobal = window; - } + // Browser jasmineRequire = jasmineGlobal.jasmineRequire = {}; } @@ -32,7 +22,7 @@ var getJasmineRequireObj = (function(jasmineGlobal) { getJasmineRequire().core = function(jRequire) { const j$ = { private: {} }; - jRequire.base(j$, jasmineGlobal); + jRequire.base(j$, globalThis); j$.private.util = jRequire.util(j$); j$.private.errors = jRequire.errors(); j$.private.formatErrorMsg = jRequire.formatErrorMsg(j$);