Skip to content

Commit 174a5f7

Browse files
EugeniyKiyashkoEugeniyKiyashko
committed
update
1 parent ba04b69 commit 174a5f7

File tree

43 files changed

+200
-160
lines changed

Some content is hidden

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

43 files changed

+200
-160
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/skipped-tests.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,6 @@ export const skippedTests = {
129129
DataGrid: ['SignalRService', 'MultipleRecordSelectionModes', 'RemoteCRUDOperations'],
130130
Map: ['ProvidersAndTypes', 'Markers', 'Routes'],
131131
Gantt: ['TaskTemplate', 'Validation'],
132-
Stepper: ['StepTemplate'],
133132
},
134133
React: {
135134
DataGrid: ['Toolbar', 'SignalRService', 'MultipleRecordSelectionModes'],

‎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 & 19 deletions
This file was deleted.

‎e2e/testcafe-devextreme/runner.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ createTestCafe(TESTCAFE_CONFIG)
248248
}
249249

250250
const runOptions: RunOptions = {
251-
quarantineMode: { successThreshold: 1, attemptLimit: 2 },
251+
quarantineMode: false, // { successThreshold: 1, attemptLimit: 2 },
252252
disableNativeAutomation: true,
253253
// @ts-expect-error ts-error
254254
hooks: {

‎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/common/pivotGrid/sort/localSort_T1150523.ts‎

Lines changed: 89 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -2,67 +2,69 @@ import { RequestLogger, RequestMock } from 'testcafe';
22
import PivotGrid from 'devextreme-testcafe-models/pivotGrid';
33
import { createWidget } from '../../../../helpers/createWidget';
44
import url from '../../../../helpers/getPageUrl';
5-
import { isMaterial } from '../../../../helpers/themeUtils';
65

7-
const testFixture = () => (isMaterial() ? fixture.skip : fixture);
8-
9-
testFixture()`pivotGrid_sort`
6+
fixture`pivotGrid_sort`
107
.page(url(__dirname, '../../../container.html'));
118

12-
const requestLogger = RequestLogger(/\/api\/data/);
13-
const apiRequestMock = RequestMock()
14-
.onRequestTo(/\/api\/data\?skip/)
15-
.respond(
16-
{
17-
data: [
18-
{ id: 0, label: 'A', value: 10 },
19-
{ id: 1, label: 'B', value: 20 },
20-
{ id: 2, label: 'C', value: 30 },
21-
],
22-
},
23-
200,
24-
{ 'access-control-allow-origin': '*' },
25-
)
26-
.onRequestTo(/\/api\/data\?group/)
27-
.respond(
28-
{
29-
data: [
30-
{
31-
key: 'A',
32-
items: null,
33-
summary: [10],
34-
},
35-
{
36-
key: 'B',
37-
items: null,
38-
summary: [20],
39-
},
40-
{
41-
key: 'C',
42-
items: null,
43-
summary: [30],
44-
},
45-
],
46-
},
47-
200,
48-
{ 'access-control-allow-origin': '*' },
49-
);
50-
519
test('Should sort without DataSource reload if scrolling mode isn\'t virtual', async (t) => {
10+
const requestLogger = RequestLogger(/\/api\/data/);
5211
const pivotGrid = new PivotGrid('#container');
12+
5313
await t.addRequestHooks(requestLogger);
5414
const initialRequestCount = await requestLogger.count(() => true);
5515

5616
await t.click(pivotGrid.getColumnHeaderArea().getField());
5717

18+
await t.wait(500);
19+
5820
const afterSortRequestCount = await requestLogger.count(() => true);
5921
const requestCount = afterSortRequestCount - initialRequestCount;
6022

6123
await t.expect(requestCount).eql(0);
6224

6325
await t.removeRequestHooks(requestLogger);
6426
}).before(async (t) => {
27+
const apiRequestMock = RequestMock()
28+
.onRequestTo(/\/api\/data\?skip/)
29+
.respond(
30+
{
31+
data: [
32+
{ id: 0, label: 'A', value: 10 },
33+
{ id: 1, label: 'B', value: 20 },
34+
{ id: 2, label: 'C', value: 30 },
35+
],
36+
},
37+
200,
38+
{ 'access-control-allow-origin': '*' },
39+
)
40+
.onRequestTo(/\/api\/data\?group/)
41+
.respond(
42+
{
43+
data: [
44+
{
45+
key: 'A',
46+
items: null,
47+
summary: [10],
48+
},
49+
{
50+
key: 'B',
51+
items: null,
52+
summary: [20],
53+
},
54+
{
55+
key: 'C',
56+
items: null,
57+
summary: [30],
58+
},
59+
],
60+
},
61+
200,
62+
{ 'access-control-allow-origin': '*' },
63+
);
64+
65+
(t.ctx as any).apiRequestMock = apiRequestMock;
6566
await t.addRequestHooks(apiRequestMock);
67+
6668
return createWidget('dxPivotGrid', () => ({
6769
allowSorting: true,
6870
fieldPanel: { visible: true },
@@ -86,11 +88,13 @@ test('Should sort without DataSource reload if scrolling mode isn\'t virtual', a
8688
},
8789
}));
8890
}).after(async (t) => {
89-
await t.removeRequestHooks(apiRequestMock);
91+
await t.removeRequestHooks((t.ctx as any).apiRequestMock);
9092
});
9193

9294
test('Should sort with DataSource reload if scrolling mode is virtual', async (t) => {
95+
const requestLogger = RequestLogger(/\/api\/data/);
9396
const pivotGrid = new PivotGrid('#container');
97+
9498
await t.addRequestHooks(requestLogger);
9599
const initialRequestCount = await requestLogger.count(() => true);
96100

@@ -103,7 +107,47 @@ test('Should sort with DataSource reload if scrolling mode is virtual', async (t
103107

104108
await t.removeRequestHooks(requestLogger);
105109
}).before(async (t) => {
110+
const apiRequestMock = RequestMock()
111+
.onRequestTo(/\/api\/data\?skip/)
112+
.respond(
113+
{
114+
data: [
115+
{ id: 0, label: 'A', value: 10 },
116+
{ id: 1, label: 'B', value: 20 },
117+
{ id: 2, label: 'C', value: 30 },
118+
],
119+
},
120+
200,
121+
{ 'access-control-allow-origin': '*' },
122+
)
123+
.onRequestTo(/\/api\/data\?group/)
124+
.respond(
125+
{
126+
data: [
127+
{
128+
key: 'A',
129+
items: null,
130+
summary: [10],
131+
},
132+
{
133+
key: 'B',
134+
items: null,
135+
summary: [20],
136+
},
137+
{
138+
key: 'C',
139+
items: null,
140+
summary: [30],
141+
},
142+
],
143+
},
144+
200,
145+
{ 'access-control-allow-origin': '*' },
146+
);
147+
148+
(t.ctx as any).apiRequestMock = apiRequestMock;
106149
await t.addRequestHooks(apiRequestMock);
150+
107151
return createWidget('dxPivotGrid', () => ({
108152
allowSorting: true,
109153
fieldPanel: { visible: true },
@@ -128,5 +172,5 @@ test('Should sort with DataSource reload if scrolling mode is virtual', async (t
128172
},
129173
}));
130174
}).after(async (t) => {
131-
await t.removeRequestHooks(apiRequestMock);
175+
await t.removeRequestHooks((t.ctx as any).apiRequestMock);
132176
});

‎e2e/testcafe-devextreme/tests/common/pivotGrid/virtualScrolling_T1210807.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ test('Row fields overlap data fields if dataFieldArea is set to "row" and virtua
3232
await t
3333
.click(firstHeaderRow);
3434
await pivotGrid.scrollBy({ top: 30000 });
35-
await pivotGrid.scrollBy({ top: 30000 });
3635

3736
await testScreenshot(t, takeScreenshot, 'rows_do_not_overlap_data_fields_if_virtual_scrolling_enabled_T1210807.png', { element: pivotGrid.element });
3837

0 commit comments

Comments
 (0)