usbharu
/
misskey
mirror of https://github.com/misskey-dev/misskey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

update test

This commit is contained in:
tamaina 2025-07-16 19:10:20 +09:00
parent f5d4b2744b
commit 85f4730308
2 changed files with 130 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

161
packages/backend/test/e2e/timelines.ts
View File

@ -11,7 +11,7 @@ import { setTimeout } from 'node:timers/promises';
import { Redis } from 'ioredis'; import { Redis } from 'ioredis';
import { api, post, randomString, sendEnvUpdateRequest, signup, uploadUrl, role } from '../utils.js'; import { api, post, randomString, sendEnvUpdateRequest, signup, uploadUrl, role } from '../utils.js';
import { loadConfig } from '@/config.js'; import { loadConfig } from '@/config.js';
import { SignupResponse, Role } from 'misskey-js/entities.js'; import { SignupResponse, Role, Note } from 'misskey-js/entities.js';
function genHost() { function genHost() {
return randomString() + '.example.com'; return randomString() + '.example.com';
@ -654,26 +654,45 @@ describe('Timelines', () => {
assert.strictEqual(await redisForTimelines.exists(`list:homeTimeline:${bob.id}`), 0); assert.strictEqual(await redisForTimelines.exists(`list:homeTimeline:${bob.id}`), 0);
}); });
test('凍結: 凍結後に凍結されたユーザーのノートは見えなくなる', async () => { describe('凍結', async () => {
const [alice, bob, carol] = await Promise.all([signup(), signup(), signup()]); let alice: SignupResponse, bob: SignupResponse, carol: SignupResponse;
let aliceNote: Note, bobNote: Note, carolNote: Note;
await api('following/create', { userId: bob.id }, alice); beforeAll(async () => {
await api('following/create', { userId: carol.id }, alice); [alice, bob, carol] = await Promise.all([signup(), signup(), signup()]);
const aliceNote = await post(alice, { text: 'hi' });
const bobNote = await post(bob, { text: 'yo' });
const carolNote = await post(carol, { text: 'kon\'nichiwa' });
await waitForPushToTl(); await api('following/create', { userId: bob.id }, alice);
await api('following/create', { userId: carol.id }, alice);
aliceNote = await post(alice, { text: 'hi' });
bobNote = await post(bob, { text: 'yo' });
carolNote = await post(carol, { text: 'kon\'nichiwa' });
await api('admin/suspend-user', { userId: carol.id }, root); await waitForPushToTl();
});
await setTimeout(250); test('凍結後に凍結されたユーザーのノートは見えなくなる', async () => {
await api('admin/suspend-user', { userId: carol.id }, root);
await setTimeout(100);
const res = await api('notes/timeline', { limit: 100 }, alice); const res = await api('notes/timeline', { limit: 100 }, alice);
assert.strictEqual(res.body.length, 2); assert.strictEqual(res.body.length, 2);
assert.strictEqual(res.body.some(note => note.id === aliceNote.id), true); assert.strictEqual(res.body.some(note => note.id === aliceNote.id), true);
assert.strictEqual(res.body.some(note => note.id === bobNote.id), true); assert.strictEqual(res.body.some(note => note.id === bobNote.id), true);
assert.strictEqual(res.body.some(note => note.id === carolNote.id), false); assert.strictEqual(res.body.some(note => note.id === carolNote.id), false);
});
test('凍結解除後に凍結されていたユーザーのノートは見えるようになる', async () => {
await api('admin/unsuspend-user', { userId: carol.id }, root);
await setTimeout(100);
const res = await api('notes/timeline', { limit: 100 }, alice);
assert.strictEqual(res.body.length, 3);
assert.strictEqual(res.body.some(note => note.id === aliceNote.id), true);
assert.strictEqual(res.body.some(note => note.id === bobNote.id), true);
assert.strictEqual(res.body.some(note => note.id === carolNote.id), true);
assert.strictEqual(res.body.find(note => note.id === carolNote.id)?.text, 'kon\'nichiwa');
});
}); });
}); });
@ -912,25 +931,43 @@ describe('Timelines', () => {
assert.strictEqual(res.body.some(note => note.id === bobNote2.id), true); assert.strictEqual(res.body.some(note => note.id === bobNote2.id), true);
}, 1000 * 10); }, 1000 * 10);
test('凍結: 凍結後に凍結されたユーザーのノートは見えなくなる', async () => { describe('凍結', async () => {
const [alice, bob, carol] = await Promise.all([signup(), signup(), signup()]); let alice: SignupResponse, bob: SignupResponse, carol: SignupResponse;
let aliceNote: Note, bobNote: Note, carolNote: Note;
await api('following/create', { userId: bob.id }, alice); beforeAll(async () => {
await api('following/create', { userId: carol.id }, alice); [alice, bob, carol] = await Promise.all([signup(), signup(), signup()]);
const aliceNote = await post(alice, { text: 'hi' });
const bobNote = await post(bob, { text: 'yo' });
const carolNote = await post(carol, { text: 'kon\'nichiwa' });
await waitForPushToTl(); aliceNote = await post(alice, { text: 'hi' });
bobNote = await post(bob, { text: 'yo' });
carolNote = await post(carol, { text: 'kon\'nichiwa' });
await api('admin/suspend-user', { userId: carol.id }, root); await waitForPushToTl();
});
await setTimeout(250); test('凍結後に凍結されたユーザーのノートは見えなくなる', async () => {
await api('admin/suspend-user', { userId: carol.id }, root);
await setTimeout(100);
const res = await api('notes/local-timeline', { limit: 100 }, alice); const res = await api('notes/local-timeline', { limit: 100 }, alice);
assert.strictEqual(res.body.some(note => note.id === aliceNote.id), true); assert.strictEqual(res.body.length, 2);
assert.strictEqual(res.body.some(note => note.id === bobNote.id), true); assert.strictEqual(res.body.some(note => note.id === aliceNote.id), true);
assert.strictEqual(res.body.some(note => note.id === carolNote.id), false); assert.strictEqual(res.body.some(note => note.id === bobNote.id), true);
assert.strictEqual(res.body.some(note => note.id === carolNote.id), false);
});
test('凍結解除後に凍結されていたユーザーのノートは見えるようになる', async () => {
await api('admin/unsuspend-user', { userId: carol.id }, root);
await setTimeout(100);
const res = await api('notes/local-timeline', { limit: 100 }, alice);
assert.strictEqual(res.body.length, 3);
assert.strictEqual(res.body.some(note => note.id === aliceNote.id), true);
assert.strictEqual(res.body.some(note => note.id === bobNote.id), true);
assert.strictEqual(res.body.some(note => note.id === carolNote.id), true);
assert.strictEqual(res.body.find(note => note.id === carolNote.id)?.text, 'kon\'nichiwa');
});
}); });
}); });
@ -1152,25 +1189,61 @@ describe('Timelines', () => {
assert.strictEqual(res.body.some(note => note.id === bobNote2.id), true); assert.strictEqual(res.body.some(note => note.id === bobNote2.id), true);
}, 1000 * 10); }, 1000 * 10);
test('凍結: 凍結後に凍結されたユーザーのノートは見えなくなる', async () => { describe('凍結', async () => {
const [alice, bob, carol] = await Promise.all([signup(), signup(), signup()]); /*
* bob = 未フォローのローカルユーザー (凍結対象でない)
* carol = 未フォローのローカルユーザー (凍結対象)
* dave = フォローしているローカルユーザー (凍結対象)
* elle = フォローしているリモートユーザー (凍結対象)
*/
let alice: SignupResponse, bob: SignupResponse, carol: SignupResponse, dave: SignupResponse, elle: SignupResponse;
let aliceNote: Note, bobNote: Note, carolNote: Note, daveNote: Note, elleNote: Note;
await api('following/create', { userId: bob.id }, alice); beforeAll(async () => {
await api('following/create', { userId: carol.id }, alice); [alice, bob, carol, dave, elle] = await Promise.all([signup(), signup(), signup(), signup(), signup({ host: genHost() })]);
const aliceNote = await post(alice, { text: 'hi' });
const bobNote = await post(bob, { text: 'yo' });
const carolNote = await post(carol, { text: 'kon\'nichiwa' });
await waitForPushToTl(); aliceNote = await post(alice, { text: 'hi' });
bobNote = await post(bob, { text: 'yo' });
carolNote = await post(carol, { text: 'kon\'nichiwa' });
daveNote = await post(dave, { text: 'hello' });
elleNote = await post(elle, { text: 'hi there' });
await api('admin/suspend-user', { userId: carol.id }, root); await api('following/create', { userId: dave.id }, alice);
await api('following/create', { userId: elle.id }, alice);
await setTimeout(250); await waitForPushToTl();
});
const res = await api('notes/hybrid-timeline', { limit: 100 }, alice); test('凍結後に凍結されたユーザーのノートは見えなくなる', async () => {
assert.strictEqual(res.body.some(note => note.id === aliceNote.id), true); await api('admin/suspend-user', { userId: carol.id }, root);
assert.strictEqual(res.body.some(note => note.id === bobNote.id), true); await api('admin/suspend-user', { userId: dave.id }, root);
assert.strictEqual(res.body.some(note => note.id === carolNote.id), false); await api('admin/suspend-user', { userId: elle.id }, root);
await setTimeout(250);
const res = await api('notes/local-timeline', { limit: 100 }, alice);
assert.strictEqual(res.body.length, 2);
assert.strictEqual(res.body.some(note => note.id === aliceNote.id), true);
assert.strictEqual(res.body.some(note => note.id === bobNote.id), true);
assert.strictEqual(res.body.some(note => note.id === carolNote.id), false);
assert.strictEqual(res.body.some(note => note.id === daveNote.id), false);
assert.strictEqual(res.body.some(note => note.id === elleNote.id), false);
});
test('凍結解除後に凍結されていたユーザーのノートは見えるようになる', async () => {
await api('admin/unsuspend-user', { userId: carol.id }, root);
await api('admin/unsuspend-user', { userId: dave.id }, root);
await api('admin/unsuspend-user', { userId: elle.id }, root);
await setTimeout(250);
const res = await api('notes/local-timeline', { limit: 100 }, alice);
assert.strictEqual(res.body.length, 5);
assert.strictEqual(res.body.some(note => note.id === aliceNote.id), true);
assert.strictEqual(res.body.some(note => note.id === bobNote.id), true);
assert.strictEqual(res.body.some(note => note.id === carolNote.id), true);
assert.strictEqual(res.body.some(note => note.id === daveNote.id), true);
assert.strictEqual(res.body.some(note => note.id === elleNote.id), true);
});
}); });
}); });

30
packages/backend/test/unit/UserSuspendService.ts
View File

@ -7,7 +7,7 @@ process.env.NODE_ENV = 'test';
import { jest } from '@jest/globals'; import { jest } from '@jest/globals';
import { Test } from '@nestjs/testing'; import { Test } from '@nestjs/testing';
import { DataSource } from 'typeorm'; import { setTimeout } from 'node:timers/promises';
import type { TestingModule } from '@nestjs/testing'; import type { TestingModule } from '@nestjs/testing';
import { GlobalModule } from '@/GlobalModule.js'; import { GlobalModule } from '@/GlobalModule.js';
import { UserSuspendService } from '@/core/UserSuspendService.js'; import { UserSuspendService } from '@/core/UserSuspendService.js';
@ -26,10 +26,6 @@ import { ApRendererService } from '@/core/activitypub/ApRendererService.js';
import { ModerationLogService } from '@/core/ModerationLogService.js'; import { ModerationLogService } from '@/core/ModerationLogService.js';
import { secureRndstr } from '@/misc/secure-rndstr.js'; import { secureRndstr } from '@/misc/secure-rndstr.js';
export async function sleep(ms = 250): Promise<void> {
return new Promise(resolve => setTimeout(resolve, ms));
}
describe('UserSuspendService', () => { describe('UserSuspendService', () => {
let app: TestingModule; let app: TestingModule;
let userSuspendService: UserSuspendService; let userSuspendService: UserSuspendService;
@ -169,7 +165,7 @@ describe('UserSuspendService', () => {
await createFollowing(user, followee2); await createFollowing(user, followee2);
await userSuspendService.suspend(user, moderator); await userSuspendService.suspend(user, moderator);
await sleep(); await setTimeout(250);
// フォロー関係が論理削除されているかチェック // フォロー関係が論理削除されているかチェック
const followings = await followingsRepository.find({ const followings = await followingsRepository.find({
@ -187,10 +183,10 @@ describe('UserSuspendService', () => {
const moderator = await createUser(); const moderator = await createUser();
await userSuspendService.suspend(user, moderator); await userSuspendService.suspend(user, moderator);
await sleep(); await setTimeout(250);
// 内部イベントが発行されているかチェック（非同期処理のため少し待つ） // 内部イベントが発行されているかチェック（非同期処理のため少し待つ）
await new Promise(resolve => setTimeout(resolve, 100)); await setTimeout(100);
expect(globalEventService.publishInternalEvent).toHaveBeenCalledWith( expect(globalEventService.publishInternalEvent).toHaveBeenCalledWith(
'userChangeSuspendedState', 'userChangeSuspendedState',
@ -205,7 +201,7 @@ describe('UserSuspendService', () => {
const moderator = await createUser(); const moderator = await createUser();
await userSuspendService.unsuspend(user, moderator); await userSuspendService.unsuspend(user, moderator);
await sleep(); await setTimeout(250);
// ユーザーの凍結が解除されているかチェック // ユーザーの凍結が解除されているかチェック
const unsuspendedUser = await usersRepository.findOneBy({ id: user.id }); const unsuspendedUser = await usersRepository.findOneBy({ id: user.id });
@ -230,7 +226,7 @@ describe('UserSuspendService', () => {
await createFollowing(user, followee2, { isFollowerSuspended: true }); await createFollowing(user, followee2, { isFollowerSuspended: true });
await userSuspendService.unsuspend(user, moderator); await userSuspendService.unsuspend(user, moderator);
await sleep(); await setTimeout(250);
// フォロー関係が復元されているかチェック // フォロー関係が復元されているかチェック
const followings = await followingsRepository.find({ const followings = await followingsRepository.find({
@ -248,10 +244,10 @@ describe('UserSuspendService', () => {
const moderator = await createUser(); const moderator = await createUser();
await userSuspendService.unsuspend(user, moderator); await userSuspendService.unsuspend(user, moderator);
await sleep(); await setTimeout(250);
// 内部イベントが発行されているかチェック（非同期処理のため少し待つ） // 内部イベントが発行されているかチェック（非同期処理のため少し待つ）
await new Promise(resolve => setTimeout(resolve, 100)); await setTimeout(100);
expect(globalEventService.publishInternalEvent).toHaveBeenCalledWith( expect(globalEventService.publishInternalEvent).toHaveBeenCalledWith(
'userChangeSuspendedState', 'userChangeSuspendedState',
@ -282,7 +278,7 @@ describe('UserSuspendService', () => {
// 凍結 // 凍結
await userSuspendService.suspend(user, moderator); await userSuspendService.suspend(user, moderator);
await sleep(); await setTimeout(250);
// 凍結後の状態確認 // 凍結後の状態確認
followings = await followingsRepository.find({ followings = await followingsRepository.find({
@ -296,7 +292,7 @@ describe('UserSuspendService', () => {
// 凍結解除 // 凍結解除
const suspendedUser = await usersRepository.findOneByOrFail({ id: user.id }); const suspendedUser = await usersRepository.findOneByOrFail({ id: user.id });
await userSuspendService.unsuspend(suspendedUser, moderator); await userSuspendService.unsuspend(suspendedUser, moderator);
await sleep(); await setTimeout(250);
// 凍結解除後の状態確認 // 凍結解除後の状態確認
followings = await followingsRepository.find({ followings = await followingsRepository.find({
@ -320,7 +316,7 @@ describe('UserSuspendService', () => {
apRendererService.addContext.mockReturnValue({ '@context': '...', type: 'Delete' } as any); apRendererService.addContext.mockReturnValue({ '@context': '...', type: 'Delete' } as any);
await userSuspendService.suspend(localUser, moderator); await userSuspendService.suspend(localUser, moderator);
await sleep(); await setTimeout(250);
// ActivityPub配信が呼ばれているかチェック // ActivityPub配信が呼ばれているかチェック
expect(userEntityService.isLocalUser).toHaveBeenCalledWith(localUser); expect(userEntityService.isLocalUser).toHaveBeenCalledWith(localUser);
@ -339,7 +335,7 @@ describe('UserSuspendService', () => {
apRendererService.addContext.mockReturnValue({ '@context': '...', type: 'Undo' } as any); apRendererService.addContext.mockReturnValue({ '@context': '...', type: 'Undo' } as any);
await userSuspendService.unsuspend(localUser, moderator); await userSuspendService.unsuspend(localUser, moderator);
await sleep(); await setTimeout(250);
// ActivityPub配信が呼ばれているかチェック // ActivityPub配信が呼ばれているかチェック
expect(userEntityService.isLocalUser).toHaveBeenCalledWith(localUser); expect(userEntityService.isLocalUser).toHaveBeenCalledWith(localUser);
@ -355,7 +351,7 @@ describe('UserSuspendService', () => {
userEntityService.isLocalUser.mockReturnValue(false); userEntityService.isLocalUser.mockReturnValue(false);
await userSuspendService.suspend(remoteUser, moderator); await userSuspendService.suspend(remoteUser, moderator);
await sleep(); await setTimeout(250);
// ActivityPub配信が呼ばれていないことをチェック // ActivityPub配信が呼ばれていないことをチェック
expect(userEntityService.isLocalUser).toHaveBeenCalledWith(remoteUser); expect(userEntityService.isLocalUser).toHaveBeenCalledWith(remoteUser);