@webex/plugin-meetings 3.0.0-beta.71 → 3.0.0-beta.73

package/test/unit/spec/members/utils.js

@@ -15,27 +15,48 @@ describe('plugin-meetings', () => {
     describe('#generateRoleAssignmentMemberOptions', () => {
       it('returns the correct options', () => {
         const memberId = 'test';
-        const roles = [{type: 'PRESENTER', hasRole: true}, {type: 'MODERATOR', hasRole: true}, {type: 'COHOST', hasRole: true}]
+        const roles = [
+          {type: 'PRESENTER', hasRole: true},
+          {type: 'MODERATOR', hasRole: true},
+          {type: 'COHOST', hasRole: true},
+        ];
         const locusUrl = 'urlTest1';
 
-        assert.deepEqual(MembersUtil.generateRoleAssignmentMemberOptions(memberId, roles, locusUrl), {
-          memberId,
-          roles,
-          locusUrl,
-        });
+        assert.deepEqual(
+          MembersUtil.generateRoleAssignmentMemberOptions(memberId, roles, locusUrl),
+          {
+            memberId,
+            roles,
+            locusUrl,
+          }
+        );
       });
     });
 
     describe('#getRoleAssignmentMemberRequestParams', () => {
       it('returns the correct request params', () => {
-        const format = {locusUrl: 'locusUrl', memberId: 'test', roles: [{type: 'PRESENTER', hasRole: true}, {type: 'MODERATOR', hasRole: false}, {type: 'COHOST', hasRole: true}]};
+        const format = {
+          locusUrl: 'locusUrl',
+          memberId: 'test',
+          roles: [
+            {type: 'PRESENTER', hasRole: true},
+            {type: 'MODERATOR', hasRole: false},
+            {type: 'COHOST', hasRole: true},
+          ],
+        };
 
         assert.deepEqual(MembersUtil.getRoleAssignmentMemberRequestParams(format), {
           method: 'PATCH',
           uri: `locusUrl/${PARTICIPANT}/test/${CONTROLS}`,
-          body: {role: {
-            roles: [{type: 'PRESENTER', hasRole: true}, {type: 'MODERATOR', hasRole: false}, {type: 'COHOST', hasRole: true}]
-          }},
+          body: {
+            role: {
+              roles: [
+                {type: 'PRESENTER', hasRole: true},
+                {type: 'MODERATOR', hasRole: false},
+                {type: 'COHOST', hasRole: true},
+              ],
+            },
+          },
         });
       });
     });
@@ -67,6 +88,29 @@ describe('plugin-meetings', () => {
         );
       });
     });
+    describe('#generateEditDisplayNameMemberOptions', () => {
+      it('returns the correct options', () => {
+        const locusUrl = 'urlTest1';
+        const memberId = 'test1';
+        const requestingParticipantId = 'test2';
+        const alias = 'alias';
+
+        assert.deepEqual(
+          MembersUtil.generateEditDisplayNameMemberOptions(
+            memberId,
+            requestingParticipantId,
+            alias,
+            locusUrl
+          ),
+          {
+            memberId,
+            requestingParticipantId,
+            alias,
+            locusUrl,
+          }
+        );
+      });
+    });
     describe('#getAdmitMemberRequestBody', () => {
       it('returns the correct request body', () => {
         const option1 = {memberIds: ['uuid']};

package/test/unit/spec/multistream/mediaRequestManager.ts

@@ -572,7 +572,6 @@ describe('MediaRequestManager', () => {
     // nothing should be sent out as we didn't commit the requests
     assert.notCalled(sendMediaRequestsCallback);
 
-
     mediaRequestManager.commit();
     checkMediaRequestsSent([
       {
@@ -601,7 +600,6 @@ describe('MediaRequestManager', () => {
       },
     ]);
 
-
     // check that when calling commit()
     // all requests are not re-sent again (avoid duplicate requests)
     mediaRequestManager.commit();
@@ -621,7 +619,6 @@ describe('MediaRequestManager', () => {
 
     assert.notCalled(sendMediaRequestsCallback);
 
-
     mediaRequestManager.commit();
     checkMediaRequestsSent([
       {
@@ -635,11 +632,11 @@ describe('MediaRequestManager', () => {
     // now reset everything
     mediaRequestManager.reset();
 
-     // calling commit now should not cause any requests to be sent out
-     mediaRequestManager.commit();
-     checkMediaRequestsSent([]);
+    // calling commit now should not cause any requests to be sent out
+    mediaRequestManager.commit();
+    checkMediaRequestsSent([]);
 
-     //add new request
+    //add new request
     addReceiverSelectedRequest(1501, fakeReceiveSlots[1], RECEIVER_SELECTED_MAX_FS, false);
 
     // commit
@@ -653,8 +650,38 @@ describe('MediaRequestManager', () => {
         receiveSlot: fakeWcmeSlots[1],
         maxFs: RECEIVER_SELECTED_MAX_FS,
       },
-    ])
-  })
+    ]);
+  });
+
+  it('can send same media request after previous requests have been cleared', () => {
+    // add a request and commit
+    addReceiverSelectedRequest(1500, fakeReceiveSlots[0], RECEIVER_SELECTED_MAX_FS, false);
+    mediaRequestManager.commit();
+    checkMediaRequestsSent([
+      {
+        policy: 'receiver-selected',
+        csi: 1500,
+        receiveSlot: fakeWcmeSlots[0],
+        maxFs: RECEIVER_SELECTED_MAX_FS,
+      },
+    ]);
+
+    // clear previous requests
+    mediaRequestManager.clearPreviousRequests();
+
+    // commit same request
+    mediaRequestManager.commit();
+
+    // check the request was sent
+    checkMediaRequestsSent([
+      {
+        policy: 'receiver-selected',
+        csi: 1500,
+        receiveSlot: fakeWcmeSlots[0],
+        maxFs: RECEIVER_SELECTED_MAX_FS,
+      },
+    ]);
+  });
 
   it('re-sends media requests after degradation preferences are set', () => {
     // set max macroblocks limit
@@ -785,7 +812,6 @@ describe('MediaRequestManager', () => {
 
     sendMediaRequestsCallback.resetHistory();
 
-
     const maxFsHandlerCall = fakeReceiveSlots[0].on.getCall(1);
 
     const maxFsHandler = maxFsHandlerCall.args[1];
@@ -812,5 +838,4 @@ describe('MediaRequestManager', () => {
       },
     ]);
   });
-
 });

package/test/unit/spec/reconnection-manager/index.js

@@ -43,8 +43,8 @@ describe('plugin-meetings', () => {
           webrtcMediaConnection: fakeMediaConnection,
         },
         mediaRequestManagers: {
-          audio: {commit: sinon.stub()},
-          video: {commit: sinon.stub()},
+          audio: {commit: sinon.stub(), clearPreviousRequests: sinon.stub()},
+          video: {commit: sinon.stub(), clearPreviousRequests: sinon.stub()},
         },
         roap: {
           doTurnDiscovery: sinon.stub().resolves({
@@ -84,22 +84,26 @@ describe('plugin-meetings', () => {
       ]);
     });
 
-    it('does not re-request media for non-multistream meetings', async () => {
+    it('does not clear previous requests and re-request media for non-multistream meetings', async () => {
       fakeMeeting.isMultistream = false;
       const rm = new ReconnectionManager(fakeMeeting);
 
       await rm.reconnect();
 
+      assert.notCalled(fakeMeeting.mediaRequestManagers.audio.clearPreviousRequests);
+      assert.notCalled(fakeMeeting.mediaRequestManagers.video.clearPreviousRequests);
       assert.notCalled(fakeMeeting.mediaRequestManagers.audio.commit);
       assert.notCalled(fakeMeeting.mediaRequestManagers.video.commit);
     });
 
-    it('does re-request media for multistream meetings', async () => {
+    it('does clear previous requests and re-request media for multistream meetings', async () => {
       fakeMeeting.isMultistream = true;
       const rm = new ReconnectionManager(fakeMeeting);
 
       await rm.reconnect();
 
+      assert.calledOnce(fakeMeeting.mediaRequestManagers.audio.clearPreviousRequests);
+      assert.calledOnce(fakeMeeting.mediaRequestManagers.video.clearPreviousRequests);
       assert.calledOnce(fakeMeeting.mediaRequestManagers.audio.commit);
       assert.calledOnce(fakeMeeting.mediaRequestManagers.video.commit);
     });