Fix test breakages due to WSS API changes.

tobowers · Dec 5, 2010 · 4dcf657 · 4dcf657
1 parent bf4f9d7
commit 4dcf657
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 7 deletions.
diff --git a/test/test-basic.js b/test/test-basic.js
@@ -3,7 +3,7 @@
 
 var assert = require('assert');
 var WebSocket = require('../lib/websocket').WebSocket;
-var WebSocketServer = require('websocket-server/ws').Server;
+var WebSocketServer = require('websocket-server/ws/server').Server;
 
 var PORT = 1024 + Math.floor(Math.random() * 4096);
 var C_MSG = 'Client test: ' + (Math.random() * 100);
@@ -48,8 +48,7 @@ ws.addListener('data', function(buf) {
     ws.close();
 });
 ws.onmessage = function(m) {
-    assert.equal(m, S_MSG);
-    assert.equal(typeof m, 'string');
+    assert.deepEqual(m, {data : S_MSG});
     clientGotMessage = true;
 };
 

diff --git a/test/test-readonly-attrs.js b/test/test-readonly-attrs.js
@@ -3,7 +3,7 @@
 var assert = require('assert');
 var sys = require('sys');
 var WebSocket = require('../lib/websocket').WebSocket;
-var WebSocketServer = require('websocket-server/ws').Server;
+var WebSocketServer = require('websocket-server/ws/server').Server;
 
 var PORT = 1024 + Math.floor(Math.random() * 4096);
 

diff --git a/test/test-ready-state.js b/test/test-ready-state.js
@@ -2,7 +2,7 @@
 
 var assert = require('assert');
 var WebSocket = require('../lib/websocket').WebSocket;
-var WebSocketServer = require('websocket-server/ws').Server;
+var WebSocketServer = require('websocket-server/ws/server').Server;
 
 var PORT = 1024 + Math.floor(Math.random() * 4096);
 

diff --git a/test/test-unix-send-fd.js b/test/test-unix-send-fd.js
@@ -6,7 +6,7 @@ var fs = require('fs');
 var path = require('path');
 var sys = require('sys');
 var WebSocket = require('../lib/websocket').WebSocket;
-var WebSocketServer = require('websocket-server/ws').Server;
+var WebSocketServer = require('websocket-server/ws/server').Server;
 
 var PATH = path.join(__dirname, 'sock.' + process.pid);
 var C_MSG = 'Client test: ' + (Math.random() * 100);

diff --git a/test/test-unix-sockets.js b/test/test-unix-sockets.js
@@ -5,7 +5,7 @@ var fs = require('fs');
 var path = require('path');
 var sys = require('sys');
 var WebSocket = require('../lib/websocket').WebSocket;
-var WebSocketServer = require('websocket-server/ws').Server;
+var WebSocketServer = require('websocket-server/ws/server').Server;
 
 var PATH = path.join(__dirname, 'sock.' + process.pid);
 var S_MSG = 'Server test: ' + (Math.random() * 100);