diff --git a/packages/backend/test/unit/AbuseReportNotificationService.ts b/packages/backend/test/unit/AbuseReportNotificationService.ts index 24e75feb82..7095fb3445 100644 --- a/packages/backend/test/unit/AbuseReportNotificationService.ts +++ b/packages/backend/test/unit/AbuseReportNotificationService.ts @@ -166,10 +166,10 @@ describe('AbuseReportNotificationService', () => { emailService.sendEmail.mockClear(); webhookService.enqueueSystemWebhook.mockClear(); - await usersRepository.delete({}); - await userProfilesRepository.delete({}); - await systemWebhooksRepository.delete({}); - await abuseReportNotificationRecipientRepository.delete({}); + await usersRepository.deleteAll(); + await userProfilesRepository.deleteAll(); + await systemWebhooksRepository.deleteAll(); + await abuseReportNotificationRecipientRepository.deleteAll(); }); // -------------------------------------------------------------------------------------- diff --git a/packages/backend/test/unit/AnnouncementService.ts b/packages/backend/test/unit/AnnouncementService.ts index 8a3f2ef7c8..a58a55b93d 100644 --- a/packages/backend/test/unit/AnnouncementService.ts +++ b/packages/backend/test/unit/AnnouncementService.ts @@ -116,10 +116,10 @@ describe('AnnouncementService', () => { afterEach(async () => { await Promise.all([ - app.get(DI.metasRepository).delete({}), - usersRepository.delete({}), - announcementsRepository.delete({}), - announcementReadsRepository.delete({}), + app.get(DI.metasRepository).deleteAll(), + usersRepository.deleteAll(), + announcementsRepository.deleteAll(), + announcementReadsRepository.deleteAll(), ]); moderationLogService.log.mockReset(); globalEventService.publishMainStream.mockReset(); diff --git a/packages/backend/test/unit/CustomEmojiService.ts b/packages/backend/test/unit/CustomEmojiService.ts index a22c9ed3f3..01b0d09f58 100644 --- a/packages/backend/test/unit/CustomEmojiService.ts +++ b/packages/backend/test/unit/CustomEmojiService.ts @@ -89,7 +89,7 @@ describe('CustomEmojiService', () => { } afterEach(async () => { - await emojisRepository.delete({}); + await emojisRepository.deleteAll(); }); describe('単独', () => { diff --git a/packages/backend/test/unit/FlashService.ts b/packages/backend/test/unit/FlashService.ts index 43cb733456..021f668dc0 100644 --- a/packages/backend/test/unit/FlashService.ts +++ b/packages/backend/test/unit/FlashService.ts @@ -95,9 +95,9 @@ describe('FlashService', () => { }); afterEach(async () => { - await usersRepository.delete({}); - await userProfilesRepository.delete({}); - await flashsRepository.delete({}); + await usersRepository.deleteAll(); + await userProfilesRepository.deleteAll(); + await flashsRepository.deleteAll(); cacheManagementService.clear(); }); diff --git a/packages/backend/test/unit/RoleService.ts b/packages/backend/test/unit/RoleService.ts index de34f81ee2..0d30df2972 100644 --- a/packages/backend/test/unit/RoleService.ts +++ b/packages/backend/test/unit/RoleService.ts @@ -171,10 +171,10 @@ describe('RoleService', () => { afterEach(async () => { await Promise.all([ - metasRepository.delete({}), - usersRepository.delete({}), - rolesRepository.delete({}), - roleAssignmentsRepository.delete({}), + metasRepository.deleteAll(), + usersRepository.deleteAll(), + rolesRepository.deleteAll(), + roleAssignmentsRepository.deleteAll(), ]); cacheManagementService.clear(); diff --git a/packages/backend/test/unit/SystemWebhookService.ts b/packages/backend/test/unit/SystemWebhookService.ts index 0204f1da3d..e4fc99aaf4 100644 --- a/packages/backend/test/unit/SystemWebhookService.ts +++ b/packages/backend/test/unit/SystemWebhookService.ts @@ -97,8 +97,8 @@ describe('SystemWebhookService', () => { }); afterEach(async () => { - await usersRepository.delete({}); - await systemWebhooksRepository.delete({}); + await usersRepository.deleteAll(); + await systemWebhooksRepository.deleteAll(); queueService.systemWebhookDeliver.mockReset(); cacheManagementService.clear(); }); diff --git a/packages/backend/test/unit/UserSearchService.ts b/packages/backend/test/unit/UserSearchService.ts index 305e0ccc71..7a58788dcc 100644 --- a/packages/backend/test/unit/UserSearchService.ts +++ b/packages/backend/test/unit/UserSearchService.ts @@ -143,7 +143,7 @@ describe('UserSearchService', () => { }); afterEach(async () => { - await usersRepository.delete({}); + await usersRepository.deleteAll({}); cacheManagementService.clear(); }); diff --git a/packages/backend/test/unit/UserWebhookService.ts b/packages/backend/test/unit/UserWebhookService.ts index 8a0d761095..144382230f 100644 --- a/packages/backend/test/unit/UserWebhookService.ts +++ b/packages/backend/test/unit/UserWebhookService.ts @@ -93,8 +93,8 @@ describe('UserWebhookService', () => { }); afterEach(async () => { - await usersRepository.delete({}); - await userWebhooksRepository.delete({}); + await usersRepository.deleteAll({}); + await userWebhooksRepository.deleteAll({}); queueService.userWebhookDeliver.mockReset(); cacheManagementService.clear(); }); diff --git a/packages/backend/test/unit/WebhookTestService.ts b/packages/backend/test/unit/WebhookTestService.ts index db22c87fcb..d43da8d7a3 100644 --- a/packages/backend/test/unit/WebhookTestService.ts +++ b/packages/backend/test/unit/WebhookTestService.ts @@ -110,8 +110,8 @@ describe('WebhookTestService', () => { userWebhookService.fetchWebhooks.mockClear(); systemWebhookService.fetchSystemWebhooks.mockClear(); - await userProfilesRepository.delete({}); - await usersRepository.delete({}); + await userProfilesRepository.deleteAll(); + await usersRepository.deleteAll(); cacheManagementService.clear(); }); diff --git a/packages/backend/test/unit/queue/processors/CheckModeratorsActivityProcessorService.ts b/packages/backend/test/unit/queue/processors/CheckModeratorsActivityProcessorService.ts index f72f4cad7d..faae0f87fc 100644 --- a/packages/backend/test/unit/queue/processors/CheckModeratorsActivityProcessorService.ts +++ b/packages/backend/test/unit/queue/processors/CheckModeratorsActivityProcessorService.ts @@ -146,8 +146,8 @@ describe('CheckModeratorsActivityProcessorService', () => { }); afterEach(async () => { - await userProfilesRepository.delete({}); - await usersRepository.delete({}); + await usersRepository.deleteAll(); + await userProfilesRepository.deleteAll(); roleService.getModerators.mockReset(); announcementService.create.mockReset(); emailService.sendEmail.mockReset(); diff --git a/packages/backend/test/unit/server/api/drive/files/create.ts b/packages/backend/test/unit/server/api/drive/files/create.ts index 1b7b369011..9cfe0ea0f0 100644 --- a/packages/backend/test/unit/server/api/drive/files/create.ts +++ b/packages/backend/test/unit/server/api/drive/files/create.ts @@ -43,7 +43,7 @@ describe('/drive/files/create', () => { idService = module.get(IdService); const usersRepository = module.get(DI.usersRepository); - await usersRepository.delete({}); + await usersRepository.deleteAll(); root = await usersRepository.insert({ id: idService.gen(), username: 'root', @@ -52,7 +52,7 @@ describe('/drive/files/create', () => { }).then(x => usersRepository.findOneByOrFail(x.identifiers[0])); const userProfilesRepository = module.get(DI.userProfilesRepository); - await userProfilesRepository.delete({}); + await userProfilesRepository.deleteAll(); await userProfilesRepository.insert({ userId: root.id, });