From /$SYS to $SYS.

Closes #94.
moscajs · Feb 18, 2014 · 9e3cf37 · 9e3cf37
1 parent 5daf777
commit 9e3cf37
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/lib/stats.js b/lib/stats.js
@@ -123,7 +123,7 @@ Stats.prototype.wire = function wire(server) {
 
   function doPublish(topic, value) {
     server.publish({
-      topic: "/$SYS/" + server.id + "/" + topic,
+      topic: "$SYS/" + server.id + "/" + topic,
       payload: "" + value
     });
   }

diff --git a/test/abstract_server.js b/test/abstract_server.js
@@ -1596,10 +1596,10 @@ module.exports = function(moscaSettings, createConnection) {
     buildTest("/test//topic", "/test//topic");
     buildTest("/test/+/topic", "/test//topic", false);
     buildTest("#", "$SYS/hello", false);
-    buildTest("/#", "/$SYS/hello", false);
-    buildTest("/+/hello", "/$SYS/hello", false);
+    buildTest("/#", "$SYS/hello", false);
+    buildTest("/+/hello", "$SYS/hello", false);
+    buildTest("$SYS/hello", "$SYS/hello");
     buildTest("$SYS/hello", "$SYS/hello");
-    buildTest("/$SYS/hello", "/$SYS/hello");
   });
 
   it("should allow plugin authors to publish", function(done) {
@@ -1698,7 +1698,7 @@ module.exports = function(moscaSettings, createConnection) {
 
     it("should publish data each minute", function(done) {
       buildAndConnect(done, function(client1) {
-        var topic = "/$SYS/" + instance.id + "/connectedClients";
+        var topic = "$SYS/" + instance.id + "/connectedClients";
         instance.ascoltatore.subscribe(topic, function(topic, value) {
           expect(value).to.eql("1");
           client1.disconnect();

diff --git a/test/stats_spec.js b/test/stats_spec.js
@@ -51,7 +51,7 @@ describe("mosca.Stats", function() {
       server.emit("clientConnected");
 
       server.on("testPublished", function(packet) {
-        if (packet.topic === "/$SYS/42/connectedClients") {
+        if (packet.topic === "$SYS/42/connectedClients") {
           expect(packet.payload).to.eql("2");
           done();
         }
@@ -84,7 +84,7 @@ describe("mosca.Stats", function() {
       server.emit("published");
 
       server.on("testPublished", function(packet) {
-        if (packet.topic === "/$SYS/42/publishedMessages") {
+        if (packet.topic === "$SYS/42/publishedMessages") {
           expect(packet.payload).to.eql("3");
           done();
         }
@@ -134,7 +134,7 @@ describe("mosca.Stats", function() {
             var count = 0;
 
             server.on("testPublished", function(packet) {
-              if (packet.topic === "/$SYS/42/load/15m/" + events[event]) {
+              if (packet.topic === "$SYS/42/load/15m/" + events[event]) {
                 count++;
 
                 if (++count % 15 === 0) {
@@ -178,7 +178,7 @@ describe("mosca.Stats", function() {
             server.emit(event);
 
             server.on("testPublished", function(packet) {
-              if (packet.topic === "/$SYS/42/load/1m/" + events[event]) {
+              if (packet.topic === "$SYS/42/load/1m/" + events[event]) {
                 expect(packet.payload).to.eql("2");
                 done();
               }
@@ -219,7 +219,7 @@ describe("mosca.Stats", function() {
 
         server.on("testPublished", function(packet) {
           var mem = process.memoryUsage();
-          if (packet.topic === "/$SYS/42/memory/" + event) {
+          if (packet.topic === "$SYS/42/memory/" + event) {
             expect(packet.payload).to.eql("" + mem[event]);
             done();
           }