Merge pull request #247 from dahlia/main

Author: dahlia

fedify/deno.json

@@ -21,7 +21,6 @@
     "@cfworker/json-schema": "npm:@cfworker/json-schema@^4.1.1",
     "@cloudflare/workers-types": "npm:@cloudflare/workers-types@^4.20250529.0",
     "@es-toolkit/es-toolkit": "jsr:@es-toolkit/es-toolkit@^1.38.0",
-    "@hongminhee/deno-mock-fetch": "jsr:@hongminhee/deno-mock-fetch@^0.3.2",
     "@hugoalh/http-header-link": "jsr:@hugoalh/http-header-link@^1.0.2",
     "@multiformats/base-x": "npm:@multiformats/base-x@^4.0.1",
     "@opentelemetry/api": "npm:@opentelemetry/api@^1.9.0",

fedify/nodeinfo/client.test.ts

@@ -1,5 +1,5 @@
-import * as mf from "@hongminhee/deno-mock-fetch";
 import { assertEquals } from "@std/assert";
+import fetchMock from "fetch-mock";
 import { test } from "../testing/mod.ts";
 import {
   getNodeInfo,
@@ -19,20 +19,17 @@ import type {
 } from "./types.ts";
 
 test("getNodeInfo()", async (t) => {
-  mf.install();
+  fetchMock.spyGlobal();
 
-  mf.mock("GET@/.well-known/nodeinfo", (req) => {
-    assertEquals(new URL(req.url).host, "example.com");
-    return new Response(
-      JSON.stringify({
-        links: [
-          {
-            rel: "http://nodeinfo.diaspora.software/ns/schema/2.1",
-            href: "https://example.com/nodeinfo/2.1",
-          },
-        ],
-      }),
-    );
+  fetchMock.get("https://example.com/.well-known/nodeinfo", {
+    body: {
+      links: [
+        {
+          rel: "http://nodeinfo.diaspora.software/ns/schema/2.1",
+          href: "https://example.com/nodeinfo/2.1",
+        },
+      ],
+    },
   });
 
   const rawExpected = {
@@ -41,17 +38,8 @@ test("getNodeInfo()", async (t) => {
     usage: { users: {}, localPosts: 123, localComments: 456 },
   };
 
-  mf.mock("GET@/nodeinfo/2.1", (req) => {
-    assertEquals(new URL(req.url).host, "example.com");
-    return new Response(
-      JSON.stringify(rawExpected),
-    );
-  });
-
-  mf.mock("GET@/404", (req) => {
-    assertEquals(new URL(req.url).host, "example.com");
-    return new Response(null, { status: 404 });
-  });
+  fetchMock.get("https://example.com/nodeinfo/2.1", { body: rawExpected });
+  fetchMock.get("https://example.com/404", { status: 404 });
 
   const expected: NodeInfo = {
     software: {
@@ -78,21 +66,19 @@ test("getNodeInfo()", async (t) => {
     assertEquals(info, expected);
   });
 
-  mf.mock("GET@/.well-known/nodeinfo", (req) => {
-    assertEquals(new URL(req.url).host, "example.com");
-    return new Response(JSON.stringify({
-      links: [],
-    }));
+  fetchMock.removeRoutes();
+  fetchMock.get("https://example.com/.well-known/nodeinfo", {
+    body: { links: [] },
   });
 
   await t.step("indirect: no links", async () => {
     const info = await getNodeInfo("https://example.com/");
     assertEquals(info, undefined);
   });
 
-  mf.mock("GET@/.well-known/nodeinfo", (req) => {
-    assertEquals(new URL(req.url).host, "example.com");
-    return new Response(null, { status: 404 });
+  fetchMock.removeRoutes();
+  fetchMock.get("https://example.com/.well-known/nodeinfo", {
+    status: 404,
   });
 
   await t.step("indirect: 404", async () => {
@@ -113,7 +99,7 @@ test("getNodeInfo()", async (t) => {
     assertEquals(info2, undefined);
   });
 
-  mf.uninstall();
+  fetchMock.hardReset();
 });
 
 test("parseNodeInfo()", () => {

fedify/package.json

@@ -104,7 +104,6 @@
   },
   "devDependencies": {
     "@cloudflare/workers-types": "^4.20250529.0",
-    "@hongminhee/deno-mock-fetch": "jsr:^0.3.2",
     "@std/assert": "jsr:^0.226.0",
     "@std/path": "jsr:^1.0.9",
     "@std/url": "jsr:1.0.0-rc.3",