Merge branch 'orbitet push origin master:orbiteleven-master'

jameslnewell · Dec 1, 2015 · b150177 · b150177
2 parents 8d7300a + d09e939
commit b150177
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/index.js b/index.js
@@ -1,4 +1,4 @@
-
+var window              = require('global');
 var MockXMLHttpRequest  = require('./lib/MockXMLHttpRequest');
 var real                = window.XMLHttpRequest;
 var mock                = MockXMLHttpRequest;
@@ -85,4 +85,4 @@ module.exports = {
 		return this.mock('PUT', url, fn);
 	}
 
-};
+};
diff --git a/lib/MockRequest.js b/lib/MockRequest.js
@@ -74,4 +74,4 @@ MockRequest.prototype.body = function(body) {
   }
 };
 
-module.exports = MockRequest;
+module.exports = MockRequest;
diff --git a/lib/MockXMLHttpRequest.js b/lib/MockXMLHttpRequest.js
@@ -134,7 +134,7 @@ MockXMLHttpRequest.prototype.send = function(data) {
 
   self.readyState = MockXMLHttpRequest.STATE_LOADING;
 
-  self._sendTimeout = window.setTimeout(function() {
+  self._sendTimeout = setTimeout(function() {
 
     var response = MockXMLHttpRequest.handle(new MockRequest(self));
 
@@ -145,7 +145,7 @@ MockXMLHttpRequest.prototype.send = function(data) {
       if (timeout) {
 
         //trigger a timeout event because the request timed out - wait for the timeout time because many libs like jquery and superagent use setTimeout to detect the error type
-        self._sendTimeout = window.setTimeout(function() {
+        self._sendTimeout = setTimeout(function() {
           self.readyState = MockXMLHttpRequest.STATE_DONE;
           self.trigger('timeout');
         }, typeof(timeout) === 'number' ? timeout : self.timeout+1);
@@ -178,7 +178,7 @@ MockXMLHttpRequest.prototype.send = function(data) {
 };
 
 MockXMLHttpRequest.prototype.abort = function() {
-  window.clearTimeout(this._sendTimeout);
+  clearTimeout(this._sendTimeout);
 
   if (this.readyState > MockXMLHttpRequest.STATE_UNSENT && this.readyState < MockXMLHttpRequest.STATE_DONE) {
     this.readyState = MockXMLHttpRequest.STATE_UNSENT;

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "xhr-mock",
-  "version": "1.4.1",
+  "version": "1.5.0",
   "description": "Utility for mocking XMLHttpRequests in the browser.",
   "keywords": [
     "mock",
@@ -20,6 +20,7 @@
   },
   "devDependencies": {
     "browserify": "^11.0.1",
+    "global": "^4.3.0",
     "mochify": "^2.13.0",
     "superagent": "^1.3.0"
   },
@@ -29,4 +30,3 @@
   },
   "license": "MIT"
 }
-
diff --git a/test/index.js b/test/index.js
@@ -1,3 +1,4 @@
+var window  = require('global');
 var assert  = require('assert');
 var mock    = require('..');
-Original file line number
+Diff line change
@@ Expand Up / @@ -74,4 +74,4 @@ MockRequest.prototype.body = function(body) { @@
       }
     };
-    module.exports = MockRequest;
+    module.exports = MockRequest;