fix(backend): typeormのbreaking changeに対応 (#16105)

* fix(backend): typeormのbreaking changeに対応

* attempt to fix test
This commit is contained in:
かっこかり 2025-05-27 13:50:45 +09:00 committed by GitHub
parent 47f4f11e3e
commit 07c2de3749
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
11 changed files with 27 additions and 27 deletions

View File

@ -162,10 +162,10 @@ describe('AbuseReportNotificationService', () => {
emailService.sendEmail.mockClear(); emailService.sendEmail.mockClear();
webhookService.enqueueSystemWebhook.mockClear(); webhookService.enqueueSystemWebhook.mockClear();
await usersRepository.delete({}); await usersRepository.createQueryBuilder().delete().execute();
await userProfilesRepository.delete({}); await userProfilesRepository.createQueryBuilder().delete().execute();
await systemWebhooksRepository.delete({}); await systemWebhooksRepository.createQueryBuilder().delete().execute();
await abuseReportNotificationRecipientRepository.delete({}); await abuseReportNotificationRecipientRepository.createQueryBuilder().delete().execute();
}); });
afterAll(async () => { afterAll(async () => {

View File

@ -103,10 +103,10 @@ describe('AnnouncementService', () => {
afterEach(async () => { afterEach(async () => {
await Promise.all([ await Promise.all([
app.get(DI.metasRepository).delete({}), app.get(DI.metasRepository).clear(),
usersRepository.delete({}), usersRepository.createQueryBuilder().delete().execute(),
announcementsRepository.delete({}), announcementsRepository.createQueryBuilder().delete().execute(),
announcementReadsRepository.delete({}), announcementReadsRepository.createQueryBuilder().delete().execute(),
]); ]);
await app.close(); await app.close();

View File

@ -86,7 +86,7 @@ describe('CustomEmojiService', () => {
} }
afterEach(async () => { afterEach(async () => {
await emojisRepository.delete({}); await emojisRepository.createQueryBuilder().delete().execute();
}); });
describe('単独', () => { describe('単独', () => {

View File

@ -85,9 +85,9 @@ describe('FlashService', () => {
}); });
afterEach(async () => { afterEach(async () => {
await usersRepository.delete({}); await usersRepository.createQueryBuilder().delete().execute();
await userProfilesRepository.delete({}); await userProfilesRepository.createQueryBuilder().delete().execute();
await flashsRepository.delete({}); await flashsRepository.createQueryBuilder().delete().execute();
}); });
afterAll(async () => { afterAll(async () => {

View File

@ -159,10 +159,10 @@ describe('RoleService', () => {
clock.uninstall(); clock.uninstall();
await Promise.all([ await Promise.all([
app.get(DI.metasRepository).delete({}), app.get(DI.metasRepository).clear(),
usersRepository.delete({}), usersRepository.createQueryBuilder().delete().execute(),
rolesRepository.delete({}), rolesRepository.createQueryBuilder().delete().execute(),
roleAssignmentsRepository.delete({}), roleAssignmentsRepository.createQueryBuilder().delete().execute(),
]); ]);
await app.close(); await app.close();

View File

@ -101,8 +101,8 @@ describe('SystemWebhookService', () => {
} }
async function afterEachImpl() { async function afterEachImpl() {
await usersRepository.delete({}); await usersRepository.createQueryBuilder().delete().execute();
await systemWebhooksRepository.delete({}); await systemWebhooksRepository.createQueryBuilder().delete().execute();
} }
// -------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------

View File

@ -127,7 +127,7 @@ describe('UserSearchService', () => {
}); });
afterEach(async () => { afterEach(async () => {
await usersRepository.delete({}); await usersRepository.createQueryBuilder().delete().execute();
}); });
afterAll(async () => { afterAll(async () => {

View File

@ -95,8 +95,8 @@ describe('UserWebhookService', () => {
} }
async function afterEachImpl() { async function afterEachImpl() {
await usersRepository.delete({}); await usersRepository.createQueryBuilder().delete().execute();
await userWebhooksRepository.delete({}); await userWebhooksRepository.createQueryBuilder().delete().execute();
} }
// -------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------

View File

@ -111,8 +111,8 @@ describe('WebhookTestService', () => {
userWebhookService.fetchWebhooks.mockClear(); userWebhookService.fetchWebhooks.mockClear();
systemWebhookService.fetchSystemWebhooks.mockClear(); systemWebhookService.fetchSystemWebhooks.mockClear();
await usersRepository.delete({}); await usersRepository.createQueryBuilder().delete().execute();
await userProfilesRepository.delete({}); await userProfilesRepository.createQueryBuilder().delete().execute();
}); });
afterAll(async () => { afterAll(async () => {

View File

@ -157,8 +157,8 @@ describe('CheckModeratorsActivityProcessorService', () => {
afterEach(async () => { afterEach(async () => {
clock.uninstall(); clock.uninstall();
await usersRepository.delete({}); await usersRepository.createQueryBuilder().delete().execute();
await userProfilesRepository.delete({}); await userProfilesRepository.createQueryBuilder().delete().execute();
roleService.getModerators.mockReset(); roleService.getModerators.mockReset();
announcementService.create.mockReset(); announcementService.create.mockReset();
emailService.sendEmail.mockReset(); emailService.sendEmail.mockReset();

View File

@ -41,7 +41,7 @@ describe('/drive/files/create', () => {
idService = module.get(IdService); idService = module.get(IdService);
const usersRepository = module.get<UsersRepository>(DI.usersRepository); const usersRepository = module.get<UsersRepository>(DI.usersRepository);
await usersRepository.delete({}); await usersRepository.createQueryBuilder().delete().execute();
root = await usersRepository.insert({ root = await usersRepository.insert({
id: idService.gen(), id: idService.gen(),
username: 'root', username: 'root',
@ -50,7 +50,7 @@ describe('/drive/files/create', () => {
}).then(x => usersRepository.findOneByOrFail(x.identifiers[0])); }).then(x => usersRepository.findOneByOrFail(x.identifiers[0]));
const userProfilesRepository = module.get<UserProfilesRepository>(DI.userProfilesRepository); const userProfilesRepository = module.get<UserProfilesRepository>(DI.userProfilesRepository);
await userProfilesRepository.delete({}); await userProfilesRepository.createQueryBuilder().delete().execute();
await userProfilesRepository.insert({ await userProfilesRepository.insert({
userId: root.id, userId: root.id,
}); });