From 231ef297b5b650048b1daaaafa9fd78ca917eeec Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Wed, 30 Apr 2025 11:12:54 -0400
Subject: replace JSDOM with cheerio

---
 packages/backend/test/e2e/oauth.ts | 10 +++++-----
 packages/backend/test/utils.ts     |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'packages/backend/test')

diff --git a/packages/backend/test/e2e/oauth.ts b/packages/backend/test/e2e/oauth.ts
index 7434701e67..47851e9474 100644
--- a/packages/backend/test/e2e/oauth.ts
+++ b/packages/backend/test/e2e/oauth.ts
@@ -19,7 +19,7 @@ import {
 	ResourceOwnerPassword,
 } from 'simple-oauth2';
 import pkceChallenge from 'pkce-challenge';
-import { JSDOM } from 'jsdom';
+import { load as cheerio } from 'cheerio';
 import Fastify, { type FastifyInstance, type FastifyReply } from 'fastify';
 import { api, port, sendEnvUpdateRequest, signup } from '../utils.js';
 import type * as misskey from 'misskey-js';
@@ -73,11 +73,11 @@ const clientConfig: ModuleOptions<'client_id'> = {
 };
 
 function getMeta(html: string): { transactionId: string | undefined, clientName: string | undefined, clientLogo: string | undefined } {
-	const fragment = JSDOM.fragment(html);
+	const fragment = cheerio(html);
 	return {
-		transactionId: fragment.querySelector<HTMLMetaElement>('meta[name="misskey:oauth:transaction-id"]')?.content,
-		clientName: fragment.querySelector<HTMLMetaElement>('meta[name="misskey:oauth:client-name"]')?.content,
-		clientLogo: fragment.querySelector<HTMLMetaElement>('meta[name="misskey:oauth:client-logo"]')?.content,
+		transactionId: fragment('meta[name="misskey:oauth:transaction-id"][content]').attr('content'),
+		clientName: fragment('meta[name="misskey:oauth:client-name"][content]').attr('content'),
+		clientLogo: fragment('meta[name="misskey:oauth:client-logo"][content]').attr('content'),
 	};
 }
 
diff --git a/packages/backend/test/utils.ts b/packages/backend/test/utils.ts
index 7b69cb04f4..70deff2e2d 100644
--- a/packages/backend/test/utils.ts
+++ b/packages/backend/test/utils.ts
@@ -11,7 +11,7 @@ import { inspect } from 'node:util';
 import WebSocket, { ClientOptions } from 'ws';
 import fetch, { File, RequestInit, type Headers } from 'node-fetch';
 import { DataSource } from 'typeorm';
-import { JSDOM } from 'jsdom';
+import { load as cheerio, CheerioAPI } from 'cheerio';
 import { type Response } from 'node-fetch';
 import Fastify from 'fastify';
 import { entities } from '../src/postgres.js';
@@ -464,7 +464,7 @@ export function makeStreamCatcher<T>(
 
 export type SimpleGetResponse = {
 	status: number,
-	body: any | JSDOM | null,
+	body: any | CheerioAPI | null,
 	type: string | null,
 	location: string | null
 };
@@ -495,7 +495,7 @@ export const simpleGet = async (path: string, accept = '*/*', cookie: any = unde
 
 	const body =
 		jsonTypes.includes(res.headers.get('content-type') ?? '') ? await res.json() :
-		htmlTypes.includes(res.headers.get('content-type') ?? '') ? new JSDOM(await res.text()) :
+		htmlTypes.includes(res.headers.get('content-type') ?? '') ? cheerio(await res.text()) :
 		await bodyExtractor(res);
 
 	return {
-- 
cgit v1.2.3-freya