fix: clean up tests and tsconfig

Author: jsjoeio

test/package.json

@@ -11,8 +11,10 @@
   "license": "ISC",
   "devDependencies": {
     "@types/jest": "^26.0.20",
+    "@types/node-fetch": "^2.5.8",
     "@types/supertest": "^2.0.10",
     "jest": "^26.6.3",
+    "node-fetch": "^2.6.1",
     "supertest": "^6.1.1",
     "ts-jest": "^26.4.4",
     "typescript": "^4.1.3"

test/plugin.test.ts

@@ -1,5 +1,4 @@
 import { logger } from "@coder/logger"
-import * as assert from "assert"
 import * as express from "express"
 import * as fs from "fs"
 import * as path from "path"
@@ -15,7 +14,7 @@ describe("plugin", () => {
   let papi: PluginAPI
   let s: httpserver.HttpServer
 
-  before(async () => {
+  beforeAll(async () => {
     papi = new PluginAPI(logger, `${path.resolve(__dirname, "test-plugin")}:meow`)
     await papi.loadPlugins()
 
@@ -27,16 +26,16 @@ describe("plugin", () => {
     await s.listen(app)
   })
 
-  after(async () => {
+  afterAll(async () => {
     await s.close()
   })
 
   it("/api/applications", async () => {
     const resp = await s.fetch("/api/applications")
-    assert.equal(200, resp.status)
+    expect(resp.status).toBe(200)
     const body = await resp.json()
     logger.debug(`${JSON.stringify(body)}`)
-    assert.deepEqual(body, [
+    expect(body).toBe([
       {
         name: "Test App",
         version: "4.0.0",
@@ -65,8 +64,8 @@ describe("plugin", () => {
       encoding: "utf8",
     })
     const resp = await s.fetch("/test-plugin/test-app")
-    assert.equal(200, resp.status)
+    expect(resp.status).toBe(200)
     const body = await resp.text()
-    assert.equal(body, indexHTML)
+    expect(body).toBe(indexHTML)
   })
 })

test/proxy.test.ts

@@ -1,4 +1,3 @@
-import * as assert from "assert"
 import * as express from "express"
 import * as httpserver from "./httpserver"
 import * as integration from "./integration"
@@ -8,7 +7,7 @@ describe("proxy", () => {
   const nhooyrDevServer = new httpserver.HttpServer()
   let proxyPath: string
 
-  before(async () => {
+  beforeAll(async () => {
     const e = express.default()
     await nhooyrDevServer.listen(e)
     e.get("/wsup", (req, res) => {
@@ -20,7 +19,7 @@ describe("proxy", () => {
     })
   })
 
-  after(async () => {
+  afterAll(async () => {
     await nhooyrDevServer.close()
   })
 
@@ -34,14 +33,16 @@ describe("proxy", () => {
   it("should rewrite the base path", async () => {
     ;[, , codeServer] = await integration.setup(["--auth=none"], "")
     const resp = await codeServer.fetch(proxyPath)
-    assert.equal(resp.status, 200)
-    assert.equal(await resp.json(), "asher is the best")
+    expect(resp.status).toBe(200)
+    const json = await resp.json()
+    expect(json).toBe("asher is the best")
   })
 
   it("should not rewrite the base path", async () => {
     ;[, , codeServer] = await integration.setup(["--auth=none", "--proxy-path-passthrough=true"], "")
     const resp = await codeServer.fetch(proxyPath)
-    assert.equal(resp.status, 200)
-    assert.equal(await resp.json(), "joe is the best")
+    expect(resp.status).toBe(200)
+    const json = await resp.json()
+    expect(json).toBe("joe is the best")
   })
 })

test/tsconfig.json

@@ -4,6 +4,7 @@
     "typeRoots": [
       "node_modules/@types"
     ],
+    "composite": true
   },
   "include": ["./**/*.ts"],
   "exclude": ["node_modules/**"],

test/yarn.lock

@@ -551,6 +551,14 @@
     jest-diff "^26.0.0"
     pretty-format "^26.0.0"
 
+"@types/node-fetch@^2.5.8":
+  version "2.5.8"
+  resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.5.8.tgz#e199c835d234c7eb0846f6618012e558544ee2fb"
+  integrity sha512-fbjI6ja0N5ZA8TV53RUqzsKNkl9fv8Oj3T7zxW7FGv1GSH7gwJaNF8dzCjrqKaxKeUpTz4yT1DaJFq/omNpGfw==
+  dependencies:
+    "@types/node" "*"
+    form-data "^3.0.0"
+
 "@types/node@*":
   version "14.14.22"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.22.tgz#0d29f382472c4ccf3bd96ff0ce47daf5b7b84b18"
@@ -2578,6 +2586,11 @@ nice-try@^1.0.4:
   resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
   integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
 
+node-fetch@^2.6.1:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052"
+  integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==
+
 node-int64@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"

tsconfig.json

@@ -20,5 +20,5 @@
     "downlevelIteration": true
   },
   "include": ["./src/**/*.ts"],
-  "exclude": ["./test"]
+  "exclude": "test"
 }