Adding tests and fix for websockets in sub-apps

Author: daffl

src/index.js

@@ -10,21 +10,25 @@ export default function(config, configurer) {
   return function() {
     const app = this;
 
-    app.configure(socket);
+    app.configure(socket('primus'));
 
     // Monkey patch app.setup(server)
     Proto.mixin({
       setup(server) {
         debug('Setting up Primus');
 
-        const primus = this.primus = new Primus(server, config);
+        let primus = this.primus;
 
-        primus.use('emitter', Emitter);
+        if(!primus) {
+          primus = this.primus = new Primus(server, config);
 
-        primus.before('feathers', function(req, res, next) {
-          req.feathers = { provider: 'primus' };
-          next();
-        }, 0);
+          primus.use('emitter', Emitter);
+
+          primus.before('feathers', function(req, res, next) {
+            req.feathers = { provider: 'primus' };
+            next();
+          }, 0);
+        }
 
         if (typeof configurer === 'function') {
           debug('Calling Primus configuration function');

test/sub-app.js

@@ -0,0 +1,34 @@
+import feathers from 'feathers';
+import primus from '../src';
+import memory from 'feathers-memory';
+
+function todoService() {
+  return memory().extend({
+    get: function(id, params, callback) {
+      if(params.query.error) {
+        return callback(new Error('Something went wrong'));
+      }
+
+      return this._super(id, params).then(
+        data => Object.assign({ query: params.query }, data)
+      );
+    }
+  });
+}
+
+export default function(callback) {
+  const options = {
+    transformer: 'websockets'
+  };
+  const app = feathers().configure(primus(options, primus => callback(primus)));
+  const v1 = feathers().configure(primus(options)).use('/todos', todoService());
+  const v2 = feathers().configure(primus(options)).use('/todos', todoService());
+
+  app.use('/api/v1', v1);
+  app.use('/api/v2', v2);
+
+  v1.service('todos').create({ text: 'some todo', complete: false }, {}, function() {});
+  v2.service('todos').create({ text: 'some todo', complete: false }, {}, function() {});
+
+  return app;
+}

test/sub-app.test.js

@@ -0,0 +1,34 @@
+import feathers from 'feathers/client';
+import baseTests from 'feathers-commons/lib/test/client';
+
+import server from './sub-app';
+import primus from '../client';
+
+describe('Sub Apps', function() {
+  const app = feathers().configure(primus({}, { timeout: 500 }));
+  const v1Service = app.service('api/v1/todos');
+  const v2Service = app.service('api/v2/todos');
+
+  before(function(done) {
+    this.server = server(primus => {
+      const connection = this.socket = new primus.Socket('http://localhost:14014');
+      v1Service.connection = connection;
+      v2Service.connection = connection;
+    }).listen(14014);
+
+    this.server.on('listening', done);
+  });
+
+  after(function(done) {
+    this.socket.socket.close();
+    this.server.close(done);
+  });
+
+  describe('First Sub App', () => {
+    baseTests(v1Service);
+  });
+
+  describe('Second Sub App', () => {
+    baseTests(v2Service);
+  });
+});