@webex/plugin-meetings 2.60.0-next.9 → 2.60.1

package/test/integration/spec/space-meeting.js

@@ -3,11 +3,9 @@ import {assert} from '@webex/test-helper-chai';
 import {skipInNode, jenkinsOnly} from '@webex/test-helper-mocha';
 import {patterns} from '@webex/common';
 import MeetingInfoUtil from '@webex/plugin-meetings/dist/meeting-info/utilv2';
-import {createCameraStream, createMicrophoneStream} from '@webex/plugin-meetings';
 
 import CMR from '../../utils/cmr';
 import testUtils from '../../utils/testUtils';
-import integrationTestUtils from '../../utils/integrationTestUtils';
 
 require('dotenv').config();
 
@@ -15,21 +13,6 @@ const webexTestUsers = require('../../utils/webex-test-users');
 
 let userSet, alice, bob, chris, guest;
 
-const localTracks = {
-  alice: {
-    microphone: undefined,
-    camera: undefined,
-  },
-  bob: {
-    microphone: undefined,
-    camera: undefined,
-  },
-  guest: {
-    microphone: undefined,
-    camera: undefined,
-  },
-};
-
 skipInNode(describe)('plugin-meetings', () => {
   describe('space-meeting', () => {
     let space = null;
@@ -152,22 +135,13 @@ skipInNode(describe)('plugin-meetings', () => {
         .then(() => testUtils.waitForStateChange(bob.meeting, 'JOINED'))
         .then(() => testUtils.waitForStateChange(chris.meeting, 'JOINED')));
 
-    it('Bob and Alice create local microphone and camera tracks', async () => {
-      localTracks.alice.microphone = await createMicrophoneStream();
-      localTracks.alice.camera = await createCameraStream();
-
-      localTracks.bob.microphone = await createMicrophoneStream();
-      localTracks.bob.camera = await createCameraStream();
-    });
-
     it('Bob and Alice addsMedia', () =>
-      integrationTestUtils.addMedia(bob, {microphone: localTracks.bob.microphone, camera: localTracks.bob.camera})
-        .then(() => integrationTestUtils.addMedia(alice, {microphone: localTracks.alice.microphone, camera: localTracks.alice.camera})));
+      testUtils.addMedia(bob).then(() => testUtils.addMedia(alice)));
 
     it('Bob has flowing streams on reconnect', () => {
       const retrieveStats = () => {
         assert.isAbove(
-          bob.meeting.statsAnalyzer.statsResults['audio-recv-0'].recv.totalPacketsReceived,
+          bob.meeting.statsAnalyzer.statsResults.audio.recv.totalPacketsReceived,
           0,
           'total packets received greater than 0'
         );
@@ -213,11 +187,7 @@ skipInNode(describe)('plugin-meetings', () => {
           ])
         )
         .then(() => testUtils.waitForStateChange(guest.meeting, 'JOINED'))
-        .then(async () => {
-          localTracks.guest.microphone = await createMicrophoneStream();
-          localTracks.guest.camera = await createCameraStream();
-        })
-        .then(() => integrationTestUtils.addMedia(guest, {microphone: localTracks.guest.microphone, camera: localTracks.guest.camera}))
+        .then(() => testUtils.addMedia(guest))
         .catch((e) => {
           console.error('Error chris joining the meeting ', e);
           throw e;
@@ -250,35 +220,6 @@ skipInNode(describe)('plugin-meetings', () => {
         .then(() => chris.meeting.leave())
         .then(() => testUtils.waitUntil(4000)));
 
-    it('alice, bob and chris stop all local tracks', () => {
-      if (localTracks.alice.microphone) {
-        localTracks.alice.microphone.stop();
-        localTracks.alice.microphone = undefined;
-      }
-      if (localTracks.alice.camera) {
-        localTracks.alice.camera.stop();
-        localTracks.alice.camera = undefined;
-      }
-
-      if (localTracks.bob.microphone) {
-        localTracks.bob.microphone.stop();
-        localTracks.bob.microphone = undefined;
-      }
-      if (localTracks.bob.camera) {
-        localTracks.bob.camera.stop();
-        localTracks.bob.camera = undefined;
-      }
-
-      if (localTracks.guest.microphone) {
-        localTracks.guest.microphone.stop();
-        localTracks.guest.microphone = undefined;
-      }
-      if (localTracks.guest.camera) {
-        localTracks.guest.camera.stop();
-        localTracks.guest.camera = undefined;
-      }
-    });
-
     it('check for meeting cleanup', () => {
       console.log('Alice ', alice.webex.meetings.getAllMeetings());
       console.log('Bob ', bob.webex.meetings.getAllMeetings());
@@ -473,11 +414,7 @@ skipInNode(describe)('plugin-meetings', () => {
                 }),
             ])
               .then(() => testUtils.waitForStateChange(guest.meeting, 'JOINED'))
-              .then(async () => {
-                localTracks.guest.microphone = await createMicrophoneStream();
-                localTracks.guest.camera = await createCameraStream();
-              })
-              .then(() => integrationTestUtils.addMedia(guest, {microphone: localTracks.guest.microphone, camera: localTracks.guest.camera}));
+              .then(() => testUtils.addMedia(guest));
           })
           .catch((e) => {
             console.error('Error guest joining the meeting ', e);
@@ -514,16 +451,6 @@ skipInNode(describe)('plugin-meetings', () => {
               testUtils.waitForCallEnded(bob, alice.sipAddress),
               testUtils.waitForCallEnded(chris, alice.sipAddress),
             ])
-          .then(() => {
-            if (localTracks.guest.microphone) {
-              localTracks.guest.microphone.stop();
-              localTracks.guest.microphone = undefined;
-            }
-            if (localTracks.guest.camera) {
-              localTracks.guest.camera.stop();
-              localTracks.guest.camera = undefined;
-            }
-          })
           ));
     });
   });

package/test/unit/spec/common/queue.js

@@ -1,5 +1,5 @@
 import {assert} from '@webex/test-helper-chai';
-import SortedQueue from '@webex/plugin-meetings/src/common/queue';
+import SimpleQueue from '@webex/plugin-meetings/src/common/queue';
 
 describe('common/queue', () => {
   let fifo = null;
@@ -11,15 +11,7 @@ describe('common/queue', () => {
   };
 
   beforeEach(() => {
-    fifo = new SortedQueue((left, right) => {
-      if (left.text > right.text) {
-        return 1;
-      }
-      if (left.text < right.text) {
-        return -1;
-      }
-      return 0;
-    });
+    fifo = new SimpleQueue();
   });
 
   afterEach(() => {
@@ -74,25 +66,4 @@ describe('common/queue', () => {
   it('Returns null if the queue is empty.', () => {
     assert.equal(fifo.dequeue(), null);
   });
-
-  it('Implement lifo', () => {
-    const lifo = new SortedQueue((left, right) => {
-      if (left.text < right.text) {
-        return 1;
-      }
-      if (left.text > right.text) {
-        return -1;
-      }
-      return 0;
-    });
-
-    const item1 = {text: 'fake item1'};
-    const item2 = {text: 'fake item2'};
-
-    lifo.enqueue(item1);
-    lifo.enqueue(item2);
-
-    assert.equal(lifo.dequeue(), item2);
-    assert.equal(lifo.dequeue(), item1);
-  });
 });

package/test/unit/spec/controls-options-manager/index.js

@@ -1,5 +1,4 @@
 import ControlsOptionsManager from '@webex/plugin-meetings/src/controls-options-manager';
-import Util from '@webex/plugin-meetings/src/controls-options-manager/util';
 import sinon from 'sinon';
 import {assert} from '@webex/test-helper-chai';
 import { HTTP_VERBS } from '@webex/plugin-meetings/src/constants';
@@ -120,168 +119,6 @@ describe('plugin-meetings', () => {
                     });
                   });
             });
-
-            describe('update()', () => {
-              let manager;
-
-              beforeEach(() => {
-                request = {
-                  request: sinon.stub().resolves(),
-                };
-
-                manager = new ControlsOptionsManager(request);
-
-                manager.set({
-                  locusUrl: 'test/id',
-                  displayHints: [],
-                });
-              });
-
-              it('should throw an error if the scope is not supported', () => {
-                const scope = 'invalid';
-
-                assert.throws(() => manager.update({scope}));
-              });
-
-              it('should throw an error if canUpdate returns false', () => {
-                const restorable = Util.canUpdate;
-                Util.canUpdate = sinon.stub().returns(false);
-
-                const scope = 'audio';
-
-                assert.throws(() => manager.update({scope}));
-                Util.canUpdate = restorable;
-              });
-
-              it('should call request multiple times with a bodies that include formatted locus details', () => {
-                const restorable = Util.canUpdate;
-                Util.canUpdate = sinon.stub().returns(true);
-
-                const audio = {scope: 'audio', properties: {a: 1, b: 2}};
-                const reactions = {scope: 'reactions', properties: {c: 3, d: 4}};
-
-                return manager.update(audio, reactions)
-                  .then(() => {
-                    assert.calledWith(request.request, {
-                      uri: 'test/id/controls',
-                      body: {
-                        audio: audio.properties,
-                      },
-                      method: HTTP_VERBS.PATCH,
-                    });
-
-                    assert.calledWith(request.request, {
-                      uri: 'test/id/controls',
-                      body: {
-                        reactions: reactions.properties,
-                      },
-                      method: HTTP_VERBS.PATCH,
-                    });
-
-                    Util.canUpdate = restorable;
-                  });
-              });
-
-              it('should check if the user can update for each provided control config', () => {
-                const restorable = Util.canUpdate;
-                Util.canUpdate = sinon.stub().returns(true);
-
-                const audio = {scope: 'audio', properties: {a: 1, b: 2}};
-                const reactions = {scope: 'reactions', properties: {c: 3, d: 4}};
-                const controls = [audio, reactions];
-
-                return manager.update(...controls)
-                  .then(() => {
-                    assert.callCount(Util.canUpdate, controls.length);
-
-                    controls.forEach((control) => {
-                      assert.calledWith(Util.canUpdate, control, manager.displayHints);
-                    });
-
-                    Util.canUpdate = restorable;
-                  });
-              });
-            });
-
-            describe('Mute/Unmute All', () => {
-              let manager;
-              beforeEach(() => {
-                request = {
-                  request: sinon.stub().returns(Promise.resolve()),
-                };
-
-                manager = new ControlsOptionsManager(request);
-
-                manager.set({
-                  locusUrl: 'test/id',
-                  displayHints: [],
-                })
-              });
-
-              it('rejects when correct display hint is not present mutedEnabled=false', () => {  
-                const result = manager.setMuteAll(false, false, false);
-
-                assert.notCalled(request.request);
-
-                assert.isRejected(result);
-              });
-
-              it('rejects when correct display hint is not present mutedEnabled=true', () => {  
-                const result = manager.setMuteAll(true, false, false);
-
-                assert.notCalled(request.request);
-
-                assert.isRejected(result);
-              });
-
-              it('can set mute all when the display hint is available mutedEnabled=true', () => {
-                manager.setDisplayHints(['MUTE_ALL', 'ENABLE_HARD_MUTE', 'ENABLE_MUTE_ON_ENTRY']);
-
-                const result = manager.setMuteAll(true, true, true);
-
-                assert.calledWith(request.request, {  uri: 'test/id/controls',
-                body: { audio: { muted: true, disallowUnmute: true, muteOnEntry: true } },
-                method: HTTP_VERBS.PATCH});
-
-                assert.deepEqual(result, request.request.firstCall.returnValue);
-              });
-
-              it('can set mute all when the display hint is available mutedEnabled=true', () => {
-                manager.setDisplayHints(['MUTE_ALL', 'DISABLE_HARD_MUTE', 'ENABLE_MUTE_ON_ENTRY']);
-
-                const result = manager.setMuteAll(true, true, true);
-
-                assert.calledWith(request.request, {  uri: 'test/id/controls',
-                body: { audio: { muted: true, disallowUnmute: true, muteOnEntry: true } },
-                method: HTTP_VERBS.PATCH});
-
-                assert.deepEqual(result, request.request.firstCall.returnValue);
-              });
-
-              it('can set mute all when the display hint is available mutedEnabled=true', () => {
-                manager.setDisplayHints(['MUTE_ALL', 'DISABLE_HARD_MUTE', 'DISABLE_MUTE_ON_ENTRY']);
-
-                const result = manager.setMuteAll(true, true, true);
-
-                assert.calledWith(request.request, {  uri: 'test/id/controls',
-                body: { audio: { muted: true, disallowUnmute: true, muteOnEntry: true } },
-                method: HTTP_VERBS.PATCH});
-
-                assert.deepEqual(result, request.request.firstCall.returnValue);
-              });
-
-              it('can set mute all when the display hint is available mutedEnabled=false', () => {
-                manager.setDisplayHints(['UNMUTE_ALL', 'DISABLE_HARD_MUTE', 'DISABLE_MUTE_ON_ENTRY']);
-
-                const result = manager.setMuteAll(false, false, false);
-
-                assert.calledWith(request.request, {  uri: 'test/id/controls',
-                body: { audio: { muted: false, disallowUnmute: false, muteOnEntry: false } },
-                method: HTTP_VERBS.PATCH});
-
-                assert.deepEqual(result, request.request.firstCall.returnValue);
-              });
-            });
           });
     });
 });