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

Set jasmineGlobal correctly in GJS

Browse Source 
In GJS, jasmineGlobal was not getting set to the global object; when
importing jasmine.js in GJS, "this" resolves to the jasmine.js module
object, not the global object. Solve this specifically for GJS by
assuming that `window.toString === '[object GjsGlobal]'` only in GJS; if
this is the case, assign "window" to "jasmineGlobal".

Adding a "var" to the declaration of "getJasmineRequireObj" is also
necessary, or else "getJasmineRequireObj" won't be exported in the
Jasmine module.

See #751
This commit is contained in:
Philip Chimento
2015-01-19 22:34:54 -08:00
parent ebbaab4cf9
commit ebaa2e7f24
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/core/requireCore.js
View File

@@ -1,10 +1,13 @@
getJasmineRequireObj = (function (jasmineGlobal) { var getJasmineRequireObj = (function (jasmineGlobal) {
var jasmineRequire; var jasmineRequire;
if (typeof module !== 'undefined' && module.exports) { if (typeof module !== 'undefined' && module.exports) {
jasmineGlobal = global; jasmineGlobal = global;
jasmineRequire = exports; jasmineRequire = exports;
} else { } else {
if (typeof window !== 'undefined' && typeof window.toString === 'function' && window.toString() === '[object GjsGlobal]') {
jasmineGlobal = window;
}
jasmineRequire = jasmineGlobal.jasmineRequire = jasmineGlobal.jasmineRequire || {}; jasmineRequire = jasmineGlobal.jasmineRequire = jasmineGlobal.jasmineRequire || {};
} }