chore: add test

Author: Aenimus

cli/src/commands/auth/commands/login.ts

@@ -4,6 +4,7 @@ import pc from 'picocolors';
 import jwtDecode from 'jwt-decode';
 import inquirer from 'inquirer';
 import { EnumStatusCode } from '@wundergraph/cosmo-connect/dist/common/common_pb';
+import ora from 'ora';
 import { BaseCommandOptions } from '../../../core/types/types.js';
 import { DecodedAccessToken, performDeviceAuth, startPollingForAccessToken } from '../utils.js';
 import { updateConfigFile } from '../../../utils.js';
@@ -50,6 +51,8 @@ export default (opts: BaseCommandOptions) => {
     const organizationSlugs = new Set(decoded.groups.map((group) => group.split('/')[1]));
 
     const organizationSlugByDisplayKey = new Map<string, string>();
+    const organizationKeys: Array<string> = [];
+    const spinner = ora('Fetching organizations...').start();
     for (const organizationSlug of organizationSlugs) {
       const headers = getBaseHeaders();
       const response = await opts.client.platform.getOrganizationBySlug(
@@ -65,16 +68,22 @@ export default (opts: BaseCommandOptions) => {
         },
       );
       if (!response.response || response.response.code !== EnumStatusCode.OK || !response.organization) {
+        organizationKeys.push(organizationSlug);
         organizationSlugByDisplayKey.set(organizationSlug, organizationSlug);
         continue;
       }
-      organizationSlugByDisplayKey.set(`${response.organization.name} (${organizationSlug})`, organizationSlug);
+      const organizationKey = `${response.organization.name} (${organizationSlug})`;
+      organizationKeys.push(organizationKey);
+      organizationSlugByDisplayKey.set(organizationKey, organizationSlug);
     }
+
+    spinner.stop();
+
     const selectedOrganization = await inquirer.prompt({
       name: 'organizationKey',
       type: 'list',
       message: 'Select Organization:',
-      choices: [...organizationSlugByDisplayKey.keys()],
+      choices: organizationKeys,
     });
 
     const organizationSlug = organizationSlugByDisplayKey.get(selectedOrganization.organizationKey);

controlplane/test/organization/getOrganizationBySlug.test.ts

@@ -0,0 +1,53 @@
+import { randomUUID } from 'node:crypto';
+import { afterAll, afterEach, beforeAll, beforeEach, describe, expect, test, vi } from 'vitest';
+import { EnumStatusCode } from '@wundergraph/cosmo-connect/dist/common/common_pb';
+import { SetupTest } from '../test-util.js';
+import { afterAllSetup, beforeAllSetup } from '../../src/core/test-util.js';
+import { ClickHouseClient } from '../../src/core/clickhouse/index.js';
+
+describe('router compatibility-version list tests', () => {
+  let chClient: ClickHouseClient;
+  let dbname = '';
+
+  vi.mock('../src/core/clickhouse/index.js', () => {
+    const ClickHouseClient = vi.fn();
+    ClickHouseClient.prototype.queryPromise = vi.fn();
+
+    return { ClickHouseClient };
+  });
+
+
+  beforeAll(async () => {
+    dbname = await beforeAllSetup();
+  });
+
+  beforeEach(() => {
+    chClient = new ClickHouseClient();
+  });
+
+  afterEach(() => {
+    vi.clearAllMocks();
+  });
+
+  afterAll(async () => {
+    await afterAllSetup(dbname);
+  });
+
+  test('that a list of supported router compatibility versions is returned', async () => {
+    const organizationId = randomUUID();
+    const organizationSlug = `slug-${organizationId}`;
+    const organizationName = 'company-a';
+    const { client, server, } = await SetupTest({ dbname, chClient, organizationId, });
+    const response = await client.getOrganizationBySlug({
+      slug: organizationSlug,
+    });
+    expect(response.response).toBeDefined();
+    expect(response.response!.code).toBe(EnumStatusCode.OK);
+    const organization = response.organization;
+    expect(organization).toBeDefined();
+    expect(organization!.slug).toBe(organizationSlug);
+    expect(organization!.name).toBe(organizationName);
+
+    await server.close();
+  });
+});

controlplane/test/test-util.ts

@@ -1,4 +1,4 @@
-import { randomUUID } from 'node:crypto';
+import { randomUUID, UUID } from 'node:crypto';
 import { join, resolve } from 'node:path';
 import fs from 'node:fs';
 import { createPromiseClient, PromiseClient } from '@connectrpc/connect';
@@ -57,6 +57,7 @@ export const SetupTest = async function ({
   enableMultiUsers,
   createScimKey,
   setupBilling,
+  organizationId,
 }: {
   dbname: string;
   chClient?: ClickHouseClient;
@@ -66,6 +67,7 @@ export const SetupTest = async function ({
   setupBilling?: {
     plan: 'developer@1' | 'launch@1' | 'scale@1' | 'enterprise';
   };
+  organizationId?: UUID;
 }) {
   const log = pino();
   const databaseConnectionUrl = `postgresql://postgres:changeme@localhost:5432/${dbname}`;
@@ -79,7 +81,7 @@ export const SetupTest = async function ({
     runMigration: true,
   });
 
-  const companyAOrganizationId = randomUUID();
+  const companyAOrganizationId = organizationId || randomUUID();
   const aliceContext = createTestContext('company-a', companyAOrganizationId);
 
   const users: TestAuthenticatorOptions = {