Don't assume exports is defined when window is undefined

The current code makes the assumption that if window is undefined it is being run in an environment which supports the CommonJS Modules spec. This is not the case when Jasmine is being run in rhino or SpiderMonkey (smjs) without EnvJS. The fix is simply to check that exports is an object. Signed-off-by: Kevin Locke <kevin@kevinlocke.name>
herval · Jul 19, 2012 · 442f3bf · 442f3bf
1 parent dad4865
commit 442f3bf
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/jasmine-core/jasmine.js b/lib/jasmine-core/jasmine.js
@@ -1,4 +1,4 @@
-var isCommonJS = typeof window == "undefined";
+var isCommonJS = typeof window == "undefined" && typeof exports == "object";
 
 /**
  * Top level namespace for Jasmine, a lightweight JavaScript BDD/spec/testing framework.

diff --git a/src/core/base.js b/src/core/base.js
@@ -1,4 +1,4 @@
-var isCommonJS = typeof window == "undefined";
+var isCommonJS = typeof window == "undefined" && typeof exports == "object";
 
 /**
  * Top level namespace for Jasmine, a lightweight JavaScript BDD/spec/testing framework.