fix tests

Author: YousefED

packages/editor/package.json

@@ -116,8 +116,7 @@
     "test-watch": "vitest watch",
     "unittest:vitest": "vitest",
     "unittest:playwright": "playwright-test '**/*.browsertest.ts'",
-    "test": "npm run unittest:playwright",
-    "testFIXME": "npm run unittest:vitest",
+    "test": "npm run unittest:vitest && npm run unittest:playwright",
     "vite:dev": "vite",
     "vite:build": "vite build --mode=$MODE",
     "vite:preview": "vite preview",

packages/editor/src/store/BaseResource.test.ts

@@ -5,7 +5,7 @@
 import { enableMobxBindings } from "@syncedstore/yjs-reactive-bindings";
 import * as mobx from "mobx";
 import { beforeEach, describe, expect, it } from "vitest";
-import { uri } from "vscode-lib";
+import { async, uri } from "vscode-lib";
 import * as Y from "yjs";
 import { Identifier } from "../identifiers/Identifier";
 import {
@@ -76,7 +76,7 @@ function createDocAndAllowAccess(forUsers: User[], docId: DocId) {
     const resourceAsInbox = inboxBaseResource.getSpecificType<InboxResource>(
       InboxResource as any
     );
-    resourceAsInbox.inboxTarget = docId;
+    resourceAsInbox.inboxTarget = "test:test/" + docId;
     user.docs[docId + "-inbox"] = {
       resourceAsInbox,
       resource: inboxBaseResource,
@@ -86,24 +86,27 @@ function createDocAndAllowAccess(forUsers: User[], docId: DocId) {
 
     // create main doc
     const ydoc = new Y.Doc();
-    const resource = new BaseResource(ydoc, new TestIdentifier(docId), {
-      ...UnimplementedBaseResourceExternalManager,
-      loadInboxResource: async (id) => {
-        const testIdentifier = new TestIdentifier(id.toString());
-        const inbox = user.docs[testIdentifier.id + "-inbox"].resourceAsInbox;
+    const manager: any = {
+      loadInboxResource: async (id: TestIdentifier) => {
+        // const testIdentifier = new TestIdentifier(id.toString());
+        const inbox = user.docs[id.id + "-inbox"].resourceAsInbox;
         if (!inbox) {
           throw new Error("can't resolve inbox id " + id);
         }
         return inbox;
       },
-    });
+    };
+    manager.prototype = UnimplementedBaseResourceExternalManager;
+    const resource = new BaseResource(ydoc, new TestIdentifier(docId), manager);
 
     const validator = new InboxValidator(
       resourceAsInbox!,
       ChildReference,
-      async (identifier) => {
-        const testIdentifier = identifier.uri.path.substring(1);
-        return user.docs[testIdentifier].resource;
+      async (idStr) => {
+        // hacky
+        const testIdentifier = uri.URI.parse(idStr.replace("test:", "test://"));
+        const docId = testIdentifier.path.substring(1);
+        return user.docs[docId].resource;
       }
     );
 
@@ -158,7 +161,7 @@ describe("links", () => {
     expect(user2.docs.doc1.ydoc.getMap("test").get("hello")).toBeUndefined();
   });
 
-  it.only("adds a ref", async () => {
+  it("adds a ref", async () => {
     createDocAndAllowAccess([user1, user2], "doc1");
     createDocAndAllowAccess([user1, user2], "doc2");
 
@@ -174,6 +177,8 @@ describe("links", () => {
 
     await new Promise((resolve) => setImmediate(resolve)); // allow autorun to fire
 
+    await async.timeout(100);
+
     expect(user1.docs.doc2.validator!.validRefMessages.length).toBe(1);
     expect(user2.docs.doc2.validator!.validRefMessages.length).toBe(0);
 

packages/editor/src/store/InboxValidatorStore.ts

@@ -1,8 +1,6 @@
 import { autorun } from "mobx";
 import { lifecycle } from "vscode-lib";
 import * as Y from "yjs";
-import { parseIdentifier } from "../identifiers";
-import { Identifier } from "../identifiers/Identifier";
 import { UnreachableCaseError } from "../util/UnreachableCaseError";
 import { BaseResource } from "./BaseResource";
 import { InboxResource, RefInboxMessage } from "./InboxResource";
@@ -49,7 +47,7 @@ export class InboxValidator<
   constructor(
     private readonly inbox: InboxResource,
     private referenceDefinition: T,
-    loader: (identifier: Identifier) => Promise<BaseResource>
+    loader: (idString: string) => Promise<BaseResource>
   ) {
     super();
     const dispose = autorun(() => {
@@ -61,7 +59,7 @@ export class InboxValidator<
         this.seenMessages.add(message.id);
         this.pendingMessages.add(message.id);
 
-        const resource = await loader(parseIdentifier(message.source));
+        const resource = await loader(message.source);
         const handler = () => {
           this.updateMessageStateFromResource(message, resource);
         };
@@ -130,7 +128,7 @@ export class InboxValidator<
     const state = Y.getState(resource.ydoc.store, clientNum);
     if (state < clockNum) {
       // we need to wait for the document to be updated
-      // console.log("wait");
+      console.log("wait");
       return "wait";
     }
 
@@ -139,10 +137,10 @@ export class InboxValidator<
       this.inbox.inboxTarget
     );
     if (!ref || ref.target !== this.inbox.inboxTarget) {
-      // console.log("invalid");
+      // console.log("invalid", ref?.target, this.inbox.inboxTarget);
       return false;
     }
-    // console.log("valid");
+    // console.log("valid", ref.target, this.inbox.inboxTarget);
     return true;
   }