patch: test update

Author: yuhao900914

test/amplitude-client.js

@@ -2859,8 +2859,9 @@ describe('AmplitudeClient', function () {
 
     it('should not set eventUploadThreshold with invalid eventUploadThreshold value', function () {
       amplitude.init(apiKey);
+      let previousEventUploadThreshold = amplitude.options.eventUploadThreshold;
       amplitude.setEventUploadThreshold('invalid eventUploadThreshold');
-      assert.equal(amplitude.options.eventUploadThreshold, 30);
+      assert.equal(amplitude.options.eventUploadThreshold, previousEventUploadThreshold);
     });
 
     it('should set eventUploadThreshold', function () {
@@ -2953,9 +2954,9 @@ describe('AmplitudeClient', function () {
 
     it('should not set optOut with invalid input', function () {
       amplitude.init(apiKey);
-      let optOut = 'invalid sessionTimeOut';
-      amplitude.setOptOut(optOut);
-      assert.equal(amplitude.options.optOut, false);
+      let previousOptOut = amplitude.options.optOut;
+      amplitude.setOptOut('invalid sessionTimeOut');
+      assert.equal(amplitude.options.optOut, previousOptOut);
     });
 
     it('should set optOut', function () {
@@ -4237,7 +4238,7 @@ describe('AmplitudeClient', function () {
       reset();
     });
 
-    it('EU serverZone should not set apiEndpoint to EU because of invaid useDynamicConfig value', function () {
+    it('EU serverZone should not set apiEndpoint to EU because of invalid useDynamicConfig value', function () {
       assert.equal(amplitude.options.apiEndpoint, constants.EVENT_LOG_URL);
       amplitude.init(apiKey, null, {
         serverZone: AmplitudeServerZone.EU,
@@ -4282,7 +4283,7 @@ describe('AmplitudeClient', function () {
     it('should set serverUrl with valid serverUrl input', function () {
       assert.equal(amplitude.options.apiEndpoint, constants.EVENT_LOG_URL);
       amplitude.init(apiKey);
-      amplitude.setServerUrl('api.eu.amplitude.com');
+      amplitude.setServerUrl(constants.EVENT_LOG_EU_URL);
       assert.equal(amplitude.options.apiEndpoint, constants.EVENT_LOG_EU_URL);
     });
   });
@@ -4293,40 +4294,33 @@ describe('AmplitudeClient', function () {
     });
 
     it('should not set serverZone with invalid serverZone value', function () {
-      assert.equal(amplitude.options.serverZone, 'US');
       amplitude.init(apiKey);
+      let previousServerZone = amplitude.options.serverZone;
       amplitude.setServerZone('invalid serverZone');
-      assert.equal(amplitude.options.serverZone, 'US');
+      assert.equal(amplitude.options.serverZone, previousServerZone);
     });
 
     it('should not set serverZone with invalid serverZoneBasedApi value', function () {
-      assert.equal(amplitude.options.serverZone, 'US');
       amplitude.init(apiKey);
-      amplitude.setServerZone('EU', 'invalid serverZoneBasedApi');
-      assert.equal(amplitude.options.serverZone, 'US');
+      assert.equal(amplitude.options.serverZone, AmplitudeServerZone.US);
+      amplitude.setServerZone(AmplitudeServerZone.EU, 'invalid serverZoneBasedApi');
+      assert.equal(amplitude.options.serverZone, AmplitudeServerZone.US);
     });
 
     it('should set serverZone to EU', function () {
-      assert.equal(amplitude.options.serverZone, 'US');
-      amplitude.init(apiKey);
-      amplitude.setServerZone('EU');
-      assert.equal(amplitude.options.serverZone, 'EU');
-    });
-
-    it('should set serverZont to EU and serverUrl to EVENT_LOG_EU_URL with serverZoneBasedApi is true', function () {
-      assert.equal(amplitude.options.serverZone, 'US');
       amplitude.init(apiKey);
-      amplitude.setServerZone('EU', true);
-      assert.equal(amplitude.options.serverZone, 'EU');
-      assert.equal(amplitude.options.apiEndpoint, 'api.eu.amplitude.com');
+      assert.equal(amplitude.options.serverZone, AmplitudeServerZone.US);
+      amplitude.setServerZone(AmplitudeServerZone.EU);
+      assert.equal(amplitude.options.serverZone, AmplitudeServerZone.EU);
+      assert.equal(amplitude.options.apiEndpoint, constants.EVENT_LOG_EU_URL);
     });
 
-    it('should set serverZont to EU and keep the default serverUrl with serverZoneBasedApi is false', function () {
-      assert.equal(amplitude.options.serverZone, 'US');
+    it('should set serverZone to EU and keep the default serverUrl with serverZoneBasedApi is false', function () {
       amplitude.init(apiKey);
-      amplitude.setServerZone('EU', false);
-      assert.equal(amplitude.options.serverZone, 'EU');
-      assert.equal(amplitude.options.apiEndpoint, 'api.amplitude.com');
+      assert.equal(amplitude.options.serverZone, AmplitudeServerZone.US);
+      amplitude.setServerZone(AmplitudeServerZone.EU, false);
+      assert.equal(amplitude.options.serverZone, AmplitudeServerZone.EU);
+      assert.equal(amplitude.options.apiEndpoint, constants.EVENT_LOG_URL);
     });
   });
 
@@ -4338,7 +4332,7 @@ describe('AmplitudeClient', function () {
     it('should get userId', function () {
       amplitude.init(apiKey, userId);
       let currentUserId = amplitude.getUserId();
-      assert.equal(amplitude.options.userId, currentUserId);
+      assert.equal(currentUserId, userId);
     });
 
     it('should get userId null', function () {
@@ -4371,9 +4365,10 @@ describe('AmplitudeClient', function () {
 
     it('should not set sessionTimeout with invalid input', function () {
       amplitude.init(apiKey);
+      let previousSessionTimeOut = amplitude.options.sessionTimeout;
       let newSessionTimeOut = 'invalid sessionTimeOut';
       amplitude.setMinTimeBetweenSessionsMillis(newSessionTimeOut);
-      assert.equal(amplitude.options.sessionTimeout, 30 * 60 * 1000);
+      assert.equal(amplitude.options.sessionTimeout, previousSessionTimeOut);
     });
 
     it('should set sessionTimeout', function () {
@@ -4416,13 +4411,15 @@ describe('AmplitudeClient', function () {
       clock.tick(sessionId);
       amplitude.init(apiKey);
       assert.equal(amplitude.getSessionId(), startTime);
+      assert.equal(amplitude.options.userId, null);
 
       amplitude.setUserId('test user', 'invalid startNewSession');
       assert.notEqual(amplitude.getSessionId(), new Date().getTime());
       assert.notEqual(amplitude.options.userId, 'test user');
+      assert.equal(amplitude.options.userId, null);
     });
 
-    it('should renew the session id with current timestemp', function () {
+    it('should set user id and renew the session id with current timestemp', function () {
       var amplitude = new AmplitudeClient();
       // set up initial session
       var sessionId = 1000;