@@ -71,17 +71,17 @@ jobs:
7171 retention-days : 1
7272
7373 testcafe :
74- name : ${{ matrix.ARGS.name }}
74+ name : ${{ matrix.ARGS.name }}${{ !matrix.ARGS.theme && ' - fluent' || '' }}
7575 needs : [build]
7676 strategy :
7777 fail-fast : false
7878 matrix :
7979 ARGS : [
80- { componentFolder: "accessibility", name: "accessibility - fluent (1/2)", theme: "fluent.blue.light ", indices: "1/2" },
81- { componentFolder: "accessibility", name: "accessibility - fluent (2/2)", theme: "fluent.blue.light ", indices: "2/2" },
80+ { componentFolder: "accessibility", name: "accessibility (1/2)", indices: "1/2" },
81+ { componentFolder: "accessibility", name: "accessibility (2/2)", indices: "2/2" },
8282 { componentFolder: "common", name: "common" },
83- { componentFolder: "common", name: "common - material", theme: 'material.blue.light' },
84- { componentFolder: "common", name: "common - fluent", theme: ' fluent.blue.light' },
83+
84+ # Grids tests need to be reworked to work in fluent theme
8585 { componentFolder: "dataGrid/common", name: "dataGrid / common (1/5)", indices: "1/5" },
8686 { componentFolder: "dataGrid/common", name: "dataGrid / common (2/5)", indices: "2/5" },
8787 { componentFolder: "dataGrid/common", name: "dataGrid / common (3/5)", indices: "3/5" },
@@ -92,27 +92,22 @@ jobs:
9292 { componentFolder: "dataGrid/sticky/fixed", name: "dataGrid / sticky (2/3)", indices: "2/3" },
9393 { componentFolder: "dataGrid/sticky/fixed", name: "dataGrid / sticky (3/3)", indices: "3/3" },
9494 { componentFolder: "cardView", name: "cardView" },
95- { componentFolder: "cardView", name: "cardView - material", theme: 'material.blue.light' },
96- { componentFolder: "cardView", name: "cardView - fluent", theme: 'fluent.blue.light' },
97- { componentFolder: "scheduler/common", name: "scheduler / common (1/6)", indices: "1/6" },
98- { componentFolder: "scheduler/common", name: "scheduler / common (2/6)", indices: "2/6" },
99- { componentFolder: "scheduler/common", name: "scheduler / common (3/6)", indices: "3/6" },
100- { componentFolder: "scheduler/common", name: "scheduler / common (4/6)", indices: "4/6" },
101- { componentFolder: "scheduler/common", name: "scheduler / common (5/6)", indices: "5/6" },
102- { componentFolder: "scheduler/common", name: "scheduler / common (6/6)", indices: "6/6" },
103- { componentFolder: "scheduler/viewOffset/common", name: "scheduler / offset" },
104- { componentFolder: "scheduler/viewOffset/markup", name: "scheduler / offset markups" },
105- { componentFolder: "scheduler/timezones", name: "scheduler / timezones (Europe/Berlin)", timezone: "Europe/Berlin" },
106- { componentFolder: "scheduler/timezones", name: "scheduler / timezones (America/Los_Angeles)", timezone: "America/Los_Angeles" },
95+
96+ # Scheduler tests need to be reworked to work in fluent theme
97+ { componentFolder: "scheduler/common", name: "scheduler / common (1/6)", indices: "1/6", theme: 'generic.light' },
98+ { componentFolder: "scheduler/common", name: "scheduler / common (2/6)", indices: "2/6", theme: 'generic.light' },
99+ { componentFolder: "scheduler/common", name: "scheduler / common (3/6)", indices: "3/6", theme: 'generic.light' },
100+ { componentFolder: "scheduler/common", name: "scheduler / common (4/6)", indices: "4/6", theme: 'generic.light' },
101+ { componentFolder: "scheduler/common", name: "scheduler / common (5/6)", indices: "5/6", theme: 'generic.light' },
102+ { componentFolder: "scheduler/common", name: "scheduler / common (6/6)", indices: "6/6", theme: 'generic.light' },
103+ { componentFolder: "scheduler/viewOffset/common", name: "scheduler / offset", theme: 'generic.light' },
104+ { componentFolder: "scheduler/viewOffset/markup", name: "scheduler / offset markups", theme: 'generic.light' },
105+ { componentFolder: "scheduler/timezones", name: "scheduler / timezones (Europe/Berlin)", timezone: "Europe/Berlin", theme: 'generic.light' },
106+ { componentFolder: "scheduler/timezones", name: "scheduler / timezones (America/Los_Angeles)", timezone: "America/Los_Angeles", theme: 'generic.light' },
107+
107108 { componentFolder: "editors", name: "editors (1/2)", indices: "1/2" },
108109 { componentFolder: "editors", name: "editors (2/2)", indices: "2/2" },
109- { componentFolder: "editors", name: "editors - material (1/2)", indices: "1/2", theme: 'material.blue.light' },
110- { componentFolder: "editors", name: "editors - material (2/2)", indices: "2/2", theme: 'material.blue.light' },
111- { componentFolder: "editors", name: "editors - fluent (1/2)", indices: "1/2", theme: 'fluent.blue.light' },
112- { componentFolder: "editors", name: "editors - fluent (2/2)", indices: "2/2", theme: 'fluent.blue.light' },
113110 { componentFolder: "navigation", name: "navigation" },
114- { componentFolder: "navigation", name: "navigation - material", theme: 'material.blue.light' },
115- { componentFolder: "navigation", name: "navigation - fluent", theme: 'fluent.blue.light' },
116111 ]
117112 runs-on : devextreme-shr2
118113 timeout-minutes : 45
@@ -172,7 +167,11 @@ jobs:
172167 - name : Run TestCafe tests
173168 working-directory : ./e2e/testcafe-devextreme
174169 run : |
175- [ "${{ matrix.ARGS.theme }}" != "" ] && THEME="--theme ${{ matrix.ARGS.theme }}"
170+ if [ "${{ matrix.ARGS.theme }}" != "" ]; then
171+ THEME="--theme ${{ matrix.ARGS.theme }}"
172+ else
173+ THEME="--theme fluent.blue.light"
174+ fi
176175 [ "${{ matrix.ARGS.indices }}" != "" ] && INDICES="--indices ${{ matrix.ARGS.indices }}"
177176 [ "${{ matrix.ARGS.concurrency }}" != "" ] && CONCURRENCY="--concurrency ${{ matrix.ARGS.concurrency }}"
178177 [ "${{ matrix.ARGS.platform }}" != "" ] && PLATFORM="--platform ${{ matrix.ARGS.platform }}"
0 commit comments