[BUG] Fix JS client regression (#2026)

Fix regression that stopped running the JS client unit tests during CI. Both regressions are from a large PR: #1970.
chroma-core · Apr 19, 2024 · e3d2b8a · e3d2b8a
1 parent 729e657
commit e3d2b8a
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 8 deletions.
diff --git a/bin/ts-integration-test b/bin/ts-integration-test
@@ -39,6 +39,8 @@ EOF
 
 trap cleanup EXIT
 
+docker compose -f docker-compose.test.yml up --build -d
+
 export CHROMA_INTEGRATION_TEST_ONLY=1
 export CHROMA_API_IMPL=chromadb.api.fastapi.FastAPI
 export CHROMA_SERVER_HOST=localhost
@@ -49,14 +51,18 @@ export CHROMA_SERVER_NOFILE=65535
 cd clients/js
 # moved off of yarn to npm to fix issues with jackspeak/cliui/string-width versions #1314
 npm install
+
+npm run test:run
+docker compose down
+
 cd ../..
 
 for auth_type in basic token xtoken; do
   echo "Testing $auth_type auth"
   setup_auth "$auth_type"
   cd clients/js
   docker compose --env-file ../../.chroma_env -f ../../docker-compose.test-auth.yml up --build -d
-  yarn test:run-auth-"$auth_type"
+  npm run test:run-auth-"$auth_type"
   cd ../..
   docker compose down
 done
diff --git a/clients/js/src/ChromaClient.ts b/clients/js/src/ChromaClient.ts
@@ -62,7 +62,7 @@ export class ChromaClient {
       basePath: path,
     });
 
-    this.api = new DefaultApi(apiConfig);
+    this.api = new DefaultApi(apiConfig, undefined, chromaFetch);
     this.api.options = fetchOptions ?? {};
 
     if (auth !== undefined) {

diff --git a/clients/js/test/auth.basic.test.ts b/clients/js/test/auth.basic.test.ts
@@ -1,6 +1,7 @@
 import { expect, test } from "@jest/globals";
 import { chromaBasic } from "./initClientWithAuth";
 import chromaNoAuth from "./initClient";
+import { ChromaForbiddenError } from "../src/Errors";
 
 test("it should get the version without auth needed", async () => {
   const version = await chromaNoAuth.version();
@@ -15,9 +16,9 @@ test("it should get the heartbeat without auth needed", async () => {
 });
 
 test("it should raise error when non authenticated", async () => {
-  await expect(chromaNoAuth.listCollections()).rejects.toMatchObject({
-    status: 403,
-  });
+  await expect(chromaNoAuth.listCollections()).rejects.toBeInstanceOf(
+    ChromaForbiddenError
+  );
 });
 
 test("it should list collections", async () => {

diff --git a/clients/js/test/auth.token.test.ts b/clients/js/test/auth.token.test.ts
@@ -6,6 +6,7 @@ import {
   cloudClient,
 } from "./initClientWithAuth";
 import chromaNoAuth from "./initClient";
+import { ChromaForbiddenError } from "../src/Errors";
 
 test("it should get the version without auth needed", async () => {
   const version = await chromaNoAuth.version();
@@ -20,9 +21,9 @@ test("it should get the heartbeat without auth needed", async () => {
 });
 
 test("it should raise error when non authenticated", async () => {
-  await expect(chromaNoAuth.listCollections()).rejects.toMatchObject({
-    status: 403,
-  });
+  await expect(chromaNoAuth.listCollections()).rejects.toBeInstanceOf(
+    ChromaForbiddenError
+  );
 });
 
 if (!process.env.XTOKEN_TEST) {