Skip to content

Commit fde10e4

Browse files
update
1 parent ba04b69 commit fde10e4

File tree

70 files changed

+258
-196
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

+258
-196
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: 2 additions & 2 deletions
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,
@@ -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 (
Loading
Loading

0 commit comments

Comments
 (0)