test: rewrite agent-ca tests with undici

octokit · wolfy1339 · Jul 11, 2023 · Jun 3, 2023 · Jun 3, 2023 · Jun 27, 2023
commit 8a9a24e020eb73b5b702fac8463bd59b0a33560e
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -54,7 +54,8 @@
    "semantic-release": "^21.0.0",
    "semantic-release-plugin-update-version-in-files": "^1.0.0",
    "ts-jest": "^29.0.0",
-    "typescript": "^5.0.0"
+    "typescript": "^5.0.0",
+    "undici": "^5.22.1"
  },
  "scripts": {
    "build": "node scripts/build.mjs && tsc -p tsconfig.json",

diff --git a/test/integration/agent-ca/agent-ca-test.js b/test/integration/agent-ca/agent-ca-test.js
@@ -1,11 +1,11 @@
-const https = require("https");
 const { readFileSync } = require("fs");
 const { resolve } = require("path");
+const { fetch: undiciFetch, Agent } = require("undici");

 const { Octokit } = require("../../..");
 const ca = readFileSync(resolve(__dirname, "./ca.crt"));

-describe.skip("custom client certificate", () => {
+describe("custom client certificate", () => {
  let server;
  before((done) => {
    server = https.createServer(
@@ -26,13 +26,23 @@ describe.skip("custom client certificate", () => {
    server.listen(0, done);
  });

-  it("https.Agent({ca})", () => {
-    const agent = new https.Agent({
-      ca,
+  it("undici.Agent({ca})", () => {
+    const agent = new Agent({
+      keepAliveTimeout: 10,
+      keepAliveMaxTimeout: 10,
+      connect: { ca: ca },
    });
+    const myFetch = (url, opts) => {
+      return undiciFetch(url, {
+        ...opts,
+        dispatcher: agent,
+      });
+    };
    const octokit = new Octokit({
      baseUrl: "https://localhost:" + server.address().port,
-      request: { agent },
+      request: {
+        fetch: myFetch,
+      },
    });

    return octokit.rest.repos.get({
@@ -41,14 +51,26 @@ describe.skip("custom client certificate", () => {
    });
  });

-  it("https.Agent({ca, rejectUnauthorized})", () => {
-    const agent = new https.Agent({
-      ca: "invalid",
-      rejectUnauthorized: false,
+  it("undici.Agent({ca, rejectUnauthorized})", () => {
+    const agent = new Agent({
+      keepAliveTimeout: 10,
+      keepAliveMaxTimeout: 10,
+      connect: {
+        ca: "invalid",
+        rejectUnauthorized: true,
+      },
    });
+    const myFetch = (url, opts) => {
+      return undiciFetch(url, {
+        ...opts,
+        dispatcher: agent,
+      });
+    };
    const octokit = new Octokit({
      baseUrl: "https://localhost:" + server.address().port,
-      request: { agent },
+      request: {
+        fetch: myFetch,
+      },
    });

    return octokit.rest.repos.get({