chore: Refactoring event processors and service architecture (#2495)

server/api/attachments.test.js

@@ -1,7 +1,7 @@
 /* eslint-disable flowtype/require-valid-file-annotation */
 import TestServer from "fetch-test-server";
-import app from "../app";
 import { Attachment } from "../models";
+import webService from "../services/web";
 import {
   buildUser,
   buildAdmin,
@@ -11,6 +11,7 @@ import {
 } from "../test/factories";
 import { flushdb } from "../test/support";
 
+const app = webService();
 const server = new TestServer(app.callback());
 
 jest.mock("aws-sdk", () => {

server/api/auth.test.js

@@ -1,9 +1,9 @@
 /* eslint-disable flowtype/require-valid-file-annotation */
 import TestServer from "fetch-test-server";
-import app from "../app";
+import webService from "../services/web";
 import { buildUser, buildTeam } from "../test/factories";
 import { flushdb } from "../test/support";
-
+const app = webService();
 const server = new TestServer(app.callback());
 
 beforeEach(() => flushdb());

server/api/authenticationProviders.test.js

@@ -1,10 +1,11 @@
 // @flow
 import TestServer from "fetch-test-server";
 import { v4 as uuidv4 } from "uuid";
-import app from "../app";
+import webService from "../services/web";
 import { buildUser, buildAdmin, buildTeam } from "../test/factories";
 import { flushdb } from "../test/support";
 
+const app = webService();
 const server = new TestServer(app.callback());
 
 beforeEach(() => flushdb());

server/api/collections.test.js

@@ -1,7 +1,7 @@
 /* eslint-disable flowtype/require-valid-file-annotation */
 import TestServer from "fetch-test-server";
-import app from "../app";
 import { Document, CollectionUser, CollectionGroup } from "../models";
+import webService from "../services/web";
 import {
   buildUser,
   buildAdmin,
@@ -11,6 +11,7 @@ import {
 } from "../test/factories";
 import { flushdb, seed } from "../test/support";
 
+const app = webService();
 const server = new TestServer(app.callback());
 
 beforeEach(() => flushdb());
@@ -262,7 +263,7 @@ describe("#collections.move", () => {
 });
 
 describe("#collections.export", () => {
-  it("should now allow export of private collection not a member", async () => {
+  it("should not allow export of private collection not a member", async () => {
     const { user } = await seed();
     const collection = await buildCollection({
       permission: null,

server/api/documents.test.js

@@ -1,6 +1,5 @@
 /* eslint-disable flowtype/require-valid-file-annotation */
 import TestServer from "fetch-test-server";
-import app from "../app";
 import {
   Document,
   View,
@@ -10,6 +9,7 @@ import {
   CollectionUser,
   SearchQuery,
 } from "../models";
+import webService from "../services/web";
 import {
   buildShare,
   buildCollection,
@@ -17,7 +17,7 @@ import {
   buildDocument,
 } from "../test/factories";
 import { flushdb, seed } from "../test/support";
-
+const app = webService();
 const server = new TestServer(app.callback());
 
 beforeEach(() => flushdb());

server/api/events.test.js

@@ -1,9 +1,9 @@
 /* eslint-disable flowtype/require-valid-file-annotation */
 import TestServer from "fetch-test-server";
-import app from "../app";
+import webService from "../services/web";
 import { buildEvent, buildUser } from "../test/factories";
 import { flushdb, seed } from "../test/support";
-
+const app = webService();
 const server = new TestServer(app.callback());
 
 beforeEach(() => flushdb());

server/api/groups.test.js

@@ -1,10 +1,10 @@
 /* eslint-disable flowtype/require-valid-file-annotation */
 import TestServer from "fetch-test-server";
-import app from "../app";
 import { Event } from "../models";
+import webService from "../services/web";
 import { buildUser, buildAdmin, buildGroup } from "../test/factories";
 import { flushdb } from "../test/support";
-
+const app = webService();
 const server = new TestServer(app.callback());
 
 beforeEach(() => flushdb());

server/api/hooks.test.js

@@ -1,11 +1,12 @@
 /* eslint-disable flowtype/require-valid-file-annotation */
 import TestServer from "fetch-test-server";
-import app from "../app";
 import { IntegrationAuthentication, SearchQuery } from "../models";
+import webService from "../services/web";
 import * as Slack from "../slack";
 import { buildDocument, buildIntegration } from "../test/factories";
 import { flushdb, seed } from "../test/support";
 
+const app = webService();
 const server = new TestServer(app.callback());
 
 beforeEach(() => flushdb());

server/api/index.test.js

@@ -1,7 +1,8 @@
 /* eslint-disable flowtype/require-valid-file-annotation */
 import TestServer from "fetch-test-server";
-import app from "../app";
+import webService from "../services/web";
 import { flushdb } from "../test/support";
+const app = webService();
 const server = new TestServer(app.callback());
 
 beforeEach(() => flushdb());

server/api/middlewares/pagination.test.js

@@ -1,8 +1,8 @@
 /* eslint-disable flowtype/require-valid-file-annotation */
 import TestServer from "fetch-test-server";
-import app from "../../app";
+import webService from "../../services/web";
 import { flushdb, seed } from "../../test/support";
-
+const app = webService();
 const server = new TestServer(app.callback());
 
 beforeEach(() => flushdb());

server/api/revisions.test.js

@@ -1,10 +1,11 @@
 /* eslint-disable flowtype/require-valid-file-annotation */
 import TestServer from "fetch-test-server";
-import app from "../app";
 import { Revision } from "../models";
+import webService from "../services/web";
 import { buildDocument, buildUser } from "../test/factories";
 import { flushdb, seed } from "../test/support";
 
+const app = webService();
 const server = new TestServer(app.callback());
 
 beforeEach(() => flushdb());

server/api/shares.test.js

@@ -1,10 +1,11 @@
 /* eslint-disable flowtype/require-valid-file-annotation */
 import TestServer from "fetch-test-server";
-import app from "../app";
 import { CollectionUser } from "../models";
+import webService from "../services/web";
 import { buildUser, buildDocument, buildShare } from "../test/factories";
 import { flushdb, seed } from "../test/support";
 
+const app = webService();
 const server = new TestServer(app.callback());
 
 beforeEach(() => flushdb());

server/api/team.test.js

@@ -1,9 +1,9 @@
 /* eslint-disable flowtype/require-valid-file-annotation */
 import TestServer from "fetch-test-server";
-import app from "../app";
+import webService from "../services/web";
 
 import { flushdb, seed } from "../test/support";
-
+const app = webService();
 const server = new TestServer(app.callback());
 
 beforeEach(() => flushdb());

server/api/users.test.js

@@ -1,11 +1,11 @@
 /* eslint-disable flowtype/require-valid-file-annotation */
 import TestServer from "fetch-test-server";
-import app from "../app";
+import webService from "../services/web";
 
 import { buildTeam, buildAdmin, buildUser } from "../test/factories";
 
 import { flushdb, seed } from "../test/support";
-
+const app = webService();
 const server = new TestServer(app.callback());
 
 beforeEach(() => flushdb());

server/api/utils.test.js

@@ -1,11 +1,12 @@
 /* eslint-disable flowtype/require-valid-file-annotation */
 import { subDays } from "date-fns";
 import TestServer from "fetch-test-server";
-import app from "../app";
 import { Document } from "../models";
+import webService from "../services/web";
 import { buildDocument } from "../test/factories";
 import { flushdb } from "../test/support";
 
+const app = webService();
 const server = new TestServer(app.callback());
 
 jest.mock("aws-sdk", () => {

server/api/views.test.js

@@ -1,10 +1,11 @@
 /* eslint-disable flowtype/require-valid-file-annotation */
 import TestServer from "fetch-test-server";
-import app from "../app";
 import { View, CollectionUser } from "../models";
+import webService from "../services/web";
 import { buildUser } from "../test/factories";
 import { flushdb, seed } from "../test/support";
 
+const app = webService();
 const server = new TestServer(app.callback());
 
 beforeEach(() => flushdb());