yuuza/outline
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: Improve perf of server tests (#5785)

Browse Source
This commit is contained in:
Tom Moor
2023-09-06 07:14:49 -04:00
committed by GitHub
parent a724a21c21
commit 3eb947e9a5
69 changed files with 2045 additions and 1551 deletions
Download Patch File Download Diff File Expand all files Collapse all files

120
server/commands/accountProvisioner.test.ts
View File

@@ -1,11 +1,12 @@
import { faker } from "@faker-js/faker";
import { v4 as uuidv4 } from "uuid";
import WelcomeEmail from "@server/emails/templates/WelcomeEmail";
import { TeamDomain } from "@server/models";
import Collection from "@server/models/Collection";
import UserAuthentication from "@server/models/UserAuthentication";
import { buildUser, buildTeam } from "@server/test/factories";
import { buildUser, buildTeam, buildAdmin } from "@server/test/factories";
import {
setupTestDatabase,
seed,
setCloudHosted,
setSelfHosted,
} from "@server/test/support";
@@ -21,24 +22,25 @@ describe("accountProvisioner", () => {
it("should create a new user and team", async () => {
const spy = jest.spyOn(WelcomeEmail.prototype, "schedule");
const email = faker.internet.email();
const { user, team, isNewTeam, isNewUser } = await accountProvisioner({
ip,
user: {
name: "Jenny Tester",
email: "jenny@example-company.com",
avatarUrl: "https://example.com/avatar.png",
email,
avatarUrl: faker.internet.avatar(),
},
team: {
name: "New workspace",
avatarUrl: "https://example.com/avatar.png",
subdomain: "example",
avatarUrl: faker.internet.avatar(),
subdomain: faker.internet.domainWord(),
},
authenticationProvider: {
name: "google",
providerId: "example-company.com",
providerId: faker.internet.domainName(),
},
authentication: {
providerId: "123456789",
providerId: uuidv4(),
accessToken: "123",
scopes: ["read"],
},
@@ -49,11 +51,15 @@ describe("accountProvisioner", () => {
expect(auth.scopes.length).toEqual(1);
expect(auth.scopes[0]).toEqual("read");
expect(team.name).toEqual("New workspace");
expect(user.email).toEqual("jenny@example-company.com");
expect(user.email).toEqual(email);
expect(isNewUser).toEqual(true);
expect(isNewTeam).toEqual(true);
expect(spy).toHaveBeenCalled();
const collectionCount = await Collection.count();
const collectionCount = await Collection.count({
where: {
teamId: team.id,
},
});
expect(collectionCount).toEqual(1);
spy.mockRestore();
@@ -69,7 +75,7 @@ describe("accountProvisioner", () => {
});
const authentications = await existing.$get("authentications");
const authentication = authentications[0];
const newEmail = "test@example-company.com";
const newEmail = faker.internet.email();
const { user, isNewUser, isNewTeam } = await accountProvisioner({
ip,
user: {
@@ -80,7 +86,7 @@ describe("accountProvisioner", () => {
team: {
name: existingTeam.name,
avatarUrl: existingTeam.avatarUrl,
subdomain: "example",
subdomain: faker.internet.domainWord(),
},
authenticationProvider: {
name: authenticationProvider.name,
@@ -100,18 +106,20 @@ describe("accountProvisioner", () => {
expect(isNewTeam).toEqual(false);
expect(isNewUser).toEqual(false);
expect(spy).not.toHaveBeenCalled();
const collectionCount = await Collection.count();
expect(collectionCount).toEqual(0);
spy.mockRestore();
});
it("should allow authentication by email matching", async () => {
const existingTeam = await buildTeam();
it.skip("should allow authentication by email matching", async () => {
const subdomain = faker.internet.domainWord();
const existingTeam = await buildTeam({
subdomain,
});
const providers = await existingTeam.$get("authenticationProviders");
const authenticationProvider = providers[0];
const email = faker.internet.email();
const userWithoutAuth = await buildUser({
email: "email@example.com",
email,
teamId: existingTeam.id,
authentications: [],
});
@@ -120,20 +128,21 @@ describe("accountProvisioner", () => {
ip,
user: {
name: userWithoutAuth.name,
email: "email@example.com",
email,
avatarUrl: userWithoutAuth.avatarUrl,
},
team: {
teamId: existingTeam.id,
name: existingTeam.name,
avatarUrl: existingTeam.avatarUrl,
subdomain: "example",
subdomain,
},
authenticationProvider: {
name: authenticationProvider.name,
providerId: authenticationProvider.providerId,
},
authentication: {
providerId: "anything",
providerId: uuidv4(),
accessToken: "123",
scopes: ["read"],
},
@@ -169,7 +178,7 @@ describe("accountProvisioner", () => {
team: {
name: existingTeam.name,
avatarUrl: existingTeam.avatarUrl,
subdomain: "example",
subdomain: faker.internet.domainWord(),
},
authenticationProvider: {
name: authenticationProvider.name,
@@ -189,9 +198,11 @@ describe("accountProvisioner", () => {
});
it("should throw an error when the domain is not allowed", async () => {
const { admin, team: existingTeam } = await seed();
const existingTeam = await buildTeam();
const admin = await buildAdmin({ teamId: existingTeam.id });
const providers = await existingTeam.$get("authenticationProviders");
const authenticationProvider = providers[0];
const email = faker.internet.email();
await TeamDomain.create({
teamId: existingTeam.id,
@@ -206,20 +217,20 @@ describe("accountProvisioner", () => {
ip,
user: {
name: "Jenny Tester",
email: "jenny@example-company.com",
avatarUrl: "https://example.com/avatar.png",
email,
avatarUrl: faker.internet.avatar(),
},
team: {
name: existingTeam.name,
avatarUrl: existingTeam.avatarUrl,
subdomain: "example",
subdomain: faker.internet.domainWord(),
},
authenticationProvider: {
name: authenticationProvider.name,
providerId: authenticationProvider.providerId,
},
authentication: {
providerId: "123456789",
providerId: uuidv4(),
accessToken: "123",
scopes: ["read"],
},
@@ -233,35 +244,37 @@ describe("accountProvisioner", () => {
it("should create a new user in an existing team when the domain is allowed", async () => {
const spy = jest.spyOn(WelcomeEmail.prototype, "schedule");
const { admin, team } = await seed();
const team = await buildTeam();
const admin = await buildAdmin({ teamId: team.id });
const authenticationProviders = await team.$get(
"authenticationProviders"
);
const authenticationProvider = authenticationProviders[0];
const domain = faker.internet.domainName();
await TeamDomain.create({
teamId: team.id,
name: "example-company.com",
name: domain,
createdById: admin.id,
});
const email = faker.internet.email({ provider: domain });
const { user, isNewUser } = await accountProvisioner({
ip,
user: {
name: "Jenny Tester",
email: "jenny@example-company.com",
avatarUrl: "https://example.com/avatar.png",
email,
avatarUrl: faker.internet.avatar(),
},
team: {
name: team.name,
avatarUrl: team.avatarUrl,
subdomain: "example",
subdomain: faker.internet.domainWord(),
},
authenticationProvider: {
name: authenticationProvider.name,
providerId: authenticationProvider.providerId,
},
authentication: {
providerId: "123456789",
providerId: uuidv4(),
accessToken: "123",
scopes: ["read"],
},
@@ -271,11 +284,15 @@ describe("accountProvisioner", () => {
expect(auth.accessToken).toEqual("123");
expect(auth.scopes.length).toEqual(1);
expect(auth.scopes[0]).toEqual("read");
expect(user.email).toEqual("jenny@example-company.com");
expect(user.email).toEqual(email);
expect(isNewUser).toEqual(true);
expect(spy).toHaveBeenCalled();
// should provision welcome collection
const collectionCount = await Collection.count();
const collectionCount = await Collection.count({
where: {
teamId: team.id,
},
});
expect(collectionCount).toEqual(1);
spy.mockRestore();
@@ -288,24 +305,25 @@ describe("accountProvisioner", () => {
"authenticationProviders"
);
const authenticationProvider = authenticationProviders[0];
const email = faker.internet.email();
const { user, isNewUser } = await accountProvisioner({
ip,
user: {
name: "Jenny Tester",
email: "jenny@example-company.com",
avatarUrl: "https://example.com/avatar.png",
email,
avatarUrl: faker.internet.avatar(),
},
team: {
name: team.name,
avatarUrl: team.avatarUrl,
subdomain: "example",
subdomain: faker.internet.domainWord(),
},
authenticationProvider: {
name: authenticationProvider.name,
providerId: authenticationProvider.providerId,
},
authentication: {
providerId: "123456789",
providerId: uuidv4(),
accessToken: "123",
scopes: ["read"],
},
@@ -315,11 +333,15 @@ describe("accountProvisioner", () => {
expect(auth.accessToken).toEqual("123");
expect(auth.scopes.length).toEqual(1);
expect(auth.scopes[0]).toEqual("read");
expect(user.email).toEqual("jenny@example-company.com");
expect(user.email).toEqual(email);
expect(isNewUser).toEqual(true);
expect(spy).toHaveBeenCalled();
// should provision welcome collection
const collectionCount = await Collection.count();
const collectionCount = await Collection.count({
where: {
teamId: team.id,
},
});
expect(collectionCount).toEqual(1);
spy.mockRestore();
@@ -338,21 +360,21 @@ describe("accountProvisioner", () => {
ip,
user: {
name: "Jenny Tester",
email: "jenny@example-company.com",
avatarUrl: "https://example.com/avatar.png",
email: faker.internet.email(),
avatarUrl: faker.internet.avatar(),
},
team: {
teamId: team.id,
name: team.name,
avatarUrl: team.avatarUrl,
subdomain: "example",
subdomain: faker.internet.domainWord(),
},
authenticationProvider: {
name: "google",
providerId: "example-company.com",
},
authentication: {
providerId: "123456789",
providerId: uuidv4(),
accessToken: "123",
scopes: ["read"],
},
@@ -372,14 +394,14 @@ describe("accountProvisioner", () => {
ip,
user: {
name: "Jenny Tester",
email: "jenny@example-company.com",
avatarUrl: "https://example.com/avatar.png",
email: faker.internet.email(),
avatarUrl: faker.internet.avatar(),
},
team: {
teamId: team.id,
name: team.name,
avatarUrl: team.avatarUrl,
subdomain: "example",
subdomain: faker.internet.domainWord(),
domain: "allowed-domain.com",
},
authenticationProvider: {
@@ -387,7 +409,7 @@ describe("accountProvisioner", () => {
providerId: "allowed-domain.com",
},
authentication: {
providerId: "123456789",
providerId: uuidv4(),
accessToken: "123",
scopes: ["read"],
},