Added extra assertion in tests.

microsoft · Mar 16, 2020 · 0632e1a · 0632e1a
1 parent 074dd4b
commit 0632e1a
Show file tree

Hide file tree

Showing 2 changed files with 77 additions and 4 deletions.
diff --git a/packages/app/client/src/state/sagas/botSagas.spec.ts b/packages/app/client/src/state/sagas/botSagas.spec.ts
@@ -200,7 +200,7 @@ describe('The botSagas', () => {
     expect(putNotification.value).toEqual(put(errorNotification));
   });
 
-  it('should open a bot via url', () => {
+  it('should open a bot via url with the custom user ID', () => {
     const mockAction: any = {
       payload: {
         endpoint: 'http://localhost:3978/api/messages',
@@ -213,13 +213,86 @@ describe('The botSagas', () => {
     const gen = BotSagas.openBotViaUrl(mockAction);
     gen.next();
     gen.next('userId'); // select custom user GUID
-    gen.next('http://localhost:52673'); // select server url
+
+    // select server url
+    expect(gen.next('http://localhost:52673').value).toEqual(
+      call([ConversationService, ConversationService.startConversation], 'http://localhost:52673', {
+        botUrl: mockAction.payload.endpoint,
+        channelServiceType: mockAction.payload.channelService,
+        members: [{ id: 'userId', name: 'User', role: 'user' }],
+        mode: mockAction.payload.mode,
+        msaAppId: mockAction.payload.appId,
+        msaPassword: mockAction.payload.appPassword,
+      })
+    );
 
     const mockStartConvoResponse = {
       json: async () => undefined,
       ok: true,
     };
-    gen.next(mockStartConvoResponse); // startConversation
+
+    // startConversation
+    gen.next(mockStartConvoResponse);
+    gen.next({
+      conversationId: 'someConvoId',
+      endpointId: 'someEndpointId',
+      members: [],
+    }); //res.json()
+
+    let next = gen.next(); // bootstrapChat()
+
+    const putOpenValue = next.value;
+    expect(putOpenValue).toEqual(
+      put(
+        openEditorDocument({
+          contentType: SharedConstants.ContentTypes.CONTENT_TYPE_LIVE_CHAT,
+          documentId: 'someConvoId',
+          isGlobal: false,
+        })
+      )
+    );
+    gen.next(); // put open()
+
+    gen.next({ ok: true }); // sendInitialLogReport()
+    next = gen.next({ ok: true }); // sendInitialActivity()
+
+    const callValue = next.value;
+    expect(callValue).toEqual(
+      call(
+        [commandService, commandService.remoteCall],
+        SharedConstants.Commands.Settings.SaveBotUrl,
+        'http://localhost:3978/api/messages'
+      )
+    );
+    expect(gen.next().done).toBe(true);
+  });
+
+  it('should open a bot via url with a newly generated user GUID', () => {
+    const mockAction: any = {
+      payload: {
+        endpoint: 'http://localhost:3978/api/messages',
+        channelService: 'public',
+        mode: 'livechat',
+        appId: 'someAppId',
+        appPassword: 'someAppPw',
+      },
+    };
+    const gen = BotSagas.openBotViaUrl(mockAction);
+    gen.next();
+    gen.next(''); // select custom user GUID (force generation of new GUID)
+
+    // select server url
+    const startConversationCall = gen.next('http://localhost:52673').value;
+    const startConversationPayload = startConversationCall.CALL.args[1];
+    expect(startConversationPayload.members[0].id.length).toBeGreaterThan(0);
+
+    const mockStartConvoResponse = {
+      json: async () => undefined,
+      ok: true,
+    };
+
+    // startConversation
+    gen.next(mockStartConvoResponse);
     gen.next({
       conversationId: 'someConvoId',
       endpointId: 'someEndpointId',

diff --git a/packages/app/client/src/state/sagas/botSagas.ts b/packages/app/client/src/state/sagas/botSagas.ts
@@ -111,7 +111,7 @@ export class BotSagas {
       msaAppId: action.payload.appId,
       msaPassword: action.payload.appPassword,
     };
-    let res: Response = yield ConversationService.startConversation(serverUrl, payload);
+    let res: Response = yield call([ConversationService, ConversationService.startConversation], serverUrl, payload);
     if (!res.ok) {
       yield* throwErrorFromResponse('Error occurred while starting a new conversation', res);
     }