From f03b8470a4d6aab27ade5d5e60ec42c6fcca4add Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Wed, 29 Sep 2021 18:22:56 +0100 Subject: [PATCH] Only use fetch for search when running in cypress --- packages/server/src/api/controllers/row/internal.js | 4 ++-- packages/server/src/environment.js | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/packages/server/src/api/controllers/row/internal.js b/packages/server/src/api/controllers/row/internal.js index b500ce7fd3..02bfad85d2 100644 --- a/packages/server/src/api/controllers/row/internal.js +++ b/packages/server/src/api/controllers/row/internal.js @@ -351,8 +351,8 @@ exports.bulkDestroy = async ctx => { } exports.search = async ctx => { - // Fetch the whole table when running tests, as search doesn't work - if (env.isTest()) { + // Fetch the whole table when running in cypress, as search doesn't work + if (env.isCypress()) { return { rows: await exports.fetch(ctx) } } diff --git a/packages/server/src/environment.js b/packages/server/src/environment.js index 89e015b6f5..5012808950 100644 --- a/packages/server/src/environment.js +++ b/packages/server/src/environment.js @@ -13,6 +13,10 @@ function isDev() { ) } +function isCypress() { + return process.env.NODE_ENV === "cypress" +} + let LOADED = false if (!LOADED && isDev() && !isTest()) { require("dotenv").config() @@ -61,6 +65,7 @@ module.exports = { module.exports[key] = value }, isTest, + isCypress, isDev, isProd: () => { return !isDev()