Fix tests in IE < 10 (WebSocket not supported)

socketio · Jan 3, 2016 · 9c44967 · 9c44967
1 parent 298250c
commit 9c44967
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/transports/websocket.js b/lib/transports/websocket.js
@@ -16,7 +16,7 @@ var BrowserWebSocket = global.WebSocket || global.MozWebSocket;
  * exposed by `ws` for Node environment.
  */
 
-var WebSocket = BrowserWebSocket || require('ws');
+var WebSocket = BrowserWebSocket || (typeof window !== 'undefined' ? null : require('ws'));
 
 /**
  * Module exports.

diff --git a/test/support/env.js b/test/support/env.js
@@ -3,7 +3,7 @@
 // support in browsers and in node.js
 // some tests do not yet work in both
 exports.browser = !!global.window;
-exports.wsSupport = !!((global.window && (window.WebSocket || window.MozWebSocket)) || require('ws'));
+exports.wsSupport = !!(!global.window || window.WebSocket || window.MozWebSocket);
 
 var userAgent = global.navigator ? navigator.userAgent : '';
 exports.isOldSimulator = ~userAgent.indexOf('iPhone OS 4') || ~userAgent.indexOf('iPhone OS 5');