@webex/webex-core 3.0.0-bnr.5 → 3.0.0

package/test/unit/spec/interceptors/auth.js

@@ -12,6 +12,7 @@ import Logger from '@webex/plugin-logger';
 import MockWebex from '@webex/test-helper-mock-webex';
 import {AuthInterceptor, config, Credentials, WebexHttpError, Token} from '@webex/webex-core';
 import {cloneDeep, merge} from 'lodash';
+import Metrics from '@webex/internal-plugin-metrics';
 
 const {assert} = chai;
 
@@ -28,6 +29,7 @@ describe('webex-core', () => {
           children: {
             credentials: Credentials,
             logger: Logger,
+            metrics: Metrics,
           },
           config: merge(cloneDeep(config), {credentials: {client_secret: 'fake'}}),
         });
@@ -41,6 +43,7 @@ describe('webex-core', () => {
         );
 
         interceptor = Reflect.apply(AuthInterceptor.create, webex, []);
+        sinon.stub(webex.internal.metrics, 'submitClientMetrics').callsFake(() => {});
       });
 
       describe('#onRequest()', () => {
@@ -254,7 +257,7 @@ describe('webex-core', () => {
             Promise.resolve(services[pto.name] || pto.url);
         });
 
-        afterEach('remove services plugin', () => {
+        afterEach(() => {
           if (webex.internal.services) {
             delete webex.internal.services;
           }

package/test/unit/spec/interceptors/embargo.js

@@ -12,7 +12,7 @@ describe('webex-core', () => {
   describe('EmbargoInterceptor', () => {
     let interceptor;
 
-    before('create interceptor', () => {
+    beforeAll(() => {
       interceptor = new EmbargoInterceptor();
     });
 
@@ -23,7 +23,7 @@ describe('webex-core', () => {
       let options;
       let reason;
 
-      beforeEach('create options object', () => {
+      beforeEach(() => {
         options = {
           uri: 'http://not-a-url.com/embargoed',
         };
@@ -46,8 +46,8 @@ describe('webex-core', () => {
         ].join('');
       });
 
-      describe("when the reason does have a '451' status code", () => {
-        beforeEach('set appropriate status code and spys', () => {
+      describe('when the reason does have a \'451\' status code', () => {
+        beforeEach(() => {
           reason = new WebexHttpError.InternalServerError({
             message: 'test message',
             statusCode: 451,
@@ -78,7 +78,7 @@ describe('webex-core', () => {
         describe('when the device plugin is mounted', () => {
           let deviceClear;
 
-          beforeEach('set up the device plugin', () => {
+          beforeEach(() => {
             interceptor.webex.internal.device = {
               clear: sinon.spy(),
             };
@@ -93,8 +93,8 @@ describe('webex-core', () => {
         });
       });
 
-      describe("when the reason does not have a '451' status code", () => {
-        beforeEach('set appropriate status code and spys', () => {
+      describe('when the reason does not have a \'451\' status code', () => {
+        beforeEach(() => {
           reason = new WebexHttpError.InternalServerError({
             message: 'test message',
             statusCode: 452,
@@ -125,7 +125,7 @@ describe('webex-core', () => {
         describe('when the device plugin is mounted', () => {
           let deviceClear;
 
-          beforeEach('set up the device plugin', () => {
+          beforeEach(() => {
             interceptor.webex.internal.device = {
               clear: sinon.spy(),
             };

package/test/unit/spec/interceptors/webex-user-agent.js

@@ -27,7 +27,7 @@ describe('webex-core', () => {
           assert.property(options.headers, 'spark-user-agent');
           assert.equal(
             options.headers['spark-user-agent'],
-            `webex-js-sdk/${pkg.version} (${typeof window === 'undefined' ? 'node' : 'web'})`
+            `webex-js-sdk/development (${typeof window === 'undefined' ? 'node' : 'web'})`
           );
         });
 
@@ -47,7 +47,7 @@ describe('webex-core', () => {
           assert.property(options.headers, 'spark-user-agent');
           assert.equal(
             options.headers['spark-user-agent'],
-            `webex-js-sdk/${pkg.version} (${typeof window === 'undefined' ? 'node' : 'web'})`
+            `webex-js-sdk/development (${typeof window === 'undefined' ? 'node' : 'web'})`
           );
         });
 
@@ -74,7 +74,7 @@ describe('webex-core', () => {
           assert.property(options.headers, 'spark-user-agent');
           assert.equal(
             options.headers['spark-user-agent'],
-            `webex-js-sdk/${pkg.version} (${
+            `webex-js-sdk/development (${
               typeof window === 'undefined' ? 'node' : 'web'
             }) sample/1.0.0`
           );
@@ -104,7 +104,7 @@ describe('webex-core', () => {
           assert.property(options.headers, 'spark-user-agent');
           assert.equal(
             options.headers['spark-user-agent'],
-            `webex-js-sdk/${pkg.version} (${
+            `webex-js-sdk/development (${
               typeof window === 'undefined' ? 'node' : 'web'
             }) sample/1.0.0 custom-label/1.0.0`
           );
@@ -128,7 +128,7 @@ describe('webex-core', () => {
             assert.property(options.headers, 'spark-user-agent');
             assert.equal(
               options.headers['spark-user-agent'],
-              `webex/${pkg.version} (${typeof window === 'undefined' ? 'node' : 'web'})`
+              `webex/development (${typeof window === 'undefined' ? 'node' : 'web'})`
             );
           });
 
@@ -149,7 +149,7 @@ describe('webex-core', () => {
             assert.property(options.headers, 'spark-user-agent');
             assert.equal(
               options.headers['spark-user-agent'],
-              `webex/${pkg.version} (${typeof window === 'undefined' ? 'node' : 'web'})`
+              `webex/development (${typeof window === 'undefined' ? 'node' : 'web'})`
             );
           });
         });

package/test/unit/spec/lib/page.js

@@ -11,7 +11,7 @@ describe('webex-core', () => {
     describe('#constructor', () => {
       let page;
 
-      before(() => {
+      beforeAll(() => {
         sinon.stub(Page, 'parseLinkHeaders');
         const response = {
           body: {
@@ -45,7 +45,7 @@ describe('webex-core', () => {
     describe('#next', () => {
       let page, webex;
 
-      before(() => {
+      beforeAll(() => {
         webex = {
           request: sinon.stub().returns(
             Promise.resolve({
@@ -84,7 +84,7 @@ describe('webex-core', () => {
     describe('#previous', () => {
       let page, webex;
 
-      before(() => {
+      beforeAll(() => {
         webex = {
           request: sinon.stub().returns(
             Promise.resolve({

package/test/unit/spec/services/interceptors/server-error.js

@@ -12,7 +12,7 @@ describe('webex-core', () => {
   describe('ServerErrorInterceptor', () => {
     let interceptor;
 
-    before(() => {
+    beforeAll(() => {
       interceptor = new ServerErrorInterceptor();
     });
 
@@ -76,7 +76,7 @@ describe('webex-core', () => {
         });
 
         describe('when the web-ha feature is enabled', () => {
-          beforeEach('mock device and metrics', () => {
+          beforeEach(() => {
             get.returns({value: true});
           });
 
@@ -132,7 +132,7 @@ describe('webex-core', () => {
         });
 
         describe('when the web-ha feature is not available or disabled', () => {
-          beforeEach('setup web-ha feature to be disabled', () => {
+          beforeEach(() => {
             get.returns({value: false});
           });
 
@@ -163,7 +163,7 @@ describe('webex-core', () => {
       });
 
       describe('when the reason is not a webex server error', () => {
-        beforeEach('set the reason to a mutable object', () => {
+        beforeEach(() => {
           options.uri = 'http://not-a-url.com/';
           reason = {};
         });
@@ -178,7 +178,7 @@ describe('webex-core', () => {
       });
 
       describe('when the uri does not exist', () => {
-        beforeEach('set uri to undefined and get the output', () => {
+        beforeEach(() => {
           delete options.uri;
           reason = new WebexHttpError.InternalServerError({
             statusCode: 500,

package/test/unit/spec/services/interceptors/service.js

@@ -5,6 +5,7 @@ import chai from 'chai';
 import chaiAsPromised from 'chai-as-promised';
 import sinon from 'sinon';
 import {ServiceInterceptor} from '@webex/webex-core';
+import CONFIG from '../../../../../src/config';
 
 const {assert} = chai;
 
@@ -26,6 +27,7 @@ describe('webex-core', () => {
         service: 'example',
         serviceUrl: 'https://www.example-service.com/',
         uri: 'https://www.example-uri.com/',
+        waitForServiceTimeout: 11,
       };
 
       options = {};
@@ -34,8 +36,11 @@ describe('webex-core', () => {
     describe('#generateUri()', () => {
       let uri;
 
-      beforeEach('generate uri', () => {
-        uri = interceptor.generateUri(fixture.serviceUrl, fixture.resource);
+      beforeEach(() => {
+        uri = interceptor.generateUri(
+          fixture.serviceUrl,
+          fixture.resource
+        );
       });
       it('should remove all trailing slashes', () => assert.equal(uri.split('//').length, 2));
 
@@ -47,7 +52,7 @@ describe('webex-core', () => {
 
     describe('#normalizeOptions()', () => {
       describe('when the api parameter is defined', () => {
-        beforeEach('define the api parameter', () => {
+        beforeEach(() => {
           options.api = fixture.api;
         });
 
@@ -58,7 +63,7 @@ describe('webex-core', () => {
         });
 
         describe('when the service parameter is defined', () => {
-          beforeEach('define the service parameter', () => {
+          beforeEach(() => {
             options.service = fixture.service;
           });
 
@@ -73,7 +78,7 @@ describe('webex-core', () => {
 
     describe('#onRequest()', () => {
       describe('when the uri parameter is defined', () => {
-        beforeEach('assign a uri parameter', () => {
+        beforeEach(() => {
           options.uri = fixture.uri;
         });
 
@@ -89,7 +94,7 @@ describe('webex-core', () => {
       describe('when the uri parameter is not defined', () => {
         let waitForService;
 
-        beforeEach('setup mock methods', () => {
+        beforeEach(() => {
           interceptor.normalizeOptions = sinon.stub();
           interceptor.validateOptions = sinon.stub();
           interceptor.generateUri = sinon.stub();
@@ -107,6 +112,7 @@ describe('webex-core', () => {
 
           options.service = fixture.service;
           options.resource = fixture.resource;
+          options.timeout = fixture.waitForServiceTimeout;
         });
 
         it('should normalize the options', () =>
@@ -116,13 +122,14 @@ describe('webex-core', () => {
           interceptor.onRequest(options).then(() => assert.called(interceptor.validateOptions)));
 
         it('should attempt to collect the service url', () =>
-          interceptor
-            .onRequest(options)
-            .then(() => assert.calledWith(waitForService, {name: options.service})));
+          interceptor.onRequest(options).then(
+            assert.calledWith(waitForService, {
+              name: options.service,
+              timeout: options.waitForServiceTimeout,
+            })
+          ));
 
         describe('when the service url was collected successfully', () => {
-          beforeEach('generate additional mocks', () => {});
-
           it('should attempt to generate the full uri', () =>
             interceptor
               .onRequest(options)
@@ -153,7 +160,7 @@ describe('webex-core', () => {
 
     describe('#validateOptions()', () => {
       describe('when the resource parameter is not defined', () => {
-        beforeEach('setup parameters', () => {
+        beforeEach(() => {
           options.service = fixture.service;
         });
 
@@ -163,7 +170,7 @@ describe('webex-core', () => {
       });
 
       describe('when the service parameter is not defined', () => {
-        beforeEach('setup parameters', () => {
+        beforeEach(() => {
           options.resource = fixture.resource;
         });
 
@@ -173,7 +180,7 @@ describe('webex-core', () => {
       });
 
       describe('when the service and resource parameters are defined', () => {
-        beforeEach('setup parameters', () => {
+        beforeEach(() => {
           options.service = fixture.service;
           options.resource = fixture.resource;
         });

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

@@ -13,7 +13,7 @@ describe('webex-core', () => {
     let services;
     let catalog;
 
-    before('initialize webex', () => {
+    beforeAll(() => {
       webex = new MockWebex();
       services = new Services(undefined, {parent: webex});
       catalog = services._getCatalog();
@@ -71,7 +71,7 @@ describe('webex-core', () => {
     });
 
     describe('#clean()', () => {
-      beforeEach('ammend data to the catalog', () => {
+      beforeEach(() => {
         catalog.serviceGroups.preauth = [1, 2, 3];
         catalog.serviceGroups.signin = [1, 2, 3];
         catalog.serviceGroups.postauth = [1, 2, 3];
@@ -100,13 +100,17 @@ describe('webex-core', () => {
     describe('#findAllowedDomain()', () => {
       const domains = [];
 
-      beforeEach('generate allowed domains', () => {
-        domains.push('example-a', 'example-b', 'example-c');
+      beforeEach(() => {
+        domains.push(
+          'example-a',
+          'example-b',
+          'example-c'
+        );
 
         catalog.setAllowedDomains(domains);
       });
 
-      afterEach('remove allowed domains', () => {
+      afterEach(() => {
         domains.length = 0;
       });
 
@@ -120,13 +124,17 @@ describe('webex-core', () => {
     describe('#getAllowedDomains()', () => {
       const domains = [];
 
-      beforeEach('generate allowed domains', () => {
-        domains.push('example-a', 'example-b', 'example-c');
+      beforeEach(() => {
+        domains.push(
+          'example-a',
+          'example-b',
+          'example-c'
+        );
 
         catalog.setAllowedDomains(domains);
       });
 
-      afterEach('remove allowed domains', () => {
+      afterEach(() => {
         domains.length = 0;
       });
 
@@ -140,7 +148,7 @@ describe('webex-core', () => {
     describe('#list()', () => {
       let serviceList;
 
-      beforeEach('get services list', () => {
+      beforeEach(() => {
         serviceList = catalog.list();
       });
 
@@ -159,13 +167,17 @@ describe('webex-core', () => {
     describe('#setAllowedDomains()', () => {
       const domains = [];
 
-      beforeEach('generate allowed domains', () => {
-        domains.push('example-a', 'example-b', 'example-c');
+      beforeEach(() => {
+        domains.push(
+          'example-a',
+          'example-b',
+          'example-c'
+        );
 
         catalog.setAllowedDomains(domains);
       });
 
-      afterEach('remove allowed domains', () => {
+      afterEach(() => {
         domains.length = 0;
       });
 

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

@@ -8,7 +8,7 @@ describe('webex-core', () => {
     let fixture;
     let serviceHost;
 
-    before('generate fixture', () => {
+    beforeAll(() => {
       fixture = {
         catalog: 'discovery',
         defaultUri: 'https://example-default.com/',
@@ -32,7 +32,7 @@ describe('webex-core', () => {
     });
 
     describe('class members', () => {
-      beforeEach('generate service host', () => {
+      beforeEach(() => {
         serviceHost = new ServiceHost(fixture);
       });
 
@@ -180,7 +180,7 @@ describe('webex-core', () => {
         describe('#polyGenerate()', () => {
           let polyFixture;
 
-          beforeEach('set the poly fixture', () => {
+          beforeEach(() => {
             polyFixture = {
               catalog: fixture.catalog,
               name: fixture.id.split(':')[3],

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

@@ -10,7 +10,7 @@ describe('webex-core', () => {
     let fixtureHosts;
     let serviceRegistry;
 
-    before('generate fixture', () => {
+    beforeAll(() => {
       fixture = {
         serviceLinks: {
           'example-service-a-name': 'http://example-service-a.com/',
@@ -63,7 +63,7 @@ describe('webex-core', () => {
       }, []);
     });
 
-    beforeEach('initialize a service catalog', () => {
+    beforeEach(() => {
       serviceRegistry = new ServiceRegistry();
     });
 
@@ -77,7 +77,7 @@ describe('webex-core', () => {
       describe('#map', () => {
         let priorityLocalHosts;
 
-        beforeEach('setup hosts', () => {
+        beforeEach(() => {
           serviceRegistry.load(
             ServiceRegistry.mapRemoteCatalog({
               catalog: SERVICE_CATALOGS[0],
@@ -108,13 +108,11 @@ describe('webex-core', () => {
       let filter;
       let host;
 
-      beforeEach('generate the service host class objects', () => {
-        serviceRegistry.load(
-          ServiceRegistry.mapRemoteCatalog({
-            catalog: SERVICE_CATALOGS[0],
-            ...fixture,
-          })
-        );
+      beforeEach(() => {
+        serviceRegistry.load(ServiceRegistry.mapRemoteCatalog({
+          catalog: SERVICE_CATALOGS[0],
+          ...fixture
+        }));
 
         host = serviceRegistry.hosts[0];
 
@@ -158,13 +156,11 @@ describe('webex-core', () => {
       let filter;
       let filteredHost;
 
-      beforeEach('generate the service host class objects', () => {
-        serviceRegistry.load(
-          ServiceRegistry.mapRemoteCatalog({
-            catalog: SERVICE_CATALOGS[0],
-            ...fixture,
-          })
-        );
+      beforeEach(() => {
+        serviceRegistry.load(ServiceRegistry.mapRemoteCatalog({
+          catalog: SERVICE_CATALOGS[0],
+          ...fixture
+        }));
 
         filteredHost = serviceRegistry.hosts[0];
 
@@ -201,7 +197,7 @@ describe('webex-core', () => {
       let failedHost;
       let filteredHosts;
 
-      beforeEach('generate the service host class objects', () => {
+      beforeEach(() => {
         hostList = ServiceRegistry.mapRemoteCatalog({
           catalog: SERVICE_CATALOGS[0],
           ...fixture,
@@ -238,7 +234,7 @@ describe('webex-core', () => {
       let hostsCustomA;
       let hostsCustomB;
 
-      beforeEach('generate the service host class objects', () => {
+      beforeEach(() => {
         hostsCustomA = ServiceRegistry.mapRemoteCatalog({
           catalog: SERVICE_CATALOGS[0],
           ...fixture,
@@ -291,7 +287,7 @@ describe('webex-core', () => {
       let remoteHosts;
       let localHosts;
 
-      beforeEach('generate the service host class objects', () => {
+      beforeEach(() => {
         serviceRegistry.load(
           ServiceRegistry.mapRemoteCatalog({
             catalog: SERVICE_CATALOGS[0],
@@ -331,7 +327,7 @@ describe('webex-core', () => {
       let filteredHosts;
       let priorityHosts;
 
-      beforeEach('generate the service host class objects', () => {
+      beforeEach(() => {
         serviceRegistry.load(
           ServiceRegistry.mapRemoteCatalog({
             catalog: SERVICE_CATALOGS[0],
@@ -383,7 +379,7 @@ describe('webex-core', () => {
       let serviceHosts;
       let serviceName;
 
-      beforeEach('generate the service host class objects', () => {
+      beforeEach(() => {
         serviceRegistry.load(
           ServiceRegistry.mapRemoteCatalog({
             catalog: SERVICE_CATALOGS[0],
@@ -437,7 +433,7 @@ describe('webex-core', () => {
       let filteredHostA;
       let filteredHostB;
 
-      beforeEach('generate the service host class objects', () => {
+      beforeEach(() => {
         serviceRegistry.load(
           ServiceRegistry.mapRemoteCatalog({
             catalog: SERVICE_CATALOGS[0],
@@ -480,13 +476,11 @@ describe('webex-core', () => {
       let filter;
       let host;
 
-      beforeEach('generate the service host class objects', () => {
-        serviceRegistry.load(
-          ServiceRegistry.mapRemoteCatalog({
-            catalog: SERVICE_CATALOGS[0],
-            ...fixture,
-          })
-        );
+      beforeEach(() => {
+        serviceRegistry.load(ServiceRegistry.mapRemoteCatalog({
+          catalog: SERVICE_CATALOGS[0],
+          ...fixture
+        }));
 
         host = serviceRegistry.hosts[0];
 
@@ -589,13 +583,11 @@ describe('webex-core', () => {
       let filter;
       let filteredHost;
 
-      beforeEach('generate the service host class objects', () => {
-        serviceRegistry.load(
-          ServiceRegistry.mapRemoteCatalog({
-            catalog: SERVICE_CATALOGS[0],
-            ...fixture,
-          })
-        );
+      beforeEach(() => {
+        serviceRegistry.load(ServiceRegistry.mapRemoteCatalog({
+          catalog: SERVICE_CATALOGS[0],
+          ...fixture
+        }));
 
         filteredHost = serviceRegistry.hosts[0];
 
@@ -631,13 +623,11 @@ describe('webex-core', () => {
       let filter;
       let filteredHost;
 
-      beforeEach('generate the service host class objects', () => {
-        serviceRegistry.load(
-          ServiceRegistry.mapRemoteCatalog({
-            catalog: SERVICE_CATALOGS[0],
-            ...fixture,
-          })
-        );
+      beforeEach(() => {
+        serviceRegistry.load(ServiceRegistry.mapRemoteCatalog({
+          catalog: SERVICE_CATALOGS[0],
+          ...fixture
+        }));
 
         filteredHost = serviceRegistry.hosts[0];
 

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

@@ -5,7 +5,7 @@ describe('webex-core', () => {
   describe('ServiceState', () => {
     let serviceState;
 
-    beforeEach('generate service state', () => {
+    beforeEach(() => {
       serviceState = new ServiceState();
     });
 

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

@@ -13,7 +13,7 @@ describe('webex-core', () => {
     let serviceUrl;
     let template;
 
-    beforeEach('initialize webex', () => {
+    beforeEach(() => {
       webex = new MockWebex();
       /* eslint-disable-next-line no-unused-vars */
       const services = new Services(undefined, {parent: webex});
@@ -128,7 +128,7 @@ describe('webex-core', () => {
     describe('#_getPriorityHostUrl()', () => {
       let highPriorityHost;
 
-      beforeEach('get a high priority host manually', () => {
+      beforeEach(() => {
         highPriorityHost = serviceUrl._generateHostUrl(
           serviceUrl.hosts.reduce((o, c) => (o.priority > c.priority || !o.homeCluster ? c : o))
             .host