From 6d92c1add38e3bf1b57bd599c8517445238678f1 Mon Sep 17 00:00:00 2001
From: Jerko Steiner <jerko.steiner@nyumc.org>
Date: Wed, 7 Nov 2018 10:36:13 +0100
Subject: [PATCH] Fix broken tests after update

---
 __mocks__/simple-peer.js                      |  2 +-
 src/client/__tests__/App-test.js              |  1 +
 src/client/__tests__/middlewares-test.js      | 11 +++++++
 src/client/__tests__/store-test.js            | 11 -------
 .../actions/__tests__/CallActions-test.js     | 32 ++++++++-----------
 src/client/components/__tests__/Video-test.js |  2 +-
 src/server/__tests__/socket-test.js           | 12 +++----
 7 files changed, 33 insertions(+), 38 deletions(-)
 create mode 100644 src/client/__tests__/middlewares-test.js
 delete mode 100644 src/client/__tests__/store-test.js

diff --git a/__mocks__/simple-peer.js b/__mocks__/simple-peer.js
index 482f4e6..00345a1 100644
--- a/__mocks__/simple-peer.js
+++ b/__mocks__/simple-peer.js
@@ -1,5 +1,5 @@
 import EventEmitter from 'events'
-const Peer = jest.genMockFunction().mockImplementation(() => {
+const Peer = jest.fn().mockImplementation(() => {
   let peer = new EventEmitter()
   peer.destroy = jest.fn()
   peer.signal = jest.fn()
diff --git a/src/client/__tests__/App-test.js b/src/client/__tests__/App-test.js
index 036e5df..eed8939 100644
--- a/src/client/__tests__/App-test.js
+++ b/src/client/__tests__/App-test.js
@@ -22,6 +22,7 @@ describe('App', () => {
   beforeEach(() => {
     init.mockReturnValue(initAction)
     state = reducers()
+    window.HTMLMediaElement.prototype.play = jest.fn()
   })
 
   let component, node, store
diff --git a/src/client/__tests__/middlewares-test.js b/src/client/__tests__/middlewares-test.js
new file mode 100644
index 0000000..cd03f76
--- /dev/null
+++ b/src/client/__tests__/middlewares-test.js
@@ -0,0 +1,11 @@
+import logger from 'redux-logger'
+import { create } from '../middlewares.js'
+
+describe('store', () => {
+
+  it('should load logger middleware', () => {
+    expect(create(true)).toContain(logger)
+    expect(create(false)).not.toContain(logger)
+  })
+
+})
diff --git a/src/client/__tests__/store-test.js b/src/client/__tests__/store-test.js
deleted file mode 100644
index c16b309..0000000
--- a/src/client/__tests__/store-test.js
+++ /dev/null
@@ -1,11 +0,0 @@
-window.localStorage = { log: true }
-import logger from 'redux-logger'
-const store = require('../store.js')
-
-describe('store', () => {
-
-  it('should load logger middleware', () => {
-    expect(store.middlewares.some(m => m === logger)).toBeTruthy()
-  })
-
-})
diff --git a/src/client/actions/__tests__/CallActions-test.js b/src/client/actions/__tests__/CallActions-test.js
index 7b4fd34..21da683 100644
--- a/src/client/actions/__tests__/CallActions-test.js
+++ b/src/client/actions/__tests__/CallActions-test.js
@@ -27,7 +27,7 @@ describe('reducers/alerts', () => {
 
   describe('init', () => {
 
-    it('calls handshake.init when connected & got camera stream', done => {
+    it('calls handshake.init when connected & got camera stream', async () => {
       const promise = store.dispatch(CallActions.init())
       socket.emit('connect')
       expect(store.getActions()).toEqual([{
@@ -40,18 +40,16 @@ describe('reducers/alerts', () => {
           type: 'warning'
         }
       }])
-      promise.then(() => {
-        expect(SocketActions.handshake.mock.calls).toEqual([[{
-          socket,
-          roomName: callId,
-          stream: getUserMedia.stream
-        }]])
-      })
-      .then(done)
-      .catch(done.fail)
+      await promise
+      expect(SocketActions.handshake.mock.calls).toEqual([[{
+        socket,
+        roomName: callId,
+        stream: getUserMedia.stream
+      }]])
     })
 
-    it('calls dispatches disconnect message on disconnect', done => {
+    it('calls dispatches disconnect message on disconnect', async () => {
+
       const promise = store.dispatch(CallActions.init())
       socket.emit('connect')
       socket.emit('disconnect')
@@ -72,19 +70,15 @@ describe('reducers/alerts', () => {
           type: 'error'
         }
       }])
-      promise.then(done).catch(done.fail)
+      await promise
     })
 
-    it('dispatches alert when failed to get media stream', done => {
+    it('dispatches alert when failed to get media stream', async () => {
       getUserMedia.fail(true)
       const promise = store.dispatch(CallActions.init())
       socket.emit('connect')
-      promise
-      .then(result => {
-        expect(result.value).toBe(null)
-        done()
-      })
-      .catch(done.fail)
+      const result = await promise
+      expect(result.value).toBe(null)
     })
 
   })
diff --git a/src/client/components/__tests__/Video-test.js b/src/client/components/__tests__/Video-test.js
index 9047362..074f6f5 100644
--- a/src/client/components/__tests__/Video-test.js
+++ b/src/client/components/__tests__/Video-test.js
@@ -54,7 +54,7 @@ describe('components/Video', () => {
         component.setState({
           stream: { url: 'test', mediaStream }
         })
-        expect(video.refs.video.src).toBe('test')
+        expect(video.refs.video.src).toBe('http://localhost/test')
         component.setState({
           stream: { url: 'test', mediaStream }
         })
diff --git a/src/server/__tests__/socket-test.js b/src/server/__tests__/socket-test.js
index 5b30a9e..04de632 100644
--- a/src/server/__tests__/socket-test.js
+++ b/src/server/__tests__/socket-test.js
@@ -8,14 +8,14 @@ describe('server/socket', () => {
   beforeEach(() => {
     socket = new EventEmitter()
     socket.id = 'socket0'
-    socket.join = jest.genMockFunction()
-    socket.leave = jest.genMockFunction()
+    socket.join = jest.fn()
+    socket.leave = jest.fn()
     rooms = {}
 
     io = {}
-    io.in = io.to = jest.genMockFunction().mockImplementation(room => {
+    io.in = io.to = jest.fn().mockImplementation(room => {
       return (rooms[room] = rooms[room] || {
-        emit: jest.genMockFunction()
+        emit: jest.fn()
       })
     })
 
@@ -39,8 +39,8 @@ describe('server/socket', () => {
       }
     }
 
-    socket.leave = jest.genMockFunction()
-    socket.join = jest.genMockFunction()
+    socket.leave = jest.fn()
+    socket.join = jest.fn()
   })
 
   it('should be a function', () => {