Skip to content

Commit

Permalink
Merge branch 'next' into antsukan/conditionally-add-device-permissions
Browse files Browse the repository at this point in the history
  • Loading branch information
sreenara authored Sep 27, 2024
2 parents db7bbcf + 0bf3d24 commit ba5ed1b
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 0 deletions.
3 changes: 3 additions & 0 deletions packages/@webex/plugin-meetings/src/meeting/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5232,6 +5232,9 @@ export default class Meeting extends StatelessWebexPlugin {
this.meetingFiniteStateMachine.join();
this.setupLocusMediaRequest();

// @ts-ignore
this.webex.internal.device.meetingStarted();

LoggerProxy.logger.log('Meeting:index#join --> Success');

Metrics.sendBehavioralMetric(BEHAVIORAL_METRICS.JOIN_SUCCESS, {
Expand Down
2 changes: 2 additions & 0 deletions packages/@webex/plugin-meetings/src/meeting/util.ts
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,8 @@ const MeetingUtil = {
},

cleanUp: (meeting) => {
meeting.getWebexObject().internal.device.meetingEnded();

meeting.breakouts.cleanUp();
meeting.simultaneousInterpretation.cleanUp();
meeting.locusMediaRequest = undefined;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1605,6 +1605,7 @@ describe('plugin-meetings', () => {
const result = await join;

assert.calledOnce(MeetingUtil.joinMeeting);
assert.calledOnce(webex.internal.device.meetingStarted);
assert.calledOnce(meeting.setLocus);
assert.equal(result, joinMeetingResult);
assert.calledWith(webex.internal.llm.on, 'online', meeting.handleLLMOnline);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ describe('plugin-meetings', () => {
assert.calledOnce(meeting.updateLLMConnection);
assert.calledOnce(meeting.breakouts.cleanUp);
assert.calledOnce(meeting.simultaneousInterpretation.cleanUp);
assert.calledOnce(webex.internal.device.meetingEnded);
});

it('do clean up on meeting object with LLM disabled', async () => {
Expand All @@ -87,6 +88,7 @@ describe('plugin-meetings', () => {
assert.notCalled(meeting.updateLLMConnection);
assert.calledOnce(meeting.breakouts.cleanUp);
assert.calledOnce(meeting.simultaneousInterpretation.cleanUp);
assert.calledOnce(webex.internal.device.meetingEnded);
});

it('do clean up on meeting object with no config', async () => {
Expand All @@ -102,6 +104,7 @@ describe('plugin-meetings', () => {
assert.notCalled(meeting.updateLLMConnection);
assert.calledOnce(meeting.breakouts.cleanUp);
assert.calledOnce(meeting.simultaneousInterpretation.cleanUp);
assert.calledOnce(webex.internal.device.meetingEnded);
});
});

Expand Down
2 changes: 2 additions & 0 deletions packages/@webex/test-helper-mock-webex/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,8 @@ function makeWebex(options) {
get: sinon.stub(),
},
},
meetingEnded: sinon.stub(),
meetingStarted: sinon.stub(),
registered: true,
register: sinon.stub().returns(Promise.resolve()),
ipNetworkDetector: {
Expand Down

0 comments on commit ba5ed1b

Please sign in to comment.