Skip to content

Commit e48aada

Browse files
e2e frameworks tests: get rid of Material, Generic themes testing (#31350)
1 parent b2be014 commit e48aada

File tree

70 files changed

+53
-381
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+53
-381
lines changed

.github/workflows/demos_visual_tests_frameworks.yml

Lines changed: 3 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -302,41 +302,12 @@ jobs:
302302
- name: Install tgz
303303
run: pnpm add -w ./devextreme-installer.tgz ./devextreme-dist-installer.tgz ./devextreme-react-installer.tgz ./devextreme-vue-installer.tgz ./devextreme-angular-installer.tgz
304304

305-
- name: Run lint on all demos
306-
if: github.event_name != 'pull_request' || contains(github.event.pull_request.labels.*.name, 'force all tests')
305+
- name: Run lint
307306
working-directory: apps/demos
308307
env:
309308
CHANGEDFILEINFOSPATH: changed-files.json
310309
DEBUG: 'eslint:cli-engine,stylelint:standalone'
311-
run: pnpx nx lint
312-
313-
- name: Run lint on changed demos
314-
if: github.event_name == 'pull_request' && !contains(github.event.pull_request.labels.*.name, 'force all tests')
315-
working-directory: apps/demos
316-
env:
317-
DEBUG: 'eslint:cli-engine,stylelint:standalone'
318-
run: |
319-
pnpx nx lint-non-demos
320-
321-
if [ -f "changed-files.json" ]; then
322-
echo "Running lint-demos on changed files"
323-
CHANGED_DEMOS=$(jq -r '.[].filename' changed-files.json \
324-
| grep '^apps/demos/Demos/' \
325-
| sed 's|^apps/demos/||' \
326-
| while read f; do
327-
[ -f "$f" ] && echo "$f"
328-
done \
329-
| tr '\n' ' ')
330-
if [ ! -z "$CHANGED_DEMOS" ]; then
331-
echo "Changed demo files: $CHANGED_DEMOS"
332-
pnpx eslint $CHANGED_DEMOS
333-
else
334-
echo "No demo files changed, skipping lint-demos"
335-
fi
336-
else
337-
echo "changed-files.json not found"
338-
pnpm run lint-demos
339-
fi
310+
run: pnpx nx lint-non-demos
340311

341312
check_generated_demos:
342313
name: ${{ matrix.name }}
@@ -435,7 +406,7 @@ jobs:
435406
fail-fast: false
436407
matrix:
437408
CONSTEL: [react(1/4), react(2/4), react(3/4), react(4/4), vue(1/4), vue(2/4), vue(3/4), vue(4/4), angular(1/4), angular(2/4), angular(3/4), angular(4/4)]
438-
THEME: ['generic.light', 'material.blue.light', 'fluent.blue.light']
409+
THEME: ['fluent.blue.light']
439410

440411
runs-on: ubuntu-22.04
441412
name: testcafe-${{ matrix.CONSTEL }}-${{ matrix.THEME }}

apps/demos/Demos/Common/EditorAppearanceVariants/test-code.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,5 @@ testUtils.importAnd(() => 'devextreme/animation/fx', () => DevExpress.fx, (fx) =
22
fx.off = true;
33

44
return testUtils
5-
.postponeUntilFound('.dx-texteditor-with-label.dx-invalid', 100, 10000)
6-
.then(() => testUtils.postpone(200));
5+
.postponeUntilFound('.dx-texteditor-with-label.dx-invalid', 100, 5000);
76
});

apps/demos/Demos/DataGrid/CellEditing/Angular/app/app.component.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
[disabled]="!selectedItemKeys.length"
3434
icon="trash"
3535
text="Delete Selected Records"
36+
stylingMode="text"
3637
>
3738
</dx-button>
3839
</dxi-item>

apps/demos/Demos/DataGrid/CellEditing/React/App.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,8 @@ const App = () => {
5959
onClick={deleteRecords}
6060
icon="trash"
6161
disabled={!selectedItemKeys.length}
62-
text="Delete Selected Records" />
62+
text="Delete Selected Records"
63+
stylingMode="text" />
6364
</Item>
6465
</Toolbar>
6566
</DataGrid>

apps/demos/Demos/DataGrid/CellEditing/ReactJs/App.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ const App = () => {
8585
icon="trash"
8686
disabled={!selectedItemKeys.length}
8787
text="Delete Selected Records"
88+
stylingMode="text"
8889
/>
8990
</Item>
9091
</Toolbar>

apps/demos/Demos/DataGrid/CellEditing/Vue/App.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@
5757
:disabled="!selectedItemKeys.length"
5858
icon="trash"
5959
text="Delete Selected Records"
60+
stylingMode="text"
6061
/>
6162
</template>
6263
</DxItem>

apps/demos/Demos/DataGrid/MultipleRecordSelectionAPI/Angular/app/app.component.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
<dx-button
3232
text="Clear Selection"
3333
[disabled]="!selectedRows?.length"
34+
stylingMode="text"
3435
(onClick)="grid.instance.clearSelection()"
3536
>
3637
</dx-button>

apps/demos/Demos/DataGrid/MultipleRecordSelectionAPI/React/App.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ const App = () => {
8080
disabled={!selectedRowKeys.length}
8181
onClick={onClearButtonClicked}
8282
text="Clear Selection"
83+
stylingMode="text"
8384
/>
8485
</Item>
8586
</Toolbar>

apps/demos/Demos/DataGrid/MultipleRecordSelectionAPI/ReactJs/App.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ const App = () => {
8989
disabled={!selectedRowKeys.length}
9090
onClick={onClearButtonClicked}
9191
text="Clear Selection"
92+
stylingMode="text"
9293
/>
9394
</Item>
9495
</Toolbar>

apps/demos/Demos/DataGrid/MultipleRecordSelectionAPI/Vue/App.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
<DxButton
5151
:disabled="!selectedRowKeys.length"
5252
text="Clear Selection"
53+
stylingMode="text"
5354
@click="clearSelection"
5455
/>
5556
</DxItem>

0 commit comments

Comments
 (0)