fix(backend): typeormのbreaking changeに対応 (#16105)
* fix(backend): typeormのbreaking changeに対応 * attempt to fix test
This commit is contained in:
parent
47f4f11e3e
commit
07c2de3749
|
@ -162,10 +162,10 @@ describe('AbuseReportNotificationService', () => {
|
|||
emailService.sendEmail.mockClear();
|
||||
webhookService.enqueueSystemWebhook.mockClear();
|
||||
|
||||
await usersRepository.delete({});
|
||||
await userProfilesRepository.delete({});
|
||||
await systemWebhooksRepository.delete({});
|
||||
await abuseReportNotificationRecipientRepository.delete({});
|
||||
await usersRepository.createQueryBuilder().delete().execute();
|
||||
await userProfilesRepository.createQueryBuilder().delete().execute();
|
||||
await systemWebhooksRepository.createQueryBuilder().delete().execute();
|
||||
await abuseReportNotificationRecipientRepository.createQueryBuilder().delete().execute();
|
||||
});
|
||||
|
||||
afterAll(async () => {
|
||||
|
|
|
@ -103,10 +103,10 @@ describe('AnnouncementService', () => {
|
|||
|
||||
afterEach(async () => {
|
||||
await Promise.all([
|
||||
app.get(DI.metasRepository).delete({}),
|
||||
usersRepository.delete({}),
|
||||
announcementsRepository.delete({}),
|
||||
announcementReadsRepository.delete({}),
|
||||
app.get(DI.metasRepository).clear(),
|
||||
usersRepository.createQueryBuilder().delete().execute(),
|
||||
announcementsRepository.createQueryBuilder().delete().execute(),
|
||||
announcementReadsRepository.createQueryBuilder().delete().execute(),
|
||||
]);
|
||||
|
||||
await app.close();
|
||||
|
|
|
@ -86,7 +86,7 @@ describe('CustomEmojiService', () => {
|
|||
}
|
||||
|
||||
afterEach(async () => {
|
||||
await emojisRepository.delete({});
|
||||
await emojisRepository.createQueryBuilder().delete().execute();
|
||||
});
|
||||
|
||||
describe('単独', () => {
|
||||
|
|
|
@ -85,9 +85,9 @@ describe('FlashService', () => {
|
|||
});
|
||||
|
||||
afterEach(async () => {
|
||||
await usersRepository.delete({});
|
||||
await userProfilesRepository.delete({});
|
||||
await flashsRepository.delete({});
|
||||
await usersRepository.createQueryBuilder().delete().execute();
|
||||
await userProfilesRepository.createQueryBuilder().delete().execute();
|
||||
await flashsRepository.createQueryBuilder().delete().execute();
|
||||
});
|
||||
|
||||
afterAll(async () => {
|
||||
|
|
|
@ -159,10 +159,10 @@ describe('RoleService', () => {
|
|||
clock.uninstall();
|
||||
|
||||
await Promise.all([
|
||||
app.get(DI.metasRepository).delete({}),
|
||||
usersRepository.delete({}),
|
||||
rolesRepository.delete({}),
|
||||
roleAssignmentsRepository.delete({}),
|
||||
app.get(DI.metasRepository).clear(),
|
||||
usersRepository.createQueryBuilder().delete().execute(),
|
||||
rolesRepository.createQueryBuilder().delete().execute(),
|
||||
roleAssignmentsRepository.createQueryBuilder().delete().execute(),
|
||||
]);
|
||||
|
||||
await app.close();
|
||||
|
|
|
@ -101,8 +101,8 @@ describe('SystemWebhookService', () => {
|
|||
}
|
||||
|
||||
async function afterEachImpl() {
|
||||
await usersRepository.delete({});
|
||||
await systemWebhooksRepository.delete({});
|
||||
await usersRepository.createQueryBuilder().delete().execute();
|
||||
await systemWebhooksRepository.createQueryBuilder().delete().execute();
|
||||
}
|
||||
|
||||
// --------------------------------------------------------------------------------------
|
||||
|
|
|
@ -127,7 +127,7 @@ describe('UserSearchService', () => {
|
|||
});
|
||||
|
||||
afterEach(async () => {
|
||||
await usersRepository.delete({});
|
||||
await usersRepository.createQueryBuilder().delete().execute();
|
||||
});
|
||||
|
||||
afterAll(async () => {
|
||||
|
|
|
@ -95,8 +95,8 @@ describe('UserWebhookService', () => {
|
|||
}
|
||||
|
||||
async function afterEachImpl() {
|
||||
await usersRepository.delete({});
|
||||
await userWebhooksRepository.delete({});
|
||||
await usersRepository.createQueryBuilder().delete().execute();
|
||||
await userWebhooksRepository.createQueryBuilder().delete().execute();
|
||||
}
|
||||
|
||||
// --------------------------------------------------------------------------------------
|
||||
|
|
|
@ -111,8 +111,8 @@ describe('WebhookTestService', () => {
|
|||
userWebhookService.fetchWebhooks.mockClear();
|
||||
systemWebhookService.fetchSystemWebhooks.mockClear();
|
||||
|
||||
await usersRepository.delete({});
|
||||
await userProfilesRepository.delete({});
|
||||
await usersRepository.createQueryBuilder().delete().execute();
|
||||
await userProfilesRepository.createQueryBuilder().delete().execute();
|
||||
});
|
||||
|
||||
afterAll(async () => {
|
||||
|
|
|
@ -157,8 +157,8 @@ describe('CheckModeratorsActivityProcessorService', () => {
|
|||
|
||||
afterEach(async () => {
|
||||
clock.uninstall();
|
||||
await usersRepository.delete({});
|
||||
await userProfilesRepository.delete({});
|
||||
await usersRepository.createQueryBuilder().delete().execute();
|
||||
await userProfilesRepository.createQueryBuilder().delete().execute();
|
||||
roleService.getModerators.mockReset();
|
||||
announcementService.create.mockReset();
|
||||
emailService.sendEmail.mockReset();
|
||||
|
|
|
@ -41,7 +41,7 @@ describe('/drive/files/create', () => {
|
|||
idService = module.get(IdService);
|
||||
|
||||
const usersRepository = module.get<UsersRepository>(DI.usersRepository);
|
||||
await usersRepository.delete({});
|
||||
await usersRepository.createQueryBuilder().delete().execute();
|
||||
root = await usersRepository.insert({
|
||||
id: idService.gen(),
|
||||
username: 'root',
|
||||
|
@ -50,7 +50,7 @@ describe('/drive/files/create', () => {
|
|||
}).then(x => usersRepository.findOneByOrFail(x.identifiers[0]));
|
||||
|
||||
const userProfilesRepository = module.get<UserProfilesRepository>(DI.userProfilesRepository);
|
||||
await userProfilesRepository.delete({});
|
||||
await userProfilesRepository.createQueryBuilder().delete().execute();
|
||||
await userProfilesRepository.insert({
|
||||
userId: root.id,
|
||||
});
|
||||
|
|
Loading…
Reference in New Issue