chore: Reduce test boilerplate (#4300)

* chore: Reduce test boilerplate

* mo

server/commands/accountProvisioner.test.ts

@@ -4,14 +4,10 @@ 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 { getTestDatabase, seed } from "@server/test/support";
+import { setupTestDatabase, seed } from "@server/test/support";
 import accountProvisioner from "./accountProvisioner";
 
-const db = getTestDatabase();
-
-afterAll(db.disconnect);
-
-beforeEach(db.flush);
+setupTestDatabase();
 
 describe("accountProvisioner", () => {
   const ip = "127.0.0.1";

server/commands/documentImporter.test.ts

@@ -2,16 +2,12 @@ import path from "path";
 import fs from "fs-extra";
 import Attachment from "@server/models/Attachment";
 import { buildUser } from "@server/test/factories";
-import { getTestDatabase } from "@server/test/support";
+import { setupTestDatabase } from "@server/test/support";
 import documentImporter from "./documentImporter";
 
 jest.mock("../utils/s3");
 
-const db = getTestDatabase();
-
-afterAll(db.disconnect);
-
-beforeEach(db.flush);
+setupTestDatabase();
 
 describe("documentImporter", () => {
   const ip = "127.0.0.1";

server/commands/documentMover.test.ts

@@ -5,14 +5,10 @@ import {
   buildCollection,
   buildUser,
 } from "@server/test/factories";
-import { getTestDatabase, seed } from "@server/test/support";
+import { setupTestDatabase, seed } from "@server/test/support";
 import documentMover from "./documentMover";
 
-const db = getTestDatabase();
-
-afterAll(db.disconnect);
-
-beforeEach(db.flush);
+setupTestDatabase();
 
 describe("documentMover", () => {
   const ip = "127.0.0.1";

server/commands/documentPermanentDeleter.test.ts

@@ -1,14 +1,10 @@
 import { subDays } from "date-fns";
 import { Attachment, Document } from "@server/models";
 import { buildAttachment, buildDocument } from "@server/test/factories";
-import { getTestDatabase } from "@server/test/support";
+import { setupTestDatabase } from "@server/test/support";
 import documentPermanentDeleter from "./documentPermanentDeleter";
 
-const db = getTestDatabase();
-
-afterAll(db.disconnect);
-
-beforeEach(db.flush);
+setupTestDatabase();
 
 describe("documentPermanentDeleter", () => {
   it("should destroy documents", async () => {

server/commands/documentUpdater.test.ts

@@ -1,14 +1,10 @@
 import { sequelize } from "@server/database/sequelize";
 import { Event } from "@server/models";
 import { buildDocument, buildUser } from "@server/test/factories";
-import { getTestDatabase } from "@server/test/support";
+import { setupTestDatabase } from "@server/test/support";
 import documentUpdater from "./documentUpdater";
 
-const db = getTestDatabase();
-
-afterAll(db.disconnect);
-
-beforeEach(db.flush);
+setupTestDatabase();
 
 describe("documentUpdater", () => {
   const ip = "127.0.0.1";

server/commands/fileOperationDeleter.test.ts

@@ -1,13 +1,9 @@
 import { FileOperation } from "@server/models";
 import { buildAdmin, buildFileOperation } from "@server/test/factories";
-import { getTestDatabase } from "@server/test/support";
+import { setupTestDatabase } from "@server/test/support";
 import fileOperationDeleter from "./fileOperationDeleter";
 
-const db = getTestDatabase();
-
-afterAll(db.disconnect);
-
-beforeEach(db.flush);
+setupTestDatabase();
 
 describe("fileOperationDeleter", () => {
   const ip = "127.0.0.1";

server/commands/pinCreator.test.ts

@@ -1,13 +1,9 @@
 import { Event } from "@server/models";
 import { buildDocument, buildUser } from "@server/test/factories";
-import { getTestDatabase } from "@server/test/support";
+import { setupTestDatabase } from "@server/test/support";
 import pinCreator from "./pinCreator";
 
-const db = getTestDatabase();
-
-afterAll(db.disconnect);
-
-beforeEach(db.flush);
+setupTestDatabase();
 
 describe("pinCreator", () => {
   const ip = "127.0.0.1";

server/commands/pinDestroyer.test.ts

@@ -1,13 +1,9 @@
 import { Pin, Event } from "@server/models";
 import { buildDocument, buildUser } from "@server/test/factories";
-import { getTestDatabase } from "@server/test/support";
+import { setupTestDatabase } from "@server/test/support";
 import pinDestroyer from "./pinDestroyer";
 
-const db = getTestDatabase();
-
-afterAll(db.disconnect);
-
-beforeEach(db.flush);
+setupTestDatabase();
 
 describe("pinCreator", () => {
   const ip = "127.0.0.1";

server/commands/revisionCreator.test.ts

@@ -1,13 +1,9 @@
 import { Event } from "@server/models";
 import { buildDocument, buildUser } from "@server/test/factories";
-import { getTestDatabase } from "@server/test/support";
+import { setupTestDatabase } from "@server/test/support";
 import revisionCreator from "./revisionCreator";
 
-const db = getTestDatabase();
-
-afterAll(db.disconnect);
-
-beforeEach(db.flush);
+setupTestDatabase();
 
 describe("revisionCreator", () => {
   const ip = "127.0.0.1";

server/commands/starCreator.test.ts

@@ -1,14 +1,10 @@
 import { sequelize } from "@server/database/sequelize";
 import { Star, Event } from "@server/models";
 import { buildDocument, buildUser } from "@server/test/factories";
-import { getTestDatabase } from "@server/test/support";
+import { setupTestDatabase } from "@server/test/support";
 import starCreator from "./starCreator";
 
-const db = getTestDatabase();
-
-afterAll(db.disconnect);
-
-beforeEach(db.flush);
+setupTestDatabase();
 
 describe("starCreator", () => {
   const ip = "127.0.0.1";

server/commands/starDestroyer.test.ts

@@ -1,13 +1,9 @@
 import { Star, Event } from "@server/models";
 import { buildDocument, buildUser } from "@server/test/factories";
-import { getTestDatabase } from "@server/test/support";
+import { setupTestDatabase } from "@server/test/support";
 import starDestroyer from "./starDestroyer";
 
-const db = getTestDatabase();
-
-afterAll(db.disconnect);
-
-beforeEach(db.flush);
+setupTestDatabase();
 
 describe("starDestroyer", () => {
   const ip = "127.0.0.1";

server/commands/starUpdater.test.ts

@@ -1,13 +1,9 @@
 import { Star, Event } from "@server/models";
 import { buildDocument, buildUser } from "@server/test/factories";
-import { getTestDatabase } from "@server/test/support";
+import { setupTestDatabase } from "@server/test/support";
 import starUpdater from "./starUpdater";
 
-const db = getTestDatabase();
-
-afterAll(db.disconnect);
-
-beforeEach(db.flush);
+setupTestDatabase();
 
 describe("starUpdater", () => {
   const ip = "127.0.0.1";

server/commands/subscriptionCreator.test.ts

@@ -1,14 +1,11 @@
 import { sequelize } from "@server/database/sequelize";
 import { Subscription, Event } from "@server/models";
 import { buildDocument, buildUser } from "@server/test/factories";
-import { getTestDatabase } from "@server/test/support";
+import { setupTestDatabase } from "@server/test/support";
 import subscriptionCreator from "./subscriptionCreator";
 import subscriptionDestroyer from "./subscriptionDestroyer";
 
-const db = getTestDatabase();
-
-beforeEach(db.flush);
-afterAll(db.disconnect);
+setupTestDatabase();
 
 describe("subscriptionCreator", () => {
   const ip = "127.0.0.1";

server/commands/subscriptionDestroyer.test.ts

@@ -5,13 +5,10 @@ import {
   buildSubscription,
   buildUser,
 } from "@server/test/factories";
-import { getTestDatabase } from "@server/test/support";
+import { setupTestDatabase } from "@server/test/support";
 import subscriptionDestroyer from "./subscriptionDestroyer";
 
-const db = getTestDatabase();
-
-beforeEach(db.flush);
-afterAll(db.disconnect);
+setupTestDatabase();
 
 describe("subscriptionDestroyer", () => {
   const ip = "127.0.0.1";

server/commands/teamPermanentDeleter.test.ts

@@ -6,14 +6,10 @@ import {
   buildTeam,
   buildDocument,
 } from "@server/test/factories";
-import { getTestDatabase } from "@server/test/support";
+import { setupTestDatabase } from "@server/test/support";
 import teamPermanentDeleter from "./teamPermanentDeleter";
 
-const db = getTestDatabase();
-
-afterAll(db.disconnect);
-
-beforeEach(db.flush);
+setupTestDatabase();
 
 describe("teamPermanentDeleter", () => {
   it("should destroy related data", async () => {

server/commands/teamProvisioner.test.ts

@@ -1,14 +1,10 @@
 import env from "@server/env";
 import TeamDomain from "@server/models/TeamDomain";
 import { buildTeam, buildUser } from "@server/test/factories";
-import { getTestDatabase } from "@server/test/support";
+import { setupTestDatabase } from "@server/test/support";
 import teamProvisioner from "./teamProvisioner";
 
-const db = getTestDatabase();
-
-afterAll(db.disconnect);
-
-beforeEach(db.flush);
+setupTestDatabase();
 
 describe("teamProvisioner", () => {
   const ip = "127.0.0.1";

server/commands/userDemoter.test.ts

@@ -2,14 +2,10 @@ import { CollectionPermission } from "@shared/types";
 import { CollectionUser } from "@server/models";
 import { UserRole } from "@server/models/User";
 import { buildUser, buildAdmin, buildCollection } from "@server/test/factories";
-import { getTestDatabase } from "@server/test/support";
+import { setupTestDatabase } from "@server/test/support";
 import userDemoter from "./userDemoter";
 
-const db = getTestDatabase();
-
-afterAll(db.disconnect);
-
-beforeEach(db.flush);
+setupTestDatabase();
 
 describe("userDemoter", () => {
   const ip = "127.0.0.1";

server/commands/userDestroyer.test.ts

@@ -1,12 +1,8 @@
 import { buildUser, buildAdmin } from "@server/test/factories";
-import { getTestDatabase } from "@server/test/support";
+import { setupTestDatabase } from "@server/test/support";
 import userDestroyer from "./userDestroyer";
 
-const db = getTestDatabase();
-
-afterAll(db.disconnect);
-
-beforeEach(db.flush);
+setupTestDatabase();
 
 describe("userDestroyer", () => {
   const ip = "127.0.0.1";

server/commands/userInviter.test.ts

@@ -1,12 +1,8 @@
 import { buildUser } from "@server/test/factories";
-import { getTestDatabase } from "@server/test/support";
+import { setupTestDatabase } from "@server/test/support";
 import userInviter from "./userInviter";
 
-const db = getTestDatabase();
-
-afterAll(db.disconnect);
-
-beforeEach(db.flush);
+setupTestDatabase();
 
 describe("userInviter", () => {
   const ip = "127.0.0.1";

server/commands/userProvisioner.test.ts

@@ -1,14 +1,10 @@
 import { v4 as uuidv4 } from "uuid";
 import { TeamDomain } from "@server/models";
 import { buildUser, buildTeam, buildInvite } from "@server/test/factories";
-import { getTestDatabase, seed } from "@server/test/support";
+import { setupTestDatabase, seed } from "@server/test/support";
 import userProvisioner from "./userProvisioner";
 
-const db = getTestDatabase();
-
-afterAll(db.disconnect);
-
-beforeEach(db.flush);
+setupTestDatabase();
 
 describe("userProvisioner", () => {
   const ip = "127.0.0.1";

server/commands/userSuspender.test.ts

@@ -1,13 +1,9 @@
 import GroupUser from "@server/models/GroupUser";
 import { buildGroup, buildAdmin, buildUser } from "@server/test/factories";
-import { getTestDatabase } from "@server/test/support";
+import { setupTestDatabase } from "@server/test/support";
 import userSuspender from "./userSuspender";
 
-const db = getTestDatabase();
-
-afterAll(db.disconnect);
-
-beforeEach(db.flush);
+setupTestDatabase();
 
 describe("userSuspender", () => {
   const ip = "127.0.0.1";

server/commands/userUnsuspender.test.ts

@@ -1,12 +1,8 @@
 import { buildAdmin, buildUser } from "@server/test/factories";
-import { getTestDatabase } from "@server/test/support";
+import { setupTestDatabase } from "@server/test/support";
 import userUnsuspender from "./userUnsuspender";
 
-const db = getTestDatabase();
-
-afterAll(db.disconnect);
-
-beforeEach(db.flush);
+setupTestDatabase();
 
 describe("userUnsuspender", () => {
   const ip = "127.0.0.1";

server/middlewares/authentication.test.ts

@@ -1,14 +1,10 @@
 import randomstring from "randomstring";
 import ApiKey from "@server/models/ApiKey";
 import { buildUser, buildTeam } from "@server/test/factories";
-import { getTestDatabase } from "@server/test/support";
+import { setupTestDatabase } from "@server/test/support";
 import auth from "./authentication";
 
-const db = getTestDatabase();
-
-afterAll(db.disconnect);
-
-beforeEach(db.flush);
+setupTestDatabase();
 
 describe("Authentication middleware", () => {
   describe("with JWT", () => {

server/models/Collection.test.ts

@@ -7,17 +7,14 @@ import {
   buildTeam,
   buildDocument,
 } from "@server/test/factories";
-import { getTestDatabase, seed } from "@server/test/support";
+import { setupTestDatabase, seed } from "@server/test/support";
 import slugify from "@server/utils/slugify";
 import Collection from "./Collection";
 import Document from "./Document";
 
-const db = getTestDatabase();
+setupTestDatabase();
 
-afterAll(db.disconnect);
-
-beforeEach(async () => {
-  await db.flush();
+beforeEach(() => {
   jest.resetAllMocks();
 });
 

server/models/Document.test.ts

@@ -6,15 +6,12 @@ import {
   buildUser,
   buildShare,
 } from "@server/test/factories";
-import { getTestDatabase, seed } from "@server/test/support";
+import { setupTestDatabase, seed } from "@server/test/support";
 import slugify from "@server/utils/slugify";
 
-const db = getTestDatabase();
+setupTestDatabase();
 
-afterAll(db.disconnect);
-
-beforeEach(async () => {
-  await db.flush();
+beforeEach(() => {
   jest.resetAllMocks();
 });
 

server/models/Group.test.ts

@@ -1,14 +1,11 @@
 import { buildUser, buildGroup, buildCollection } from "@server/test/factories";
-import { getTestDatabase } from "@server/test/support";
+import { setupTestDatabase } from "@server/test/support";
 import CollectionGroup from "./CollectionGroup";
 import GroupUser from "./GroupUser";
 
-const db = getTestDatabase();
-
-afterAll(db.disconnect);
+setupTestDatabase();
 
 beforeEach(async () => {
-  await db.flush();
   jest.resetAllMocks();
 });
 

server/models/Revision.test.ts

@@ -1,15 +1,8 @@
 import { buildDocument } from "@server/test/factories";
-import { getTestDatabase } from "@server/test/support";
+import { setupTestDatabase } from "@server/test/support";
 import Revision from "./Revision";
 
-const db = getTestDatabase();
-
-afterAll(db.disconnect);
-
-beforeEach(async () => {
-  await db.flush();
-  jest.resetAllMocks();
-});
+setupTestDatabase();
 
 describe("#findLatest", () => {
   test("should return latest revision", async () => {

server/models/Team.test.ts

@@ -1,14 +1,7 @@
 import { buildTeam, buildCollection } from "@server/test/factories";
-import { getTestDatabase } from "@server/test/support";
+import { setupTestDatabase } from "@server/test/support";
 
-const db = getTestDatabase();
-
-afterAll(db.disconnect);
-
-beforeEach(async () => {
-  await db.flush();
-  jest.resetAllMocks();
-});
+setupTestDatabase();
 
 describe("collectionIds", () => {
   it("should return non-private collection ids", async () => {

server/models/TeamDomain.test.ts

@@ -1,16 +1,9 @@
 import env from "@server/env";
 import { buildAdmin, buildTeam } from "@server/test/factories";
-import { getTestDatabase } from "@server/test/support";
+import { setupTestDatabase } from "@server/test/support";
 import TeamDomain from "./TeamDomain";
 
-const db = getTestDatabase();
-
-afterAll(db.disconnect);
-
-beforeEach(async () => {
-  await db.flush();
-  jest.resetAllMocks();
-});
+setupTestDatabase();
 
 describe("team domain model", () => {
   describe("create", () => {

server/models/User.test.ts

@@ -1,10 +1,10 @@
 import { CollectionPermission } from "@shared/types";
 import { buildUser, buildTeam, buildCollection } from "@server/test/factories";
-import { getTestDatabase } from "@server/test/support";
+import { setupTestDatabase } from "@server/test/support";
 import CollectionUser from "./CollectionUser";
 import UserAuthentication from "./UserAuthentication";
 
-const db = getTestDatabase();
+setupTestDatabase();
 
 beforeAll(() => {
   jest.useFakeTimers().setSystemTime(new Date("2018-01-02T00:00:00.000Z"));
@@ -12,11 +12,8 @@ beforeAll(() => {
 
 afterAll(() => {
   jest.useRealTimers();
-  db.disconnect();
 });
 
-beforeEach(db.flush);
-
 describe("user model", () => {
   describe("destroy", () => {
     it("should delete user authentications", async () => {

server/policies/collection.test.ts

@@ -1,14 +1,10 @@
 import { CollectionPermission } from "@shared/types";
 import { CollectionUser, Collection } from "@server/models";
 import { buildUser, buildTeam, buildCollection } from "@server/test/factories";
-import { getTestDatabase } from "@server/test/support";
+import { setupTestDatabase } from "@server/test/support";
 import { serialize } from "./index";
 
-const db = getTestDatabase();
-
-afterAll(db.disconnect);
-
-beforeEach(db.flush);
+setupTestDatabase();
 
 describe("member", () => {
   describe("read_write permission", () => {

server/policies/document.test.ts

@@ -5,14 +5,10 @@ import {
   buildDocument,
   buildCollection,
 } from "@server/test/factories";
-import { getTestDatabase } from "@server/test/support";
+import { setupTestDatabase } from "@server/test/support";
 import { serialize } from "./index";
 
-const db = getTestDatabase();
-
-afterAll(db.disconnect);
-
-beforeEach(db.flush);
+setupTestDatabase();
 
 describe("read_write collection", () => {
   it("should allow read write permissions for member", async () => {

server/policies/index.test.ts

@@ -1,12 +1,8 @@
 import { buildUser, buildTeam } from "@server/test/factories";
-import { getTestDatabase } from "@server/test/support";
+import { setupTestDatabase } from "@server/test/support";
 import { serialize } from "./index";
 
-const db = getTestDatabase();
-
-afterAll(db.disconnect);
-
-beforeEach(db.flush);
+setupTestDatabase();
 
 it("should serialize policy", async () => {
   const user = await buildUser();

server/policies/team.test.ts

@@ -1,12 +1,8 @@
 import { buildUser, buildTeam, buildAdmin } from "@server/test/factories";
-import { getTestDatabase } from "@server/test/support";
+import { setupTestDatabase } from "@server/test/support";
 import { serialize } from "./index";
 
-const db = getTestDatabase();
-
-afterAll(db.disconnect);
-
-beforeEach(db.flush);
+setupTestDatabase();
 
 it("should allow reading only", async () => {
   const team = await buildTeam();

server/queues/processors/BacklinksProcessor.test.ts

@@ -1,18 +1,11 @@
 import { Backlink } from "@server/models";
 import { buildDocument } from "@server/test/factories";
-import { getTestDatabase } from "@server/test/support";
+import { setupTestDatabase } from "@server/test/support";
 import BacklinksProcessor from "./BacklinksProcessor";
 
 const ip = "127.0.0.1";
 
-const db = getTestDatabase();
-
-afterAll(db.disconnect);
-
-beforeEach(async () => {
-  await db.flush();
-  jest.resetAllMocks();
-});
+setupTestDatabase();
 
 describe("documents.publish", () => {
   test("should create new backlink records", async () => {

server/queues/processors/NotificationsProcessor.test.ts

@@ -12,18 +12,15 @@ import {
   buildCollection,
   buildUser,
 } from "@server/test/factories";
-import { getTestDatabase } from "@server/test/support";
+import { setupTestDatabase } from "@server/test/support";
 import NotificationsProcessor from "./NotificationsProcessor";
 
 jest.mock("@server/emails/templates/DocumentNotificationEmail");
 const ip = "127.0.0.1";
 
-const db = getTestDatabase();
-
-afterAll(db.disconnect);
+setupTestDatabase();
 
 beforeEach(async () => {
-  await db.flush();
   jest.resetAllMocks();
 });
 

server/queues/processors/RevisionsProcessor.test.ts

@@ -1,18 +1,11 @@
 import { Revision } from "@server/models";
 import { buildDocument } from "@server/test/factories";
-import { getTestDatabase } from "@server/test/support";
+import { setupTestDatabase } from "@server/test/support";
 import RevisionsProcessor from "./RevisionsProcessor";
 
 const ip = "127.0.0.1";
 
-const db = getTestDatabase();
-
-afterAll(db.disconnect);
-
-beforeEach(async () => {
-  await db.flush();
-  jest.resetAllMocks();
-});
+setupTestDatabase();
 
 describe("documents.update.debounced", () => {
   test("should create a revision", async () => {

server/queues/processors/WebhookProcessor.test.ts

@@ -1,5 +1,5 @@
 import { buildUser, buildWebhookSubscription } from "@server/test/factories";
-import { getTestDatabase } from "@server/test/support";
+import { setupTestDatabase } from "@server/test/support";
 import { UserEvent } from "@server/types";
 import DeliverWebhookTask from "../tasks/DeliverWebhookTask";
 import WebhookProcessor from "./WebhookProcessor";
@@ -7,12 +7,9 @@ import WebhookProcessor from "./WebhookProcessor";
 jest.mock("@server/queues/tasks/DeliverWebhookTask");
 const ip = "127.0.0.1";
 
-const db = getTestDatabase();
-
-afterAll(db.disconnect);
+setupTestDatabase();
 
 beforeEach(async () => {
-  await db.flush();
   jest.resetAllMocks();
 });
 

server/queues/tasks/CleanupDeletedDocumentsTask.test.ts

@@ -1,14 +1,10 @@
 import { subDays } from "date-fns";
 import { Document } from "@server/models";
 import { buildDocument } from "@server/test/factories";
-import { getTestDatabase } from "@server/test/support";
+import { setupTestDatabase } from "@server/test/support";
 import CleanupDeletedDocumentsTask from "./CleanupDeletedDocumentsTask";
 
-const db = getTestDatabase();
-
-afterAll(db.disconnect);
-
-beforeEach(db.flush);
+setupTestDatabase();
 
 describe("CleanupDeletedDocumentsTask", () => {
   it("should not destroy documents not deleted", async () => {

server/queues/tasks/CleanupDemotedUserTask.test.ts

@@ -6,14 +6,10 @@ import {
   buildWebhookSubscription,
   buildViewer,
 } from "@server/test/factories";
-import { getTestDatabase } from "@server/test/support";
+import { setupTestDatabase } from "@server/test/support";
 import CleanupDemotedUserTask from "./CleanupDemotedUserTask";
 
-const db = getTestDatabase();
-
-afterAll(db.disconnect);
-
-beforeEach(db.flush);
+setupTestDatabase();
 
 describe("CleanupDemotedUserTask", () => {
   it("should delete api keys for suspended user", async () => {

server/queues/tasks/CleanupExpiredFileOperationsTask.test.ts

@@ -5,14 +5,10 @@ import {
   FileOperationType,
 } from "@server/models/FileOperation";
 import { buildFileOperation } from "@server/test/factories";
-import { getTestDatabase } from "@server/test/support";
+import { setupTestDatabase } from "@server/test/support";
 import CleanupExpiredFileOperationsTask from "./CleanupExpiredFileOperationsTask";
 
-const db = getTestDatabase();
-
-afterAll(db.disconnect);
-
-beforeEach(db.flush);
+setupTestDatabase();
 
 describe("CleanupExpiredFileOperationsTask", () => {
   it("should expire exports older than 15 days ago", async () => {

server/queues/tasks/CleanupWebhookDeliveriesTask.test.ts

@@ -1,14 +1,10 @@
 import { subDays } from "date-fns";
 import { WebhookDelivery } from "@server/models";
 import { buildWebhookDelivery } from "@server/test/factories";
-import { getTestDatabase } from "@server/test/support";
+import { setupTestDatabase } from "@server/test/support";
 import CleanupWebhookDeliveriesTask from "./CleanupWebhookDeliveriesTask";
 
-const db = getTestDatabase();
-
-afterAll(db.disconnect);
-
-beforeEach(db.flush);
+setupTestDatabase();
 
 const deliveryExists = async (delivery: WebhookDelivery) => {
   const results = await WebhookDelivery.findOne({ where: { id: delivery.id } });

server/queues/tasks/DeliverWebhookTask.test.ts

@@ -6,16 +6,13 @@ import {
   buildWebhookDelivery,
   buildWebhookSubscription,
 } from "@server/test/factories";
-import { getTestDatabase } from "@server/test/support";
+import { setupTestDatabase } from "@server/test/support";
 import { UserEvent } from "@server/types";
 import DeliverWebhookTask from "./DeliverWebhookTask";
 
-const db = getTestDatabase();
-
-afterAll(db.disconnect);
+setupTestDatabase();
 
 beforeEach(async () => {
-  await db.flush();
   jest.resetAllMocks();
   fetchMock.resetMocks();
   fetchMock.doMock();

server/queues/tasks/ImportMarkdownZipTask.test.ts

@@ -2,14 +2,10 @@ import fs from "fs";
 import path from "path";
 import { FileOperation } from "@server/models";
 import { buildFileOperation } from "@server/test/factories";
-import { getTestDatabase } from "@server/test/support";
+import { setupTestDatabase } from "@server/test/support";
 import ImportMarkdownZipTask from "./ImportMarkdownZipTask";
 
-const db = getTestDatabase();
-
-afterAll(db.disconnect);
-
-beforeEach(db.flush);
+setupTestDatabase();
 
 describe("ImportMarkdownZipTask", () => {
   it("should import the documents, attachments", async () => {

server/queues/tasks/ImportNotionTask.test.ts

@@ -2,14 +2,10 @@ import fs from "fs";
 import path from "path";
 import { FileOperation } from "@server/models";
 import { buildFileOperation } from "@server/test/factories";
-import { getTestDatabase } from "@server/test/support";
+import { setupTestDatabase } from "@server/test/support";
 import ImportNotionTask from "./ImportNotionTask";
 
-const db = getTestDatabase();
-
-afterAll(db.disconnect);
-
-beforeEach(db.flush);
+setupTestDatabase();
 
 describe("ImportNotionTask", () => {
   it("should import successfully from a Markdown export", async () => {

server/queues/tasks/InviteReminderTask.test.ts

@@ -1,14 +1,10 @@
 import { subDays } from "date-fns";
 import InviteReminderEmail from "@server/emails/templates/InviteReminderEmail";
 import { buildInvite } from "@server/test/factories";
-import { getTestDatabase } from "@server/test/support";
+import { setupTestDatabase } from "@server/test/support";
 import InviteReminderTask from "./InviteReminderTask";
 
-const db = getTestDatabase();
-
-afterAll(db.disconnect);
-
-beforeEach(db.flush);
+setupTestDatabase();
 
 describe("InviteReminderTask", () => {
   it("should not destroy documents not deleted", async () => {

server/routes/api/attachments.test.ts

@@ -6,17 +6,12 @@ import {
   buildAttachment,
   buildDocument,
 } from "@server/test/factories";
-import { getTestDatabase, getTestServer } from "@server/test/support";
+import { getTestServer } from "@server/test/support";
 
 jest.mock("@server/utils/s3");
 
-const db = getTestDatabase();
 const server = getTestServer();
 
-afterAll(server.disconnect);
-
-beforeEach(db.flush);
-
 describe("#attachments.create", () => {
   it("should require authentication", async () => {
     const res = await server.post("/api/attachments.create");

server/routes/api/auth.test.ts

@@ -1,7 +1,7 @@
 import sharedEnv from "@shared/env";
 import env from "@server/env";
 import { buildUser, buildTeam } from "@server/test/factories";
-import { getTestDatabase, getTestServer } from "@server/test/support";
+import { getTestServer } from "@server/test/support";
 
 const mockTeamInSessionId = "1e023d05-951c-41c6-9012-c9fa0402e1c3";
 
@@ -13,13 +13,8 @@ jest.mock("@server/utils/authentication", () => {
   };
 });
 
-const db = getTestDatabase();
 const server = getTestServer();
 
-afterAll(server.disconnect);
-
-beforeEach(db.flush);
-
 describe("#auth.info", () => {
   it("should return current authentication", async () => {
     const team = await buildTeam();

server/routes/api/authenticationProviders.test.ts

@@ -1,14 +1,9 @@
 import { v4 as uuidv4 } from "uuid";
 import { buildUser, buildAdmin, buildTeam } from "@server/test/factories";
-import { getTestDatabase, getTestServer } from "@server/test/support";
+import { getTestServer } from "@server/test/support";
 
-const db = getTestDatabase();
 const server = getTestServer();
 
-afterAll(server.disconnect);
-
-beforeEach(db.flush);
-
 describe("#authenticationProviders.info", () => {
   it("should return auth provider", async () => {
     const team = await buildTeam();

server/routes/api/collections.test.ts

@@ -8,15 +8,10 @@ import {
   buildCollection,
   buildDocument,
 } from "@server/test/factories";
-import { seed, getTestDatabase, getTestServer } from "@server/test/support";
+import { seed, getTestServer } from "@server/test/support";
 
-const db = getTestDatabase();
 const server = getTestServer();
 
-afterAll(server.disconnect);
-
-beforeEach(db.flush);
-
 describe("#collections.list", () => {
   it("should require authentication", async () => {
     const res = await server.post("/api/collections.list");

server/routes/api/cron.test.ts

@@ -1,12 +1,7 @@
-import { getTestDatabase, getTestServer } from "@server/test/support";
+import { getTestServer } from "@server/test/support";
 
-const db = getTestDatabase();
 const server = getTestServer();
 
-afterAll(server.disconnect);
-
-beforeEach(db.flush);
-
 describe("#cron.daily", () => {
   it("should require authentication", async () => {
     const res = await server.post("/api/cron.daily");

server/routes/api/documents.test.ts

@@ -16,15 +16,10 @@ import {
   buildDocument,
   buildViewer,
 } from "@server/test/factories";
-import { seed, getTestDatabase, getTestServer } from "@server/test/support";
+import { seed, getTestServer } from "@server/test/support";
 
-const db = getTestDatabase();
 const server = getTestServer();
 
-afterAll(server.disconnect);
-
-beforeEach(db.flush);
-
 describe("#documents.info", () => {
   it("should return published document", async () => {
     const { user, document } = await seed();

server/routes/api/events.test.ts

@@ -1,13 +1,8 @@
 import { buildEvent, buildUser } from "@server/test/factories";
-import { seed, getTestDatabase, getTestServer } from "@server/test/support";
+import { seed, getTestServer } from "@server/test/support";
 
-const db = getTestDatabase();
 const server = getTestServer();
 
-afterAll(server.disconnect);
-
-beforeEach(db.flush);
-
 describe("#events.list", () => {
   it("should only return activity events", async () => {
     const { user, admin, document, collection } = await seed();

server/routes/api/fileOperations.test.ts

@@ -11,17 +11,12 @@ import {
   buildUser,
 } from "@server/test/factories";
 
-import { getTestDatabase, getTestServer } from "@server/test/support";
+import { getTestServer } from "@server/test/support";
 
-const db = getTestDatabase();
 const server = getTestServer();
 
 jest.mock("@server/utils/s3");
 
-afterAll(server.disconnect);
-
-beforeEach(db.flush);
-
 describe("#fileOperations.info", () => {
   it("should return fileOperation", async () => {
     const team = await buildTeam();

server/routes/api/groups.test.ts

@@ -1,14 +1,9 @@
 import { Event } from "@server/models";
 import { buildUser, buildAdmin, buildGroup } from "@server/test/factories";
-import { getTestDatabase, getTestServer } from "@server/test/support";
+import { getTestServer } from "@server/test/support";
 
-const db = getTestDatabase();
 const server = getTestServer();
 
-afterAll(server.disconnect);
-
-beforeEach(db.flush);
-
 describe("#groups.create", () => {
   it("should create a group", async () => {
     const name = "hello I am a group";

server/routes/api/hooks.test.ts

@@ -1,20 +1,15 @@
 import env from "@server/env";
 import { IntegrationAuthentication, SearchQuery } from "@server/models";
 import { buildDocument, buildIntegration } from "@server/test/factories";
-import { seed, getTestDatabase, getTestServer } from "@server/test/support";
+import { seed, getTestServer } from "@server/test/support";
 import * as Slack from "@server/utils/slack";
 
 jest.mock("../../utils/slack", () => ({
   post: jest.fn(),
 }));
 
-const db = getTestDatabase();
 const server = getTestServer();
 
-afterAll(server.disconnect);
-
-beforeEach(db.flush);
-
 describe("#hooks.unfurl", () => {
   it("should return documents", async () => {
     const { user, document } = await seed();

server/routes/api/index.test.ts

@@ -2,8 +2,6 @@ import { getTestServer } from "@server/test/support";
 
 const server = getTestServer();
 
-afterAll(server.disconnect);
-
 describe("POST unknown endpoint", () => {
   it("should be not found", async () => {
     const res = await server.post("/api/blah");

server/routes/api/integrations.test.ts

@@ -4,16 +4,10 @@ import {
   buildUser,
   buildIntegration,
 } from "@server/test/factories";
+import { getTestServer } from "@server/test/support";
 
-import { getTestDatabase, getTestServer } from "@server/test/support";
-
-const db = getTestDatabase();
 const server = getTestServer();
 
-afterAll(server.disconnect);
-
-beforeEach(db.flush);
-
 describe("#integrations.update", () => {
   it("should allow updating integration events", async () => {
     const team = await buildTeam();

server/routes/api/middlewares/pagination.test.ts

@@ -1,12 +1,7 @@
-import { seed, getTestDatabase, getTestServer } from "@server/test/support";
+import { seed, getTestServer } from "@server/test/support";
 
-const db = getTestDatabase();
 const server = getTestServer();
 
-afterAll(server.disconnect);
-
-beforeEach(db.flush);
-
 describe("#pagination", () => {
   it("should allow offset and limit", async () => {
     const { user } = await seed();

server/routes/api/revisions.test.ts

@@ -1,14 +1,9 @@
 import { Revision } from "@server/models";
 import { buildDocument, buildUser } from "@server/test/factories";
-import { seed, getTestDatabase, getTestServer } from "@server/test/support";
+import { seed, getTestServer } from "@server/test/support";
 
-const db = getTestDatabase();
 const server = getTestServer();
 
-afterAll(server.disconnect);
-
-beforeEach(db.flush);
-
 describe("#revisions.info", () => {
   it("should return a document revision", async () => {
     const { user, document } = await seed();

server/routes/api/shares.test.ts

@@ -8,15 +8,10 @@ import {
   buildCollection,
 } from "@server/test/factories";
 
-import { seed, getTestDatabase, getTestServer } from "@server/test/support";
+import { seed, getTestServer } from "@server/test/support";
 
-const db = getTestDatabase();
 const server = getTestServer();
 
-afterAll(server.disconnect);
-
-beforeEach(db.flush);
-
 describe("#shares.list", () => {
   it("should only return shares created by user", async () => {
     const { user, admin, document } = await seed();

server/routes/api/stars.test.ts

@@ -1,13 +1,8 @@
 import { buildUser, buildStar, buildDocument } from "@server/test/factories";
-import { getTestDatabase, getTestServer } from "@server/test/support";
+import { getTestServer } from "@server/test/support";
 
-const db = getTestDatabase();
 const server = getTestServer();
 
-afterAll(server.disconnect);
-
-beforeEach(db.flush);
-
 describe("#stars.create", () => {
   it("should create a star", async () => {
     const user = await buildUser();

server/routes/api/subscriptions.test.ts

@@ -4,15 +4,10 @@ import {
   buildSubscription,
   buildDocument,
 } from "@server/test/factories";
-import { getTestDatabase, getTestServer } from "@server/test/support";
+import { getTestServer } from "@server/test/support";
 
-const db = getTestDatabase();
 const server = getTestServer();
 
-afterAll(server.disconnect);
-
-beforeEach(db.flush);
-
 describe("#subscriptions.create", () => {
   it("should create a subscription", async () => {
     const user = await buildUser();

server/routes/api/team.test.ts

@@ -1,14 +1,9 @@
 import { TeamDomain } from "@server/models";
 import { buildAdmin, buildCollection, buildTeam } from "@server/test/factories";
-import { seed, getTestDatabase, getTestServer } from "@server/test/support";
+import { seed, getTestServer } from "@server/test/support";
 
-const db = getTestDatabase();
 const server = getTestServer();
 
-afterAll(server.disconnect);
-
-beforeEach(db.flush);
-
 describe("#team.update", () => {
   it("should update team details", async () => {
     const { admin } = await seed();

server/routes/api/users.test.ts

@@ -1,7 +1,6 @@
 import { buildTeam, buildAdmin, buildUser } from "@server/test/factories";
-import { seed, getTestDatabase, getTestServer } from "@server/test/support";
+import { seed, getTestServer } from "@server/test/support";
 
-const db = getTestDatabase();
 const server = getTestServer();
 
 beforeAll(() => {
@@ -9,11 +8,8 @@ beforeAll(() => {
 });
 afterAll(() => {
   jest.useRealTimers();
-  server.disconnect();
 });
 
-beforeEach(db.flush);
-
 describe("#users.list", () => {
   it("should allow filtering by user name", async () => {
     const user = await buildUser({

server/routes/api/views.test.ts

@@ -1,15 +1,10 @@
 import { CollectionPermission } from "@shared/types";
 import { View, CollectionUser } from "@server/models";
 import { buildUser } from "@server/test/factories";
-import { seed, getTestDatabase, getTestServer } from "@server/test/support";
+import { seed, getTestServer } from "@server/test/support";
 
-const db = getTestDatabase();
 const server = getTestServer();
 
-afterAll(server.disconnect);
-
-beforeEach(db.flush);
-
 describe("#views.list", () => {
   it("should return views for a document", async () => {
     const { user, document } = await seed();

server/routes/auth/index.test.ts

@@ -1,13 +1,8 @@
 import { buildUser, buildCollection } from "@server/test/factories";
-import { getTestDatabase, getTestServer } from "@server/test/support";
+import { getTestServer } from "@server/test/support";
 
-const db = getTestDatabase();
 const server = getTestServer();
 
-afterAll(server.disconnect);
-
-beforeEach(db.flush);
-
 describe("auth/redirect", () => {
   it("should redirect to home", async () => {
     const user = await buildUser();

server/routes/auth/providers/email.test.ts

@@ -3,15 +3,10 @@ import SigninEmail from "@server/emails/templates/SigninEmail";
 import WelcomeEmail from "@server/emails/templates/WelcomeEmail";
 import env from "@server/env";
 import { buildUser, buildGuestUser, buildTeam } from "@server/test/factories";
-import { getTestDatabase, getTestServer } from "@server/test/support";
+import { getTestServer } from "@server/test/support";
 
-const db = getTestDatabase();
 const server = getTestServer();
 
-afterAll(server.disconnect);
-
-beforeEach(db.flush);
-
 describe("email", () => {
   it("should require email param", async () => {
     const res = await server.post("/auth/email", {

server/routes/index.test.ts

@@ -1,13 +1,8 @@
 import { buildShare, buildDocument } from "@server/test/factories";
-import { getTestDatabase, getTestServer } from "@server/test/support";
+import { getTestServer } from "@server/test/support";
 
-const db = getTestDatabase();
 const server = getTestServer();
 
-afterAll(server.disconnect);
-
-beforeEach(db.flush);
-
 describe("/s/:id", () => {
   it("should return standard title in html when loading unpublished share", async () => {
     const share = await buildShare({

server/scripts/20210716000000-backfill-revisions.test.ts

@@ -1,13 +1,9 @@
 import { Revision, Event } from "@server/models";
 import { buildDocument } from "@server/test/factories";
-import { getTestDatabase } from "@server/test/support";
+import { setupTestDatabase } from "@server/test/support";
 import script from "./20210716000000-backfill-revisions";
 
-const db = getTestDatabase();
-
-afterAll(db.disconnect);
-
-beforeEach(db.flush);
+setupTestDatabase();
 
 describe("#work", () => {
   it("should create events for revisions", async () => {

server/scripts/20220722000000-backfill-subscriptions.test.ts

@@ -1,12 +1,9 @@
 import { Subscription } from "@server/models";
 import { buildDocument, buildUser } from "@server/test/factories";
-import { getTestDatabase } from "@server/test/support";
+import { setupTestDatabase } from "@server/test/support";
 import script from "./20220722000000-backfill-subscriptions";
 
-const db = getTestDatabase();
-
-beforeEach(db.flush);
-afterAll(db.disconnect);
+setupTestDatabase();
 
 describe("#work", () => {
   it("should create subscriptions and subscriptions for document creator and collaborators", async () => {

server/test/support.ts

@@ -1,12 +1,12 @@
 import TestServer from "fetch-test-server";
 import { v4 as uuidv4 } from "uuid";
 import { CollectionPermission } from "@shared/types";
-import { sequelize as db } from "@server/database/sequelize";
+import { sequelize } from "@server/database/sequelize";
 import { User, Document, Collection, Team } from "@server/models";
 import webService from "@server/services/web";
 
 export const seed = async () => {
-  return db.transaction(async (transaction) => {
+  return sequelize.transaction(async (transaction) => {
     const team = await Team.create(
       {
         name: "Team",
@@ -105,30 +105,34 @@ export function getTestServer() {
   const server = new TestServer(app.callback());
 
   server.disconnect = async () => {
-    await db.close();
+    await sequelize.close();
     server.close();
   };
 
+  setupTestDatabase();
+  afterAll(server.disconnect);
+
   return server;
 }
 
-export function getTestDatabase() {
+export function setupTestDatabase() {
   const flush = async () => {
-    const sql = db.getQueryInterface();
-    const tables = Object.keys(db.models).map((model) => {
-      const n = db.models[model].getTableName();
+    const sql = sequelize.getQueryInterface();
+    const tables = Object.keys(sequelize.models).map((model) => {
+      const n = sequelize.models[model].getTableName();
       return (sql.queryGenerator as any).quoteTable(
         typeof n === "string" ? n : n.tableName
       );
     });
     const flushQuery = `TRUNCATE ${tables.join(", ")} CASCADE`;
 
-    await db.query(flushQuery);
+    await sequelize.query(flushQuery);
   };
 
   const disconnect = async () => {
-    await db.close();
+    await sequelize.close();
   };
 
-  return { flush, disconnect };
+  afterAll(disconnect);
+  beforeEach(flush);
 }