fix unit tests

Signed-off-by: nkomonen-amazon <[email protected]>

Author: nkomonen-amazon

packages/core/src/shared/telemetry/util.ts

@@ -217,9 +217,14 @@ let _hadClientIdOnStartup = false
 /**
  * Returns true if the ClientID existed before this session started
  */
-export const hadClientIdOnStartup = (globalState: GlobalState) => {
+export const hadClientIdOnStartup = (
+    globalState: GlobalState,
+    update = (globalState: GlobalState) => {
+        getClientId(globalState)
+    }
+) => {
     // triggers the flow that will update the state, if not done already
-    getClientId(globalState)
+    update(globalState)
 
     return _hadClientIdOnStartup
 }

packages/core/src/test/credentials/utils.test.ts

@@ -11,23 +11,23 @@ import globals from '../../shared/extensionGlobals'
 
 describe('ExtensionUse.isFirstUse()', function () {
     let instance: ExtensionUse
+    const notHasExistingConnections = () => false
 
     beforeEach(async function () {
         instance = new ExtensionUse()
-        await globals.globalState.update(ExtensionUse.instance.isExtensionFirstUseKey, true)
+        await makeStateValueNotExist()
     })
 
     it('is true only on first startup', function () {
-        assert.strictEqual(instance.isFirstUse(), true, 'Failed on first call.')
-        assert.strictEqual(instance.isFirstUse(), true, 'Failed on second call.')
+        assert.strictEqual(instance.isFirstUse(notHasExistingConnections), true, 'Failed on first call.')
+        assert.strictEqual(instance.isFirstUse(notHasExistingConnections), true, 'Failed on second call.')
 
         const nextStartup = nextExtensionStartup()
-        assert.strictEqual(nextStartup.isFirstUse(), false, 'Failed on new startup.')
+        assert.strictEqual(nextStartup.isFirstUse(notHasExistingConnections), false, 'Failed on new startup.')
     })
 
     it('true when: (state value not exists + NOT has existing connections)', async function () {
         await makeStateValueNotExist()
-        const notHasExistingConnections = () => false
         assert.strictEqual(
             instance.isFirstUse(notHasExistingConnections),
             true,

packages/core/src/test/shared/telemetry/util.test.ts

@@ -141,6 +141,11 @@ describe('getClientId', function () {
     }
 
     function setClientIdEnvVar(val: string | undefined) {
+        if (val === undefined) {
+            delete process.env[telemetryClientIdEnvKey]
+            return
+        }
+
         process.env[telemetryClientIdEnvKey] = val
     }
 
@@ -227,19 +232,19 @@ describe('getClientId', function () {
     describe('hadClientIdOnStartup', async function () {
         it('returns false when no existing clientId', async function () {
             const globalState = new GlobalState(new FakeMemento())
-            assert.strictEqual(hadClientIdOnStartup(globalState), false)
+            assert.strictEqual(hadClientIdOnStartup(globalState, testGetClientId), false)
         })
 
         it('returns true when existing env var clientId', async function () {
             const globalState = new GlobalState(new FakeMemento())
             setClientIdEnvVar('aaa-111')
-            assert.strictEqual(hadClientIdOnStartup(globalState), true)
+            assert.strictEqual(hadClientIdOnStartup(globalState, testGetClientId), true)
         })
 
         it('returns true when existing state clientId', async function () {
             const globalState = new GlobalState(new FakeMemento())
             await globalState.update('telemetryClientId', 'bbb-222')
-            assert.strictEqual(hadClientIdOnStartup(globalState), true)
+            assert.strictEqual(hadClientIdOnStartup(globalState, testGetClientId), true)
         })
     })
 })