Fix bug re-initing Node (#114)

-Check against resolved node name when looking for valid re-init calls
-Adds new tests for calling initNode multiple times.

Author: chris-smith

src/index.js

@@ -90,11 +90,11 @@ let Rosnodejs = {
     names.init(remappings, namespace);
 
     if (ThisNode.node !== null) {
-      if (nodeName === ThisNode.getNodeName()) {
+      if (resolvedName === ThisNode.getNodeName()) {
         return Promise.resolve(this.getNodeHandle());
       }
       // else
-      return Promise.reject( Error('Unable to initialize node [' + nodeName + '] - node ['
+      return Promise.reject( Error('Unable to initialize node [' + resolvedName + '] - node ['
                       + ThisNode.getNodeName() + '] already exists'));
     }
 

test/namespaceTest.js

@@ -229,18 +229,37 @@ describe('Namespace', function () {
       });
     });
 
-    it('__ns', function(done) {
+    it('__ns', function() {
       this.slow(500);
 
       const remappedNs = 'customNs';
       setRemapArg(remapUtils.SPECIAL_KEYS.ns, remappedNs);
 
       const nodeName = 'node_name';
-      rosnodejs.initNode(nodeName, { rosMasterUri })
+      return rosnodejs.initNode(nodeName, { rosMasterUri })
       .then(() => {
         expect(rosnodejs.nh.getNodeName()).to.equal(`/${remappedNs}/${nodeName}`);
 
-        done();
+        // make sure re-initing the same node still works
+        return rosnodejs.initNode(nodeName, { rosMasterUri })
+        .then(() => {
+          expect(rosnodejs.nh.getNodeName()).to.equal(`/${remappedNs}/${nodeName}`);
+        });
+      });
+    });
+
+    it('Re-init Without Remapping', function() {
+      this.slow(500);
+      const nodeName = 'node_name';
+      return rosnodejs.initNode(nodeName, { rosMasterUri })
+      .then(() => {
+        expect(rosnodejs.nh.getNodeName()).to.equal(`/${nodeName}`);
+
+        // make sure re-initing the same node still works
+        return rosnodejs.initNode(nodeName, { rosMasterUri })
+        .then(() => {
+          expect(rosnodejs.nh.getNodeName()).to.equal(`/${nodeName}`);
+        });
       });
     });