feathersjs · daffl · Jun 3, 2014 · Jun 3, 2014 · Jun 3, 2014
diff --git a/lib/providers/socket/socketio.js b/lib/providers/socket/socketio.js
@@ -25,10 +25,10 @@ module.exports = function (config) {
         // The info object we can pass to commons.setupEventHandler
         var info = {
           emitters: function() {
-            return io.sockets.clients();
+            return io.sockets.sockets;
              },
           params: function(socket) {
-            return socket.handshake.feathers;
+            return socket.feathers;
           },
           method: 'emit'
         };
@@ -37,7 +37,7 @@ module.exports = function (config) {
         io.sockets.on('connection', function (socket) {
           _.each(self.services, function (service, path) {
             _.each(self.methods, function (method) {
-              commons.setupMethodHandler(socket, socket.handshake.feathers, service, path, method);
+              commons.setupMethodHandler(socket, socket.feathers || {}, service, path, method);
             });
           });
         });

diff --git a/package.json b/package.json
@@ -40,7 +40,7 @@
     "primus": "^2.2.1",
     "primus-emitter": "^3.0.2",
     "rubberduck": "^1.0.0",
-    "socket.io": "^0.9.0",
+    "socket.io": "^1.0.0",
     "uberproto": "^1.1.0"
   },
   "devDependencies": {
@@ -53,6 +53,8 @@
     "mocha": "^1.x",
     "q": "^1.0.1",
     "request": "^2.x",
-    "socket.io-client": "^0.9.0"
+    "socket.io-client": "^1.0.0",
+    "sockjs": "^0.3.9",
+    "sockjs-client-node": "^0.1.1"
   }
 }
diff --git a/test/application.test.js b/test/application.test.js
@@ -75,9 +75,7 @@ describe('Feathers application', function () {
 
     var app = feathers()
       .configure(feathers.rest())
-      .configure(feathers.socketio(function(io) {
-        io.set('log level', 0);
-      })).use('/todo', todoService);
+      .configure(feathers.socketio()).use('/todo', todoService);
     var server = app.listen(6999).on('listening', function () {
       console.log = oldlog;
 
@@ -151,9 +149,7 @@ describe('Feathers application', function () {
     console.log = function () {};
     var app = feathers()
       .configure(feathers.rest())
-      .configure(feathers.socketio(function(io) {
-        io.set('log level', 0);
-      })).use('/secureTodos', todoService);
+      .configure(feathers.socketio()).use('/secureTodos', todoService);
 
     var httpsServer = https.createServer({
       key: fs.readFileSync(__dirname + '/resources/privatekey.pem'),
@@ -182,7 +178,8 @@ describe('Feathers application', function () {
           assert.equal(data.description, 'You have to do laundry!');
 
           socket.disconnect();
-          httpsServer.close(done);
+          httpsServer.close();
+          done();
         });
       });
     });

diff --git a/test/providers/primus.test.js b/test/providers/primus.test.js
@@ -12,13 +12,13 @@ describe('Primus provider', function () {
   var server, socket, app,
     socketParams = {
       user: { name: 'David' },
-      provider: 'socketio'
+      provider: 'sockjs'
     };
 
   before(function () {
     app = feathers()
       .configure(feathers.primus({
-        transformer: 'socket.io'
+        transformer: 'sockjs'
       }, function(primus) {
         socket = new primus.Socket('http://localhost:7888');
 
@@ -33,7 +33,7 @@ describe('Primus provider', function () {
   });
 
   after(function (done) {
-    socket.socket.disconnect();
+    socket.socket.close();
     server.close(done);
   });
 
@@ -64,7 +64,7 @@ describe('Primus provider', function () {
     };
 
     service.remove = function(id, params) {
-      assert.equal(params.provider, 'socketio', 'Handshake parameters have priority');
+      assert.equal(params.provider, 'sockjs', 'Handshake parameters have priority');
       old.remove.apply(this, arguments);
     };
 

diff --git a/test/providers/socketio.test.js b/test/providers/socketio.test.js
@@ -24,10 +24,9 @@ describe('SocketIO provider', function () {
 
     app = feathers()
       .configure(feathers.socketio(function(io) {
-        io.set('log level', 0);
-        io.set('authorization', function (handshake, callback) {
-          handshake.feathers = socketParams;
-          callback(null, true);
+        io.use(function (socket, next) {
+          socket.feathers = socketParams;
+          next();
         });
       }))
       .use('todo', todoService);