test: resolved merge conflicts errors

Author: Dipanshu Sharma

.circleci/config.yml

@@ -180,8 +180,20 @@ jobs:
           command: |
             PACKAGES=$(node tooling/modified-packages.js --single-line)
 
-            node -v
+            echo "Modified Packages:"
+            echo "${PACKAGES}"
+            
+            VAR1="@webex/plugin-meetings"
+            VAR2="webex" 
+            for PACKAGE in ${PACKAGES}; do
+              if [[ "$PACKAGE" == "$VAR1" || "$PACKAGE" == "$VAR2" ]]; then
+                yarn run test:unit --silent --packages "${PACKAGE}"
+                echo "DONE TESTING ${PACKAGE} ON MOCHA"
+              fi
+            done
+
             yarn run jest --selectProjects ${PACKAGES} --maxWorkers=2
+            echo "DONE TESTING"
       # This script parses all the XML files generated by mocha and karma to see if any tests failed/errored out
       # The reason this script exists is that all tests are "exec"'d and running in a single process instead of a parallel
       # So if a failure happens it will continue to the next test suite in the queue
@@ -200,9 +212,13 @@ jobs:
               exit 1
             fi
       - store_test_results:
-          path: coverage/junit
+          path: reports/junit
       - store_artifacts:
-          path: coverage
+          path: reports/junit
+          destination: junit
+      - store_artifacts:
+          path: sauce.log
+          destination: sauce
 
   samples:
     working_directory: ~/webex-js-sdk

.vscode/settings.json

@@ -14,7 +14,7 @@
   },
   "search.exclude": {
     "**/bower_components": true,
-    "**/dist": true,
+    "**/dist": true
   },
   "editor.codeActionsOnSave": {
     "source.fixAll": true,

jest.config.js

@@ -1,4 +1,3 @@
-
 const packages = [
   '@webex/common',
   '@webex/common-evented',
@@ -36,7 +35,6 @@ const packages = [
   '@webex/plugin-authorization-node',
   '@webex/plugin-device-manager',
   '@webex/plugin-logger',
-  '@webex/plugin-meetings',
   '@webex/plugin-memberships',
   '@webex/plugin-messages',
   '@webex/plugin-people',
@@ -66,12 +64,11 @@ const packages = [
   '@webex/webex-server',
   '@webex/webrtc',
   '@webex/xunit-with-logs',
-  'webex'
 ];
 
-const packagesWithSetup = [
-  '@webex/plugin-meetings'
-];
+/* const packagesWithSetup = [
+  //'@webex/plugin-meetings'
+]; */
 
 const jestProject = [];
 
@@ -84,19 +81,16 @@ packages.forEach((packageName) => {
     testEnvironment: 'node',
     displayName: packageName,
 
-    testMatch: [
-      `<rootDir>/packages/${packageName}/test/unit/**/!(lib|fixture)/*.[jt]s`
-    ]
+    testMatch: [`<rootDir>/packages/${packageName}/test/unit/**/!(lib|fixture)/*.[jt]s`],
   };
 
-  if (packagesWithSetup.includes(packageName)) {
+  /* if (packagesWithSetup.includes(packageName)) {
     config.setupFiles = [`<rootDir>/packages/${packageName}/jest.setup.js`];
-  }
+  } */
 
   jestProject.push(config);
 });
 
-
 module.exports = {
   clearMocks: true,
   rootDir: './',

packages/@webex/internal-plugin-avatar/test/unit/spec/avatar.js

@@ -559,7 +559,7 @@ describe('plugin-avatar', () => {
                 },
               ],
             },
-          })
+          }})
         );
 
         return Promise.all([

packages/@webex/internal-plugin-conversation/test/unit/spec/conversation.js

@@ -138,7 +138,7 @@ describe('plugin-conversation', () => {
       it('should convert a "us" cluster to WEBEX_CONVERSATION_DEFAULT_CLUSTER cluster', async () => {
         await webex.internal.conversation.getUrlFromClusterId({cluster: 'us'});
 
-        sinon.assert.calledWith(webex.internal.services.getServiceFromClusterId, {clusterId: 'urn:TEAM:us-east-1_int13:identityLookup'});
+        sinon.assert.calledWith(webex.internal.services.getServiceFromClusterId, {clusterId: 'urn:TEAM:us-east-2_a:identityLookup'});
       });
 
       it('should add the cluster service when missing', async () => {

packages/@webex/plugin-meetings/jest.setup.js

@@ -134,13 +134,10 @@ class EffectsState {
       this.state.callToWebrtcBNRInProgress = false;
       LoggerProxy.logger.error('Meeting:index#enableBNR.', error);
 
-      Metrics.sendBehavioralMetric(
-        BEHAVIORAL_METRICS.ENABLE_BNR_FAILURE,
-        {
-          reason: error.message,
-          stack: error.stack
-        }
-      );
+      Metrics.sendBehavioralMetric(BEHAVIORAL_METRICS.ENABLE_BNR_FAILURE, {
+        reason: error.message,
+        stack: error.stack,
+      });
 
       return this.rejectPromise(error);
     }
@@ -197,13 +194,10 @@ class EffectsState {
       this.state.callToWebrtcBNRInProgress = false;
       LoggerProxy.logger.error(`Meeting:index#disableBNR. ${error}`);
 
-      Metrics.sendBehavioralMetric(
-        BEHAVIORAL_METRICS.DISABLE_BNR_FAILURE,
-        {
-          reason: error.message,
-          stack: error.stack
-        }
-      );
+      Metrics.sendBehavioralMetric(BEHAVIORAL_METRICS.DISABLE_BNR_FAILURE, {
+        reason: error.message,
+        stack: error.stack,
+      });
 
       return this.rejectPromise(error);
     }

packages/@webex/plugin-meetings/src/meeting/effectsState.ts

@@ -90,6 +90,8 @@ import {SkinTones, Reactions} from '../reactions/reactions';
 import {Reaction, ReactionType, SkinToneType} from '../reactions/reactions.type';
 
 import InMeetingActions from './in-meeting-actions';
+import RecordingController from '../recording-controller';
+import ControlsOptionsManager from '../controls-options-manager';
 
 const {isBrowser} = BrowserDetection();
 
@@ -5695,7 +5697,9 @@ export default class Meeting extends StatelessWebexPlugin {
 
     if (layoutType) {
       if (!LAYOUT_TYPES.includes(layoutType)) {
-        return this.rejectWithErrorLog('Meeting:index#changeVideoLayout --> cannot change video layout, invalid layoutType recieved.');
+        return this.rejectWithErrorLog(
+          'Meeting:index#changeVideoLayout --> cannot change video layout, invalid layoutType recieved.'
+        );
       }
 
       layoutInfo.layoutType = layoutType;

packages/@webex/plugin-meetings/src/meeting/index.ts

@@ -64,7 +64,7 @@ describe('plugin-meetings', () => {
     describe('#updateControls', () => {
       let newControls;
 
-      beforeEach(() => {
+      beforeEach('setup new controls', () => {
         newControls = {
           lock: {},
           meetingFull: {},
@@ -403,7 +403,7 @@ describe('plugin-meetings', () => {
     describe('#updateParticipants()', () => {
       let newParticipants;
 
-      beforeEach(() => {
+      beforeEach('setup new participants', () => {
         newParticipants = [
           {
             person: {
@@ -897,7 +897,7 @@ describe('plugin-meetings', () => {
       let getRolesSpy;
       let isJoinedSpy;
 
-      beforeEach(() => {
+      beforeEach('setup meeting info', () => {
         meetingInfo = {
           displayHints: {
             joined: ['ROSTER_IN_MEETING', 'LOCK_STATUS_UNLOCKED'],

packages/@webex/plugin-meetings/test/unit/spec/locus-info/index.js

@@ -3,6 +3,7 @@ import {assert} from '@webex/test-helper-chai';
 import sinon from 'sinon';
 import MockWebex from '@webex/test-helper-mock-webex';
 import {BNR_STATUS} from '@webex/plugin-meetings/src/constants';
+
 import BEHAVIORAL_METRICS from '@webex/plugin-meetings/src/metrics/constants';
 import Meeting from '@webex/plugin-meetings/src/meeting';
 import Meetings from '@webex/plugin-meetings';
@@ -211,12 +212,14 @@ describe('plugin-meetings', () => {
       });
 
       it('if called twice, does bnr effect enable on audio track for the first request and resolves second', async () => {
-        Promise.all([effects.handleClientRequest(true, meeting), effects.handleClientRequest(true, meeting)])
-          .then((resolveFirst, resolveSecond) => {
-            assert.isTrue(resolveFirst);
-            assert.isTrue(resolveSecond);
-            assert.calledOnce(MediaUtil.createMediaStream);
-          });
+        Promise.all([
+          effects.handleClientRequest(true, meeting),
+          effects.handleClientRequest(true, meeting),
+        ]).then((resolveFirst, resolveSecond) => {
+          assert.isTrue(resolveFirst);
+          assert.isTrue(resolveSecond);
+          assert.calledOnce(MediaUtil.createMediaStream);
+        });
       });
 
       it('should throw error for inappropriate sample rate and send error metrics', async () => {