fix: Fixes workflow Applitools Cypress (#28566)

apache · May 20, 2024 · e954360 · e954360
1 parent 389d8b5
commit e954360
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 5 deletions.
diff --git 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
@@ -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/...e/chart_list/chartlist.applitools.test.ts → ...base/cypress/applitools/chartlist.test.ts b/...e/chart_list/chartlist.applitools.test.ts → ...base/cypress/applitools/chartlist.test.ts
diff --git a/...2e/dashboard/dashboard.applitools.test.ts → ...base/cypress/applitools/dashboard.test.ts b/...2e/dashboard/dashboard.applitools.test.ts → ...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/...ard_list/dashboardlist.applitools.test.ts → .../cypress/applitools/dashboardlist.test.ts b/...ard_list/dashboardlist.applitools.test.ts → .../cypress/applitools/dashboardlist.test.ts
diff --git a/...ss/e2e/explore/explore.applitools.test.ts → ...s-base/cypress/applitools/explore.test.ts b/...ss/e2e/explore/explore.applitools.test.ts → ...s-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/...ress/e2e/sqllab/sqllab.applitools.test.ts → ...ss-base/cypress/applitools/sqllab.test.ts b/...ress/e2e/sqllab/sqllab.applitools.test.ts → ...ss-base/cypress/applitools/sqllab.test.ts