Skip to content

Commit

Permalink
Merge branch '24_2' into khd/ignore-doc-changes-on-ci
Browse files Browse the repository at this point in the history
  • Loading branch information
IlyaKhD committed Sep 5, 2024
2 parents ba9a785 + 22ff217 commit 6b1e22e
Show file tree
Hide file tree
Showing 1,447 changed files with 2,249 additions and 165 deletions.
7 changes: 5 additions & 2 deletions .github/workflows/testcafe_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,11 @@ jobs:
{ componentFolder: "common", name: "common - material", theme: 'material.blue.light' },
{ componentFolder: "common", name: "common - fluent", theme: 'fluent.blue.light' },
{ componentFolder: "treeList", name: "treeList", concurrency: 1 },
{ componentFolder: "dataGrid", name: "dataGrid (1/2)", indices: "1/2" },
{ componentFolder: "dataGrid", name: "dataGrid (2/2)", indices: "2/2" },
{ componentFolder: "dataGrid", name: "dataGrid (1/5)", indices: "1/5" },
{ componentFolder: "dataGrid", name: "dataGrid (2/5)", indices: "2/5" },
{ componentFolder: "dataGrid", name: "dataGrid (3/5)", indices: "3/5" },
{ componentFolder: "dataGrid", name: "dataGrid (4/5)", indices: "4/5" },
{ componentFolder: "dataGrid", name: "dataGrid (5/5)", indices: "5/5" },
{ componentFolder: "pivotGrid", name: "pivotGrid", concurrency: 1 },
{ componentFolder: "pivotGrid", name: "pivotGrid - material", theme: 'material.blue.light', concurrency: 1 },
{ componentFolder: "pivotGrid", name: "pivotGrid - fluent", theme: 'fluent.blue.light', concurrency: 1 },
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified apps/demos/testing/etalons/DataGrid-ColumnCustomization.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified apps/demos/testing/etalons/TreeList-ColumnFixing.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 5 additions & 2 deletions e2e/testcafe-devextreme/docker/run-testcafe.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,11 @@ const parseArgs = require('minimist');

const matrix = [
{ componentFolder: 'treeList', name: 'treeList', concurrency: 1 },
{ componentFolder: 'dataGrid', name: 'dataGrid (1/2)', indices: '1/2' },
{ componentFolder: 'dataGrid', name: 'dataGrid (2/2)', indices: '2/2' },
{ componentFolder: 'dataGrid', name: 'dataGrid (1/5)', indices: '1/5' },
{ componentFolder: 'dataGrid', name: 'dataGrid (2/5)', indices: '2/5' },
{ componentFolder: 'dataGrid', name: 'dataGrid (3/5)', indices: '3/5' },
{ componentFolder: 'dataGrid', name: 'dataGrid (4/5)', indices: '4/5' },
{ componentFolder: 'dataGrid', name: 'dataGrid (5/5)', indices: '5/5' },
{ componentFolder: 'scheduler', name: 'scheduler (1/5)', indices: '1/5' },
{ componentFolder: 'scheduler', name: 'scheduler (2/5)', indices: '2/5' },
{ componentFolder: 'scheduler', name: 'scheduler (3/5)', indices: '3/5' },
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions e2e/testcafe-devextreme/tests/common/icons.ts
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,8 @@ const iconSet = {
triangledown: '\f16c',
triangleright: '\f16d',
triangleleft: '\f16e',
sendfilled: '\f09a',
chat: '\f17e',
};

fixture.disablePageReloads`Icons`
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4751,6 +4751,10 @@ test('DataGrid input cell should not put tabindex to incorrect element while on
mode: 'form',
allowAdding: true,
},
columnFixing: {
// @ts-expect-error private option
legacyMode: true,
},
columns: [
'Calculation',
'CalculationType',
Expand Down Expand Up @@ -4795,6 +4799,8 @@ test('Cancel button in the last column cannot be focused via the Tab key (T12489
},
columnFixing: {
enabled: true,
// @ts-expect-error private option
legacyMode: true,
},
columns: [
'FirstName',
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 6b1e22e

Please sign in to comment.