From e69e849e2555160c7b859aa5c7f3298b80fb5ce3 Mon Sep 17 00:00:00 2001 From: dakkar Date: Tue, 13 May 2025 14:17:52 +0100 Subject: [PATCH] fix `test/e2e/users.ts` --- packages/backend/test/e2e/users.ts | 38 ++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/packages/backend/test/e2e/users.ts b/packages/backend/test/e2e/users.ts index 4b3ec856f1..ef3b21b103 100644 --- a/packages/backend/test/e2e/users.ts +++ b/packages/backend/test/e2e/users.ts @@ -35,6 +35,8 @@ describe('ユーザー', () => { name: user.name, username: user.username, host: user.host, + createdAt: user.createdAt, + approved: user.approved, avatarUrl: user.avatarUrl, avatarBlurhash: user.avatarBlurhash, avatarDecorations: user.avatarDecorations, @@ -45,6 +47,15 @@ describe('ユーザー', () => { emojis: user.emojis, onlineStatus: user.onlineStatus, badgeRoles: user.badgeRoles, + enableRss: user.enableRss, + mandatoryCW: user.mandatoryCW, + noindex: user.noindex, + rejectQuotes: user.rejectQuotes, + followersCount: user.followersCount, + followingCount: user.followingCount, + notesCount: user.notesCount, + isSilenced: user.isSilenced, + description: user.description, // BUG isAdmin/isModeratorはUserLiteではなくMeDetailedOnlyに含まれる。 isAdmin: undefined, @@ -60,7 +71,6 @@ describe('ユーザー', () => { uri: user.uri, movedTo: user.movedTo, alsoKnownAs: user.alsoKnownAs, - createdAt: user.createdAt, updatedAt: user.updatedAt, lastFetchedAt: user.lastFetchedAt, bannerUrl: user.bannerUrl, @@ -68,17 +78,13 @@ describe('ユーザー', () => { backgroundUrl: user.backgroundUrl, backgroundBlurhash: user.backgroundBlurhash, isLocked: user.isLocked, - isSilenced: user.isSilenced, isSuspended: user.isSuspended, - description: user.description, location: user.location, birthday: user.birthday, + listenbrainz: user.listenbrainz, lang: user.lang, fields: user.fields, verifiedLinks: user.verifiedLinks, - followersCount: user.followersCount, - followingCount: user.followingCount, - notesCount: user.notesCount, pinnedNoteIds: user.pinnedNoteIds, pinnedNotes: user.pinnedNotes, pinnedPageId: user.pinnedPageId, @@ -117,6 +123,7 @@ describe('ユーザー', () => { ...userDetailedNotMe(user), avatarId: user.avatarId, bannerId: user.bannerId, + backgroundId: user.backgroundId, followedMessage: user.followedMessage, isModerator: user.isModerator, isAdmin: user.isAdmin, @@ -153,6 +160,11 @@ describe('ユーザー', () => { achievements: user.achievements, loggedInDays: user.loggedInDays, policies: user.policies, + defaultCW: user.defaultCW, + defaultCWPriority: user.defaultCWPriority, + allowUnsignedFetch: user.allowUnsignedFetch, + defaultSensitive: user.defaultSensitive, + isSystem: false, twoFactorEnabled: user.twoFactorEnabled, usePasswordLessLogin: user.usePasswordLessLogin, securityKeys: user.securityKeys, @@ -160,6 +172,7 @@ describe('ユーザー', () => { email: user.email, emailVerified: user.emailVerified, securityKeysList: user.securityKeysList, + signupReason: user.signupReason, } : {}), }); }; @@ -268,6 +281,7 @@ describe('ユーザー', () => { userBlockedByAlice = await signup({ username: 'userBlockedByAlice' }); await post(userBlockedByAlice, { text: 'test' }); await api('blocking/create', { userId: userBlockedByAlice.id }, alice); + await api('mute/delete', { userId: userBlockedByAlice.id }, alice); // blocking implies muting, in Sharkey, but we want to test un-muted block userMutingAlice = await signup({ username: 'userMutingAlice' }); await post(userMutingAlice, { text: 'test' }); await api('mute/create', { userId: alice.id }, userMutingAlice); @@ -319,7 +333,7 @@ describe('ユーザー', () => { assert.deepStrictEqual(response.avatarDecorations, []); assert.strictEqual(response.isBot, false); assert.strictEqual(response.isCat, false); - assert.strictEqual(response.speakAsCat, false); + assert.strictEqual(response.speakAsCat, true); assert.strictEqual(response.instance, undefined); assert.deepStrictEqual(response.emojis, {}); assert.strictEqual(response.onlineStatus, 'unknown'); @@ -377,7 +391,7 @@ describe('ユーザー', () => { assert.strictEqual(response.isExplorable, true); assert.strictEqual(response.isDeleted, false); assert.strictEqual(response.twoFactorBackupCodesStock, 'none'); - assert.strictEqual(response.hideOnlineStatus, false); + assert.strictEqual(response.hideOnlineStatus, true); assert.strictEqual(response.hasUnreadSpecifiedNotes, false); assert.strictEqual(response.hasUnreadMentions, false); assert.strictEqual(response.hasUnreadAnnouncement, false); @@ -457,8 +471,6 @@ describe('ユーザー', () => { { parameters: () => ({ autoAcceptFollowed: false }) }, { parameters: () => ({ noCrawle: true }) }, { parameters: () => ({ noCrawle: false }) }, - { parameters: () => ({ preventAiLearning: false }) }, - { parameters: () => ({ preventAiLearning: true }) }, { parameters: () => ({ isBot: true }) }, { parameters: () => ({ isBot: false }) }, { parameters: () => ({ isCat: true }) }, @@ -469,8 +481,8 @@ describe('ユーザー', () => { { parameters: () => ({ receiveAnnouncementEmail: false }) }, { parameters: () => ({ alwaysMarkNsfw: true }) }, { parameters: () => ({ alwaysMarkNsfw: false }) }, - { parameters: () => ({ autoSensitive: true }) }, - { parameters: () => ({ autoSensitive: false }) }, + { parameters: () => ({ defaultSensitive: true }) }, + { parameters: () => ({ defaultSensitive: false }) }, { parameters: () => ({ followingVisibility: 'private' as const }) }, { parameters: () => ({ followingVisibility: 'followers' as const }) }, { parameters: () => ({ followingVisibility: 'public' as const }) }, @@ -544,7 +556,7 @@ describe('ユーザー', () => { test('を書き換えることができる(Background)', async () => { const aliceFile = (await uploadFile(alice)).body; - const parameters = { bannerId: aliceFile!.id }; + const parameters = { backgroundId: aliceFile!.id }; const response = await successfulApiCall({ endpoint: 'i/update', parameters: parameters, user: alice }); assert.match(response.backgroundUrl ?? '.', /^[-a-zA-Z0-9@:%._\+~#&?=\/]+$/); assert.match(response.backgroundBlurhash ?? '.', /[ -~]{54}/);