Merge pull request #39 from MyPureCloud/gh-7

Fixes #7; adds some test coverage.

Author: djhouseknecht

src/client.ts

@@ -180,8 +180,15 @@ export default class PureCloudWebrtcSdk extends WildEmitter {
   /**
    * Accept a pending session based on the passed in ID.
    * @param id string ID of the pending session
+   * @param opts object with mediaStream and/or audioElement to attach to session
    */
-  public acceptPendingSession (id: string): void {
+  public acceptPendingSession (id: string, opts?: { mediaStream ?: MediaStream, audioElement?: HTMLAudioElement}): void {
+    if (opts && opts.mediaStream) {
+      this.pendingStream = opts.mediaStream;
+    }
+    if (opts && opts.audioElement) {
+      this._pendingAudioElement = opts.audioElement;
+    }
     this._streamingConnection.webrtcSessions.acceptRtcSession(id);
   }
 
@@ -214,7 +221,7 @@ export default class PureCloudWebrtcSdk extends WildEmitter {
       const { body } = await requestApi.call(this, `/conversations/calls/${session.conversationId}`);
       const participant = body.participants
         .find((p: { user?: { id?: string } }) => p.user && p.user.id === this._personDetails.id);
-      return requestApi.call(this, `/conversations/calls/${session.conversationId}/participants/${participant.id}`, {
+      await requestApi.call(this, `/conversations/calls/${session.conversationId}/participants/${participant.id}`, {
         method: 'patch',
         data: JSON.stringify({ state: 'disconnected' })
       });

src/logging.ts

@@ -11,6 +11,7 @@ let APP_VERSION = '[AIV]{version}[/AIV]'; // injected by webpack auto-inject-ver
 
 // check if it was replaced.
 // if it wasn't we're being imported or required from source, so get it from package.json
+/* istanbul ignore next */
 if (APP_VERSION.indexOf('AIV') > -1 &&
   APP_VERSION.indexOf('{version}') > -1 &&
   APP_VERSION.indexOf('/AIV') > -1) {

test/test-utils.ts

@@ -44,6 +44,7 @@ interface MockApiOptions {
   failSecurityCode?: boolean;
   failOrg?: boolean;
   failUser?: boolean;
+  failConversationPatch?: boolean;
   failStreaming?: boolean;
   failLogs?: boolean;
   failLogsPayload?: boolean;
@@ -123,6 +124,7 @@ function mockApis (options: MockApiOptions = {}): MockApiReturns {
     failSecurityCode,
     failOrg,
     failUser,
+    failConversationPatch,
     failStreaming,
     failLogs,
     failLogsPayload,
@@ -177,9 +179,15 @@ function mockApis (options: MockApiOptions = {}): MockApiReturns {
 
   let patchConversation: nock.Scope;
   if (conversationId && participantId) {
-    patchConversation = conversationsApi
-      .patch(`/api/v2/conversations/calls/${conversationId}/participants/${participantId}`)
-      .reply(202, {});
+    if (failConversationPatch) {
+      patchConversation = conversationsApi
+        .patch(`/api/v2/conversations/calls/${conversationId}/participants/${participantId}`)
+        .reply(401);
+    } else {
+      patchConversation = conversationsApi
+        .patch(`/api/v2/conversations/calls/${conversationId}/participants/${participantId}`)
+        .reply(202, {});
+    }
   }
 
   Object.defineProperty(global, 'window', { value: global.window || {}, writable: true });

test/unit/client.test.ts

@@ -284,22 +284,24 @@ describe('Client', () => {
       expect(mockSession.end).not.toHaveBeenCalled();
     });
 
-    // test.serial('requests the conversation then patches the participant to disconnected', async t => {
-    //   const sessionId = random();
-    //   const conversationId = random();
-    //   const participantId = PARTICIPANT_ID;
-    //   const { sdk, getConversation, patchConversation } = mockApis({ conversationId, participantId });
-    //   await sdk.initialize();
-
-    //   const mockSession = { id: sessionId, conversationId, end: sinon.stub() };
-    //   sdk._sessionManager.sessions = {};
-    //   sdk._sessionManager.sessions[sessionId] = mockSession;
-
-    //   await sdk.endSession({ conversationId });
-    //   getConversation.done();
-    //   patchConversation.done();
-    //   sinon.assert.notCalled(mockSession.end);
-    // });
+    test('ends the session directly if patching the conversation fails', async () => {
+      const sessionId = random();
+      const conversationId = random();
+      const participantId = PARTICIPANT_ID;
+      const { sdk, getConversation, patchConversation } = mockApis({ conversationId, participantId, failConversationPatch: true });
+      await sdk.initialize();
+
+      const mockSession = { id: sessionId, conversationId, end: jest.fn() };
+      sdk._sessionManager.sessions = {};
+      sdk._sessionManager.sessions[sessionId] = mockSession;
+
+      await sdk.endSession({ id: sessionId })
+        .catch(() => {
+          getConversation.done();
+          patchConversation.done();
+          expect(mockSession.end).toHaveBeenCalled();
+        });
+    });
 
     test('rejects if not provided either an id or a conversationId', async done => {
       const { sdk } = mockApis();