fix eslint

streamr-dev · Oct 7, 2018 · 2965a4f · 2965a4f
1 parent 8dec85c
commit 2965a4f
Show file tree

Hide file tree

Showing 6 changed files with 47 additions and 41 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -1,7 +1,7 @@
 module.exports = exports = {
     extends: 'streamr',
     env: {
-        mocha: true,
+        jest: true,
     },
     rules: {
         'no-plusplus': ["error", { "allowForLoopAfterthoughts": true }],

diff --git a/package.json b/package.json
@@ -13,6 +13,7 @@
   "scripts": {
     "build": "NODE_ENV=production webpack",
     "dev": "webpack --progress --colors --watch",
+    "eslint": "eslint src/** test/**",
     "test": "jest",
     "test-unit": "jest test/unit",
     "test-integration": "jest test/integration"

diff --git a/src/Connection.js b/src/Connection.js
@@ -30,47 +30,46 @@ class Connection extends EventEmitter {
             return Promise.reject(new Error('Already connecting!'))
         } else if (this.state === Connection.State.CONNECTED) {
             return Promise.reject(new Error('Already connected!'))
-        } else {
-            this.socket = this.socket || new WebSocket(this.options.url)
-            this.socket.binaryType = 'arraybuffer'
-            this.socket.events = new EventEmitter()
-            this.socket.onopen = () => this.socket.events.emit('open')
-            this.socket.onclose = () => this.socket.events.emit('close')
-
-            this.updateState(Connection.State.CONNECTING)
-
-            this.socket.events.on('open', () => {
-                debug('Connected to ', this.options.url)
-                this.updateState(Connection.State.CONNECTED)
-            })
+        }
+        this.socket = this.socket || new WebSocket(this.options.url)
+        this.socket.binaryType = 'arraybuffer'
+        this.socket.events = new EventEmitter()
+        this.socket.onopen = () => this.socket.events.emit('open')
+        this.socket.onclose = () => this.socket.events.emit('close')
 
-            this.socket.events.on('close', () => {
-                if (this.state !== Connection.State.DISCONNECTING) {
-                    debug('Connection lost. Attempting to reconnect')
-                    setTimeout(() => {
-                        this.connect()
-                    }, 2000)
-                }
+        this.updateState(Connection.State.CONNECTING)
 
-                this.updateState(Connection.State.DISCONNECTED)
-            })
+        this.socket.events.on('open', () => {
+            debug('Connected to ', this.options.url)
+            this.updateState(Connection.State.CONNECTED)
+        })
 
-            this.socket.onmessage = (messageEvent) => {
-                try {
-                    const decodedWrapper = decodeBrowserWrapper(messageEvent.data)
-                    const decodedMessage = decodeMessage(decodedWrapper.type, decodedWrapper.msg)
-                    this.emit(decodedWrapper.type, decodedMessage, decodedWrapper.subId)
-                } catch (err) {
-                    this.emit('error', err)
-                }
+        this.socket.events.on('close', () => {
+            if (this.state !== Connection.State.DISCONNECTING) {
+                debug('Connection lost. Attempting to reconnect')
+                setTimeout(() => {
+                    this.connect()
+                }, 2000)
             }
 
-            return new Promise((resolve) => {
-                this.socket.events.once('open', () => {
-                    resolve()
-                })
-            })
+            this.updateState(Connection.State.DISCONNECTED)
+        })
+
+        this.socket.onmessage = (messageEvent) => {
+            try {
+                const decodedWrapper = decodeBrowserWrapper(messageEvent.data)
+                const decodedMessage = decodeMessage(decodedWrapper.type, decodedWrapper.msg)
+                this.emit(decodedWrapper.type, decodedMessage, decodedWrapper.subId)
+            } catch (err) {
+                this.emit('error', err)
+            }
         }
+
+        return new Promise((resolve) => {
+            this.socket.events.once('open', () => {
+                resolve()
+            })
+        })
     }
 
     disconnect() {

diff --git a/test/mocha.opts b/test/mocha.opts
diff --git a/test/unit/Connection.test.js b/test/unit/Connection.test.js
@@ -145,7 +145,11 @@ describe('Connection', () => {
             })
             conn.socket.onmessage({
                 data: JSON.stringify([0, 0, '',
-                    [28, 'L9xDhrevS_CE3_OA6pLVuQ', 0, 1538926879033, 0, 3445690152, 3445690148, 27, '{"t":"p","id":437.0,"lat":60.16314,"lng":24.908923,"color":"rgba(233, 87, 15, 1.0)"}']]),
+                    [28, 'L9xDhrevS_CE3_OA6pLVuQ', 0, 1538926879033, 0,
+                        3445690152, 3445690148, 27,
+                        JSON.stringify({
+                            t: 'p', id: 437.0, lat: 60.16314, lng: 24.908923, color: 'rgba(233, 87, 15, 1.0)',
+                        })]]),
             })
         })
 

diff --git a/test/unit/StreamrClient.test.js b/test/unit/StreamrClient.test.js
@@ -90,7 +90,12 @@ describe('StreamrClient', () => {
 
         c.send = (msgToSend) => {
             const next = c.expectedMessagesToSend.shift()
-            assert.deepEqual(msgToSend, next, `Sending unexpected message: ${JSON.stringify(msgToSend)}. Expected: ${JSON.stringify(next)}, Queue: ${JSON.stringify(c.expectedMessagesToSend)}`)
+            assert.deepEqual(
+                msgToSend, next,
+                `Sending unexpected message: ${JSON.stringify(msgToSend)}
+                Expected: ${JSON.stringify(next)}
+                Queue: ${JSON.stringify(c.expectedMessagesToSend)}`,
+            )
         }
 
         c.expect = (msgToExpect) => {