From e7d4f90f1beb9280f87d49c58546fa2d0ae51e79 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Mon, 21 Oct 2024 15:31:33 +0200
Subject: [PATCH] Cleanup sqs flags from tests

---
 .../sdk/app/rows/search/tests/search.spec.ts  | 78 ++++++++-----------
 .../api/routes/global/tests/auditLogs.spec.ts |  9 +--
 2 files changed, 34 insertions(+), 53 deletions(-)

diff --git a/packages/server/src/sdk/app/rows/search/tests/search.spec.ts b/packages/server/src/sdk/app/rows/search/tests/search.spec.ts
index 4d8a6b6d69..cf91033c40 100644
--- a/packages/server/src/sdk/app/rows/search/tests/search.spec.ts
+++ b/packages/server/src/sdk/app/rows/search/tests/search.spec.ts
@@ -10,7 +10,7 @@ import {
 import TestConfiguration from "../../../../../tests/utilities/TestConfiguration"
 import { search } from "../../../../../sdk/app/rows/search"
 import { generator } from "@budibase/backend-core/tests"
-import { features } from "@budibase/backend-core"
+
 import {
   DatabaseName,
   getDatasource,
@@ -21,30 +21,20 @@ import { tableForDatasource } from "../../../../../tests/utilities/structures"
 // (e.g. limiting searches to returning specific fields). If it's possible to
 // test through the API, it should be done there instead.
 describe.each([
-  ["lucene", undefined],
-  ["sqs", undefined],
+  ["internal", undefined],
   [DatabaseName.POSTGRES, getDatasource(DatabaseName.POSTGRES)],
   [DatabaseName.MYSQL, getDatasource(DatabaseName.MYSQL)],
   [DatabaseName.SQL_SERVER, getDatasource(DatabaseName.SQL_SERVER)],
   [DatabaseName.MARIADB, getDatasource(DatabaseName.MARIADB)],
 ])("search sdk (%s)", (name, dsProvider) => {
-  const isSqs = name === "sqs"
-  const isLucene = name === "lucene"
-  const isInternal = isLucene || isSqs
+  const isInternal = name === "internal"
   const config = new TestConfiguration()
 
-  let envCleanup: (() => void) | undefined
   let datasource: Datasource | undefined
   let table: Table
 
   beforeAll(async () => {
-    await features.testutils.withFeatureFlags("*", { SQS: isSqs }, () =>
-      config.init()
-    )
-
-    envCleanup = features.testutils.setFeatureFlags("*", {
-      SQS: isSqs,
-    })
+    await config.init()
 
     if (dsProvider) {
       datasource = await config.createDatasource({
@@ -105,9 +95,6 @@ describe.each([
 
   afterAll(async () => {
     config.end()
-    if (envCleanup) {
-      envCleanup()
-    }
   })
 
   it("querying by fields will always return data attribute columns", async () => {
@@ -211,36 +198,35 @@ describe.each([
     })
   })
 
-  !isLucene &&
-    it.each([
-      [["id", "name", "age"], 3],
-      [["name", "age"], 10],
-    ])(
-      "cannot query by non search fields (fields: %s)",
-      async (queryFields, expectedRows) => {
-        await config.doInContext(config.appId, async () => {
-          const { rows } = await search({
-            tableId: table._id!,
-            query: {
-              $or: {
-                conditions: [
-                  {
-                    $and: {
-                      conditions: [
-                        { range: { id: { low: 2, high: 4 } } },
-                        { range: { id: { low: 3, high: 5 } } },
-                      ],
-                    },
+  it.each([
+    [["id", "name", "age"], 3],
+    [["name", "age"], 10],
+  ])(
+    "cannot query by non search fields (fields: %s)",
+    async (queryFields, expectedRows) => {
+      await config.doInContext(config.appId, async () => {
+        const { rows } = await search({
+          tableId: table._id!,
+          query: {
+            $or: {
+              conditions: [
+                {
+                  $and: {
+                    conditions: [
+                      { range: { id: { low: 2, high: 4 } } },
+                      { range: { id: { low: 3, high: 5 } } },
+                    ],
                   },
-                  { equal: { id: 7 } },
-                ],
-              },
+                },
+                { equal: { id: 7 } },
+              ],
             },
-            fields: queryFields,
-          })
-
-          expect(rows).toHaveLength(expectedRows)
+          },
+          fields: queryFields,
         })
-      }
-    )
+
+        expect(rows).toHaveLength(expectedRows)
+      })
+    }
+  )
 })
diff --git a/packages/worker/src/api/routes/global/tests/auditLogs.spec.ts b/packages/worker/src/api/routes/global/tests/auditLogs.spec.ts
index b540836583..f901925016 100644
--- a/packages/worker/src/api/routes/global/tests/auditLogs.spec.ts
+++ b/packages/worker/src/api/routes/global/tests/auditLogs.spec.ts
@@ -1,5 +1,5 @@
 import { mocks, structures } from "@budibase/backend-core/tests"
-import { context, events, features } from "@budibase/backend-core"
+import { context, events } from "@budibase/backend-core"
 import { Event, IdentityType } from "@budibase/types"
 import { TestConfiguration } from "../../../../tests"
 
@@ -12,19 +12,14 @@ const BASE_IDENTITY = {
 const USER_AUDIT_LOG_COUNT = 3
 const APP_ID = "app_1"
 
-describe.each(["lucene", "sql"])("/api/global/auditlogs (%s)", method => {
+describe("/api/global/auditlogs (%s)", () => {
   const config = new TestConfiguration()
-  let envCleanup: (() => void) | undefined
 
   beforeAll(async () => {
-    envCleanup = features.testutils.setFeatureFlags("*", {
-      SQS: method === "sql",
-    })
     await config.beforeAll()
   })
 
   afterAll(async () => {
-    envCleanup?.()
     await config.afterAll()
   })