always put proxyFixtures on the QUnit object

jakecraige · Nov 4, 2014 · 837100e · 837100e
1 parent ab53e68
commit 837100e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/lib/qunit.js b/lib/qunit.js
@@ -75,8 +75,7 @@ var proxyFixtures = function proxyFixtures(name) {
   });
 };
 
+QUnit.proxyFixtures = proxyFixtures;
 if(typeof module !== 'undefined' && typeof module.exports !== 'undefined') {
   module.exports = proxyFixtures;
-} else {
-  QUnit.proxyFixtures = proxyFixtures;
 }
diff --git a/tests/unit/qunit-test.js b/tests/unit/qunit-test.js
@@ -1,12 +1,13 @@
+// Sinon must be required prior to resetGloals being called. This is because
+// resetGlobals sets the `window` object and sinon will pick it up and think
+// it's in the browser
+var sinon = require('sinon');
+
+resetGlobals();
 var assert        = require('assert');
-var sinon         = require('sinon');
 var proxyFixtures = require('../../lib/qunit');
 
 describe('QUnit Injection', function() {
-  before(function() {
-    resetGlobals();
-  });
-
   describe('calls QUnit lifecycle methods', function() {
     var spy;
     beforeEach(function() {