@webex/plugin-meetings 3.7.0-next.42 → 3.7.0-next.44

package/src/locus-info/index.ts

@@ -10,6 +10,7 @@ import {
   _SIP_BRIDGE_,
   MEETING_STATE,
   _MEETING_,
+  _SPACE_SHARE_,
   LOCUSINFO,
   LOCUS,
   _LEFT_,
@@ -489,7 +490,8 @@ export default class LocusInfo extends EventsScope {
   isMeetingActive() {
     if (
       this.parsedLocus.fullState.type === _CALL_ ||
-      this.parsedLocus.fullState.type === _SIP_BRIDGE_
+      this.parsedLocus.fullState.type === _SIP_BRIDGE_ ||
+      this.parsedLocus.fullState.type === _SPACE_SHARE_
     ) {
       // @ts-ignore
       const partner = this.getLocusPartner(this.participants, this.self);

package/src/meetings/index.ts

@@ -856,9 +856,12 @@ export default class Meetings extends WebexPlugin {
               );
             }),
         'deviceRegister'
-      ).then(
-        // @ts-ignore
-        this.executeRegistrationStep(() => this.webex.internal.mercury.connect(), 'mercuryConnect')
+      ).then(() =>
+        this.executeRegistrationStep(
+          // @ts-ignore
+          () => this.webex.internal.mercury.connect(),
+          'mercuryConnect'
+        )
       ),
       this.executeRegistrationStep(
         () => Promise.resolve(MeetingsUtil.checkH264Support.call(this)),

package/test/unit/spec/locus-info/index.js

@@ -1,6 +1,6 @@
 import 'jsdom-global/register';
 import sinon from 'sinon';
-import {cloneDeep} from 'lodash';
+import {cloneDeep, forEach} from 'lodash';
 import {assert} from '@webex/test-helper-chai';
 import MockWebex from '@webex/test-helper-mock-webex';
 import testUtils from '../../../utils/testUtils';
@@ -23,6 +23,8 @@ import {
   LOCUS,
   MEETING_STATE,
   _MEETING_,
+  _SIP_BRIDGE_,
+  _SPACE_SHARE_,
 } from '../../../../src/constants';
 
 import {self, selfWithInactivity} from './selfConstant';
@@ -102,7 +104,11 @@ describe('plugin-meetings', () => {
           },
           entryExitTone: {enabled: true, mode: 'foo'},
           video: {enabled: true},
-          videoLayout: {overrideDefault: true, lockAttendeeViewOnStageOnly:false, stageParameters: {}},
+          videoLayout: {
+            overrideDefault: true,
+            lockAttendeeViewOnStageOnly: false,
+            stageParameters: {},
+          },
           webcastControl: {streaming: false},
           practiceSession: {enabled: true},
         };
@@ -529,7 +535,7 @@ describe('plugin-meetings', () => {
           manualCaptionControl: {enabled: false},
         };
 
-        locusInfo.updateControls({manualCaptionControl: { enabled: true, }});
+        locusInfo.updateControls({manualCaptionControl: {enabled: true}});
 
         assert.calledWith(
           locusInfo.emitScoped,
@@ -2636,65 +2642,69 @@ describe('plugin-meetings', () => {
     });
 
     describe('#isMeetingActive', () => {
-      it('sends client event correctly for state = inactive', () => {
-        locusInfo.parsedLocus = {
-          fullState: {
-            type: _CALL_,
-          },
-        };
-
-        locusInfo.fullState = {
-          state: LOCUS.STATE.INACTIVE,
-        };
-
-        locusInfo.isMeetingActive();
-
-        assert.calledWith(webex.internal.newMetrics.submitClientEvent, {
-          name: 'client.call.remote-ended',
-          options: {
-            meetingId: locusInfo.meetingId,
-          },
-        });
-      });
-
-      it('sends client event correctly for state = PARTNER_LEFT', () => {
-        locusInfo.getLocusPartner = sinon.stub().returns({state: MEETING_STATE.STATES.LEFT});
-        locusInfo.parsedLocus = {
-          fullState: {
-            type: _CALL_,
-          },
-          self: {
-            state: MEETING_STATE.STATES.DECLINED,
-          },
-        };
-        locusInfo.isMeetingActive();
-
-        assert.calledWith(webex.internal.newMetrics.submitClientEvent, {
-          name: 'client.call.remote-ended',
-          options: {
-            meetingId: locusInfo.meetingId,
-          },
-        });
-      });
-
-      it('sends client event correctly for state = SELF_LEFT', () => {
-        locusInfo.getLocusPartner = sinon.stub().returns({state: MEETING_STATE.STATES.LEFT});
-        locusInfo.parsedLocus = {
-          fullState: {
-            type: _CALL_,
-          },
-          self: {
-            state: MEETING_STATE.STATES.LEFT,
-          },
-        };
+      forEach([_CALL_, _SIP_BRIDGE_, _SPACE_SHARE_], (type) => {
+        describe(`type = ${type}`, () => {
+          it('sends client event correctly for state = inactive', () => {
+            locusInfo.parsedLocus = {
+              fullState: {
+                type: type,
+              },
+            };
+
+            locusInfo.fullState = {
+              state: LOCUS.STATE.INACTIVE,
+            };
+
+            locusInfo.isMeetingActive();
+
+            assert.calledWith(webex.internal.newMetrics.submitClientEvent, {
+              name: 'client.call.remote-ended',
+              options: {
+                meetingId: locusInfo.meetingId,
+              },
+            });
+          });
 
-        locusInfo.isMeetingActive();
+          it('sends client event correctly for state = PARTNER_LEFT', () => {
+            locusInfo.getLocusPartner = sinon.stub().returns({state: MEETING_STATE.STATES.LEFT});
+            locusInfo.parsedLocus = {
+              fullState: {
+                type: type,
+              },
+              self: {
+                state: MEETING_STATE.STATES.DECLINED,
+              },
+            };
+            locusInfo.isMeetingActive();
+
+            assert.calledWith(webex.internal.newMetrics.submitClientEvent, {
+              name: 'client.call.remote-ended',
+              options: {
+                meetingId: locusInfo.meetingId,
+              },
+            });
+          });
 
-        assert.calledWith(webex.internal.newMetrics.submitClientEvent, {
-          name: 'client.call.remote-ended',
-          options: {
-            meetingId: locusInfo.meetingId,
-          },
+          it('sends client event correctly for state = SELF_LEFT', () => {
+            locusInfo.getLocusPartner = sinon.stub().returns({state: MEETING_STATE.STATES.LEFT});
+            locusInfo.parsedLocus = {
+              fullState: {
+                type: type,
+              },
+              self: {
+                state: MEETING_STATE.STATES.LEFT,
+              },
+            };
+
+            locusInfo.isMeetingActive();
+
+            assert.calledWith(webex.internal.newMetrics.submitClientEvent, {
+              name: 'client.call.remote-ended',
+              options: {
+                meetingId: locusInfo.meetingId,
+              },
+            });
+          });
         });
       });
 

package/test/unit/spec/meetings/index.js

@@ -376,21 +376,21 @@ describe('plugin-meetings', () => {
           assert.isTrue(webex.meetings.registered);
         });
 
-        it('rejects when SDK canAuthorize is false', () => {
+        it('rejects when SDK canAuthorize is false', async () => {
           webex.canAuthorize = false;
-          assert.isRejected(webex.meetings.register());
+          await assert.isRejected(webex.meetings.register());
         });
 
-        it('rejects when device.register fails', () => {
+        it('rejects when device.register fails', async () => {
           webex.canAuthorize = true;
           webex.internal.device.register = sinon.stub().returns(Promise.reject());
-          assert.isRejected(webex.meetings.register());
+          await assert.isRejected(webex.meetings.register());
         });
 
-        it('rejects when mercury.connect fails', () => {
+        it('rejects when mercury.connect fails', async () => {
           webex.canAuthorize = true;
           webex.internal.mercury.connect = sinon.stub().returns(Promise.reject());
-          assert.isRejected(webex.meetings.register());
+          await assert.isRejected(webex.meetings.register());
         });
 
         it('resolves immediately if already registered', async () => {
@@ -500,7 +500,7 @@ describe('plugin-meetings', () => {
             checkH264Support: true,
           });
 
-          await clock.tick(1000);
+          await clock.tick(6000);
           await webex.internal.mercury.connect;
           assert.deepEqual(webex.meetings.registrationStatus, {
             fetchWebexSite: true,
@@ -535,16 +535,16 @@ describe('plugin-meetings', () => {
           });
         });
 
-        it('rejects when device.unregister fails', () => {
+        it('rejects when device.unregister fails', async () => {
           webex.meetings.registered = true;
           webex.internal.device.unregister = sinon.stub().returns(Promise.reject());
-          assert.isRejected(webex.meetings.unregister());
+          await assert.isRejected(webex.meetings.unregister());
         });
 
-        it('rejects when mercury.disconnect fails', () => {
+        it('rejects when mercury.disconnect fails', async () => {
           webex.meetings.registered = true;
           webex.internal.mercury.disconnect = sinon.stub().returns(Promise.reject());
-          assert.isRejected(webex.meetings.unregister());
+          await assert.isRejected(webex.meetings.unregister());
         });
 
         it('resolves immediately if not registered', (done) => {