feat: remove test server code from sdk repo, and fix tests (#170)

deepgram · Oct 16, 2023 · 5ef5a1e · 5ef5a1e
1 parent 4dc4125
commit 5ef5a1e
Show file tree

Hide file tree

Showing 35 changed files with 31 additions and 823 deletions.
diff --git a/Dockerfile b/Dockerfile
diff --git a/fly.toml b/fly.toml
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -42,9 +42,7 @@
     "build:module": "tsc -p tsconfig.module.json",
     "build:umd": "webpack --mode=production",
     "watch": "nodemon -e ts --watch src --exec \"npm run build\"",
-    "test:server:build": "tsc -p tsconfig.testServer.json",
-    "test:server": "nodemon -e ts --watch src --watch test --exec \"ts-node test/testServer.ts\"",
-    "test": "mocha -r ts-node/register test/*test.ts test/**/*test.ts --insect || :",
+    "test": "mocha -r ts-node/register test/*test.ts test/**/*test.ts --insect --timeout 5000 || :",
     "test:coverage": "nyc --reporter=lcovonly --reporter=text --reporter=text-summary npm run test",
     "docs": "typedoc --entryPoints src/index.ts --out docs/v2 --includes src/**/*.ts",
     "docs:json": "typedoc --entryPoints src/index.ts --includes src/**/*.ts --json docs/v2/spec.json --excludeExternals"
@@ -60,17 +58,12 @@
     "@faker-js/faker": "^8.0.2",
     "@flydotio/dockerfile": "^0.4.10",
     "@types/chai": "^4.3.5",
-    "@types/express-ws": "^3.0.2",
     "@types/mocha": "^9.1.1",
     "@types/ws": "^8.5.6",
     "chai": "^4.3.7",
     "cross-env": "^7.0.3",
-    "express-ws": "^5.0.2",
-    "fetch-mock": "^9.11.0",
     "husky": "^4.3.0",
     "mocha": "^9.2.2",
-    "mock-socket": "^9.2.1",
-    "nock": "^13.3.2",
     "nodemon": "^3.0.1",
     "npm-run-all": "^4.1.5",
     "nyc": "^15.1.0",
@@ -86,10 +79,6 @@
     "webpack-cli": "^4.9.2",
     "ws": "^8.13.0"
   },
-  "peerDependencies": {
-    "@types/express": "^4.17.17",
-    "express": "^4.18.2"
-  },
   "husky": {
     "hooks": {
       "pre-commit": "pretty-quick --staged",

diff --git a/test/client.test.ts b/test/client.test.ts
@@ -5,7 +5,6 @@ import { faker } from "@faker-js/faker";
 import { stripTrailingSlash } from "../src/lib/helpers";
 import DeepgramClient from "../src/DeepgramClient";
 import { ListenClient } from "../src/packages/ListenClient";
-import { customDomain } from "./mocks";
 
 const deepgram = createClient(faker.string.alphanumeric(40));
 
@@ -39,18 +38,18 @@ describe("testing creation of a deepgram client object", () => {
 
   it("it should create the client object with a custom domain", () => {
     const client = createClient(faker.string.alphanumeric(40), {
-      global: { url: customDomain },
+      global: { url: "https://deepgram-mock-api-server.fly.dev" },
     });
 
     // @ts-ignore
     const url = client.baseUrl.hostname;
 
     expect(client).is.instanceOf(DeepgramClient);
-    expect(url).to.equal(customDomain);
+    expect(url).to.equal("deepgram-mock-api-server.fly.dev");
   });
 
   it("it should strip trailing slashes off the API URL if they're supplied", () => {
-    const domain = `${customDomain}/`;
+    const domain = `https://deepgram-mock-api-server.fly.dev/`;
     const client = createClient(faker.string.alphanumeric(40), {
       global: { url: domain },
     });
@@ -59,7 +58,20 @@ describe("testing creation of a deepgram client object", () => {
     const url = client.baseUrl.hostname;
 
     expect(client).is.instanceOf(DeepgramClient);
-    expect(url).to.equal(stripTrailingSlash(domain));
+    expect(url).to.equal("deepgram-mock-api-server.fly.dev");
+  });
+
+  it("it should still work when provided a URL without a protocol", () => {
+    const domain = `deepgram-mock-api-server.fly.dev`;
+    const client = createClient(faker.string.alphanumeric(40), {
+      global: { url: domain },
+    });
+
+    // @ts-ignore
+    const url = client.baseUrl.hostname;
+
+    expect(client).is.instanceOf(DeepgramClient);
+    expect(url).to.equal("deepgram-mock-api-server.fly.dev");
   });
 
   it("it should allow for the supply of a custom header", () => {

diff --git a/test/mocks/asyncConfirmation.ts b/test/mocks/asyncConfirmation.ts
diff --git a/test/mocks/bufferSource.ts b/test/mocks/bufferSource.ts
diff --git a/test/mocks/customDomain.ts b/test/mocks/customDomain.ts
diff --git a/test/mocks/index.ts b/test/mocks/index.ts
diff --git a/test/mocks/liveMetadata.ts b/test/mocks/liveMetadata.ts
diff --git a/test/mocks/liveTranscription.ts b/test/mocks/liveTranscription.ts
diff --git a/test/mocks/message.ts b/test/mocks/message.ts
diff --git a/test/mocks/newOnpremCredential.ts b/test/mocks/newOnpremCredential.ts
diff --git a/test/mocks/newProjectKey.ts b/test/mocks/newProjectKey.ts
diff --git a/test/mocks/onpremCredential.ts b/test/mocks/onpremCredential.ts
diff --git a/test/mocks/onpremCredentials.ts b/test/mocks/onpremCredentials.ts
diff --git a/test/mocks/project.ts b/test/mocks/project.ts
diff --git a/test/mocks/projectBalance.ts b/test/mocks/projectBalance.ts
diff --git a/test/mocks/projectBalances.ts b/test/mocks/projectBalances.ts
diff --git a/test/mocks/projectInvites.ts b/test/mocks/projectInvites.ts