Skip to content

Commit 9c7a996

Browse files
EugeniyKiyashkoEugeniyKiyashko
committed
add changes
1 parent 23766ad commit 9c7a996

File tree

127 files changed

+359
-310
lines changed

Some content is hidden

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

127 files changed

+359
-310
lines changed

‎.github/workflows/testcafe_tests.yml‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -102,10 +102,8 @@ jobs:
102102
{ componentFolder: "dataGrid/common", name: "dataGrid / common (3/5)", indices: "3/5" },
103103
{ componentFolder: "dataGrid/common", name: "dataGrid / common (4/5)", indices: "4/5" },
104104
{ componentFolder: "dataGrid/common", name: "dataGrid / common (5/5)", indices: "5/5" },
105-
{ componentFolder: "dataGrid/sticky/common", name: "dataGrid / sticky common" },
106-
{ componentFolder: "dataGrid/sticky/fixed", name: "dataGrid / sticky (1/3)", indices: "1/3" },
107-
{ componentFolder: "dataGrid/sticky/fixed", name: "dataGrid / sticky (2/3)", indices: "2/3" },
108-
{ componentFolder: "dataGrid/sticky/fixed", name: "dataGrid / sticky (3/3)", indices: "3/3" },
105+
{ componentFolder: "dataGrid/sticky", name: "dataGrid / sticky (1/2)", indices: "1/2" },
106+
{ componentFolder: "dataGrid/sticky", name: "dataGrid / sticky (2/2)", indices: "2/2" },
109107
{ componentFolder: "cardView", name: "cardView" },
110108

111109
# Scheduler tests need to be reworked to work in fluent theme
@@ -120,8 +118,7 @@ jobs:
120118
{ componentFolder: "scheduler/timezones", name: "scheduler / timezones (Europe/Berlin)", timezone: "Europe/Berlin", theme: 'generic.light' },
121119
{ componentFolder: "scheduler/timezones", name: "scheduler / timezones (America/Los_Angeles)", timezone: "America/Los_Angeles", theme: 'generic.light' },
122120

123-
{ componentFolder: "editors", name: "editors (1/2)", indices: "1/2" },
124-
{ componentFolder: "editors", name: "editors (2/2)", indices: "2/2" },
121+
{ componentFolder: "editors", name: "editors" },
125122
{ componentFolder: "navigation", name: "navigation" },
126123
]
127124
runs-on: devextreme-shr2

‎apps/demos/Demos/Stepper/StepTemplate/Angular/app/app.component.css‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@
6767
border-radius: 4px;
6868
}
6969

70-
::ng-deep #iconOnly :is(.dx-step-selected, .dx-step-completed) .dx-icon {
71-
color: var(--dx-color-primary);
70+
::ng-deep #iconOnly .dx-step-selected .dx-icon,
71+
::ng-deep #iconOnly .dx-step-completed .dx-icon {
72+
color: var(--dx-color-primary);
7273
}

‎apps/demos/testing/widgets/vectormap/VectorMapZooming.test.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ fixture('VectorMap.DynamicViewport')
1111
runManualTest('VectorMap', 'DynamicViewport', (test) => {
1212
test('VectorMap.DynamicViewport', async (t) => {
1313
const { takeScreenshot, compareResults } = createScreenshotsComparer(t);
14-
const zoomButton = $($('#vector-map .dxm-control-bar g').nth(1)).find('circle').nth(0);
14+
const zoomButton = $($('#vector-map .dxm-control-bar g').nth(1));
1515
const showSelectBoxItems = () => t.click($('.options .dx-dropdowneditor-input-wrapper input.dx-texteditor-input'));
1616
const selectItem = (index) => $('.dx-dropdowneditor-overlay .dx-list-item-content').nth(index);
1717

18-
await t.click(zoomButton);
19-
await t.click(zoomButton);
18+
await t.click(zoomButton, { offsetX: 10, offsetY: 10 });
19+
await t.click(zoomButton, { offsetX: 10, offsetY: 10 });
2020
await testScreenshot(t, takeScreenshot, 'zoom_vector_map_by_control_bar.png');
2121

2222
await showSelectBoxItems();

‎apps/demos/utils/visual-tests/matrix-test-helper.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -225,8 +225,6 @@ const SKIPPED_TESTS = {
225225
DataGrid: ['EditStateManagement', 'Toolbar', 'RemoteGrouping'],
226226
Scheduler: ['ContextMenu'],
227227
FileUploader: ['CustomDropzone'],
228-
// TODO: make this more stable
229-
Stepper: ['StepTemplate'],
230228
},
231229
Vue: {
232230
Charts: ['Crosshair'],

‎e2e/testcafe-devextreme/helpers/restoreBrowserSize.ts‎

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎e2e/testcafe-devextreme/runner.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ function getArgs(): ParsedArgs {
122122
concurrency: 0,
123123
browsers: 'chrome',
124124
test: '',
125-
reporter: [process.env.CI === 'true' ? 'list' : 'minimal'],
125+
reporter: process.env.CI === 'true' ? 'list' : 'spec',
126126
componentFolder: '',
127127
file: '*',
128128
cache: true,

‎e2e/testcafe-devextreme/tests/accessibility/dataGrid/editing.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ fixture.disablePageReloads`DataGrid - Editing`
2121
.click(dataGrid.getToolbar().getItem(0));
2222

2323
await a11yCheck(t);
24-
}).before(() => createWidget('dxDataGrid', {
24+
}).before(async () => createWidget('dxDataGrid', {
2525
dataSource: getData(3, 2),
2626
height: 400,
2727
showBorders: true,

‎e2e/testcafe-devextreme/tests/accessibility/dataGrid/scrolling.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ test('Infinite scrolling', async (t) => {
1515
.ok();
1616

1717
await a11yCheck(t);
18-
}).before(() => createWidget('dxDataGrid', {
18+
}).before(async () => createWidget('dxDataGrid', {
1919
dataSource: getData(1000, 2),
2020
height: 400,
2121
showBorders: true,
@@ -32,7 +32,7 @@ test('Horizontal Virtual Scrolling', async (t) => {
3232
.ok();
3333

3434
await a11yCheck(t);
35-
}).before(() => createWidget('dxDataGrid', {
35+
}).before(async () => createWidget('dxDataGrid', {
3636
dataSource: getData(20, 100),
3737
columnWidth: 100,
3838
height: 400,

‎e2e/testcafe-devextreme/tests/cardView/columnSortable/utils.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,19 +80,19 @@ export const dragToHeaderPanel = async (
8080
await t.dragToElement(
8181
columnElement,
8282
insertBeforeColumn,
83-
{ destinationOffsetX: +5, destinationOffsetY: -20, speed: 0.5 },
83+
{ destinationOffsetX: +5, destinationOffsetY: -20, speed: 0.2 },
8484
);
8585
} else {
8686
const insertAfterColumn = headers.getHeaderItemNth(columnsNum - 1).element;
8787

8888
await t.dragToElement(
8989
columnElement,
9090
insertAfterColumn,
91-
{ destinationOffsetX: -5, destinationOffsetY: -20, speed: 0.5 },
91+
{ destinationOffsetX: -5, destinationOffsetY: -20, speed: 0.2 },
9292
);
9393
}
9494

95-
await t.wait(100);
95+
await t.wait(300);
9696
};
9797

9898
export const dragToColumnChooser = async (

‎e2e/testcafe-devextreme/tests/cardView/filterSync/api.functional.ts‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ test('sync from headerFilter: filter by one value', async (t) => {
7171
.eql(['id', '=', 0]);
7272

7373
await expectFilterElementsState(t, ['id']);
74-
}).before(() => createWidget('dxCardView', baseConfig));
74+
}).before(async () => createWidget('dxCardView', baseConfig));
7575

7676
test('sync from headerFilter: filter by exclude one value', async (t) => {
7777
const cardView = new CardView('#container');
@@ -83,7 +83,7 @@ test('sync from headerFilter: filter by exclude one value', async (t) => {
8383
.eql(['id', '<>', 0]);
8484

8585
await expectFilterElementsState(t, ['id']);
86-
}).before(() => createWidget('dxCardView', baseConfig));
86+
}).before(async () => createWidget('dxCardView', baseConfig));
8787

8888
test('sync from headerFilter: filter by two values', async (t) => {
8989
const cardView = new CardView('#container');
@@ -94,7 +94,7 @@ test('sync from headerFilter: filter by two values', async (t) => {
9494
.eql(['id', 'anyof', [0, 1]]);
9595

9696
await expectFilterElementsState(t, ['id']);
97-
}).before(() => createWidget('dxCardView', baseConfig));
97+
}).before(async () => createWidget('dxCardView', baseConfig));
9898

9999
test('sync from headerFilter: filter by exclude two values', async (t) => {
100100
const cardView = new CardView('#container');
@@ -106,7 +106,7 @@ test('sync from headerFilter: filter by exclude two values', async (t) => {
106106
.eql(['id', 'noneof', [0, 1]]);
107107

108108
await expectFilterElementsState(t, ['id']);
109-
}).before(() => createWidget('dxCardView', baseConfig));
109+
}).before(async () => createWidget('dxCardView', baseConfig));
110110

111111
test('sync from headerFilter: filter by empty', async (t) => {
112112
const cardView = new CardView('#container');
@@ -117,7 +117,7 @@ test('sync from headerFilter: filter by empty', async (t) => {
117117
.eql(['gender', '=', null]);
118118

119119
await expectFilterElementsState(t, ['gender']);
120-
}).before(() => createWidget('dxCardView', baseConfig));
120+
}).before(async () => createWidget('dxCardView', baseConfig));
121121

122122
test('sync from headerFilter: filter by non-empty', async (t) => {
123123
const cardView = new CardView('#container');
@@ -129,7 +129,7 @@ test('sync from headerFilter: filter by non-empty', async (t) => {
129129
.eql(['gender', '<>', null]);
130130

131131
await expectFilterElementsState(t, ['gender']);
132-
}).before(() => createWidget('dxCardView', baseConfig));
132+
}).before(async () => createWidget('dxCardView', baseConfig));
133133

134134
test('sync from headerFilter: filter by all values', async (t) => {
135135
const cardView = new CardView('#container');
@@ -138,7 +138,7 @@ test('sync from headerFilter: filter by all values', async (t) => {
138138
await cardView.apiColumnOption('id', 'filterValues', undefined);
139139

140140
await t.expect(cardView.apiOption('filterValue')).eql(null);
141-
}).before(() => createWidget('dxCardView', baseConfig));
141+
}).before(async () => createWidget('dxCardView', baseConfig));
142142

143143
test('sync from headerFilter: filter by two columns', async (t) => {
144144
const cardView = new CardView('#container');
@@ -158,7 +158,7 @@ test('sync from headerFilter: filter by two columns', async (t) => {
158158
);
159159

160160
await expectFilterElementsState(t, ['id', 'gender']);
161-
}).before(() => createWidget('dxCardView', baseConfig));
161+
}).before(async () => createWidget('dxCardView', baseConfig));
162162

163163
test('sync from headerFilter: filter by groupInterval', async (t) => {
164164
const cardView = new CardView('#container');
@@ -169,7 +169,7 @@ test('sync from headerFilter: filter by groupInterval', async (t) => {
169169
await t.expect(cardView.apiOption('filterValue')).eql(
170170
['id', 'anyof', [0]],
171171
);
172-
}).before(() => createWidget('dxCardView', {
172+
}).before(async () => createWidget('dxCardView', {
173173
...baseConfig,
174174
columns: [{
175175
dataField: 'id',
@@ -192,7 +192,7 @@ test('sync from headerFilter: filter by a column, then remove filter', async (t)
192192
await t.expect(cardView.apiOption('filterValue')).eql(null);
193193

194194
await t.expect(cardView.getFilterPanel().getClearFilterButton().element.exists).notOk();
195-
}).before(() => createWidget('dxCardView', baseConfig));
195+
}).before(async () => createWidget('dxCardView', baseConfig));
196196

197197
/*
198198
sync from filterPanel
@@ -207,7 +207,7 @@ test('sync from filterPanel: equals filter', async (t) => {
207207
await t.expect(cardView.apiColumnOption('id', 'filterValues')).eql([0]);
208208

209209
await expectFilterElementsState(t, ['id']);
210-
}).before(() => createWidget('dxCardView', baseConfig));
210+
}).before(async () => createWidget('dxCardView', baseConfig));
211211

212212
test('sync from filterPanel: does not equal filter', async (t) => {
213213
const cardView = new CardView('#container');
@@ -218,7 +218,7 @@ test('sync from filterPanel: does not equal filter', async (t) => {
218218
await t.expect(cardView.apiColumnOption('id', 'filterValues')).eql([0]);
219219

220220
await expectFilterElementsState(t, ['id']);
221-
}).before(() => createWidget('dxCardView', baseConfig));
221+
}).before(async () => createWidget('dxCardView', baseConfig));
222222

223223
test('sync from filterPanel: anyof filter', async (t) => {
224224
const cardView = new CardView('#container');
@@ -229,7 +229,7 @@ test('sync from filterPanel: anyof filter', async (t) => {
229229
await t.expect(cardView.apiColumnOption('id', 'filterValues')).eql([0, 1]);
230230

231231
await expectFilterElementsState(t, ['id']);
232-
}).before(() => createWidget('dxCardView', baseConfig));
232+
}).before(async () => createWidget('dxCardView', baseConfig));
233233

234234
test('sync from filterPanel: noneof filter', async (t) => {
235235
const cardView = new CardView('#container');
@@ -240,7 +240,7 @@ test('sync from filterPanel: noneof filter', async (t) => {
240240
await t.expect(cardView.apiColumnOption('id', 'filterValues')).eql([0, 1]);
241241

242242
await expectFilterElementsState(t, ['id']);
243-
}).before(() => createWidget('dxCardView', baseConfig));
243+
}).before(async () => createWidget('dxCardView', baseConfig));
244244

245245
test('sync from filterPanel: is blank filter', async (t) => {
246246
const cardView = new CardView('#container');
@@ -251,7 +251,7 @@ test('sync from filterPanel: is blank filter', async (t) => {
251251
await t.expect(cardView.apiColumnOption('gender', 'filterValues')).eql([null]);
252252

253253
await expectFilterElementsState(t, ['gender']);
254-
}).before(() => createWidget('dxCardView', baseConfig));
254+
}).before(async () => createWidget('dxCardView', baseConfig));
255255

256256
test('sync from filterPanel: is not blank filter', async (t) => {
257257
const cardView = new CardView('#container');
@@ -262,7 +262,7 @@ test('sync from filterPanel: is not blank filter', async (t) => {
262262
await t.expect(cardView.apiColumnOption('gender', 'filterValues')).eql([null]);
263263

264264
await expectFilterElementsState(t, ['gender']);
265-
}).before(() => createWidget('dxCardView', baseConfig));
265+
}).before(async () => createWidget('dxCardView', baseConfig));
266266

267267
[
268268
{
@@ -301,7 +301,7 @@ test('sync from filterPanel: is not blank filter', async (t) => {
301301
await t.expect(cardView.apiColumnOption(column, 'filterValues')).eql(undefined);
302302

303303
await expectFilterElementsState(t, [column]);
304-
}).before(() => createWidget('dxCardView', baseConfig));
304+
}).before(async () => createWidget('dxCardView', baseConfig));
305305
});
306306

307307
test('sync from filterPanel: filter by two columns', async (t) => {
@@ -320,7 +320,7 @@ test('sync from filterPanel: filter by two columns', async (t) => {
320320
await t.expect(cardView.apiColumnOption('gender', 'filterValues')).eql(['male']);
321321

322322
await expectFilterElementsState(t, ['id', 'gender']);
323-
}).before(() => createWidget('dxCardView', baseConfig));
323+
}).before(async () => createWidget('dxCardView', baseConfig));
324324

325325
test('sync from filterPanel: filter by groupInterval', async (t) => {
326326
const cardView = new CardView('#container');
@@ -329,7 +329,7 @@ test('sync from filterPanel: filter by groupInterval', async (t) => {
329329

330330
await t.expect(cardView.apiColumnOption('id', 'filterType')).eql('include');
331331
await t.expect(cardView.apiColumnOption('id', 'filterValues')).eql([0]);
332-
}).before(() => createWidget('dxCardView', {
332+
}).before(async () => createWidget('dxCardView', {
333333
...baseConfig,
334334
columns: [{
335335
dataField: 'id',
@@ -360,4 +360,4 @@ test('sync first from filterPanel, then from headerFilter', async (t) => {
360360
]);
361361

362362
await expectFilterElementsState(t, ['id', 'gender']);
363-
}).before(() => createWidget('dxCardView', baseConfig));
363+
}).before(async () => createWidget('dxCardView', baseConfig));

0 commit comments

Comments
 (0)