fix tests

YousefED · YousefED · commit cc6e2b0bbd72 · 2023-06-23T09:16:21.000+02:00
diff --git a/packages/editor/.env.development b/packages/editor/.env.development
@@ -1,3 +1,4 @@
+# Note: keep this file in sync with env.ts
 VITE_ENVIRONMENT=DEV
 VITE_TYPECELL_BACKEND_WS_URL=ws://localhost:1234
 VITE_TYPECELL_SUPABASE_URL=http://localhost:54321
diff --git a/packages/editor/.env.test b/packages/editor/.env.test
@@ -0,0 +1,6 @@
+VITE_ENVIRONMENT=DEV
+VITE_TYPECELL_BACKEND_WS_URL=ws://localhost:1234
+VITE_TYPECELL_SUPABASE_URL=http://localhost:54321
+VITE_TYPECELL_SUPABASE_ANON_KEY=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZS1kZW1vIiwicm9sZSI6ImFub24iLCJleHAiOjE5ODM4MTI5OTZ9.CRXP1A7WOeoJeXxjNni43kdQwgnWNReilDMblYTn_I0
+VITE_MATRIX_HOMESERVER_URI=https://mx.typecell.org
+VITE_MATRIX_HOMESERVER_NAME=typecell.org
diff --git a/packages/editor/package.json b/packages/editor/package.json
@@ -115,7 +115,8 @@
     "lint": "eslint src",
     "test-watch": "vitest watch",
     "unittest:vitest": "vitest",
-    "unittest:playwright": "playwright-test '**/BackgroundSyncer.browsertest.ts' --debug",
+    "unittest:playwright": "playwright-test '**/*.browsertest.ts'",
+    "test": "npm run unittest:playwright",
     "testFIXME": "npm run unittest:vitest",
     "vite:dev": "vite",
     "vite:build": "vite build --mode=$MODE",
diff --git a/packages/editor/src/app/supabase-auth/SupabaseSessionStore.ts b/packages/editor/src/app/supabase-auth/SupabaseSessionStore.ts
@@ -6,6 +6,7 @@ import { SessionStore } from "../../store/local/SessionStore";
 import { uniqueId } from "@typecell-org/common";
 import * as Y from "yjs";
 import type { Database } from "../../../../server/src/@types/schema";
+import { env } from "../../config/env";
 import { TypeCellIdentifier } from "../../identifiers/TypeCellIdentifier";
 import {
   DefaultShorthandResolver,
@@ -105,7 +106,7 @@ export class SupabaseSessionStore extends SessionStore {
       isLoggedIn: computed,
       isLoaded: computed,
     });
-    this.supabase = createClient<Database>(import.meta.env.VITE_TYPECELL_SUPABASE_URL, import.meta.env.VITE_TYPECELL_SUPABASE_ANON_KEY, {
+    this.supabase = createClient<Database>(env.VITE_TYPECELL_SUPABASE_URL, env.VITE_TYPECELL_SUPABASE_ANON_KEY, {
       auth: {
         persistSession: persist,
       },
diff --git a/packages/editor/src/app/supabase-auth/routes/Login.tsx b/packages/editor/src/app/supabase-auth/routes/Login.tsx
@@ -10,11 +10,12 @@ import { createClient } from "@supabase/supabase-js";
 import { SessionStore } from "../../../store/local/SessionStore";
 import { Logo } from "../../main/components/Logo";
 
+import { env } from "../../../config/env";
 import AuthStyles from "./AuthStyles.module.css";
 
 const supabase = createClient(
-  import.meta.env.VITE_TYPECELL_SUPABASE_URL,
-  import.meta.env.VITE_TYPECELL_SUPABASE_ANON_KEY
+  env.VITE_TYPECELL_SUPABASE_URL,
+  env.VITE_TYPECELL_SUPABASE_ANON_KEY
 );
 
 export const Login = observer((props: { sessionStore: SessionStore }) => {
diff --git a/packages/editor/src/app/supabase-auth/routes/Register.tsx b/packages/editor/src/app/supabase-auth/routes/Register.tsx
@@ -7,13 +7,14 @@ import {
   ThemeSupa,
 } from "@supabase/auth-ui-shared";
 import { createClient } from "@supabase/supabase-js";
+import { env } from "../../../config/env";
 import { SessionStore } from "../../../store/local/SessionStore";
 import { Logo } from "../../main/components/Logo";
 import AuthStyles from "./AuthStyles.module.css";
 
 const supabase = createClient(
-  import.meta.env.VITE_TYPECELL_SUPABASE_URL,
-  import.meta.env.VITE_TYPECELL_SUPABASE_ANON_KEY
+  env.VITE_TYPECELL_SUPABASE_URL,
+  env.VITE_TYPECELL_SUPABASE_ANON_KEY
 );
 
 export const Register = observer((props: { sessionStore: SessionStore }) => {
diff --git a/packages/editor/src/config/config.ts b/packages/editor/src/config/config.ts
@@ -1,9 +1,10 @@
 import { uri } from "vscode-lib";
+import { env } from "./env";
 
 export const DEFAULT_PROVIDER: "matrix" | "supabase" = "supabase";
 
 export const DEFAULT_HOMESERVER_URI = uri.URI.parse(
-  import.meta.env?.VITE_MATRIX_HOMESERVER_URI
+  env.VITE_MATRIX_HOMESERVER_URI
 );
 
 export const DEFAULT_IDENTIFIER_BASE =
@@ -23,7 +24,7 @@ export const DEFAULT_IDENTIFIER_BASE_STRING =
   DEFAULT_IDENTIFIER_BASE.toString().replace("://", ":");
 
 export const MATRIX_CONFIG = {
-  hsName: import.meta.env.VITE_MATRIX_HOMESERVER_NAME,
+  hsName: env.VITE_MATRIX_HOMESERVER_NAME,
   hsUrl: DEFAULT_HOMESERVER_URI.toString(),
   isUrl: undefined as any, // "https://vector.im",
   defaultDeviceDisplayName: "TypeCell web",
diff --git a/packages/editor/src/config/env.ts b/packages/editor/src/config/env.ts
@@ -0,0 +1,27 @@
+// We need to define the defaults for the dev env here,
+// because playwright-test doesn't seem to support .env files
+// (https://github.com/hugomrdias/playwright-test/issues/549)
+// NOTE: keep in sync with .env.development
+const devDefaults = {
+  VITE_ENVIRONMENT: "development",
+  VITE_TYPECELL_BACKEND_WS_URL: "ws://localhost:1234",
+  VITE_TYPECELL_SUPABASE_URL: "http://localhost:54321",
+  VITE_TYPECELL_SUPABASE_ANON_KEY:
+    "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZS1kZW1vIiwicm9sZSI6ImFub24iLCJleHAiOjE5ODM4MTI5OTZ9.CRXP1A7WOeoJeXxjNni43kdQwgnWNReilDMblYTn_I0",
+  VITE_MATRIX_HOMESERVER_URI: "https://mx.typecell.org",
+  VITE_MATRIX_HOMESERVER_NAME: "typecell.org",
+};
+
+const passedInEnv = {
+  VITE_ENVIRONMENT: import.meta.env?.VITE_ENVIRONMENT,
+  VITE_TYPECELL_BACKEND_WS_URL: import.meta.env?.VITE_TYPECELL_BACKEND_WS_URL,
+  VITE_TYPECELL_SUPABASE_URL: import.meta.env?.VITE_TYPECELL_SUPABASE_URL,
+  VITE_TYPECELL_SUPABASE_ANON_KEY: import.meta.env
+    ?.VITE_TYPECELL_SUPABASE_ANON_KEY,
+  VITE_MATRIX_HOMESERVER_URI: import.meta.env?.VITE_MATRIX_HOMESERVER_URI,
+  VITE_MATRIX_HOMESERVER_NAME: import.meta.env?.VITE_MATRIX_HOMESERVER_NAME,
+};
+
+export const env = import.meta.env?.VITE_ENVIRONMENT
+  ? passedInEnv
+  : devDefaults;
diff --git a/packages/editor/src/config/security.ts b/packages/editor/src/config/security.ts
@@ -1,4 +1,6 @@
-const ENVIRONMENT = import.meta.env.VITE_ENVIRONMENT;
+import { env } from "./env";
+
+const ENVIRONMENT = env.VITE_ENVIRONMENT;
 /*
 Helper functions to ensure we're loading the application (host) and user-code frame (sandbox) from the correct domains
 
@@ -32,9 +34,7 @@ export function validateHostDomain() {
 }
 
 export function validateSupabaseConfig() {
-  if (
-    import.meta.env.VITE_TYPECELL_SUPABASE_URL.includes("guzxrzrjknsekuefovon")
-  ) {
+  if (env.VITE_TYPECELL_SUPABASE_URL.includes("guzxrzrjknsekuefovon")) {
     // only allow prod database on prod environment
     return ENVIRONMENT === "PROD";
   }
diff --git a/packages/editor/src/index.host.tsx b/packages/editor/src/index.host.tsx
@@ -9,6 +9,7 @@ import { matrixAuthProvider } from "./app/matrix-auth/MatrixAuthProvider";
 import { SupabaseSessionStore } from "./app/supabase-auth/SupabaseSessionStore";
 import { supabaseAuthProvider } from "./app/supabase-auth/supabaseAuthProvider";
 import { DEFAULT_PROVIDER } from "./config/config";
+import { env } from "./config/env";
 import { validateHostDomain, validateSupabaseConfig } from "./config/security";
 import { setMonacoDefaults } from "./runtime/editor";
 import { MonacoContext } from "./runtime/editor/MonacoContext";
@@ -21,7 +22,7 @@ import "./styles/index.css";
 (window as any).Buffer = Buffer;
 (window as any).process = process;
 
-if (import.meta.env.DEV) {
+if (env.VITE_ENVIRONMENT === "development") {
   // disables error overlays
   // We make use of React Error Boundaries to catch exceptions during rendering of
   // user-defined react components. It's annoying (and slow) to get the React error overlay
diff --git a/packages/editor/src/store/BackgroundSyncer.browsertest.ts b/packages/editor/src/store/BackgroundSyncer.browsertest.ts
@@ -71,7 +71,7 @@ describe("BackgroundSyncer tests", () => {
     expect(reloadedDoc.ydoc.getMap("test").get("hello")).to.eq("world");
   });
 
-  it.only("creates document remotely that was created offline earlier", async () => {
+  it("creates document remotely that was created offline earlier", async () => {
     TypeCellRemote.Offline = true;
     const doc = await DocConnection.create(sessionStoreAlice);
     doc.ydoc.getMap("test").set("hello", "world");
diff --git a/packages/editor/src/store/BackgroundSyncer.ts b/packages/editor/src/store/BackgroundSyncer.ts
@@ -63,6 +63,7 @@ export class BackgroundSyncer extends lifecycle.Disposable {
             this.identifiersToSync.delete(id);
             const connection = this.loadedConnections.get(id)!;
             connection.dispose();
+            this.loadedConnections.delete(id);
           }
         }
       }, 0); // settimeout is needed because otherwise it conflicts with creation in DocumentManager - this is a bit ugly
diff --git a/packages/editor/src/store/DocConnection.ts b/packages/editor/src/store/DocConnection.ts
@@ -53,10 +53,10 @@ export class DocConnection extends lifecycle.Disposable {
     const dispose = reaction(
       () => this.sessionStore.documentCoordinator,
       async () => {
-        console.log(
-          "sessionstore change",
-          this.sessionStore.documentCoordinator
-        );
+        // console.log(
+        //   "sessionstore change",
+        //   this.sessionStore.documentCoordinator
+        // );
 
         this._baseResourceCache = undefined;
         this.manager?.dispose();
diff --git a/packages/editor/src/store/yjs-sync/SyncManager.browsertest.ts b/packages/editor/src/store/yjs-sync/SyncManager.browsertest.ts
@@ -15,6 +15,7 @@ import {
 } from "../../../../../packages/server/src/supabase/test/supabaseTestUtil";
 import { loginAsNewRandomUser } from "../../../tests/util/loginUtil";
 import { SupabaseSessionStore } from "../../app/supabase-auth/SupabaseSessionStore";
+import { env } from "../../config/env";
 import { parseIdentifier } from "../../identifiers";
 import { SyncManager } from "./SyncManager";
 import { TypeCellRemote } from "./remote/TypeCellRemote";
@@ -105,7 +106,7 @@ describe("SyncManager tests", () => {
 
   before(async () => {
     enableMobxBindings(mobx);
-    alice = await createRandomUser("alice");
+    alice = await createRandomUser("alice", env);
   });
 
   beforeEach(async () => {
@@ -190,6 +191,7 @@ describe("SyncManager tests", () => {
     );
 
     expect(loadedManager2.state.localDoc.meta.create_source).eq("remote");
+    manager2.dispose();
   });
 
   it("can load a known remote document offline", async () => {
@@ -215,6 +217,7 @@ describe("SyncManager tests", () => {
     );
 
     expect(loadedManager2.state.localDoc.meta.create_source).eq("remote");
+    manager2.dispose();
   });
 
   it("can create a new document", async () => {
@@ -238,6 +241,7 @@ describe("SyncManager tests", () => {
     expect(loadedManager2.state.localDoc.ydoc.getMap("mymap").get("hello")).eq(
       "world"
     );
+    manager2.dispose();
   });
 
   it("can create a new document offline", async () => {
@@ -291,6 +295,8 @@ describe("SyncManager tests", () => {
     expect(loadedManager2.state.localDoc.ydoc.getMap("mymap").get("hello")).eq(
       "world"
     );
+    manager2.dispose();
+    manager.dispose();
   });
 
   it("can fork a document", async () => {
@@ -331,5 +337,8 @@ describe("SyncManager tests", () => {
     expect(
       newManagerLoaded.state.localDoc.ydoc.getMap("mymap").get("hello")
     ).eq("world");
+    manager.dispose();
+    forkManager.dispose();
+    newManager.dispose();
   });
 });
diff --git a/packages/editor/src/store/yjs-sync/remote/TypeCellRemote.ts b/packages/editor/src/store/yjs-sync/remote/TypeCellRemote.ts
@@ -13,6 +13,7 @@ import { uuid } from "vscode-lib";
 import * as awarenessProtocol from "y-protocols/awareness";
 import * as Y from "yjs";
 import { SupabaseSessionStore } from "../../../app/supabase-auth/SupabaseSessionStore";
+import { env } from "../../../config/env";
 import { TypeCellIdentifier } from "../../../identifiers/TypeCellIdentifier";
 import { Remote } from "./Remote";
 
@@ -30,7 +31,7 @@ function getWSProvider(session: SupabaseSessionStore) {
   if (!wsProvider) {
     console.log("new ws provider");
     wsProvider = new HocuspocusProviderWebsocket({
-      url: import.meta.env.VITE_TYPECELL_BACKEND_WS_URL,
+      url: env.VITE_TYPECELL_BACKEND_WS_URL,
       // WebSocketPolyfill: ws,
       onConnect() {
         // console.log("connected");
diff --git a/packages/editor/tsconfig.json b/packages/editor/tsconfig.json
@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "target": "es6",
+    "target": "ESNext",
     "lib": ["dom", "dom.iterable", "esnext"],
     "allowJs": true,
     "skipLibCheck": true,
diff --git a/packages/server/src/supabase/supabase.ts b/packages/server/src/supabase/supabase.ts
@@ -32,10 +32,19 @@ export async function createServiceClient() {
   return supabase;
 }
 
-export async function createAnonClient() {
+export async function createAnonClient(
+  env: {
+    VITE_TYPECELL_SUPABASE_URL: string;
+    VITE_TYPECELL_SUPABASE_ANON_KEY: string;
+  } = {
+    VITE_TYPECELL_SUPABASE_URL: process.env.VITE_TYPECELL_SUPABASE_URL!,
+    VITE_TYPECELL_SUPABASE_ANON_KEY:
+      process.env.VITE_TYPECELL_SUPABASE_ANON_KEY!,
+  }
+) {
   const supabase = createClient<Database>(
-    process.env.VITE_TYPECELL_SUPABASE_URL!,
-    process.env.VITE_TYPECELL_SUPABASE_ANON_KEY!,
+    env.VITE_TYPECELL_SUPABASE_URL!,
+    env.VITE_TYPECELL_SUPABASE_ANON_KEY!,
     {
       auth: {
         autoRefreshToken: false,
diff --git a/packages/server/src/supabase/test/supabaseTestUtil.ts b/packages/server/src/supabase/test/supabaseTestUtil.ts
@@ -25,10 +25,20 @@ export function createDocument(
   } as const;
 }
 
-export async function createRandomUser(name: string) {
+export async function createRandomUser(
+  name: string,
+  env: {
+    VITE_TYPECELL_SUPABASE_URL: string;
+    VITE_TYPECELL_SUPABASE_ANON_KEY: string;
+  } = {
+    VITE_TYPECELL_SUPABASE_URL: process.env.VITE_TYPECELL_SUPABASE_URL!,
+    VITE_TYPECELL_SUPABASE_ANON_KEY:
+      process.env.VITE_TYPECELL_SUPABASE_ANON_KEY!,
+  }
+) {
   const userData = getRandomUserData(name);
 
-  const supabase = await createAnonClient();
+  const supabase = await createAnonClient(env);
   const { data, error } = await supabase.auth.signUp(userData);
   if (error) {
     throw error;
diff --git a/packages/server/src/test/setup.ts b/packages/server/src/test/setup.ts
@@ -1,9 +1,8 @@
-import {
-  resetSupabaseDB,
-  startSupabase,
-} from "../supabase/test/supabaseCLIUtil";
+import { startSupabase } from "../supabase/test/supabaseCLIUtil";
 
 export default async function () {
-  await startSupabase();
-  await resetSupabaseDB();
+  if (!process.env.CI) {
+    await startSupabase();
+  }
+  // await resetSupabaseDB();
 }

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+# Note: keep this file in sync with env.ts`
`1`	`2`	`VITE_ENVIRONMENT=DEV`
`2`	`3`	`VITE_TYPECELL_BACKEND_WS_URL=ws://localhost:1234`
`3`	`4`	`VITE_TYPECELL_SUPABASE_URL=http://localhost:54321`