[CORE-1394] Streamr Client: Type Error (#14)

* Add null checking when modifying the subscription

* Remove babel from mocha and fix tests

Author: aapzu

package.json

@@ -14,9 +14,9 @@
     "build": "webpack --env dev && webpack --env prod && npm run test",
     "dev": "webpack --progress --colors --watch --env dev",
     "test": "npm run test-unit && npm run test-integration",
-    "test:watch": "mocha --require babel-core/register --colors -w --recursive ./test",
-    "test-unit": "mocha --require babel-core/register --colors --recursive ./test/unit",
-    "test-integration": "mocha --require babel-core/register --colors --recursive ./test/integration"
+    "test:watch": "mocha -w ./test",
+    "test-unit": "mocha ./test/unit",
+    "test-integration": "mocha ./test/integration"
   },
   "browser": {
     "ws": "./src/shim/ws.js",

src/StreamrClient.js

@@ -195,7 +195,9 @@ module.exports = class StreamrClient extends EventEmitter {
                 this.handleError(`Error subscribing to ${response.stream}: ${response.error}`)
             } else {
                 const subs = this.subsByStream[response.stream]
-                delete subs.subscribing
+                if (subs && typeof subs === 'object') {
+                    delete subs.subscribing
+                }
 
                 debug('Client subscribed: %o', response)
 
@@ -276,7 +278,9 @@ module.exports = class StreamrClient extends EventEmitter {
             Object.keys(this.subsByStream)
                 .forEach((streamId) => {
                     const subs = this.subsByStream[streamId]
-                    delete subs.subscribing
+                    if (subs && typeof subs === 'object') {
+                        delete subs.subscribing
+                    }
                     subs.forEach((sub) => {
                         sub.setState(Subscription.State.unsubscribed)
                     })

test/mocha.opts

@@ -0,0 +1,2 @@
+--colors
+--recursive

test/unit/StreamrClient.spec.js

@@ -146,7 +146,8 @@ describe('StreamrClient', () => {
     before(() => {
         mockery.enable()
 
-        mockery.registerMock('ws', (uri, opts) => {
+        // Must return a function since it's called with new
+        mockery.registerMock('ws', function(uri, opts) {
             wsMockCalls++
 
             // Create new sockets for subsequent calls