All tests working

Srinaath Ravichandran · Srinaath Ravichandran · commit d989a4358f51 · 2020-08-21T16:35:50.000-07:00
Signed-off-by: Srinaath Ravichandran &lt;srravich@microsoft.com&gt;
diff --git a/packages/app/main/src/server/routes/channel/conversations/handlers/replyToActivity.spec.ts b/packages/app/main/src/server/routes/channel/conversations/handlers/replyToActivity.spec.ts
@@ -42,13 +42,17 @@ jest.mock('../../../../utils/oauthLinkEncoder', () => ({
   }),
 }));
 
-jest.mock('../../../../webSocketServer', () => ({
-  WebSocketServer: {
-    getSocketByConversationId: () => ({
-      send: jest.fn(),
-    }),
-  },
-}));
+const mockSocket = {
+  send: jest.fn(),
+};
+
+jest.mock('../../../../webSocketServer', () => {
+  return {
+    WebSocketServer: {
+      sendToSubscribers: (...args) => mockSocket.send(...args),
+    },
+  };
+});
 
 describe('replyToActivity route middleware', () => {
   const mockReq: any = {
diff --git a/packages/app/main/src/server/routes/channel/conversations/handlers/sendActivityToConversation.spec.ts b/packages/app/main/src/server/routes/channel/conversations/handlers/sendActivityToConversation.spec.ts
@@ -35,13 +35,17 @@ import * as HttpStatus from 'http-status-codes';
 
 import { sendActivityToConversation } from './sendActivityToConversation';
 
-jest.mock('../../../../webSocketServer', () => ({
-  WebSocketServer: {
-    getSocketByConversationId: () => ({
-      send: jest.fn(),
-    }),
-  },
-}));
+const mockSocket = {
+  send: jest.fn(),
+};
+
+jest.mock('../../../../webSocketServer', () => {
+  return {
+    WebSocketServer: {
+      sendToSubscribers: (...args) => mockSocket.send(...args),
+    },
+  };
+});
 
 const mockSendErrorResponse = jest.fn();
 jest.mock('../../../../utils/sendErrorResponse', () => ({
diff --git a/packages/app/main/src/server/routes/directLine/handlers/postActivity.spec.ts b/packages/app/main/src/server/routes/directLine/handlers/postActivity.spec.ts
@@ -43,11 +43,14 @@ jest.mock('../../../utils/sendErrorResponse', () => ({
 const mockSocket = {
   send: jest.fn(),
 };
-jest.mock('../../../webSocketServer', () => ({
-  WebSocketServer: {
-    getSocketByConversationId: () => mockSocket,
-  },
-}));
+
+jest.mock('../../../webSocketServer', () => {
+  return {
+    WebSocketServer: {
+      sendToSubscribers: (...args) => mockSocket.send(...args),
+    },
+  };
+});
 
 describe('postActivity handler', () => {
   beforeEach(() => {
@@ -56,14 +59,16 @@ describe('postActivity handler', () => {
   });
 
   it('should return a 200 and the id of the posted activity', async () => {
+    const activity = {
+      id: 'activity1',
+    };
+
     const mockEmulatorServer: any = {
       logger: {
         logMessage: jest.fn(),
       },
     };
-    const activity = {
-      id: 'activity1',
-    };
+
     const req: any = {
       body: activity,
       conversation: {
@@ -72,6 +77,7 @@ describe('postActivity handler', () => {
           response: {},
           statusCode: HttpStatus.OK,
         }),
+        conversationId: 'convo1',
       },
       params: {
         conversationId: 'convo1',
@@ -88,11 +94,7 @@ describe('postActivity handler', () => {
     expect(res.send).toHaveBeenCalledWith(HttpStatus.OK, activity);
     expect(res.end).toHaveBeenCalled();
     expect(next).toHaveBeenCalled();
-    expect(mockSocket.send).toHaveBeenCalledWith(
-      JSON.stringify({
-        activities: [{ ...req.body, id: 'activity1' }],
-      })
-    );
+    expect(mockSocket.send).toHaveBeenCalledWith(req.params.conversationId, activity);
   });
 
   it('should return a 200 but not send the /INSPECT open command over the web socket', async () => {
diff --git a/packages/app/main/src/server/routes/emulator/handlers/feedActivitiesAsTranscript.spec.ts b/packages/app/main/src/server/routes/emulator/handlers/feedActivitiesAsTranscript.spec.ts
@@ -38,11 +38,14 @@ import { createFeedActivitiesAsTranscriptHandler } from './feedActivitiesAsTrans
 const mockSocket = {
   send: jest.fn(),
 };
-jest.mock('../../../webSocketServer', () => ({
-  WebSocketServer: {
-    getSocketByConversationId: () => mockSocket,
-  },
-}));
+
+jest.mock('../../../webSocketServer', () => {
+  return {
+    WebSocketServer: {
+      sendToSubscribers: (...args) => mockSocket.send(...args),
+    },
+  };
+});
 
 describe('feedActivitiesAsTranscript handler', () => {
   it('should send a 200 after sending all activities over the web socket connection', () => {
