Skip to content

The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:

Revert "Replace Cypress grep with Bahmutov's cy-grep (#67660)" (#67725)

Nemanja Glumac0128771ad10e
diff --git a/e2e/support/config.js b/e2e/support/config.js
index 07b5256d59c..649fc856459 100644
--- a/e2e/support/config.js
+++ b/e2e/support/config.js
@@ -54,7 +54,10 @@ const defaultConfig = {
// Use cypress-on-fix to enable multiple handlers
const on = cypressOnFix(cypressOn);
- require("@bahmutov/cy-grep/src/plugin")(config);
+
+ // CLI grep can't handle commas in the name
+ // needed when we want to run only specific tests
+ config.env.grep ??= process.env.GREP;
// cypress-terminal-report
if (isCI) {
@@ -120,15 +123,17 @@ const defaultConfig = {
** CONFIG **
********************************************************************/
- // CLI grep can't handle commas in the name
- // needed when we want to run only specific tests
- config.env.grep ??= process.env.GREP;
+ // `grepIntegrationFolder` needs to point to the root!
+ // See: https://github.com/cypress-io/cypress/issues/24452#issuecomment-1295377775
+ config.env.grepIntegrationFolder = "../../";
config.env.grepFilterSpecs = true;
config.env.grepOmitFiltered = true;
config.env.IS_ENTERPRISE = isEnterprise;
config.env.SNOWPLOW_MICRO_URL = snowplowMicroUrl;
+ require("@cypress/grep/src/plugin")(config);
+
if (isCI) {
cypressSplit(on, config);
collectFailingTests(on, config);
diff --git a/e2e/support/cypress.js b/e2e/support/cypress.js
index b7a1ad6150c..089330cf2f2 100644
--- a/e2e/support/cypress.js
+++ b/e2e/support/cypress.js
@@ -1,4 +1,4 @@
-import registerCypressGrep from "@bahmutov/cy-grep/src/support"; // eslint-disable-line import/order
+import registerCypressGrep from "@cypress/grep"; // eslint-disable-line import/order
registerCypressGrep();
import "@cypress/skip-test/support";
diff --git a/package.json b/package.json
index 8e888e7f8b6..4820516dbde 100644
--- a/package.json
+++ b/package.json
@@ -155,7 +155,6 @@
"@babel/preset-env": "^7.24.8",
"@babel/preset-react": "^7.23.3",
"@babel/preset-typescript": "^7.24.7",
- "@bahmutov/cy-grep": "^2.1.0",
"@bahmutov/cypress-esbuild-preprocessor": "^2.2.7",
"@csstools/postcss-global-data": "^3.1.0",
"@cypress/grep": "^4.0.1",
diff --git a/yarn.lock b/yarn.lock
index cac5e3ab52d..3417caa80c8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1066,17 +1066,6 @@
"@babel/helper-string-parser" "^7.27.1"
"@babel/helper-validator-identifier" "^7.27.1"
-"@bahmutov/cy-grep@^2.1.0":
- version "2.1.0"
- resolved "https://registry.yarnpkg.com/@bahmutov/cy-grep/-/cy-grep-2.1.0.tgz#b6604445fa19a5370c751cb35824a1627a6758c2"
- integrity sha512-/2k5+10zd0FN+UsE8t5g4ybnOgWRq+6n01CxMTTaes00Fg1wAjJ3z/h2F2dILVWWaOIDdPlRqJTpg3QqXenzZg==
- dependencies:
- cypress-plugin-config "^1.2.0"
- debug "^4.3.2"
- find-cypress-specs "^1.35.1"
- find-test-names "1.29.19"
- globby "^11.1.0"
-
"@bahmutov/cypress-esbuild-preprocessor@^2.2.7":
version "2.2.7"
resolved "https://registry.yarnpkg.com/@bahmutov/cypress-esbuild-preprocessor/-/cypress-esbuild-preprocessor-2.2.7.tgz#738d4e6dbd167e404e9f5a5b4fd97272851dbf50"
@@ -9190,11 +9179,6 @@ cypress-on-fix@^1.1.0:
dependencies:
debug "^4.3.7"
-cypress-plugin-config@^1.2.0:
- version "1.2.1"
- resolved "https://registry.yarnpkg.com/cypress-plugin-config/-/cypress-plugin-config-1.2.1.tgz#aa7eaa55ab5ce5e186ab7d0e37cc7e42bfb609b4"
- integrity sha512-z+bQ7oyfDKun51HiCVNBOR+g38/nYRJ7zVdCZT2/9UozzE8P4iA1zF/yc85ePZLy5NOj/0atutoUPBBR5SqjSQ==
-
cypress-real-events@^1.14.0:
version "1.14.0"
resolved "https://registry.yarnpkg.com/cypress-real-events/-/cypress-real-events-1.14.0.tgz#c5495db50a2bd247f4accde983af7153566945d3"
@@ -11561,24 +11545,6 @@ [email protected]:
spec-change "^1.11.17"
tsx "^4.19.3"
-find-cypress-specs@^1.35.1:
- version "1.54.8"
- resolved "https://registry.yarnpkg.com/find-cypress-specs/-/find-cypress-specs-1.54.8.tgz#31e9f68f667328aa09861257e73ddfde07457141"
- integrity sha512-SrYhCx2/+fgEIfhoxBMp+NO2xTtXosevNrUhK9MpTYiUCrJTGgPePhCgIgeb6abPxfLe2RSD00Rlz38aoBySIg==
- dependencies:
- "@actions/core" "^1.10.0"
- arg "^5.0.1"
- console.table "^0.10.0"
- debug "^4.3.3"
- find-test-names "1.29.19"
- minimatch "^5.1.4"
- pluralize "^8.0.0"
- require-and-forget "^1.0.1"
- shelljs "^0.10.0"
- spec-change "^1.11.17"
- tinyglobby "^0.2.15"
- tsx "^4.19.3"
-
find-free-port-sync@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/find-free-port-sync/-/find-free-port-sync-1.0.0.tgz#10c9007655b6b65a7900e79d391e8da21e31cc19"
@@ -11601,18 +11567,6 @@ [email protected]:
globby "^11.0.4"
simple-bin-help "^1.8.0"
- version "1.29.19"
- resolved "https://registry.yarnpkg.com/find-test-names/-/find-test-names-1.29.19.tgz#365a18aefbc55f88ba5c96b01145c9b616b0d0d2"
- integrity sha512-fSO2GXgOU6dH+FdffmRXYN/kLdnd8zkBGIZrKsmAdfLSFUUDLpDFF7+F/h+wjmjDWQmMgD8hPfJZR+igiEUQHQ==
- dependencies:
- "@babel/parser" "^7.27.2"
- "@babel/plugin-syntax-jsx" "^7.27.1"
- acorn-walk "^8.2.0"
- debug "^4.3.3"
- simple-bin-help "^1.8.0"
- tinyglobby "^0.2.13"
-
find-test-names@^1.19.0:
version "1.21.0"
resolved "https://registry.yarnpkg.com/find-test-names/-/find-test-names-1.21.0.tgz#fe0d0bdd7e8ad9df6b5e0f08986e982654fc4417"
@@ -21011,7 +20965,7 @@ tinyexec@^1.0.1:
resolved "https://registry.yarnpkg.com/tinyexec/-/tinyexec-1.0.1.tgz#70c31ab7abbb4aea0a24f55d120e5990bfa1e0b1"
integrity sha512-5uC6DDlmeqiOwCPmK9jMSdOuZTh8bU39Ys6yidB+UTt5hfZUPGAypSgFRiEp+jbi9qH40BLDvy85jIU88wKSqw==
-tinyglobby@^0.2.0, tinyglobby@^0.2.13, tinyglobby@^0.2.14, tinyglobby@^0.2.15:
+tinyglobby@^0.2.0, tinyglobby@^0.2.14:
version "0.2.15"
resolved "https://registry.yarnpkg.com/tinyglobby/-/tinyglobby-0.2.15.tgz#e228dd1e638cea993d2fdb4fcd2d4602a79951c2"
integrity sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==