mqtt over websocket on different path

lib/server.js

@@ -609,10 +609,17 @@ Server.prototype.close = function(callback) {
  *
  * @api public
  * @param {HttpServer} server
+ * @param {String} path
  */
-Server.prototype.attachHttpServer = function(server) {
+Server.prototype.attachHttpServer = function(server, path) {
   var that = this;
-  ws.createServer({ server: server }, function(stream) {
+
+  var opt = { server: server };
+  if (path) {
+    opt.path = path;
+  }
+
+  ws.createServer(opt, function(stream) {
     var conn = new Connection(stream);
     new Client(conn, that);
   });

test/abstract_server.js

@@ -41,9 +41,9 @@ module.exports = function(moscaSettings, createConnection) {
     });
 
     function finish () {
-      client.removeListener('error', finish)
-      client.stream.removeListener('close', finish)
-      done()
+      client.removeListener('error', finish);
+      client.stream.removeListener('close', finish);
+      done();
     }
   }
 

test/server.js

@@ -174,7 +174,7 @@ describe("mosca.Server", function() {
     // Simulate a situation that it takes same time to do authorizeSubscribe.
     this.instance.authorizeSubscribe = function(client, topic, callback) {
       setTimeout(function(){
-        callback(null, true)
+        callback(null, true);
       }, 300);
     };