fix tests
This commit is contained in:
parent
9018b7cebe
commit
c9e4e94643
|
@ -149,9 +149,9 @@ describe('AbuseReportNotificationService', () => {
|
||||||
});
|
});
|
||||||
|
|
||||||
beforeEach(async () => {
|
beforeEach(async () => {
|
||||||
root = await createUser({ username: 'root', usernameLower: 'root', isRoot: true });
|
root = await createUser({ username: 'root', usernameLower: 'root' });
|
||||||
alice = await createUser({ username: 'alice', usernameLower: 'alice', isRoot: false });
|
alice = await createUser({ username: 'alice', usernameLower: 'alice' });
|
||||||
bob = await createUser({ username: 'bob', usernameLower: 'bob', isRoot: false });
|
bob = await createUser({ username: 'bob', usernameLower: 'bob' });
|
||||||
systemWebhook1 = await createWebhook();
|
systemWebhook1 = await createWebhook();
|
||||||
systemWebhook2 = await createWebhook();
|
systemWebhook2 = await createWebhook();
|
||||||
|
|
||||||
|
|
|
@ -79,9 +79,9 @@ describe('FlashService', () => {
|
||||||
userProfilesRepository = app.get(DI.userProfilesRepository);
|
userProfilesRepository = app.get(DI.userProfilesRepository);
|
||||||
idService = app.get(IdService);
|
idService = app.get(IdService);
|
||||||
|
|
||||||
root = await createUser({ username: 'root', usernameLower: 'root', isRoot: true });
|
root = await createUser({ username: 'root', usernameLower: 'root' });
|
||||||
alice = await createUser({ username: 'alice', usernameLower: 'alice', isRoot: false });
|
alice = await createUser({ username: 'alice', usernameLower: 'alice' });
|
||||||
bob = await createUser({ username: 'bob', usernameLower: 'bob', isRoot: false });
|
bob = await createUser({ username: 'bob', usernameLower: 'bob' });
|
||||||
});
|
});
|
||||||
|
|
||||||
afterEach(async () => {
|
afterEach(async () => {
|
||||||
|
|
|
@ -97,7 +97,7 @@ describe('SystemWebhookService', () => {
|
||||||
}
|
}
|
||||||
|
|
||||||
async function beforeEachImpl() {
|
async function beforeEachImpl() {
|
||||||
root = await createUser({ isRoot: true, username: 'root', usernameLower: 'root' });
|
root = await createUser({ username: 'root', usernameLower: 'root' });
|
||||||
}
|
}
|
||||||
|
|
||||||
async function afterEachImpl() {
|
async function afterEachImpl() {
|
||||||
|
|
|
@ -113,7 +113,7 @@ describe('UserSearchService', () => {
|
||||||
});
|
});
|
||||||
|
|
||||||
beforeEach(async () => {
|
beforeEach(async () => {
|
||||||
root = await createUser({ username: 'root', usernameLower: 'root', isRoot: true });
|
root = await createUser({ username: 'root', usernameLower: 'root' });
|
||||||
alice = await createUser({ username: 'Alice', usernameLower: 'alice' });
|
alice = await createUser({ username: 'Alice', usernameLower: 'alice' });
|
||||||
alyce = await createUser({ username: 'Alyce', usernameLower: 'alyce' });
|
alyce = await createUser({ username: 'Alyce', usernameLower: 'alyce' });
|
||||||
alycia = await createUser({ username: 'Alycia', usernameLower: 'alycia' });
|
alycia = await createUser({ username: 'Alycia', usernameLower: 'alycia' });
|
||||||
|
|
|
@ -91,7 +91,7 @@ describe('UserWebhookService', () => {
|
||||||
}
|
}
|
||||||
|
|
||||||
async function beforeEachImpl() {
|
async function beforeEachImpl() {
|
||||||
root = await createUser({ isRoot: true, username: 'root', usernameLower: 'root' });
|
root = await createUser({ username: 'root', usernameLower: 'root' });
|
||||||
}
|
}
|
||||||
|
|
||||||
async function afterEachImpl() {
|
async function afterEachImpl() {
|
||||||
|
|
|
@ -88,8 +88,8 @@ describe('WebhookTestService', () => {
|
||||||
});
|
});
|
||||||
|
|
||||||
beforeEach(async () => {
|
beforeEach(async () => {
|
||||||
root = await createUser({ username: 'root', usernameLower: 'root', isRoot: true });
|
root = await createUser({ username: 'root', usernameLower: 'root' });
|
||||||
alice = await createUser({ username: 'alice', usernameLower: 'alice', isRoot: false });
|
alice = await createUser({ username: 'alice', usernameLower: 'alice' });
|
||||||
|
|
||||||
userWebhookService.fetchWebhooks.mockReturnValue(Promise.resolve([
|
userWebhookService.fetchWebhooks.mockReturnValue(Promise.resolve([
|
||||||
{ id: 'dummy-webhook', active: true, userId: alice.id } as MiWebhook,
|
{ id: 'dummy-webhook', active: true, userId: alice.id } as MiWebhook,
|
||||||
|
|
|
@ -316,7 +316,7 @@ describe('CheckModeratorsActivityProcessorService', () => {
|
||||||
createUser({}, { email: 'user2@example.com', emailVerified: false }),
|
createUser({}, { email: 'user2@example.com', emailVerified: false }),
|
||||||
createUser({}, { email: null, emailVerified: false }),
|
createUser({}, { email: null, emailVerified: false }),
|
||||||
createUser({}, { email: 'user4@example.com', emailVerified: true }),
|
createUser({}, { email: 'user4@example.com', emailVerified: true }),
|
||||||
createUser({ isRoot: true }, { email: 'root@example.com', emailVerified: true }),
|
createUser({}, { email: 'root@example.com', emailVerified: true }),
|
||||||
]);
|
]);
|
||||||
|
|
||||||
mockModeratorRole([user1, user2, user3, root]);
|
mockModeratorRole([user1, user2, user3, root]);
|
||||||
|
@ -349,7 +349,7 @@ describe('CheckModeratorsActivityProcessorService', () => {
|
||||||
createUser({}, { email: 'user2@example.com', emailVerified: false }),
|
createUser({}, { email: 'user2@example.com', emailVerified: false }),
|
||||||
createUser({}, { email: null, emailVerified: false }),
|
createUser({}, { email: null, emailVerified: false }),
|
||||||
createUser({}, { email: 'user4@example.com', emailVerified: true }),
|
createUser({}, { email: 'user4@example.com', emailVerified: true }),
|
||||||
createUser({ isRoot: true }, { email: 'root@example.com', emailVerified: true }),
|
createUser({}, { email: 'root@example.com', emailVerified: true }),
|
||||||
]);
|
]);
|
||||||
|
|
||||||
mockModeratorRole([user1, user2, user3, root]);
|
mockModeratorRole([user1, user2, user3, root]);
|
||||||
|
|
Loading…
Reference in New Issue