Convert to vitest functions and syntax

Author: tstirrat15

src/full-promises.test.ts

@@ -2,6 +2,7 @@ import { ClientSecurity } from "./util";
 import * as v1 from "./v1";
 import { Consistency } from "./v1";
 import { generateTestToken } from './__utils__/helpers' 
+import { describe, it, expect } from 'vitest'
 
 describe("a check following a write of schema and relationships", () => {
   it("should succeed", async () => {

src/full.test.ts

@@ -2,9 +2,10 @@ import { ClientSecurity } from "./util";
 import * as v1 from "./v1";
 import { Consistency } from "./v1";
 import { generateTestToken } from './__utils__/helpers'
+import { describe, it, expect } from 'vitest'
 
 describe("a check following a write of schema and relationships", () => {
-  it("should succeed", (done) => {
+  it("should succeed", () => new Promise<void>((done) => {
     // Write the schema.
     const token = generateTestToken('full-test')
     const v1client = v1.NewClient(token, "localhost:50051", ClientSecurity.INSECURE_LOCALHOST_ALLOWED);
@@ -80,5 +81,5 @@ describe("a check following a write of schema and relationships", () => {
         });
       });
     });
-  });
+  }));
 });

src/v1-promise.test.ts

@@ -20,6 +20,7 @@ import {
   WriteRelationshipsRequest,
   WriteSchemaRequest,
 } from './v1';
+import { describe, it, expect, beforeEach } from 'vitest'
 
 describe('a check with an unknown namespace', () => {
   it('should raise a failed precondition', async () => {
@@ -412,7 +413,7 @@ describe('Lookup APIs', () => {
     );
 
     const result = await client.lookupSubjects(lookupSubjectRequest);
-    expect(['someuser', 'someuser2']).toContain(result[0].subjectObjectId);
+    expect(['someuser', 'someuser2']).toContain(result[0].subject?.subjectObjectId);
     client.close();
   });
 
@@ -441,7 +442,7 @@ describe('Lookup APIs', () => {
       new grpc.Metadata(),
       {} as grpc.CallOptions
     );
-    expect(['someuser', 'someuser2']).toContain(result[0].subjectObjectId);
+    expect(['someuser', 'someuser2']).toContain(result[0].subject?.subjectObjectId);
 
     const resStream = await client.lookupResources(
       lookupResourceRequest,
@@ -479,7 +480,7 @@ describe('Experimental Service', () => {
     client.close();
   });
 
-  it('can bulk import relationships', (done) => {
+  it('can bulk import relationships', () => new Promise<void>((done, fail) => {
     const { promises: client } = NewClient(
       token,
       'localhost:50051',
@@ -488,7 +489,7 @@ describe('Experimental Service', () => {
 
     const writeStream = client.bulkImportRelationships((err, value) => {
       if (err) {
-        done.fail(err);
+        fail(err);
       }
 
       expect(value?.numLoaded).toEqual('2');
@@ -497,7 +498,7 @@ describe('Experimental Service', () => {
     });
 
     writeStream.on('error', (e) => {
-      done.fail(e);
+      fail(e);
     });
 
     const resource = ObjectReference.create({
@@ -532,7 +533,7 @@ describe('Experimental Service', () => {
     );
 
     writeStream.end();
-  });
+  }));
 
   it('can bulk export relationships', async () => {
     const { promises: client } = NewClient(

src/v1.test.ts

@@ -26,9 +26,10 @@ import {
   WriteRelationshipsResponse,
   WriteSchemaRequest,
 } from "./v1";
+import { describe, it, expect, beforeEach } from 'vitest'
 
 describe("a check with an unknown namespace", () => {
-  it("should raise a failed precondition", (done) => {
+  it("should raise a failed precondition", () => new Promise<void>((done) => {
     const resource = ObjectReference.create({
       objectType: "test/somenamespace",
       objectId: "bar",
@@ -58,11 +59,11 @@ describe("a check with an unknown namespace", () => {
       client.close();
       done();
     });
-  });
+  }));
 });
 
 describe("a check with an known namespace", () => {
-  it("should succeed", (done) => {
+  it("should succeed", () => new Promise<void>((done) => {
     // Write some schema.
     const client = NewClient(
       generateTestToken("v1-namespace"),
@@ -165,10 +166,10 @@ describe("a check with an known namespace", () => {
         client.close();
         done();
       });
-  });
+  }));
 
   describe("with caveated relations", () => {
-    it("should succeed", (done) => {
+    it("should succeed", () => new Promise<void>((done) => {
       // Write some schema.
       const client = NewClient(
         generateTestToken("v1-namespace-caveats"),
@@ -279,14 +280,14 @@ describe("a check with an known namespace", () => {
           client.close();
           done();
         });
-    });
+    }));
   });
 });
 
 describe("Lookup APIs", () => {
   let token: string;
 
-  beforeEach((done) => {
+  beforeEach(() => new Promise<void>((done) => {
     token = generateTestToken("v1-lookup");
     const client = NewClient(
       token,
@@ -348,9 +349,9 @@ describe("Lookup APIs", () => {
         done();
       });
     });
-  });
+  }));
 
-  it("can lookup subjects", (done) => {
+  it("can lookup subjects", () => new Promise<void>((done, fail) => {
     const client = NewClient(
       token,
       "localhost:50051",
@@ -375,7 +376,7 @@ describe("Lookup APIs", () => {
     const resStream = client.lookupSubjects(request);
 
     resStream.on("data", function (subject: LookupSubjectsResponse) {
-      expect(["someuser", "someuser2"]).toContain(subject.subjectObjectId);
+      expect(["someuser", "someuser2"]).toContain(subject.subject?.subjectObjectId);
     });
 
     resStream.on("end", function () {
@@ -385,15 +386,15 @@ describe("Lookup APIs", () => {
 
     resStream.on("error", function (e) {
       client.close();
-      done.fail(e);
+      fail(e);
     });
 
     resStream.on("status", function (status) {
       expect(status.code).toEqual(grpc.status.OK);
     });
-  });
+  }));
 
-  it("can lookup resources", (done) => {
+  it("can lookup resources", () => new Promise<void>((done, fail) => {
     const client = NewClient(
       token,
       "localhost:50051",
@@ -430,17 +431,17 @@ describe("Lookup APIs", () => {
 
     resStream.on("error", function (e) {
       client.close();
-      done.fail(e);
+      fail(e);
     });
 
     resStream.on("status", function (status) {
       expect(status.code).toEqual(grpc.status.OK);
     });
-  });
+  }));
 });
 
 describe("a check with a negative timeout", () => {
-  it("should fail immediately", (done) => {
+  it("should fail immediately", () => new Promise<void>((done) => {
     const resource = ObjectReference.create({
       objectType: "test/somenamespace",
       objectId: "bar",
@@ -474,13 +475,13 @@ describe("a check with a negative timeout", () => {
       client.close();
       done();
     });
-  });
+  }));
 });
 
 describe("Experimental Service", () => {
   let token: string;
 
-  beforeEach((done) => {
+  beforeEach(() => new Promise<void>((done) => {
     token = generateTestToken("v1-experimental-service");
     const client = NewClient(
       token,
@@ -503,9 +504,9 @@ describe("Experimental Service", () => {
       client.close();
       done();
     });
-  });
+  }));
 
-  it("can bulk import relationships", (done) => {
+  it("can bulk import relationships", () => new Promise<void>((done, fail) => {
     const client = NewClient(
       token,
       "localhost:50051",
@@ -514,7 +515,7 @@ describe("Experimental Service", () => {
 
     const writeStream = client.bulkImportRelationships((err, value) => {
       if (err) {
-        done.fail(err);
+        fail(err);
       }
 
       expect(value?.numLoaded).toEqual("2");
@@ -523,7 +524,7 @@ describe("Experimental Service", () => {
     });
 
     writeStream.on("error", (e) => {
-      done.fail(e);
+      fail(e);
     });
 
     const resource = ObjectReference.create({
@@ -559,9 +560,9 @@ describe("Experimental Service", () => {
     );
 
     writeStream.end();
-  });
+  }));
 
-  it("can bulk export relationships", (done) => {
+  it("can bulk export relationships", () => new Promise<void>((done, fail) => {
     const client = NewClient(
       token,
       "localhost:50051",
@@ -655,12 +656,12 @@ describe("Experimental Service", () => {
 
       resStream.on("error", function (e) {
         client.close();
-        done.fail(e);
+        fail(e);
       });
 
       resStream.on("status", function (status) {
         expect(status.code).toEqual(grpc.status.OK);
       });
     });
-  });
+  }));
 });