Cleanup requestWorkspaceId

airbytehq · Jan 30, 2023 · fd30bdd · fd30bdd
1 parent 96a712d
commit fd30bdd
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 14 deletions.
diff --git a/airbyte-webapp-e2e-tests/cypress/commands/api/api.ts b/airbyte-webapp-e2e-tests/cypress/commands/api/api.ts
@@ -1,5 +1,5 @@
 import {
-  ConectionGetBody,
+  ConnectionGetBody,
   Connection,
   ConnectionCreateRequestBody,
   ConnectionsList,
@@ -13,16 +13,6 @@ import { getWorkspaceId, setWorkspaceId } from "./workspace";
 
 const getApiUrl = (path: string): string => `http://localhost:8001/api/v1${path}`;
 
-export const requestWorkspaceId = () =>
-  cy.request("POST", getApiUrl("/workspaces/list")).then((response) => {
-    expect(response.status).to.eq(200);
-    const {
-      workspaces: [{ workspaceId }],
-    } = response.body;
-
-    setWorkspaceId(workspaceId as string);
-  });
-
 const apiRequest = <T = void>(
   method: Cypress.HttpMethod,
   path: string,
@@ -34,6 +24,13 @@ const apiRequest = <T = void>(
     return response.body;
   });
 
+export const requestWorkspaceId = () =>
+  apiRequest<{ workspaces: Array<{ workspaceId: string }> }>("POST", "/workspaces/list").then(
+    ({ workspaces: [{ workspaceId }] }) => {
+      setWorkspaceId(workspaceId);
+    }
+  );
+
 export const requestConnectionsList = () =>
   apiRequest<ConnectionsList>("POST", "/connections/list", { workspaceId: getWorkspaceId() });
 
@@ -43,7 +40,7 @@ export const requestCreateConnection = (body: ConnectionCreateRequestBody) =>
 export const requestUpdateConnection = (body: Record<string, unknown>) =>
   apiRequest<Connection>("POST", "/web_backend/connections/update", body);
 
-export const requestGetConnection = (body: ConectionGetBody) =>
+export const requestGetConnection = (body: ConnectionGetBody) =>
   apiRequest<Connection>("POST", "/web_backend/connections/get", body);
 
 export const requestDeleteConnection = (connectionId: string) =>

diff --git a/airbyte-webapp-e2e-tests/cypress/commands/api/types.ts b/airbyte-webapp-e2e-tests/cypress/commands/api/types.ts
@@ -29,7 +29,7 @@ export interface ConnectionCreateRequestBody {
   syncCatalog: SyncCatalog;
 }
 
-export interface ConectionGetBody {
+export interface ConnectionGetBody {
   connectionId: string;
   withRefreshedCatalog?: boolean;
 }

diff --git a/airbyte-webapp-e2e-tests/cypress/integration/autoDetectSchema.spec.ts b/airbyte-webapp-e2e-tests/cypress/integration/autoDetectSchema.spec.ts
@@ -41,7 +41,7 @@ describe("Connection - Auto-detect schema changes", () => {
     runDbQuery(dropUsersTableQuery);
     runDbQuery(createUsersTableQuery);
 
-    requestWorkspaceId()?.then(() => {
+    requestWorkspaceId().then(() => {
       const sourceRequestBody = getPostgresCreateSourceBody(appendRandomString("Auto-detect schema Source"));
       const destinationRequestBody = getPostgresCreateDestinationBody(
         appendRandomString("Auto-detect schema Destination")