From e954360eec991b085b176a6f697c869fe095c207 Mon Sep 17 00:00:00 2001
From: Geido <60598000+geido@users.noreply.github.com>
Date: Mon, 20 May 2024 16:32:31 +0300
Subject: [PATCH] fix: Fixes workflow Applitools Cypress (#28566)

---
 .github/workflows/bashlib.sh                               | 2 +-
 superset-frontend/cypress-base/cypress.config.ts           | 7 +++++--
 .../chartlist.test.ts}                                     | 0
 .../dashboard.test.ts}                                     | 2 +-
 .../dashboardlist.test.ts}                                 | 0
 .../explore.test.ts}                                       | 5 ++++-
 .../sqllab.test.ts}                                        | 0
 7 files changed, 11 insertions(+), 5 deletions(-)
 rename superset-frontend/cypress-base/cypress/{e2e/chart_list/chartlist.applitools.test.ts => applitools/chartlist.test.ts} (100%)
 rename superset-frontend/cypress-base/cypress/{e2e/dashboard/dashboard.applitools.test.ts => applitools/dashboard.test.ts} (96%)
 rename superset-frontend/cypress-base/cypress/{e2e/dashboard_list/dashboardlist.applitools.test.ts => applitools/dashboardlist.test.ts} (100%)
 rename superset-frontend/cypress-base/cypress/{e2e/explore/explore.applitools.test.ts => applitools/explore.test.ts} (93%)
 rename superset-frontend/cypress-base/cypress/{e2e/sqllab/sqllab.applitools.test.ts => applitools/sqllab.test.ts} (100%)

diff --git a/.github/workflows/bashlib.sh b/.github/workflows/bashlib.sh
index 5330d01e05c..c35caa7dc4b 100644
--- a/.github/workflows/bashlib.sh
+++ b/.github/workflows/bashlib.sh
@@ -212,7 +212,7 @@ cypress-run-applitools() {
   nohup flask run --no-debugger -p $port >"$flasklog" 2>&1 </dev/null &
   local flaskProcessId=$!
 
-  $cypress --spec "cypress/e2e/*/**/*.applitools.test.ts" --browser "$browser" --headless
+  $cypress --spec "cypress/applitools/**/*" --browser "$browser" --headless
 
   say "::group::Flask log for default run"
   cat "$flasklog"
diff --git a/superset-frontend/cypress-base/cypress.config.ts b/superset-frontend/cypress-base/cypress.config.ts
index 8d2f58325c0..d2be99af3cc 100644
--- a/superset-frontend/cypress-base/cypress.config.ts
+++ b/superset-frontend/cypress-base/cypress.config.ts
@@ -65,8 +65,11 @@ export default eyesPlugin(
         return require('./cypress/plugins/index.js')(on, config);
       },
       baseUrl: 'http://localhost:8088',
-      excludeSpecPattern: ['**/*.applitools.test.ts'],
-      specPattern: ['cypress/e2e/**/*.{js,jsx,ts,tsx}'],
+      excludeSpecPattern: [],
+      specPattern: [
+        'cypress/e2e/**/*.{js,jsx,ts,tsx}',
+        'cypress/applitools/**/*.{js,jsx,ts,tsx}',
+      ],
     },
   }),
 );
diff --git a/superset-frontend/cypress-base/cypress/e2e/chart_list/chartlist.applitools.test.ts b/superset-frontend/cypress-base/cypress/applitools/chartlist.test.ts
similarity index 100%
rename from superset-frontend/cypress-base/cypress/e2e/chart_list/chartlist.applitools.test.ts
rename to superset-frontend/cypress-base/cypress/applitools/chartlist.test.ts
diff --git a/superset-frontend/cypress-base/cypress/e2e/dashboard/dashboard.applitools.test.ts b/superset-frontend/cypress-base/cypress/applitools/dashboard.test.ts
similarity index 96%
rename from superset-frontend/cypress-base/cypress/e2e/dashboard/dashboard.applitools.test.ts
rename to superset-frontend/cypress-base/cypress/applitools/dashboard.test.ts
index 297702bce25..f96240b0d08 100644
--- a/superset-frontend/cypress-base/cypress/e2e/dashboard/dashboard.applitools.test.ts
+++ b/superset-frontend/cypress-base/cypress/applitools/dashboard.test.ts
@@ -18,7 +18,7 @@
  */
 import { WORLD_HEALTH_DASHBOARD } from 'cypress/utils/urls';
 import { waitForChartLoad } from 'cypress/utils';
-import { WORLD_HEALTH_CHARTS } from './utils';
+import { WORLD_HEALTH_CHARTS } from '../e2e/dashboard/utils';
 
 describe('Dashboard load', () => {
   beforeEach(() => {
diff --git a/superset-frontend/cypress-base/cypress/e2e/dashboard_list/dashboardlist.applitools.test.ts b/superset-frontend/cypress-base/cypress/applitools/dashboardlist.test.ts
similarity index 100%
rename from superset-frontend/cypress-base/cypress/e2e/dashboard_list/dashboardlist.applitools.test.ts
rename to superset-frontend/cypress-base/cypress/applitools/dashboardlist.test.ts
diff --git a/superset-frontend/cypress-base/cypress/e2e/explore/explore.applitools.test.ts b/superset-frontend/cypress-base/cypress/applitools/explore.test.ts
similarity index 93%
rename from superset-frontend/cypress-base/cypress/e2e/explore/explore.applitools.test.ts
rename to superset-frontend/cypress-base/cypress/applitools/explore.test.ts
index 4e951c2560e..142262262d9 100644
--- a/superset-frontend/cypress-base/cypress/e2e/explore/explore.applitools.test.ts
+++ b/superset-frontend/cypress-base/cypress/applitools/explore.test.ts
@@ -16,7 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { FORM_DATA_DEFAULTS, NUM_METRIC } from './visualizations/shared.helper';
+import {
+  FORM_DATA_DEFAULTS,
+  NUM_METRIC,
+} from '../e2e/explore/visualizations/shared.helper';
 
 describe('explore view', () => {
   beforeEach(() => {
diff --git a/superset-frontend/cypress-base/cypress/e2e/sqllab/sqllab.applitools.test.ts b/superset-frontend/cypress-base/cypress/applitools/sqllab.test.ts
similarity index 100%
rename from superset-frontend/cypress-base/cypress/e2e/sqllab/sqllab.applitools.test.ts
rename to superset-frontend/cypress-base/cypress/applitools/sqllab.test.ts