fix tests

Author: jankuca

src/platform/notebooks/deepnote/integrationStorage.unit.test.ts

@@ -1,4 +1,4 @@
-import { assert } from 'chai';
+import assert from 'assert';
 import { anything, instance, mock, when } from 'ts-mockito';
 
 import { IEncryptedStorage } from '../../common/application/types';
@@ -217,7 +217,7 @@ suite('IntegrationStorage', () => {
             assert.strictEqual(result, undefined);
         });
 
-        test('Fires onDidChangeIntegrations event when saving', (done) => {
+        test('Fires onDidChangeIntegrations event when saving', async () => {
             const config: DatabaseIntegrationConfig = {
                 id: 'postgres-1',
                 name: 'My Postgres',
@@ -232,11 +232,13 @@ suite('IntegrationStorage', () => {
                 }
             };
 
+            let eventCount = 0;
             storage.onDidChangeIntegrations(() => {
-                done();
+                eventCount++;
             });
 
-            storage.save(config);
+            await storage.save(config);
+            assert.strictEqual(eventCount, 1);
         });
     });
 
@@ -263,7 +265,7 @@ suite('IntegrationStorage', () => {
             assert.strictEqual(result, undefined);
         });
 
-        test('Fires onDidChangeIntegrations event when deleting', (done) => {
+        test('Fires onDidChangeIntegrations event when deleting', async () => {
             const config: DatabaseIntegrationConfig = {
                 id: 'postgres-1',
                 name: 'My Postgres',
@@ -281,13 +283,10 @@ suite('IntegrationStorage', () => {
             let eventCount = 0;
             storage.onDidChangeIntegrations(() => {
                 eventCount++;
-                if (eventCount === 2) {
-                    // First event is from save, second is from delete
-                    done();
-                }
             });
 
-            storage.save(config).then(() => storage.delete('postgres-1'));
+            await storage.save(config).then(() => storage.delete('postgres-1'));
+            assert.strictEqual(eventCount, 2);
         });
     });
 
@@ -352,12 +351,14 @@ suite('IntegrationStorage', () => {
             assert.deepStrictEqual(result, []);
         });
 
-        test('Fires onDidChangeIntegrations event when clearing', (done) => {
+        test('Fires onDidChangeIntegrations event when clearing', async () => {
+            let eventCount = 0;
             storage.onDidChangeIntegrations(() => {
-                done();
+                eventCount++;
             });
 
-            storage.clear();
+            await storage.clear();
+            assert.strictEqual(eventCount, 1);
         });
     });
 

src/platform/notebooks/deepnote/legacyIntegrationConfigUtils.unit.test.ts

@@ -1,4 +1,4 @@
-import { assert } from 'chai';
+import assert from 'assert';
 
 import { upgradeLegacyIntegrationConfig } from './legacyIntegrationConfigUtils';
 import {
@@ -54,6 +54,7 @@ suite('upgradeLegacyIntegrationConfig', () => {
             const result = await upgradeLegacyIntegrationConfig(legacyConfig);
 
             assert.ok(result);
+            assert.strictEqual(result.type, 'pgsql');
             assert.strictEqual(result.metadata.sslEnabled, false);
         });
 
@@ -72,6 +73,7 @@ suite('upgradeLegacyIntegrationConfig', () => {
             const result = await upgradeLegacyIntegrationConfig(legacyConfig);
 
             assert.ok(result);
+            assert.strictEqual(result.type, 'pgsql');
             assert.strictEqual(result.metadata.port, '5433');
             assert.strictEqual(typeof result.metadata.port, 'string');
         });
@@ -161,7 +163,7 @@ suite('upgradeLegacyIntegrationConfig', () => {
             assert.strictEqual(result.name, 'My Snowflake');
             assert.strictEqual(result.type, 'snowflake');
             // The authMethod is converted to the database-integrations format (lowercase/kebab-case)
-            assert.ok(result.metadata.authMethod);
+            assert.strictEqual(result.metadata.authMethod, 'password');
             assert.strictEqual(result.metadata.accountName, 'myaccount');
             assert.strictEqual(result.metadata.warehouse, 'mywarehouse');
             assert.strictEqual(result.metadata.database, 'mydb');
@@ -184,7 +186,8 @@ suite('upgradeLegacyIntegrationConfig', () => {
             const result = await upgradeLegacyIntegrationConfig(legacyConfig);
 
             assert.ok(result);
-            assert.ok(result.metadata.authMethod);
+            assert.strictEqual(result.type, 'snowflake');
+            assert.strictEqual(result.metadata.authMethod, 'password');
             assert.strictEqual(result.metadata.accountName, 'myaccount');
             assert.strictEqual(result.metadata.username, 'myuser');
             assert.strictEqual(result.metadata.password, 'mypass');
@@ -228,7 +231,7 @@ suite('upgradeLegacyIntegrationConfig', () => {
             assert.strictEqual(result.id, 'snowflake-keypair-1');
             assert.strictEqual(result.name, 'My Snowflake KeyPair');
             assert.strictEqual(result.type, 'snowflake');
-            assert.ok(result.metadata.authMethod);
+            assert.strictEqual(result.metadata.authMethod, 'service-account-key-pair');
             assert.strictEqual(result.metadata.accountName, 'myaccount');
             assert.strictEqual(result.metadata.username, 'myuser');
             assert.strictEqual(
@@ -252,6 +255,7 @@ suite('upgradeLegacyIntegrationConfig', () => {
             const result = await upgradeLegacyIntegrationConfig(legacyConfig);
 
             assert.ok(result);
+            assert.strictEqual(result.type, 'snowflake');
             assert.ok(result.metadata.authMethod);
         });