@webex/plugin-meetings 3.0.0-beta.115 → 3.0.0-beta.117

package/test/unit/spec/breakouts/index.ts

@@ -494,6 +494,21 @@ describe('plugin-meetings', () => {
       });
     });
 
+    describe('#_setManageGroups', () => {
+      it('do nothing if breakout info is empty', () => {
+        breakouts._setManageGroups();
+        assert.equal(breakouts.manageGroups, undefined);
+        breakouts._setManageGroups({body: null});
+        assert.equal(breakouts.manageGroups, undefined);
+        breakouts._setManageGroups({body: {groups: null}});
+        assert.equal(breakouts.manageGroups, undefined);
+      });
+      it('set the groups into manageGroups if has groups in side breakout info', () => {
+        breakouts._setManageGroups({body: {groups: [{id: 'groupId1'}]}});
+        assert.deepEqual(breakouts.manageGroups, [{id: 'groupId1'}]);
+      });
+    });
+
     describe('#queryRosters', () => {
       it('makes the expected query', async () => {
         webex.request.returns(
@@ -724,6 +739,12 @@ describe('plugin-meetings', () => {
 
     describe('#update', () => {
       it('makes the request as expected', async () => {
+        const mockedReturnBody = getBOResponse('OPEN');
+        webex.request.returns(
+          Promise.resolve({
+            body: mockedReturnBody,
+          })
+        );
         breakouts.editLock = {
           token: 'token1',
         };
@@ -731,6 +752,7 @@ describe('plugin-meetings', () => {
           id: 'groupId',
           sessions: [{name: 'Session 1'}],
         };
+        breakouts._setManageGroups = sinon.stub();
         const result = await breakouts.update(params);
         assert.calledOnceWithExactly(webex.request, {
           method: 'PUT',
@@ -740,6 +762,9 @@ describe('plugin-meetings', () => {
             groups: [params],
           },
         });
+        assert.calledOnceWithExactly(breakouts._setManageGroups, {
+          body: mockedReturnBody,
+        });
       });
       it('makes the request as expected when unlockEdit is true', async () => {
         breakouts.editLock = {
@@ -844,9 +869,10 @@ describe('plugin-meetings', () => {
 
     describe('#start', () => {
       it('should start breakout sessions', async () => {
+        const mockedReturnBody = getBOResponse('OPEN');
         webex.request.returns(
           Promise.resolve({
-            body: getBOResponse('OPEN'),
+            body: mockedReturnBody,
           })
         );
 
@@ -854,6 +880,7 @@ describe('plugin-meetings', () => {
         await breakouts.getBreakout();
 
         const result = await breakouts.start();
+        breakouts._setManageGroups = sinon.stub();
         await breakouts.start({id: 'id', someOtherParam: 'someOtherParam'});
 
         const arg = webex.request.getCall(1).args[0];
@@ -877,7 +904,8 @@ describe('plugin-meetings', () => {
           someOtherParam: 'someOtherParam',
           duration: BREAKOUTS.DEFAULT_DURATION,
         });
-        assert.deepEqual(result, {body: getBOResponse('OPEN')});
+        assert.deepEqual(result, {body: mockedReturnBody});
+        assert.calledWithExactly(breakouts._setManageGroups, {body: mockedReturnBody})
       });
 
       it('rejects when edit lock token mismatch', async () => {
@@ -911,6 +939,8 @@ describe('plugin-meetings', () => {
         await breakouts.getBreakout();
 
         const result = await breakouts.end();
+
+        breakouts._setManageGroups = sinon.stub();
         await breakouts.end({id: 'id', someOtherParam: 'someOtherParam'});
         const arg = webex.request.getCall(1).args[0];
         const argObj1 = arg.body.groups[0];
@@ -926,6 +956,7 @@ describe('plugin-meetings', () => {
           someOtherParam: 'someOtherParam',
         });
         assert.deepEqual(result, {body: getBOResponse('CLOSING')});
+        assert.calledOnceWithExactly(breakouts._setManageGroups, {body: getBOResponse('CLOSING')});
       });
 
       it('rejects when edit lock token mismatch', async () => {
@@ -956,6 +987,8 @@ describe('plugin-meetings', () => {
 
         breakouts.set('url', 'url');
         const result = await breakouts.getBreakout();
+
+        breakouts._setManageGroups = sinon.stub();
         await breakouts.getBreakout(true);
         const arg1 = webex.request.getCall(0).args[0];
         const arg2 = webex.request.getCall(1).args[0];
@@ -966,6 +999,7 @@ describe('plugin-meetings', () => {
         assert.deepEqual(result, {body: getBOResponse('PENDING')});
         assert.deepEqual(breakouts.manageGroups, result.body.groups);
         assert.equal(breakouts.breakoutGroupId, 'groupId');
+        assert.calledOnceWithExactly(breakouts._setManageGroups, {body: getBOResponse('PENDING')});
       });
 
       it('breakoutGroupId should be empty if it is CLOSED group', async () => {
@@ -1050,6 +1084,7 @@ describe('plugin-meetings', () => {
           })
         );
 
+        breakouts._setManageGroups = sinon.stub();
         const result = await breakouts.clearSessions();
         assert.calledOnceWithExactly(webex.request, {
           method: 'PUT',
@@ -1063,7 +1098,17 @@ describe('plugin-meetings', () => {
           },
         });
 
-        assert.equal(breakouts.manageGroups[0].status, 'CLOSE');
+        assert.calledOnceWithExactly(breakouts._setManageGroups, {
+          body: {
+            groups: [
+              {
+                id: '455556a4-37cd-4baa-89bc-8730581a1cc0',
+                status: 'CLOSE',
+                type: 'BREAKOUT',
+              },
+            ],
+          },
+        });
       });
 
       it('rejects when edit lock token mismatch', async () => {

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

@@ -40,8 +40,10 @@ import EventsScope from '@webex/plugin-meetings/src/common/events/events-scope';
 import Meetings, {CONSTANTS} from '@webex/plugin-meetings';
 import Meeting from '@webex/plugin-meetings/src/meeting';
 import Members from '@webex/plugin-meetings/src/members';
+import * as MembersImport from '@webex/plugin-meetings/src/members';
 import Roap from '@webex/plugin-meetings/src/roap';
 import MeetingRequest from '@webex/plugin-meetings/src/meeting/request';
+import * as MeetingRequestImport from '@webex/plugin-meetings/src/meeting/request';
 import LocusInfo from '@webex/plugin-meetings/src/locus-info';
 import MediaProperties from '@webex/plugin-meetings/src/media/properties';
 import MeetingUtil from '@webex/plugin-meetings/src/meeting/util';
@@ -169,6 +171,8 @@ describe('plugin-meetings', () => {
   let test3;
   let test4;
   let testDestination;
+  let membersSpy;
+  let meetingRequestSpy;
 
   beforeEach(() => {
     webex = new MockWebex({
@@ -203,6 +207,8 @@ describe('plugin-meetings', () => {
     webex.internal.metrics.submitClientMetrics = sinon.stub().returns(Promise.resolve());
     webex.meetings.uploadLogs = sinon.stub().returns(Promise.resolve());
     webex.internal.llm.on = sinon.stub();
+    membersSpy = sinon.spy(MembersImport, 'default');
+    meetingRequestSpy = sinon.spy(MeetingRequestImport, 'default');
 
     TriggerProxy.trigger = sinon.stub().returns(true);
     Metrics.postEvent = sinon.stub();
@@ -256,6 +262,16 @@ describe('plugin-meetings', () => {
           assert.equal(meeting.deviceUrl, uuid3);
           assert.deepEqual(meeting.meetingInfo, {});
           assert.instanceOf(meeting.members, Members);
+          assert.calledOnceWithExactly(
+            membersSpy,
+            {
+              locusUrl: meeting.locusUrl,
+              receiveSlotManager: meeting.receiveSlotManager,
+              mediaRequestManagers: meeting.mediaRequestManagers,
+              meeting,
+            },
+            {parent: meeting.webex}
+          );
           assert.instanceOf(meeting.roap, Roap);
           assert.instanceOf(meeting.reconnectionManager, ReconnectionManager);
           assert.isNull(meeting.audio);
@@ -270,6 +286,13 @@ describe('plugin-meetings', () => {
           assert.isNull(meeting.hostId);
           assert.isNull(meeting.policy);
           assert.instanceOf(meeting.meetingRequest, MeetingRequest);
+          assert.calledOnceWithExactly(
+            meetingRequestSpy,
+            {
+              meeting,
+            },
+            {parent: meeting.webex}
+          );
           assert.instanceOf(meeting.locusInfo, LocusInfo);
           assert.equal(meeting.fetchMeetingInfoTimeoutId, undefined);
           assert.instanceOf(meeting.mediaProperties, MediaProperties);
@@ -2963,7 +2986,6 @@ describe('plugin-meetings', () => {
           meeting.meetingRequest.dialOut = sinon
             .stub()
             .returns(Promise.resolve({body: {locus: 'testData'}}));
-          meeting.locusInfo.onFullLocus = sinon.stub().returns(Promise.resolve());
         });
 
         it('with no parameters triggers dial-in, delegating request to meetingRequest correctly', async () => {
@@ -2976,11 +2998,9 @@ describe('plugin-meetings', () => {
             locusUrl: meeting.locusUrl,
             clientUrl: meeting.deviceUrl,
           });
-          assert.calledWith(meeting.locusInfo.onFullLocus, 'testData');
           assert.notCalled(meeting.meetingRequest.dialOut);
 
           meeting.meetingRequest.dialIn.resetHistory();
-          meeting.locusInfo.onFullLocus.resetHistory();
 
           // try again. the dial in urls should match
           await meeting.usePhoneAudio();
@@ -2991,7 +3011,6 @@ describe('plugin-meetings', () => {
             locusUrl: meeting.locusUrl,
             clientUrl: meeting.deviceUrl,
           });
-          assert.calledWith(meeting.locusInfo.onFullLocus, 'testData');
           assert.notCalled(meeting.meetingRequest.dialOut);
         });
 
@@ -3008,11 +3027,9 @@ describe('plugin-meetings', () => {
             clientUrl: meeting.deviceUrl,
             phoneNumber,
           });
-          assert.calledWith(meeting.locusInfo.onFullLocus, 'testData');
           assert.notCalled(meeting.meetingRequest.dialIn);
 
           meeting.meetingRequest.dialOut.resetHistory();
-          meeting.locusInfo.onFullLocus.resetHistory();
 
           // try again. the dial out urls should match
           await meeting.usePhoneAudio(phoneNumber);
@@ -3024,7 +3041,6 @@ describe('plugin-meetings', () => {
             clientUrl: meeting.deviceUrl,
             phoneNumber,
           });
-          assert.calledWith(meeting.locusInfo.onFullLocus, 'testData');
           assert.notCalled(meeting.meetingRequest.dialIn);
         });
 
@@ -5376,28 +5392,7 @@ describe('plugin-meetings', () => {
           checkParseMeetingInfo(expectedInfoToParse);
         });
       });
-      describe('#parseLocus', () => {
-        describe('when CALL and participants', () => {
-          beforeEach(() => {
-            meeting.setLocus = sinon.stub().returns(true);
-            MeetingUtil.getLocusPartner = sinon.stub().returns({person: {sipUrl: uuid3}});
-          });
-          it('should parse the locus object and set meeting properties and return null', () => {
-            meeting.type = 'CALL';
-            meeting.parseLocus({url: url1, participants: [{id: uuid1}], self: {id: uuid2}});
-            assert.calledOnce(meeting.setLocus);
-            assert.calledWith(meeting.setLocus, {
-              url: url1,
-              participants: [{id: uuid1}],
-              self: {id: uuid2},
-            });
-            assert.calledOnce(MeetingUtil.getLocusPartner);
-            assert.calledWith(MeetingUtil.getLocusPartner, [{id: uuid1}], {id: uuid2});
-            assert.deepEqual(meeting.partner, {person: {sipUrl: uuid3}});
-            assert.equal(meeting.sipUri, uuid3);
-          });
-        });
-      });
+
       describe('#setCorrelationId', () => {
         it('should set the correlationId and return undefined', () => {
           assert.ok(meeting.correlationId);
@@ -5748,8 +5743,9 @@ describe('plugin-meetings', () => {
         beforeEach(() => {
           meeting.locusInfo.initialSetup = sinon.stub().returns(true);
         });
+
         it('should read the locus object, set on the meeting and return null', () => {
-          meeting.parseLocus({
+          meeting.setLocus({
             mediaConnections: [test1],
             locusUrl: url1,
             locusId: uuid1,
@@ -5774,6 +5770,7 @@ describe('plugin-meetings', () => {
           assert.equal(meeting.hostId, uuid4);
         });
       });
+
       describe('preferred video device', () => {
         describe('#getVideoDeviceId', () => {
           it('returns the preferred video device', () => {
@@ -5863,7 +5860,7 @@ describe('plugin-meetings', () => {
               'https://board-a.wbx2.com/board/api/v1/channels/977a7330-54f4-11eb-b1ef-91f5eefc7bf3',
           };
 
-          const generateContent = (beneficiaryId = null, disposition = null) => ({
+          const generateContent = (beneficiaryId = null, disposition = null,annotation = undefined) => ({
             beneficiaryId,
             disposition,
           });
@@ -5880,7 +5877,8 @@ describe('plugin-meetings', () => {
             beneficiaryId,
             resourceUrl,
             isAccepting,
-            otherBeneficiaryId
+            otherBeneficiaryId,
+            annotation,
           ) => {
             const newPayload = cloneDeep(payload);
 
@@ -5906,7 +5904,7 @@ describe('plugin-meetings', () => {
             if (isGranting) {
               if (isContent) {
                 activeSharingId.content = beneficiaryId;
-                newPayload.current.content = generateContent(beneficiaryId, FLOOR_ACTION.GRANTED);
+                newPayload.current.content = generateContent(beneficiaryId, FLOOR_ACTION.GRANTED,annotation);
 
                 if (isEqual(newPayload.current, newPayload.previous)) {
                   eventTrigger.member = null;
@@ -6533,6 +6531,28 @@ describe('plugin-meetings', () => {
             });
           });
 
+          describe('annotation policy', () => {
+
+            it('Scenario #1: blank annotation', () => {
+              const data1 = generateData(blankPayload, true, true, USER_IDS.ME);
+              const data2 = generateData(data1.payload, false, true, USER_IDS.ME);
+              const data3 = generateData(data2.payload, true, true, USER_IDS.ME);
+              const data4 = generateData(data3.payload, false, true, USER_IDS.ME);
+
+              payloadTestHelper([data1, data2, data3, data4]);
+            });
+
+            it('Scenario #2: annotation', () => {
+              const annotationInfo = {version: '1', policy: 'Approval'};
+              const data1 = generateData(blankPayload, true, true, USER_IDS.ME, annotationInfo);
+              const data2 = generateData(data1.payload, false, true, USER_IDS.ME);
+              const data3 = generateData(data2.payload, true, true, USER_IDS.ME);
+              const data4 = generateData(data3.payload, false, true, USER_IDS.ME);
+
+              payloadTestHelper([data1, data2, data3, data4]);
+            });
+          });
+
           describe('Desktop A --> Desktop B', () => {
             it('Scenario #1: you share desktop A and then share desktop B', () => {
               const data1 = generateData(blankPayload, true, true, USER_IDS.ME);

package/test/unit/spec/meeting/locusMediaRequest.ts

@@ -67,8 +67,8 @@ describe('LocusMediaRequest.send()', () => {
     muteOptions: {},
   };
 
-  const createExpectedLocalMuteBody = (expectedMute:{audioMuted: boolean, videoMuted: boolean}) => {
-    return {
+  const createExpectedLocalMuteBody = (expectedMute:{audioMuted: boolean, videoMuted: boolean}, sequence = undefined) => {
+    const body: any = {
       device: {
         url: 'deviceUrl',
         deviceType: 'deviceType',
@@ -85,7 +85,13 @@ describe('LocusMediaRequest.send()', () => {
       clientMediaPreferences: {
         preferTranscoding: true,
       },
+    };
+
+    if (sequence) {
+      body.sequence = sequence;
     }
+
+    return body;
   };
 
   beforeEach(() => {
@@ -108,7 +114,7 @@ describe('LocusMediaRequest.send()', () => {
     webexRequestStub = sinon.stub(locusMediaRequest, 'request').resolves(fakeLocusResponse);
   })
 
-  const sendLocalMute = (muteOptions) => locusMediaRequest.send({...exampleLocalMuteRequestBody, muteOptions});
+  const sendLocalMute = (muteOptions, overrides={}) => locusMediaRequest.send({...exampleLocalMuteRequestBody, ...overrides, muteOptions});
 
   const sendRoapMessage = (messageType) => {
     const request = cloneDeep(exampleRoapRequestBody);
@@ -150,6 +156,22 @@ describe('LocusMediaRequest.send()', () => {
     });
   });
 
+  it('sends a local mute request with sequence', async () => {
+    await ensureConfluenceCreated();
+
+    const sequence = {some: 'sequence data'};
+
+    const result = await sendLocalMute({audioMuted: false, videoMuted: false}, {sequence});
+
+    assert.equal(result, fakeLocusResponse);
+
+    assert.calledOnceWithExactly(webexRequestStub, {
+      method: 'PUT',
+      uri: 'fakeMeetingSelfUrl/media',
+      body: createExpectedLocalMuteBody({audioMuted: false, videoMuted: false}, sequence),
+    });
+  });
+
   it('sends a local mute request with the last audio/video mute values when called multiple times in same processing cycle', async () => {
     await ensureConfluenceCreated();
 

package/test/unit/spec/meeting/muteState.js

@@ -36,7 +36,7 @@ describe('plugin-meetings', () => {
       unmuteVideoAllowed: true,
 
       locusInfo: {
-        onFullLocus: sinon.stub(),
+        onDeltaLocus: sinon.stub(),
       },
       members: {
         selfId: 'fake self id',
@@ -351,11 +351,14 @@ describe('plugin-meetings', () => {
         await testUtils.waitUntil(200);
         assert.isFalse(clientPromiseResolved);
 
+        meeting.locusInfo.onDeltaLocus.resetHistory();
+
         // now allow the server response to arrive, this should trigger the client promise to get resolved
-        serverResponseResolve();
+        serverResponseResolve(fakeLocus);
         await testUtils.flushPromises();
 
         assert.isTrue(clientPromiseResolved);
+        assert.calledOnceWithExactly(meeting.locusInfo.onDeltaLocus, fakeLocus);
       });
 
       it('rejects client request promise if server request for local mute fails', async () => {