Refactored out config changes and now excluding on the affected SQS/Multiuser tests

packages/server/src/api/routes/public/tests/compare.spec.ts

@@ -68,7 +68,7 @@ describe("check the applications endpoints", () => {
 
 describe("check the tables endpoints", () => {
   it("should allow retrieving tables through search", async () => {
-    await config.createApp({ appName: "new app 1" })
+    await config.createApp("new app 1")
     table = await config.upsertTable()
     const res = await makeRequest("post", "/tables/search")
     expect(res).toSatisfyApiSpec()

packages/server/src/api/routes/tests/search.spec.ts

@@ -179,7 +179,6 @@ describe.each([
   }
 
   // Ensure all bindings resolve and perform as expected
-  !isSqs &&
   describe("bindings", () => {
     let globalUsers: any = []
 
@@ -335,17 +334,23 @@ describe.each([
       ])
     })
 
+    !isSqs &&
       it("should match the session user id in a multi user field", async () => {
+        const allUsers = [...globalUsers, config.getUser()].map((user: any) => {
+          return { _id: user._id }
+        })
+
         await expectQuery({
           contains: { multi_user: ["{{ [user]._id }}"] },
         }).toContainExactly([
           {
             name: "multi user with session user",
-            multi_user: [{ _id: config.getUser()._id }],
+            multi_user: allUsers,
           },
         ])
       })
 
+    !isSqs &&
       it("should not match the session user id in a multi user field", async () => {
         await expectQuery({
           notContains: { multi_user: ["{{ [user]._id }}"] },

packages/server/src/migrations/functions/tests/appUrls.spec.js

@@ -13,7 +13,7 @@ describe("run", () => {
   afterAll(config.end)
 
   it("runs successfully", async () => {
-    const app = await config.createApp({ appName: "testApp" })
+    const app = await config.createApp("testApp")
     const metadata = await dbCore.doWithDB(app.appId, async db => {
       const metadataDoc = await db.get(dbCore.DocumentType.APP_METADATA)
       delete metadataDoc.url

packages/server/src/migrations/functions/tests/tableSettings.spec.ts

@@ -11,7 +11,7 @@ describe("run", () => {
 
   beforeAll(async () => {
     await config.init()
-    app = await config.createApp({ appName: "testApp" })
+    app = await config.createApp("testApp")
     screen = await config.createScreen()
   })
 

packages/server/src/migrations/functions/usageQuotas/tests/syncApps.spec.ts

@@ -22,7 +22,7 @@ describe("syncApps", () => {
       expect(usageDoc.usageQuota.apps).toEqual(3)
 
       // create an extra app to test the migration
-      await config.createApp({ appName: "quota-test" })
+      await config.createApp("quota-test")
 
       // migrate
       await syncApps.run()

packages/server/src/migrations/functions/usageQuotas/tests/syncRows.spec.ts

@@ -29,7 +29,7 @@ describe("syncRows", () => {
         await config.createRow()
       })
       // app 2
-      const app2 = await config.createApp({ appName: "second-app" })
+      const app2 = await config.createApp("second-app")
       await context.doInAppContext(app2.appId, async () => {
         await config.createTable()
         await config.createRow()

packages/server/src/tests/utilities/TestConfiguration.ts

@@ -224,14 +224,11 @@ export default class TestConfiguration {
   // SETUP /  TEARDOWN
 
   // use a new id as the name to avoid name collisions
-  async init(opts = {}) {
+  async init(appName = newid()) {
     if (!this.started) {
       await startup()
     }
-    return this.newTenant({
+    return this.newTenant(appName)
-      appName: newid(),
-      ...opts,
-    })
   }
 
   end() {
@@ -551,14 +548,14 @@ export default class TestConfiguration {
     return this.tenantId
   }
 
-  async newTenant(opts: {}): Promise<App> {
+  async newTenant(appName = newid()): Promise<App> {
     this.csrfToken = generator.hash()
 
     this.tenantId = structures.tenant.id()
     this.user = await this.globalUser()
     this.userMetadataId = generateUserMetadataID(this.user._id!)
 
-    return this.createApp({ appName: newid(), ...opts })
+    return this.createApp(appName)
   }
 
   doInTenant<T>(task: () => T) {
@@ -588,9 +585,7 @@ export default class TestConfiguration {
   }
 
   // APP
-  async createApp(opts: CreateAppRequest): Promise<App> {
+  async createApp(appName: string, url?: string): Promise<App> {
-    const { appName, url, snippets } = opts
-
     this.appId = undefined
     this.app = await context.doInTenant(
       this.tenantId!,
@@ -602,19 +597,6 @@ export default class TestConfiguration {
     )
     this.appId = this.app.appId
 
-    if (snippets) {
-      this.app = await this._req(
-        appController.update,
-        {
-          ...this.app,
-          snippets,
-        },
-        {
-          appId: this.appId,
-        }
-      )
-    }
-
     return await context.doInAppContext(this.app.appId!, async () => {
       // create production app
       this.prodApp = await this.publish()