@webex/calling 3.0.0-next.8 → 3.0.1

package/dist/CallingClient/CallingClient.test.js

@@ -22,23 +22,24 @@ var _types2 = require("../common/types");
 var _types3 = require("../Events/types");
 var _Logger = _interopRequireDefault(require("../Logger"));
 var _CallingClient = require("./CallingClient");
-var utils = _interopRequireWildcard(require("../common/Utils"));
+var _Utils = _interopRequireWildcard(require("../common/Utils"));
+var utils = _Utils;
 var _callManager = require("./calling/callManager");
 var _constants = require("./constants");
 var _callRecordFixtures = require("./callRecordFixtures");
-var _types4 = require("./line/types");
 var _callingClientFixtures = require("./callingClientFixtures");
 var _line = _interopRequireDefault(require("./line"));
 var _registerFixtures = require("./registration/registerFixtures");
-function _getRequireWildcardCache(nodeInterop) { if (typeof _WeakMap !== "function") return null; var cacheBabelInterop = new _WeakMap(); var cacheNodeInterop = new _WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = _Object$defineProperty && _Object$getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? _Object$getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { _Object$defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-function ownKeys(object, enumerableOnly) { var keys = _Object$keys2(object); if (_Object$getOwnPropertySymbols) { var symbols = _Object$getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return _Object$getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _getRequireWildcardCache(e) { if ("function" != typeof _WeakMap) return null; var r = new _WeakMap(), t = new _WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = _Object$defineProperty && _Object$getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? _Object$getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? _Object$defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function ownKeys(e, r) { var t = _Object$keys2(e); if (_Object$getOwnPropertySymbols) { var o = _Object$getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return _Object$getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; } /* eslint-disable dot-notation */
 describe('CallingClient Tests', function () {
   // Common initializers
 
   var handleErrorSpy = jest.spyOn(utils, 'handleCallingClientErrors');
   var webex = (0, _testUtil.getTestUtilsWebex)();
+  webex.internal.services['_hostCatalog'] = _callingClientFixtures.mockCatalogUS;
   var defaultServiceIndicator = _types2.ServiceIndicator.CALLING;
   var callManager = (0, _callManager.getCallManager)(webex, defaultServiceIndicator);
   var logSpy = jest.spyOn(_Logger.default, 'info');
@@ -378,7 +379,7 @@ describe('CallingClient Tests', function () {
             expect(webex.request).nthCalledWith(1, _objectSpread(_objectSpread({
               method: 'GET'
             }, (0, _testUtil.getMockRequestTemplate)()), {}, {
-              uri: "".concat(_callingClientFixtures.uri, "myip")
+              uri: "".concat(callingClient['mobiusHost']).concat(_constants.URL_ENDPOINT).concat(_constants.IP_ENDPOINT)
             }));
             expect(webex.request).nthCalledWith(2, {
               method: 'GET',
@@ -389,7 +390,7 @@ describe('CallingClient Tests', function () {
             expect(webex.request).nthCalledWith(3, _objectSpread(_objectSpread({
               method: 'GET'
             }, (0, _testUtil.getMockRequestTemplate)()), {}, {
-              uri: "".concat(_callingClientFixtures.uri, "?regionCode=").concat(_callingClientFixtures.regionBody.clientRegion, "&countryCode=").concat(_callingClientFixtures.regionBody.countryCode)
+              uri: "".concat(callingClient['mobiusHost']).concat(_constants.URL_ENDPOINT, "?regionCode=").concat(_callingClientFixtures.regionBody.clientRegion, "&countryCode=").concat(_callingClientFixtures.regionBody.countryCode)
             }));
           case 10:
           case "end":
@@ -414,22 +415,29 @@ describe('CallingClient Tests', function () {
             });
           case 4:
             callingClient = _context14.sent;
-            expect(handleErrorSpy).toBeCalledOnceWith(failurePayload, expect.anything(), {
-              file: _constants.CALLING_CLIENT_FILE,
-              method: 'getMobiusServers'
-            });
-            expect(webex.request).toBeCalledOnceWith(_objectSpread(_objectSpread({}, (0, _testUtil.getMockRequestTemplate)()), {}, {
-              uri: "".concat(_callingClientFixtures.uri, "myip"),
+            expect(webex.request).nthCalledWith(1, _objectSpread(_objectSpread({}, (0, _testUtil.getMockRequestTemplate)()), {}, {
+              uri: 'https://mobius-us-east-1.prod.infra.webex.com/api/v1/calling/web/myip',
               method: 'GET'
             }));
-            expect(callingClient.primaryMobiusUris).toEqual([_callingClientFixtures.uri]);
-            expect(webex.request).nthCalledWith(1, _objectSpread(_objectSpread({
+            expect(webex.request).nthCalledWith(2, _objectSpread(_objectSpread({}, (0, _testUtil.getMockRequestTemplate)()), {}, {
+              uri: 'https://mobius-ca-central-1.prod.infra.webex.com/api/v1/calling/web/myip',
               method: 'GET'
-            }, (0, _testUtil.getMockRequestTemplate)()), {}, {
-              uri: "".concat(_callingClientFixtures.uri, "myip")
             }));
-            expect(warnSpy).toBeCalledWith('Error in finding Mobius Servers. Will use the default URL.', '');
-          case 10:
+            expect(webex.request).nthCalledWith(3, _objectSpread(_objectSpread({}, (0, _testUtil.getMockRequestTemplate)()), {}, {
+              uri: 'https://mobius-eu-central-1.prod.infra.webex.com/api/v1/calling/web/myip',
+              method: 'GET'
+            }));
+            expect(webex.request).nthCalledWith(4, _objectSpread(_objectSpread({}, (0, _testUtil.getMockRequestTemplate)()), {}, {
+              uri: 'https://mobius-ap-southeast-2.prod.infra.webex.com/api/v1/calling/web/myip',
+              method: 'GET'
+            }));
+            expect(handleErrorSpy).toBeCalledWith(failurePayload, expect.anything(), {
+              file: _constants.CALLING_CLIENT_FILE,
+              method: 'getMobiusServers'
+            });
+            expect(callingClient.primaryMobiusUris).toEqual(["".concat(callingClient['mobiusHost']).concat(_constants.URL_ENDPOINT)]);
+            expect(warnSpy).toBeCalledWith("Couldn't resolve the region and country code. Defaulting to the catalog entries to discover mobius servers", '');
+          case 12:
           case "end":
             return _context14.stop();
         }
@@ -457,11 +465,11 @@ describe('CallingClient Tests', function () {
               method: 'getMobiusServers'
             });
             expect(webex.request).toBeCalledTimes(3);
-            expect(callingClient.primaryMobiusUris).toEqual([_callingClientFixtures.uri]);
+            expect(callingClient.primaryMobiusUris).toEqual(["".concat(callingClient['mobiusHost']).concat(_constants.URL_ENDPOINT)]);
             expect(webex.request).nthCalledWith(1, _objectSpread(_objectSpread({
               method: 'GET'
             }, (0, _testUtil.getMockRequestTemplate)()), {}, {
-              uri: "".concat(_callingClientFixtures.uri, "myip")
+              uri: "".concat(callingClient['mobiusHost']).concat(_constants.URL_ENDPOINT).concat(_constants.IP_ENDPOINT)
             }));
             expect(webex.request).nthCalledWith(2, {
               method: 'GET',
@@ -469,7 +477,7 @@ describe('CallingClient Tests', function () {
               addAuthHeader: false,
               headers: (0, _defineProperty2.default)({}, _constants.SPARK_USER_AGENT, null)
             });
-            expect(warnSpy).toBeCalledWith('Error in finding Mobius Servers. Will use the default URL.', '');
+            expect(warnSpy).toBeCalledWith("Couldn't resolve the region and country code. Defaulting to the catalog entries to discover mobius servers", '');
           case 11:
           case "end":
             return _context15.stop();
@@ -501,7 +509,7 @@ describe('CallingClient Tests', function () {
               method: 'getMobiusServers'
             });
             expect(webex.request).toBeCalledOnceWith(_objectSpread(_objectSpread({}, (0, _testUtil.getMockRequestTemplate)()), {}, {
-              uri: "".concat(_callingClientFixtures.uri, "?regionCode=").concat(_callingClientFixtures.regionBody.clientRegion, "&countryCode=").concat(_callingClientFixtures.regionBody.countryCode),
+              uri: "".concat(callingClient['mobiusHost']).concat(_constants.URL_ENDPOINT, "?regionCode=").concat(_callingClientFixtures.regionBody.clientRegion, "&countryCode=").concat(_callingClientFixtures.regionBody.countryCode),
               method: 'GET'
             }));
             expect(handleErrorSpy).not.toBeCalled();
@@ -512,43 +520,101 @@ describe('CallingClient Tests', function () {
       }, _callee16);
     })));
   });
+  describe('Testing each cluster present withing host catalog', function () {
+    var mobiusCluster = ['mobius-eu-central-1.prod.infra.webex.com', 'mobius-us-east-1.int.infra.webex.com', 'mobius-eu-central-1.int.infra.webex.com'];
+    var checkCluster = /*#__PURE__*/function () {
+      var _ref17 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee17(mockServiceHosts, mockCatalog) {
+        var callingClient;
+        return _regenerator.default.wrap(function _callee17$(_context17) {
+          while (1) switch (_context17.prev = _context17.next) {
+            case 0:
+              webex.internal.services._hostCatalog = mockCatalog;
+              _context17.next = 3;
+              return (0, _CallingClient.createClient)(webex, {
+                logger: {
+                  level: _types.LOGGER.INFO
+                }
+              });
+            case 3:
+              callingClient = _context17.sent;
+              expect(callingClient['mobiusClusters']).toStrictEqual(mockServiceHosts);
+            case 5:
+            case "end":
+              return _context17.stop();
+          }
+        }, _callee17);
+      }));
+      return function checkCluster(_x, _x2) {
+        return _ref17.apply(this, arguments);
+      };
+    }();
+    it.each(mobiusCluster)('%s', /*#__PURE__*/function () {
+      var _ref18 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee18(clusterName) {
+        return _regenerator.default.wrap(function _callee18$(_context18) {
+          while (1) switch (_context18.prev = _context18.next) {
+            case 0:
+              _context18.t0 = clusterName;
+              _context18.next = _context18.t0 === 'mobius-eu-central-1.prod.infra.webex.com' ? 3 : _context18.t0 === 'mobius-us-east-1.int.infra.webex.com' ? 5 : _context18.t0 === 'mobius-eu-central-1.int.infra.webex.com' ? 7 : 9;
+              break;
+            case 3:
+              checkCluster(_callingClientFixtures.mockEUServiceHosts, _callingClientFixtures.mockCatalogEU);
+              return _context18.abrupt("break", 10);
+            case 5:
+              checkCluster(_callingClientFixtures.mockIntServiceHosts, _callingClientFixtures.mockCatalogUSInt);
+              return _context18.abrupt("break", 10);
+            case 7:
+              checkCluster(_callingClientFixtures.mockEUIntServiceHosts, _callingClientFixtures.mockCatalogEUInt);
+              return _context18.abrupt("break", 10);
+            case 9:
+              return _context18.abrupt("break", 10);
+            case 10:
+            case "end":
+              return _context18.stop();
+          }
+        }, _callee18);
+      }));
+      return function (_x3) {
+        return _ref18.apply(this, arguments);
+      };
+    }());
+  });
   describe('Network activity detection tests', function () {
     var callingClient;
     var line;
     var reg;
-    var deRegSpy;
     var restoreSpy;
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    var deRegSpy;
     var restartRegisterSpy;
     var registerSpy;
-    beforeEach( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee17() {
-      return _regenerator.default.wrap(function _callee17$(_context17) {
-        while (1) switch (_context17.prev = _context17.next) {
+    beforeEach( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee19() {
+      return _regenerator.default.wrap(function _callee19$(_context19) {
+        while (1) switch (_context19.prev = _context19.next) {
           case 0:
             jest.useFakeTimers();
             webex.request.mockResolvedValueOnce(_callingClientFixtures.ipPayload).mockResolvedValueOnce(_callingClientFixtures.regionPayload).mockResolvedValueOnce(_callingClientFixtures.discoveryPayload).mockResolvedValueOnce(_callingClientFixtures.registrationPayload);
-            _context17.next = 4;
+            _context19.next = 4;
             return (0, _CallingClient.createClient)(webex, {
               logger: {
                 level: _types.LOGGER.INFO
               }
             });
           case 4:
-            callingClient = _context17.sent;
+            callingClient = _context19.sent;
             line = (0, _values.default)(callingClient.lineDict)[0];
             reg = line.registration;
-            expect(line.getRegistrationStatus()).toEqual(_types2.MobiusStatus.DEFAULT);
-            _context17.next = 10;
+            _context19.next = 9;
             return line.register();
-          case 10:
+          case 9:
             deRegSpy = jest.spyOn(line.registration, 'deregister');
             restoreSpy = jest.spyOn(reg, 'restorePreviousRegistration');
             restartRegisterSpy = jest.spyOn(reg, 'restartRegistration');
             registerSpy = jest.spyOn(reg, 'attemptRegistrationWithServers');
-          case 14:
+          case 13:
           case "end":
-            return _context17.stop();
+            return _context19.stop();
         }
-      }, _callee17);
+      }, _callee19);
     })));
     afterEach(function () {
       jest.clearAllTimers();
@@ -558,18 +624,18 @@ describe('CallingClient Tests', function () {
       callingClient = undefined;
       jest.useRealTimers();
     });
-    it('detect a network flap in mercury connection', /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee18() {
-      return _regenerator.default.wrap(function _callee18$(_context18) {
-        while (1) switch (_context18.prev = _context18.next) {
+    it('detect a network flap in mercury connection', /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee20() {
+      return _regenerator.default.wrap(function _callee20$(_context20) {
+        while (1) switch (_context20.prev = _context20.next) {
           case 0:
-            expect(line.getRegistrationStatus()).toEqual(_types2.MobiusStatus.ACTIVE);
+            expect(line.getStatus()).toEqual(_types2.RegistrationStatus.ACTIVE);
 
             /* Set mercury connection to be down and execute a delay of 2.5 seconds */
             webex.internal.mercury.connected = false;
             jest.advanceTimersByTime(_constants.NETWORK_FLAP_TIMEOUT + 500);
 
             /* We should be detecting the network flap */
-            expect(warnSpy).toBeCalledWith('Network has flapped, waiting for mercury connection to be up', {
+            expect(warnSpy).toBeCalledOnceWith('Network has flapped, waiting for mercury connection to be up', {
               file: _constants.CALLING_CLIENT_FILE,
               method: _constants.NETWORK_CHANGE_DETECTION_UTIL
             });
@@ -577,32 +643,31 @@ describe('CallingClient Tests', function () {
             /* Set mercury connection to be up and execute a delay of 2.5 seconds */
             webex.internal.mercury.connected = true;
             jest.advanceTimersByTime(_constants.NETWORK_FLAP_TIMEOUT + 500);
-            _context18.next = 8;
+            _context20.next = 8;
             return flushPromises();
           case 8:
             /* We should be detecting the network recovery */
-            expect(logSpy).nthCalledWith(7, 'Mercury connection is up again, Re-registering with Mobius', {
+            expect(logSpy).toBeCalledWith('Mercury connection is up again, re-registering with Webex Calling if needed', {
               file: _constants.REGISTRATION_FILE,
               method: 'handleConnectionRestoration'
             });
-            expect(deRegSpy).toBeCalledWith();
             expect(restoreSpy).toBeCalledWith('handleConnectionRestoration');
             expect(restartRegisterSpy).toBeCalledWith('handleConnectionRestoration');
             expect(webex.request).toBeCalledTimes(6);
             expect(registerSpy).toBeCalledWith('handleConnectionRestoration', [reg.getActiveMobiusUrl()]);
             expect(registerSpy).lastCalledWith('handleConnectionRestoration', [_callingClientFixtures.primaryUrl]);
-          case 15:
+          case 14:
           case "end":
-            return _context18.stop();
+            return _context20.stop();
         }
-      }, _callee18);
+      }, _callee20);
     })));
-    it('Simulate a network flap with no active calls and re-verify registration: Restore Failure', /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee19() {
+    it('Simulate a network flap with no active calls and re-verify registration: Restore Failure', /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee21() {
       var failurePayload, mockRegistrationBody, successPayload;
-      return _regenerator.default.wrap(function _callee19$(_context19) {
-        while (1) switch (_context19.prev = _context19.next) {
+      return _regenerator.default.wrap(function _callee21$(_context21) {
+        while (1) switch (_context21.prev = _context21.next) {
           case 0:
-            expect(line.getRegistrationStatus()).toEqual(_types2.MobiusStatus.ACTIVE);
+            expect(line.getStatus()).toEqual(_types2.RegistrationStatus.ACTIVE);
             failurePayload = {
               statusCode: 500,
               body: ''
@@ -627,41 +692,39 @@ describe('CallingClient Tests', function () {
             /* Set mercury connection to be up and execute a delay of 2.5 seconds */
             webex.internal.mercury.connected = true;
             jest.advanceTimersByTime(_constants.NETWORK_FLAP_TIMEOUT + 500);
-            _context19.next = 12;
+            _context21.next = 12;
             return flushPromises();
           case 12:
             /* We should be detecting the network recovery */
-            expect(logSpy).toBeCalledWith('Mercury connection is up again, Re-registering with Mobius', {
+            expect(logSpy).toBeCalledWith('Mercury connection is up again, re-registering with Webex Calling if needed', {
               file: _constants.REGISTRATION_FILE,
               method: 'handleConnectionRestoration'
             });
-            expect(deRegSpy).toBeCalledWith();
-            expect(restoreSpy).toBeCalledWith('handleConnectionRestoration');
-            expect(restartRegisterSpy).toBeCalledWith('handleConnectionRestoration');
+            expect(restoreSpy).toBeCalledOnceWith('handleConnectionRestoration');
+            expect(restartRegisterSpy).toBeCalledOnceWith('handleConnectionRestoration');
             expect(webex.request).toBeCalledTimes(6);
             expect(registerSpy).toBeCalledWith('handleConnectionRestoration', [reg.getActiveMobiusUrl()]);
             expect(registerSpy).lastCalledWith('handleConnectionRestoration', [_callingClientFixtures.primaryUrl]);
-          case 19:
+          case 18:
           case "end":
-            return _context19.stop();
+            return _context21.stop();
         }
-      }, _callee19);
+      }, _callee21);
     })));
-    it('Simulate a network flap before initial registration is done', /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee20() {
-      return _regenerator.default.wrap(function _callee20$(_context20) {
-        while (1) switch (_context20.prev = _context20.next) {
+    it('Simulate a network flap before initial registration is done', /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee22() {
+      var handleConnectionRestoreSpy;
+      return _regenerator.default.wrap(function _callee22$(_context22) {
+        while (1) switch (_context22.prev = _context22.next) {
           case 0:
-            expect(line.getRegistrationStatus()).toEqual(_types2.MobiusStatus.ACTIVE);
-            reg.deregister();
-            reg.setActiveMobiusUrl(undefined);
-            jest.clearAllMocks();
+            handleConnectionRestoreSpy = jest.spyOn(reg, 'handleConnectionRestoration');
+            reg.setStatus(_types2.RegistrationStatus.IDLE);
 
             /* Set mercury connection to be down and execute a delay of 2.5 seconds */
             webex.internal.mercury.connected = false;
             jest.advanceTimersByTime(_constants.NETWORK_FLAP_TIMEOUT + 500);
 
             /* We should be detecting the network flap */
-            expect(warnSpy).toBeCalledWith('Network has flapped, waiting for mercury connection to be up', {
+            expect(warnSpy).toBeCalledOnceWith('Network has flapped, waiting for mercury connection to be up', {
               file: _constants.CALLING_CLIENT_FILE,
               method: _constants.NETWORK_CHANGE_DETECTION_UTIL
             });
@@ -669,11 +732,11 @@ describe('CallingClient Tests', function () {
             /* Set mercury connection to be up and execute a delay of 2.5 seconds */
             webex.internal.mercury.connected = true;
             jest.advanceTimersByTime(_constants.NETWORK_FLAP_TIMEOUT + 500);
-            _context20.next = 11;
+            _context22.next = 9;
             return flushPromises();
-          case 11:
+          case 9:
             /* We should be detecting the network recovery */
-            expect(logSpy).toBeCalledWith('Mercury connection is up again, Re-registering with Mobius', {
+            expect(logSpy).not.toBeCalledWith('Mercury connection is up again, re-registering with Webex Calling if needed', {
               file: _constants.REGISTRATION_FILE,
               method: 'handleConnectionRestoration'
             });
@@ -682,20 +745,18 @@ describe('CallingClient Tests', function () {
              * When initial registration is not done, network flap
              * will not trigger de-registration/registration
              */
-            expect(webex.request).not.toBeCalled();
-            expect(restoreSpy).not.toBeCalled();
-            expect(registerSpy).not.toBeCalled();
-          case 15:
+            expect(handleConnectionRestoreSpy).not.toBeCalledOnceWith();
+          case 11:
           case "end":
-            return _context20.stop();
+            return _context22.stop();
         }
-      }, _callee20);
+      }, _callee22);
     })));
-    it('Simulate a network flap with 1 active call', /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee21() {
-      return _regenerator.default.wrap(function _callee21$(_context21) {
-        while (1) switch (_context21.prev = _context21.next) {
+    it('Simulate a network flap with 1 active call', /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee23() {
+      return _regenerator.default.wrap(function _callee23$(_context23) {
+        while (1) switch (_context23.prev = _context23.next) {
           case 0:
-            expect(line.getRegistrationStatus()).toEqual(_types2.MobiusStatus.ACTIVE);
+            expect(line.getStatus()).toEqual(_types2.RegistrationStatus.ACTIVE);
 
             /** create a new call */
             reg.callManager.createCall();
@@ -704,11 +765,11 @@ describe('CallingClient Tests', function () {
             /* Set mercury connection to be down and execute a delay of 2.5 seconds */
             webex.internal.mercury.connected = false;
             jest.advanceTimersByTime(_constants.NETWORK_FLAP_TIMEOUT + 500);
-            _context21.next = 7;
+            _context23.next = 7;
             return flushPromises();
           case 7:
             /* We should be detecting the network flap */
-            expect(warnSpy).not.toBeCalledWith('Network has flapped, waiting for mercury connection to be up', {
+            expect(warnSpy).not.toBeCalledOnceWith('Network has flapped, waiting for mercury connection to be up', {
               file: _constants.CALLING_CLIENT_FILE,
               method: 'handleConnectionRestoration'
             });
@@ -716,39 +777,39 @@ describe('CallingClient Tests', function () {
             /* Set mercury connection to be up and execute a delay of 2.5 seconds */
             webex.internal.mercury.connected = true;
             jest.advanceTimersByTime(_constants.NETWORK_FLAP_TIMEOUT + 500);
-            _context21.next = 12;
+            _context23.next = 12;
             return flushPromises();
           case 12:
             /* We should be detecting the network recovery */
-            expect(logSpy).not.toBeCalledWith('Mercury connection is up again, Re-registering with Mobius', {
+            expect(logSpy).not.toBeCalledOnceWith('Mercury connection is up again, re-registering with Webex Calling if needed', {
               file: _constants.REGISTRATION_FILE,
               method: 'handleConnectionRestoration'
             });
             expect(registerSpy).not.toBeCalledWith(true);
           case 14:
           case "end":
-            return _context21.stop();
+            return _context23.stop();
         }
-      }, _callee21);
+      }, _callee23);
     })));
   });
   describe('Line creation tests', function () {
     var callingClient;
     var line;
-    beforeEach( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee22() {
-      return _regenerator.default.wrap(function _callee22$(_context22) {
-        while (1) switch (_context22.prev = _context22.next) {
+    beforeEach( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee24() {
+      return _regenerator.default.wrap(function _callee24$(_context24) {
+        while (1) switch (_context24.prev = _context24.next) {
           case 0:
-            _context22.next = 2;
+            _context24.next = 2;
             return (0, _CallingClient.createClient)(webex);
           case 2:
-            callingClient = _context22.sent;
+            callingClient = _context24.sent;
             line = (0, _values.default)(callingClient.lineDict)[0];
           case 4:
           case "end":
-            return _context22.stop();
+            return _context24.stop();
         }
-      }, _callee22);
+      }, _callee24);
     })));
     afterEach(function () {
       jest.clearAllTimers();
@@ -774,7 +835,7 @@ describe('CallingClient Tests', function () {
     var mutex = new _asyncMutex.Mutex();
     var userId = webex.internal.device.userId;
     var clientDeviceUri = webex.internal.device.url;
-    var mobiusUris = (0, utils.filterMobiusUris)((0, _testUtil.getMobiusDiscoveryResponse)(), _registerFixtures.URL);
+    var mobiusUris = (0, _Utils.filterMobiusUris)((0, _testUtil.getMobiusDiscoveryResponse)(), _registerFixtures.URL);
     var primaryMobiusUris = jest.fn(function () {
       return mobiusUris.primary;
     });
@@ -783,25 +844,25 @@ describe('CallingClient Tests', function () {
     });
     var callingClient;
     var line;
-    beforeAll( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee23() {
+    beforeAll( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee25() {
       var calls;
-      return _regenerator.default.wrap(function _callee23$(_context23) {
-        while (1) switch (_context23.prev = _context23.next) {
+      return _regenerator.default.wrap(function _callee25$(_context25) {
+        while (1) switch (_context25.prev = _context25.next) {
           case 0:
-            _context23.next = 2;
+            _context25.next = 2;
             return (0, _CallingClient.createClient)(webex);
           case 2:
-            callingClient = _context23.sent;
-            line = new _line.default(userId, clientDeviceUri, _types4.LineStatus.ACTIVE, mutex, primaryMobiusUris(), backupMobiusUris(), _types.LOGGER.INFO);
+            callingClient = _context25.sent;
+            line = new _line.default(userId, clientDeviceUri, mutex, primaryMobiusUris(), backupMobiusUris(), _types.LOGGER.INFO);
             calls = (0, _values.default)(callManager.getActiveCalls());
             calls.forEach(function (call) {
               call.end();
             });
           case 6:
           case "end":
-            return _context23.stop();
+            return _context25.stop();
         }
-      }, _callee23);
+      }, _callee25);
     })));
     afterAll(function () {
       callingClient.removeAllListeners();
@@ -884,23 +945,23 @@ describe('CallingClient Tests', function () {
   describe('Call Session Event test', function () {
     var mockOn = webex.internal.mercury.on;
     var callingClient;
-    beforeEach( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee24() {
-      return _regenerator.default.wrap(function _callee24$(_context24) {
-        while (1) switch (_context24.prev = _context24.next) {
+    beforeEach( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee26() {
+      return _regenerator.default.wrap(function _callee26$(_context26) {
+        while (1) switch (_context26.prev = _context26.next) {
           case 0:
-            _context24.next = 2;
+            _context26.next = 2;
             return (0, _CallingClient.createClient)(webex, {
               logger: {
                 level: _types.LOGGER.INFO
               }
             });
           case 2:
-            callingClient = _context24.sent;
+            callingClient = _context26.sent;
           case 3:
           case "end":
-            return _context24.stop();
+            return _context26.stop();
         }
-      }, _callee24);
+      }, _callee26);
     })));
     afterEach(function () {
       callingClient.removeAllListeners();