Skip to content

Commit bdb5bf1

Browse files
update
1 parent ba04b69 commit bdb5bf1

30 files changed

+102
-78
lines changed

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/tests/cardView/columnSortable/utils.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ export const dragToHeaderPanel = async (
9292
);
9393
}
9494

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

9898
export const dragToColumnChooser = async (

e2e/testcafe-devextreme/tests/common/pivotGrid/sort/localSort_T1150523.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,8 @@ 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

129
const requestLogger = RequestLogger(/\/api\/data/);
@@ -55,6 +52,9 @@ test('Should sort without DataSource reload if scrolling mode isn\'t virtual', a
5552

5653
await t.click(pivotGrid.getColumnHeaderArea().getField());
5754

55+
// Wait for sort operation to complete
56+
await t.wait(300);
57+
5858
const afterSortRequestCount = await requestLogger.count(() => true);
5959
const requestCount = afterSortRequestCount - initialRequestCount;
6060

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

e2e/testcafe-devextreme/tests/dataGrid/common/columnReordering.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,10 +224,13 @@ test('HeaderRow should be highlighted when dragging column with allowColumnReord
224224
test('Column without allowReordering should have same position after dragging to groupPanel and back', async (t) => {
225225
const dataGrid = new DataGrid('#container');
226226

227-
await t.drag(dataGrid.getHeaders().getHeaderRow(0).getHeaderCell(2).element, -30, -30);
227+
await t.expect(dataGrid.isReady()).ok();
228+
229+
await t.drag(dataGrid.getHeaders().getHeaderRow(0).getHeaderCell(2).element, -100, -50);
230+
228231
await t.expect(dataGrid.getGroupPanel().getHeadersCount()).eql(1);
229232

230-
await t.drag(dataGrid.getGroupPanel().getHeader(0).element, 0, 30);
233+
await t.drag(dataGrid.getGroupPanel().getHeader(0).element, 0, 50);
231234

232235
const headers = await Promise.all([0, 1, 2, 3].map(
233236
(i) => dataGrid.getHeaders().getHeaderRow(0).getHeaderCell(i).element.textContent,

e2e/testcafe-devextreme/tests/dataGrid/common/editing.ts

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,8 +149,13 @@ test('Tab key on editor should focus next cell if editing mode is cell', async (
149149
}));
150150

151151
test('Click should work if a column button set using svg icon (T863635)', async (t) => {
152+
const dataGrid = new DataGrid('#container');
153+
154+
await t.expect(dataGrid.isReady()).ok();
155+
152156
await t
153-
.click(Selector('.dx-command-edit-with-icons').nth(0))
157+
.click(Selector('#svg-icon').parent())
158+
.wait(300)
154159
.expect(ClientFunction(() => (window as any).onSvgClickCounter)()).eql(1);
155160
}).before(async () => createWidget('dxDataGrid', {
156161
dataSource: [{ value: 1 }],
@@ -643,6 +648,8 @@ test('Cell mode(setCellValue) with async validation - The value of an invalid de
643648
test('Cell mode(setCellValue) with async validation - The value of an invalid dependent cell should be updated in a modified row(T872751)', async (t) => {
644649
const dataGrid = new DataGrid('#container');
645650

651+
await t.expect(dataGrid.isReady()).ok();
652+
646653
await dataGrid.apiEditCell(0, 0);
647654

648655
await t
@@ -2207,6 +2214,7 @@ test('Popup EditForm screenshot when editRowKey is initially specified', async (
22072214
await t
22082215
// act
22092216
.click(dataGrid.getHeaderPanel().getSaveButton())
2217+
.wait(500)
22102218

22112219
// assert
22122220
.expect(dataGrid.dataRows.count)
7.42 KB
Loading

0 commit comments

Comments
 (0)