helloworld: Fix test

Author: hakatashi

helloworld/HelloWorld.test.ts

@@ -1,23 +1,24 @@
 /* eslint-disable import/imports-first, import/first */
 
-import crypto from 'crypto';
 import type {MockedStateInterface} from '../lib/__mocks__/state';
 import Slack from '../lib/slackMock';
 import State from '../lib/state';
 import {HelloWorld, type StateObj} from './HelloWorld';
 
+const randomUUID = vi.hoisted(() => vi.fn(() => 'test-uuid'));
+
 vi.mock('../lib/slackUtils');
 vi.mock('../lib/state');
 vi.mock('os', () => ({
 	hostname: vi.fn(() => 'test-hostname'),
 	release: vi.fn(() => 'test-release'),
 }));
 vi.mock('crypto', () => ({
-	randomUUID: vi.fn(() => 'test-uuid'),
+	default: {randomUUID},
+	randomUUID,
 }));
 
 const MockedState = State as MockedStateInterface<StateObj>;
-const mockedCrypto = vi.mocked(crypto);
 
 describe('helloworld', () => {
 	let slack: Slack = null;
@@ -33,8 +34,8 @@ describe('helloworld', () => {
 	});
 
 	it('initializes correctly', () => {
-		expect(mockedCrypto.randomUUID).toHaveBeenCalledTimes(1);
-		expect(mockedCrypto.randomUUID.mock.calls[0]).toHaveLength(0);
+		expect(randomUUID).toHaveBeenCalledTimes(1);
+		expect(randomUUID.mock.calls[0]).toHaveLength(0);
 
 		const state = MockedState.mocks.get('helloworld');
 		expect(state.counter).toBe(0);

lib/logger.ts

@@ -3,8 +3,7 @@ import winston from 'winston';
 import {Syslog as WinstonSyslog} from 'winston-syslog';
 import {inspect} from 'util';
 import type {FastifyLogFn} from 'fastify';
-import pinoStdSerializers from 'pino-std-serializers';
-const serializeHttpResponse = pinoStdSerializers.res;
+import {res as serializeHttpResponse} from 'pino-std-serializers';
 
 const logger = winston.createLogger({
 	level: 'info',

mahjong/index.js

@@ -3,13 +3,13 @@ const fs = require('fs');
 const path = require('path');
 const qs = require('querystring');
 const {promisify} = require('util');
-const {Mutex} = require('async-mutex');
 const {v2: cloudinary} = require('cloudinary');
 const {source} = require('common-tags');
 const {chunk, shuffle, sampleSize, sample, random, range, zip} = require('lodash');
 const {unlock, increment} = require('../achievements');
 const {AteQuiz} = require('../atequiz/index');
 const {blockDeploy} = require('../deploy/index');
+const {Mutex} = require('async-mutex');
 const calculator = require('./calculator.js');
 
 const mutex = new Mutex();
@@ -987,7 +987,9 @@ module.exports = (clients) => {
 				{username: 'mahjong', icon_emoji: ':mahjong:'},
 			);
 
-			const result = await mutex.runExclusive(async () => ateQuiz.start());
+			const result = await mutex.runExclusive(async () => {
+				return ateQuiz.start();
+			});
 
 			if (result.state === 'solved') {
 				await increment(result.correctAnswerer, 'mahjong-chinitsu-quiz-answer');

room-gacha/index.test.ts

@@ -1,19 +1,24 @@
 import roomGacha from './index';
 import Slack from '../lib/slackMock';
+import axios from 'axios';
+import type { AxiosResponse } from 'axios';
+import { promises as fs } from 'fs';
 import { stripIndents } from 'common-tags';
 import assert from 'assert';
 import type { KnownBlock } from '@slack/web-api';
+import type { ScrapeOptions } from 'scrape-it';
 
-vi.mock('scrape-it', async (importOriginal) => {
-    const actual = await importOriginal<typeof import('scrape-it')>();
-    const {scrapeHTML} = actual;
+vi.mock('axios');
+
+// scrape-itからのaxiosの呼び出しはモックできないため、簡易実装を提供する
+vi.mock('scrape-it', async () => {
+    const scrapeIt = await vi.importActual<typeof import('scrape-it')>('scrape-it');
+    const cheerio = await vi.importActual<typeof import('cheerio')>('cheerio');
     return {
-        default: vi.fn(async (_url: unknown, opts: Parameters<typeof scrapeHTML>[1]) => {
-            const {promises: fs} = await import('fs');
-            const html = await fs.readFile(`${__dirname}/search-result.test.html`, 'utf-8');
-            return {data: scrapeHTML(html, opts)};
-        }),
-        scrapeHTML,
+        default: async (url: string, opts: ScrapeOptions) => {
+            const res = await axios(url);
+            return {data: scrapeIt.scrapeHTML(cheerio.load(res.data), opts)};
+        },
     };
 });
 
@@ -27,6 +32,9 @@ beforeEach(async () => {
 
 describe('room-gacha', () => {
     it('responds to "物件ガチャ" with a prefecture and a city specified', async () => {
+        const data = await fs.readFile(`${__dirname}/search-result.test.html`, 'utf-8');
+        const mockAxios = vi.mocked(axios);
+        mockAxios.mockResolvedValue({data} as AxiosResponse);
         const response = await slack.getResponseTo('物件ガチャ 東京都 文京区');
         const blocks = 'blocks' in response ? response.blocks : [];
         expect('username' in response && response.username).toBe('物件ガチャ');