@webex/webex-core 3.12.0-next.8 → 3.12.0-task-refactor.1

package/test/integration/spec/services/service-catalog.js

@@ -510,19 +510,13 @@ describe('webex-core', () => {
       );
 
       it('resolves to an authed u2c hostmap when no params specified', () => {
-        assert.typeOf(fullRemoteHM, 'object');
-        assert.property(fullRemoteHM, 'serviceLinks');
-        assert.property(fullRemoteHM, 'hostCatalog');
-        assert.equal(fullRemoteHM.format, 'hostmap');
-        assert.isAbove(Object.keys(fullRemoteHM.serviceLinks).length, 0);
+        assert.typeOf(fullRemoteHM, 'array');
+        assert.isAbove(fullRemoteHM.length, 0);
       });
 
       it('resolves to a limited u2c hostmap when params specified', () => {
-        assert.typeOf(limitedRemoteHM, 'object');
-        assert.property(limitedRemoteHM, 'serviceLinks');
-        assert.property(limitedRemoteHM, 'hostCatalog');
-        assert.equal(limitedRemoteHM.format, 'hostmap');
-        assert.isAbove(Object.keys(limitedRemoteHM.serviceLinks).length, 0);
+        assert.typeOf(limitedRemoteHM, 'array');
+        assert.isAbove(limitedRemoteHM.length, 0);
       });
 
       it('rejects if the params provided are invalid', () =>

package/test/integration/spec/services/services.js

@@ -404,13 +404,10 @@ describe('webex-core', () => {
         assert.isTrue(catalog.isReady);
       });
 
-      it('should call services#initServiceCatalogs() on webex ready', async () => {
-        services._loadCatalogFromCache = sinon.stub().resolves(false);
+      it('should call services#initServiceCatalogs() on webex ready', () => {
         services.initServiceCatalogs = sinon.stub().resolves();
         services.initialize();
         webex.trigger('ready');
-        // Wait for the async 'ready' handler to complete
-        await new Promise((resolve) => setTimeout(resolve, 50));
         assert.called(services.initServiceCatalogs);
         assert.isTrue(catalog.isReady);
       });
@@ -700,11 +697,7 @@ describe('webex-core', () => {
 
       it('updates query.email to be emailhash-ed using SHA256', (done) => {
         catalog.updateServiceUrls = sinon.stub().returns({}); // returns `this`
-        services._fetchNewServiceHostmap = sinon.stub().resolves({
-          serviceLinks: {},
-          hostCatalog: {},
-          format: 'hostmap',
-        });
+        services._fetchNewServiceHostmap = sinon.stub().resolves();
 
         services
           .updateServices({
@@ -834,12 +827,9 @@ describe('webex-core', () => {
 
       const getActivationRequest = (requestStub, useUserOnboarding = false) => {
         const expectedService = useUserOnboarding ? 'user-onboarding' : 'license';
-        const expectedResource = useUserOnboarding
-          ? 'api/v1/users/activations'
-          : 'users/activations';
+        const expectedResource = useUserOnboarding ? 'api/v1/users/activations' : 'users/activations';
         const requests = requestStub.args.filter(
-          ([request]) =>
-            request.service === expectedService && request.resource === expectedResource
+          ([request]) => request.service === expectedService && request.resource === expectedResource
         );
 
         assert.strictEqual(requests.length, 1);
@@ -918,7 +908,7 @@ describe('webex-core', () => {
             assert.equal(Object.keys(unauthServices.list(false, 'postauth')).length, 0);
           }));
 
-      it('validates new user with activationOptions suppressEmail true', () =>
+      it.skip('validates new user with activationOptions suppressEmail true', () =>
         unauthServices
           .validateUser({
             email: `Collabctg+webex-js-sdk-${uuid.v4()}@gmail.com`,
@@ -1264,19 +1254,13 @@ describe('webex-core', () => {
       );
 
       it('resolves to an authed u2c hostmap when no params specified', () => {
-        assert.typeOf(fullRemoteHM, 'object');
-        assert.property(fullRemoteHM, 'serviceLinks');
-        assert.property(fullRemoteHM, 'hostCatalog');
-        assert.equal(fullRemoteHM.format, 'hostmap');
-        assert.isAbove(Object.keys(fullRemoteHM.serviceLinks).length, 0);
+        assert.typeOf(fullRemoteHM, 'array');
+        assert.isAbove(fullRemoteHM.length, 0);
       });
 
       it('resolves to a limited u2c hostmap when params specified', () => {
-        assert.typeOf(limitedRemoteHM, 'object');
-        assert.property(limitedRemoteHM, 'serviceLinks');
-        assert.property(limitedRemoteHM, 'hostCatalog');
-        assert.equal(limitedRemoteHM.format, 'hostmap');
-        assert.isAbove(Object.keys(limitedRemoteHM.serviceLinks).length, 0);
+        assert.typeOf(limitedRemoteHM, 'array');
+        assert.isAbove(limitedRemoteHM.length, 0);
       });
 
       it('rejects if the params provided are invalid', () =>

package/test/integration/spec/services-v2/services-v2.js

@@ -23,7 +23,7 @@ import {
   formattedServiceHostmapEntryConv,
   formattedServiceHostmapEntryMercury,
   formattedServiceHostmapEntryTest,
-  serviceHostmapV2,
+  serviceHostmapV2
 } from '../../../fixtures/host-catalog-v2';
 
 // /* eslint-disable no-underscore-dangle */
@@ -316,13 +316,10 @@ describe('webex-core', () => {
         assert.isTrue(catalog.isReady);
       });
 
-      it('should call services#initServiceCatalogs() on webex ready', async () => {
-        services._loadCatalogFromCache = sinon.stub().resolves(false);
+      it('should call services#initServiceCatalogs() on webex ready', () => {
         services.initServiceCatalogs = sinon.stub().resolves();
         services.initialize();
         webex.trigger('ready');
-        // Wait for the async 'ready' handler to complete
-        await new Promise((resolve) => setTimeout(resolve, 50));
         assert.called(services.initServiceCatalogs);
         assert.isTrue(catalog.isReady);
       });
@@ -416,11 +413,7 @@ describe('webex-core', () => {
             .initServiceCatalogs(true)
             // services#updateServices() gets called once by the limited catalog
             // retrieval and should get called again when authorized.
-            .then(
-              () =>
-                assert.calledTwice(services.updateServices) &&
-                assert.calledWith(services.updateServices, sinon.match({forceRefresh: true}))
-            )
+            .then(() => assert.calledTwice(services.updateServices) && assert.calledWith(services.updateServices, sinon.match({forceRefresh: true})))
         );
       });
     });
@@ -757,12 +750,9 @@ describe('webex-core', () => {
 
       const getActivationRequest = (requestStub, useUserOnboarding = false) => {
         const expectedService = useUserOnboarding ? 'user-onboarding' : 'license';
-        const expectedResource = useUserOnboarding
-          ? 'api/v1/users/activations'
-          : 'users/activations';
+        const expectedResource = useUserOnboarding ? 'api/v1/users/activations' : 'users/activations';
         const requests = requestStub.args.filter(
-          ([request]) =>
-            request.service === expectedService && request.resource === expectedResource
+          ([request]) => request.service === expectedService && request.resource === expectedResource
         );
 
         assert.strictEqual(requests.length, 1);
@@ -835,7 +825,7 @@ describe('webex-core', () => {
             assert.equal(r.user.verificationEmailTriggered, true);
           }));
 
-      it('validates new user with activationOptions suppressEmail true', () =>
+      it.skip('validates new user with activationOptions suppressEmail true', () =>
         unauthServices
           .validateUser({
             email: `Collabctg+webex-js-sdk-${uuid.v4()}@gmail.com`,

package/test/unit/spec/services/service-url.js

@@ -151,116 +151,6 @@ describe('webex-core', () => {
 
         assert.isTrue(homeClusterUrls.every((host) => !host.failed));
       });
-
-      describe('when hosts have negative priorities', () => {
-        it('should return defaultUrl when all hosts have negative priorities', () => {
-          const negativeServiceUrl = new ServiceUrl({
-            defaultUrl: 'https://default.example.com/api/v1',
-            hosts: [
-              {
-                host: 'example-host-neg1.com',
-                priority: -1,
-                ttl: -1,
-                id: '1',
-                homeCluster: true,
-              },
-              {
-                host: 'example-host-neg2.com',
-                priority: -1,
-                ttl: -1,
-                id: '2',
-                homeCluster: true,
-              },
-            ],
-            name: 'negative-priority-test',
-          });
-
-          assert.equal(
-            negativeServiceUrl._getPriorityHostUrl(),
-            'https://default.example.com/api/v1'
-          );
-        });
-
-        it('should return defaultUrl when all hosts have zero priority', () => {
-          const zeroServiceUrl = new ServiceUrl({
-            defaultUrl: 'https://default.example.com/api/v1',
-            hosts: [
-              {
-                host: 'example-host-zero.com',
-                priority: 0,
-                ttl: -1,
-                id: '1',
-                homeCluster: true,
-              },
-            ],
-            name: 'zero-priority-test',
-          });
-
-          assert.equal(zeroServiceUrl._getPriorityHostUrl(), 'https://default.example.com/api/v1');
-        });
-
-        it('should ignore hosts with negative priorities and return valid host', () => {
-          const mixedServiceUrl = new ServiceUrl({
-            defaultUrl: 'https://default.example.com/api/v1',
-            hosts: [
-              {
-                host: 'example-host-neg.com',
-                priority: -1,
-                ttl: -1,
-                id: '1',
-                homeCluster: true,
-              },
-              {
-                host: 'example-host-valid.com',
-                priority: 5,
-                ttl: -1,
-                id: '2',
-                homeCluster: true,
-              },
-            ],
-            name: 'mixed-priority-test',
-          });
-
-          const result = mixedServiceUrl._getPriorityHostUrl();
-
-          assert.include(result, 'example-host-valid.com');
-          assert.notInclude(result, 'example-host-neg.com');
-        });
-
-        it('should select lowest positive priority host when mixed with negative priorities', () => {
-          const mixedServiceUrl = new ServiceUrl({
-            defaultUrl: 'https://default.example.com/api/v1',
-            hosts: [
-              {
-                host: 'example-host-neg.com',
-                priority: -1,
-                ttl: -1,
-                id: '1',
-                homeCluster: true,
-              },
-              {
-                host: 'example-host-p5.com',
-                priority: 5,
-                ttl: -1,
-                id: '2',
-                homeCluster: true,
-              },
-              {
-                host: 'example-host-p2.com',
-                priority: 2,
-                ttl: -1,
-                id: '3',
-                homeCluster: true,
-              },
-            ],
-            name: 'mixed-priority-test',
-          });
-
-          const result = mixedServiceUrl._getPriorityHostUrl();
-
-          assert.include(result, 'example-host-p2.com');
-        });
-      });
     });
 
     describe('#failHost()', () => {