diff --git a/apps/demos/Demos/DataGrid/SignalRService/jQuery/index.js b/apps/demos/Demos/DataGrid/SignalRService/jQuery/index.js index c999c5f3a61f..d4c38db31583 100644 --- a/apps/demos/Demos/DataGrid/SignalRService/jQuery/index.js +++ b/apps/demos/Demos/DataGrid/SignalRService/jQuery/index.js @@ -44,8 +44,10 @@ $(() => { dataType: 'number', format: '#0.####', cellTemplate(container, options) { - container.addClass((options.data.change > 0) ? 'inc' : 'dec'); - container.html(options.text); + const wrapper = $('
') + .addClass((options.data.change > 0) ? 'inc' : 'dec') + .text(options.text); + wrapper.appendTo(container); }, }, { dataField: 'change', @@ -54,21 +56,24 @@ $(() => { format: '#0.####', cellTemplate(container, options) { const fieldData = options.data; - container.addClass(fieldData.change > 0 ? 'inc' : 'dec'); + const wrapper = $('
') + .addClass(fieldData.change > 0 ? 'inc' : 'dec'); $('') .addClass('current-value') .text(options.text) - .appendTo(container); + .appendTo(wrapper); $('') .addClass('arrow') - .appendTo(container); + .appendTo(wrapper); $('') .addClass('diff') .text(`${fieldData.percentChange.toFixed(2)}%`) - .appendTo(container); + .appendTo(wrapper); + + wrapper.appendTo(container); }, }, { dataField: 'dayOpen', diff --git a/apps/demos/testing/etalons/DataGrid-SignalRService (fluent.blue.light).png b/apps/demos/testing/etalons/DataGrid-SignalRService (fluent.blue.light).png index a201d84c263e..9764312a2295 100644 Binary files a/apps/demos/testing/etalons/DataGrid-SignalRService (fluent.blue.light).png and b/apps/demos/testing/etalons/DataGrid-SignalRService (fluent.blue.light).png differ diff --git a/apps/demos/testing/skipped-tests.js b/apps/demos/testing/skipped-tests.js index ae6c78908870..73dc01fe1097 100644 --- a/apps/demos/testing/skipped-tests.js +++ b/apps/demos/testing/skipped-tests.js @@ -22,7 +22,6 @@ export const skippedTests = { Charts: ['ServerSideDataProcessing'], Common: ['PopupAndNotificationsOverview'], DataGrid: [ - 'SignalRService', 'MultipleRecordSelectionModes', 'RemoteCRUDOperations', 'ExcelJSExportMultipleGrids', @@ -45,7 +44,6 @@ export const skippedTests = { DataGrid: [ 'Overview', 'Toolbar', - 'SignalRService', 'MultipleRecordSelectionModes', 'ExcelJSExportMultipleGrids', 'PDFExportMultipleGrids', @@ -66,7 +64,6 @@ export const skippedTests = { Common: ['PopupAndNotificationsOverview'], Charts: ['PointsAggregation', 'ServerSideDataProcessing'], DataGrid: [ - 'SignalRService', 'MultipleRecordSelectionModes', 'ExcelJSExportMultipleGrids', 'PDFExportMultipleGrids', diff --git a/apps/demos/testing/widgets/datagrid/BatchUpdateRequest.test.ts b/apps/demos/testing/widgets/datagrid/BatchUpdateRequest.test.ts deleted file mode 100644 index c1a10a815cb5..000000000000 --- a/apps/demos/testing/widgets/datagrid/BatchUpdateRequest.test.ts +++ /dev/null @@ -1,50 +0,0 @@ -import { createScreenshotsComparer } from 'devextreme-screenshot-comparer'; -import { Selector as $ } from 'testcafe'; -import { runManualTest } from '../../../utils/visual-tests/matrix-test-helper'; -import { testScreenshot } from '../../../utils/visual-tests/helpers/theme-utils'; - -fixture('DataGrid.BatchUpdateRequest') - .before(async (ctx) => { - ctx.initialWindowSize = [900, 600]; - }); - -runManualTest('DataGrid', 'BatchUpdateRequest', (test) => { - test('BatchUpdateRequest', async (t) => { - const { takeScreenshot, compareResults } = createScreenshotsComparer(t); - - // update - await t - .click($('.dx-datagrid-rowsview td').nth(2)) - .typeText($('.dx-datagrid-rowsview').find('.dx-texteditor-input').nth(0), 'Russia', { - replace: true, - }) - .pressKey('enter'); - - // remove - await t.click($('.dx-link-delete').nth(1)); - - // insert - await t - .click($('.dx-icon-edit-button-addrow')) - .click($('.dx-datagrid-rowsview td').nth(5)) - .typeText($('.dx-datagrid-rowsview').find('.dx-texteditor-input').nth(0), '11/2/2020', { - replace: true, - }) - .pressKey('enter'); - - await testScreenshot(t, takeScreenshot, 'datagrid_batch_update_request_1_desktop.png'); - - // save changes - await t.click($('.dx-datagrid-save-button')); - await testScreenshot(t, takeScreenshot, 'datagrid_batch_update_request_2_desktop.png'); - - // go to the last page to check the inserted row - await t - .click($('.dx-datagrid-pager').find('.dx-page').nth(-1)) - .drag($('.dx-scrollbar-vertical').find('.dx-scrollable-scroll'), 0, 100); - - await t - .expect(compareResults.isValid()) - .ok(compareResults.errorMessages()); - }); -}); diff --git a/apps/demos/testing/widgets/datagrid/EditStateManagement.test.ts b/apps/demos/testing/widgets/datagrid/EditStateManagement.test.ts deleted file mode 100644 index 6c59cd02e1a8..000000000000 --- a/apps/demos/testing/widgets/datagrid/EditStateManagement.test.ts +++ /dev/null @@ -1,116 +0,0 @@ -import { createScreenshotsComparer } from 'devextreme-screenshot-comparer'; -import { Selector as $ } from 'testcafe'; -import { runManualTest } from '../../../utils/visual-tests/matrix-test-helper'; -import { testScreenshot } from '../../../utils/visual-tests/helpers/theme-utils'; - -fixture('DataGrid.EditStateManagement') - .before(async (ctx) => { - ctx.initialWindowSize = [900, 600]; - }); - -runManualTest('DataGrid', 'EditStateManagement', (test) => { - test('EditStateManagement - update row', async (t) => { - const { takeScreenshot, compareResults } = createScreenshotsComparer(t); - - // edit row - await t.click($('.dx-link-edit').nth(0)); - await testScreenshot(t, takeScreenshot, 'datagrid_edit_state_management_update_row_1_desktop.png'); - - await t - .typeText($('.dx-datagrid-rowsview').find('.dx-texteditor-input').nth(1), 'Russia', { - replace: true, - }) - .pressKey('tab'); - await testScreenshot(t, takeScreenshot, 'datagrid_edit_state_management_update_row_2_desktop.png'); - - // cancel change - await t - .click($('.dx-link-cancel').nth(0)); - await testScreenshot(t, takeScreenshot, 'datagrid_edit_state_management_update_row_3_desktop.png'); - - // edit row - await t - .click($('.dx-link-edit').nth(0)) - .typeText($('.dx-datagrid-rowsview').find('.dx-texteditor-input').nth(1), 'Russia', { - replace: true, - }) - .pressKey('tab'); - await testScreenshot(t, takeScreenshot, 'datagrid_edit_state_management_update_row_4_desktop.png'); - - await t.click($('.dx-link-save').nth(0)); - await testScreenshot(t, takeScreenshot, 'datagrid_edit_state_management_update_row_5_desktop.png'); - - await t - .expect(compareResults.isValid()) - .ok(compareResults.errorMessages()); - }); -}); - -runManualTest('DataGrid', 'EditStateManagement', (test) => { - test('EditStateManagement - insert row', async (t) => { - const { takeScreenshot, compareResults } = createScreenshotsComparer(t); - - await t - .click($('.dx-icon-edit-button-addrow')); - - await testScreenshot(t, takeScreenshot, 'datagrid_edit_state_management_insert_row_1_desktop.png'); - - await t - .typeText($('.dx-datagrid-rowsview').find('.dx-texteditor-input').nth(4), '11/2/2020', { - replace: true, - }) - .pressKey('tab'); - - await testScreenshot(t, takeScreenshot, 'datagrid_edit_state_management_insert_row_2_desktop.png'); - - // cancel change - await t - .click($('.dx-link-cancel').nth(0)); - - await testScreenshot(t, takeScreenshot, 'datagrid_edit_state_management_insert_row_3_desktop.png'); - - // add and edit row - await t - .click($('.dx-icon-edit-button-addrow')) - .typeText($('.dx-datagrid-rowsview').find('.dx-texteditor-input').nth(4), '11/2/2020', { - replace: true, - }) - .pressKey('tab'); - - await testScreenshot(t, takeScreenshot, 'datagrid_edit_state_management_insert_row_4_desktop.png'); - - await t - .click($('.dx-link-save').nth(0)); - - await testScreenshot(t, takeScreenshot, 'datagrid_edit_state_management_insert_row_5_desktop.png'); - - // go to the last page to check the inserted row - await t - .click($('.dx-datagrid-pager').find('.dx-page').nth(-1)) - .drag($('.dx-scrollbar-vertical').find('.dx-scrollable-scroll'), 0, 100); - - await testScreenshot(t, takeScreenshot, 'datagrid_edit_state_management_insert_row_6_desktop.png'); - - await t - .expect(compareResults.isValid()) - .ok(compareResults.errorMessages()); - }); -}); - -runManualTest('DataGrid', 'EditStateManagement', (test) => { - test('EditStateManagement - remove row', async (t) => { - const { takeScreenshot, compareResults } = createScreenshotsComparer(t); - - // remove row - const editLink = $('.dx-link-delete').nth(0); - await t.click(editLink); - await testScreenshot(t, takeScreenshot, 'datagrid_edit_state_management_remove_row_1_desktop.png'); - - await t.click($('[aria-label="Yes"]').nth(0)); - await testScreenshot(t, takeScreenshot, 'datagrid_edit_state_management_remove_row_2_desktop.png'); - - await t - .expect(compareResults.isValid()) - .ok(compareResults.errorMessages()); - }); -}); diff --git a/apps/demos/testing/widgets/datagrid/RemoteGrouping.test.ts b/apps/demos/testing/widgets/datagrid/RemoteGrouping.test.ts index d6b9681d6690..71ebeba18176 100644 --- a/apps/demos/testing/widgets/datagrid/RemoteGrouping.test.ts +++ b/apps/demos/testing/widgets/datagrid/RemoteGrouping.test.ts @@ -17,14 +17,16 @@ runManualTest('DataGrid', 'RemoteGrouping', (test) => { const { takeScreenshot, compareResults } = createScreenshotsComparer(t); await $('.dx-scrollable-container')(); + + await testScreenshot(t, takeScreenshot, 'datagrid_remote_grouping_initial.png'); + await scroll(5000); - await testScreenshot(t, takeScreenshot, 'datagrid_remote_grouping_2_desktop.png'); + await testScreenshot(t, takeScreenshot, 'datagrid_remote_grouping_scrolled.png'); - await t - .click($('.dx-group-row td').withText('Madrid Store').prevSibling()); + await t.click($('.dx-group-row').nth(2).child('.dx-datagrid-expand')); - await testScreenshot(t, takeScreenshot, 'datagrid_remote_grouping_3_desktop.png'); + await testScreenshot(t, takeScreenshot, 'datagrid_remote_grouping_expanded.png'); await t .expect(compareResults.isValid()) diff --git a/apps/demos/testing/widgets/datagrid/etalons/datagrid_batch_update_request_1_desktop (fluent.blue.light).png b/apps/demos/testing/widgets/datagrid/etalons/datagrid_batch_update_request_1_desktop (fluent.blue.light).png deleted file mode 100644 index d96233c4b63e..000000000000 Binary files a/apps/demos/testing/widgets/datagrid/etalons/datagrid_batch_update_request_1_desktop (fluent.blue.light).png and /dev/null differ diff --git a/apps/demos/testing/widgets/datagrid/etalons/datagrid_batch_update_request_1_desktop (material.blue.light).png b/apps/demos/testing/widgets/datagrid/etalons/datagrid_batch_update_request_1_desktop (material.blue.light).png deleted file mode 100644 index a28023223a14..000000000000 Binary files a/apps/demos/testing/widgets/datagrid/etalons/datagrid_batch_update_request_1_desktop (material.blue.light).png and /dev/null differ diff --git a/apps/demos/testing/widgets/datagrid/etalons/datagrid_batch_update_request_2_desktop (fluent.blue.light).png b/apps/demos/testing/widgets/datagrid/etalons/datagrid_batch_update_request_2_desktop (fluent.blue.light).png deleted file mode 100644 index 518baf6dcc3c..000000000000 Binary files a/apps/demos/testing/widgets/datagrid/etalons/datagrid_batch_update_request_2_desktop (fluent.blue.light).png and /dev/null differ diff --git a/apps/demos/testing/widgets/datagrid/etalons/datagrid_batch_update_request_2_desktop (material.blue.light).png b/apps/demos/testing/widgets/datagrid/etalons/datagrid_batch_update_request_2_desktop (material.blue.light).png deleted file mode 100644 index bc6b6997cfdd..000000000000 Binary files a/apps/demos/testing/widgets/datagrid/etalons/datagrid_batch_update_request_2_desktop (material.blue.light).png and /dev/null differ diff --git a/apps/demos/testing/widgets/datagrid/etalons/datagrid_edit_state_management_insert_row_1_desktop (fluent.blue.light).png b/apps/demos/testing/widgets/datagrid/etalons/datagrid_edit_state_management_insert_row_1_desktop (fluent.blue.light).png deleted file mode 100644 index 95b32d9d6179..000000000000 Binary files a/apps/demos/testing/widgets/datagrid/etalons/datagrid_edit_state_management_insert_row_1_desktop (fluent.blue.light).png and /dev/null differ diff --git a/apps/demos/testing/widgets/datagrid/etalons/datagrid_edit_state_management_insert_row_1_desktop (fluent.blue.light)_mask.png b/apps/demos/testing/widgets/datagrid/etalons/datagrid_edit_state_management_insert_row_1_desktop (fluent.blue.light)_mask.png deleted file mode 100644 index 3acb7dec412e..000000000000 Binary files a/apps/demos/testing/widgets/datagrid/etalons/datagrid_edit_state_management_insert_row_1_desktop (fluent.blue.light)_mask.png and /dev/null differ diff --git a/apps/demos/testing/widgets/datagrid/etalons/datagrid_edit_state_management_insert_row_1_desktop (material.blue.light).png b/apps/demos/testing/widgets/datagrid/etalons/datagrid_edit_state_management_insert_row_1_desktop (material.blue.light).png deleted file mode 100644 index 87f7ca0be79a..000000000000 Binary files a/apps/demos/testing/widgets/datagrid/etalons/datagrid_edit_state_management_insert_row_1_desktop (material.blue.light).png and /dev/null differ diff --git a/apps/demos/testing/widgets/datagrid/etalons/datagrid_edit_state_management_insert_row_1_desktop (material.blue.light)_mask.png b/apps/demos/testing/widgets/datagrid/etalons/datagrid_edit_state_management_insert_row_1_desktop (material.blue.light)_mask.png deleted file mode 100644 index 3661eabce5ec..000000000000 Binary files a/apps/demos/testing/widgets/datagrid/etalons/datagrid_edit_state_management_insert_row_1_desktop (material.blue.light)_mask.png and /dev/null differ diff --git a/apps/demos/testing/widgets/datagrid/etalons/datagrid_edit_state_management_insert_row_2_desktop (fluent.blue.light).png b/apps/demos/testing/widgets/datagrid/etalons/datagrid_edit_state_management_insert_row_2_desktop (fluent.blue.light).png deleted file mode 100644 index 466de84ababb..000000000000 Binary files a/apps/demos/testing/widgets/datagrid/etalons/datagrid_edit_state_management_insert_row_2_desktop (fluent.blue.light).png and /dev/null differ diff --git a/apps/demos/testing/widgets/datagrid/etalons/datagrid_edit_state_management_insert_row_2_desktop (fluent.blue.light)_mask.png b/apps/demos/testing/widgets/datagrid/etalons/datagrid_edit_state_management_insert_row_2_desktop (fluent.blue.light)_mask.png deleted file mode 100644 index 0a56de77f091..000000000000 Binary files a/apps/demos/testing/widgets/datagrid/etalons/datagrid_edit_state_management_insert_row_2_desktop (fluent.blue.light)_mask.png and /dev/null differ diff --git a/apps/demos/testing/widgets/datagrid/etalons/datagrid_edit_state_management_insert_row_2_desktop (material.blue.light).png b/apps/demos/testing/widgets/datagrid/etalons/datagrid_edit_state_management_insert_row_2_desktop (material.blue.light).png deleted file mode 100644 index e129fac77bf0..000000000000 Binary files a/apps/demos/testing/widgets/datagrid/etalons/datagrid_edit_state_management_insert_row_2_desktop (material.blue.light).png and /dev/null differ diff --git a/apps/demos/testing/widgets/datagrid/etalons/datagrid_edit_state_management_insert_row_2_desktop (material.blue.light)_mask.png b/apps/demos/testing/widgets/datagrid/etalons/datagrid_edit_state_management_insert_row_2_desktop (material.blue.light)_mask.png deleted file mode 100644 index 8de31c6be792..000000000000 Binary files a/apps/demos/testing/widgets/datagrid/etalons/datagrid_edit_state_management_insert_row_2_desktop (material.blue.light)_mask.png and /dev/null differ diff --git a/apps/demos/testing/widgets/datagrid/etalons/datagrid_edit_state_management_insert_row_3_desktop (fluent.blue.light).png b/apps/demos/testing/widgets/datagrid/etalons/datagrid_edit_state_management_insert_row_3_desktop (fluent.blue.light).png deleted file mode 100644 index ecb11e5cf72c..000000000000 Binary files a/apps/demos/testing/widgets/datagrid/etalons/datagrid_edit_state_management_insert_row_3_desktop (fluent.blue.light).png and /dev/null differ diff --git a/apps/demos/testing/widgets/datagrid/etalons/datagrid_edit_state_management_insert_row_3_desktop (material.blue.light).png b/apps/demos/testing/widgets/datagrid/etalons/datagrid_edit_state_management_insert_row_3_desktop (material.blue.light).png deleted file mode 100644 index f66765be02f5..000000000000 Binary files a/apps/demos/testing/widgets/datagrid/etalons/datagrid_edit_state_management_insert_row_3_desktop (material.blue.light).png and /dev/null differ diff --git a/apps/demos/testing/widgets/datagrid/etalons/datagrid_edit_state_management_insert_row_4_desktop (fluent.blue.light).png b/apps/demos/testing/widgets/datagrid/etalons/datagrid_edit_state_management_insert_row_4_desktop (fluent.blue.light).png deleted file mode 100644 index 697cdd3b984e..000000000000 Binary files a/apps/demos/testing/widgets/datagrid/etalons/datagrid_edit_state_management_insert_row_4_desktop (fluent.blue.light).png and /dev/null differ diff --git a/apps/demos/testing/widgets/datagrid/etalons/datagrid_edit_state_management_insert_row_4_desktop (fluent.blue.light)_mask.png b/apps/demos/testing/widgets/datagrid/etalons/datagrid_edit_state_management_insert_row_4_desktop (fluent.blue.light)_mask.png deleted file mode 100644 index 90a1dd68c6da..000000000000 Binary files a/apps/demos/testing/widgets/datagrid/etalons/datagrid_edit_state_management_insert_row_4_desktop (fluent.blue.light)_mask.png and /dev/null differ diff --git a/apps/demos/testing/widgets/datagrid/etalons/datagrid_edit_state_management_insert_row_4_desktop (material.blue.light).png b/apps/demos/testing/widgets/datagrid/etalons/datagrid_edit_state_management_insert_row_4_desktop (material.blue.light).png deleted file mode 100644 index 4ec22b37a11c..000000000000 Binary files a/apps/demos/testing/widgets/datagrid/etalons/datagrid_edit_state_management_insert_row_4_desktop (material.blue.light).png and /dev/null differ diff --git a/apps/demos/testing/widgets/datagrid/etalons/datagrid_edit_state_management_insert_row_4_desktop (material.blue.light)_mask.png b/apps/demos/testing/widgets/datagrid/etalons/datagrid_edit_state_management_insert_row_4_desktop (material.blue.light)_mask.png deleted file mode 100644 index b3c9f0ac92f8..000000000000 Binary files a/apps/demos/testing/widgets/datagrid/etalons/datagrid_edit_state_management_insert_row_4_desktop (material.blue.light)_mask.png and /dev/null differ diff --git a/apps/demos/testing/widgets/datagrid/etalons/datagrid_edit_state_management_insert_row_5_desktop (fluent.blue.light).png b/apps/demos/testing/widgets/datagrid/etalons/datagrid_edit_state_management_insert_row_5_desktop (fluent.blue.light).png deleted file mode 100644 index ecb11e5cf72c..000000000000 Binary files a/apps/demos/testing/widgets/datagrid/etalons/datagrid_edit_state_management_insert_row_5_desktop (fluent.blue.light).png and /dev/null differ diff --git a/apps/demos/testing/widgets/datagrid/etalons/datagrid_edit_state_management_insert_row_5_desktop (material.blue.light).png b/apps/demos/testing/widgets/datagrid/etalons/datagrid_edit_state_management_insert_row_5_desktop (material.blue.light).png deleted file mode 100644 index f66765be02f5..000000000000 Binary files a/apps/demos/testing/widgets/datagrid/etalons/datagrid_edit_state_management_insert_row_5_desktop (material.blue.light).png and /dev/null differ diff --git a/apps/demos/testing/widgets/datagrid/etalons/datagrid_edit_state_management_insert_row_6_desktop (fluent.blue.light).png b/apps/demos/testing/widgets/datagrid/etalons/datagrid_edit_state_management_insert_row_6_desktop (fluent.blue.light).png deleted file mode 100644 index bea9fce7e39e..000000000000 Binary files a/apps/demos/testing/widgets/datagrid/etalons/datagrid_edit_state_management_insert_row_6_desktop (fluent.blue.light).png and /dev/null differ diff --git a/apps/demos/testing/widgets/datagrid/etalons/datagrid_edit_state_management_insert_row_6_desktop (material.blue.light).png b/apps/demos/testing/widgets/datagrid/etalons/datagrid_edit_state_management_insert_row_6_desktop (material.blue.light).png deleted file mode 100644 index 1e9741f74645..000000000000 Binary files a/apps/demos/testing/widgets/datagrid/etalons/datagrid_edit_state_management_insert_row_6_desktop (material.blue.light).png and /dev/null differ diff --git a/apps/demos/testing/widgets/datagrid/etalons/datagrid_edit_state_management_remove_row_1_desktop (fluent.blue.light).png b/apps/demos/testing/widgets/datagrid/etalons/datagrid_edit_state_management_remove_row_1_desktop (fluent.blue.light).png deleted file mode 100644 index a771ecee3a0f..000000000000 Binary files a/apps/demos/testing/widgets/datagrid/etalons/datagrid_edit_state_management_remove_row_1_desktop (fluent.blue.light).png and /dev/null differ diff --git a/apps/demos/testing/widgets/datagrid/etalons/datagrid_edit_state_management_remove_row_1_desktop (material.blue.light).png b/apps/demos/testing/widgets/datagrid/etalons/datagrid_edit_state_management_remove_row_1_desktop (material.blue.light).png deleted file mode 100644 index ae592fbf8fe3..000000000000 Binary files a/apps/demos/testing/widgets/datagrid/etalons/datagrid_edit_state_management_remove_row_1_desktop (material.blue.light).png and /dev/null differ diff --git a/apps/demos/testing/widgets/datagrid/etalons/datagrid_edit_state_management_remove_row_2_desktop (fluent.blue.light).png b/apps/demos/testing/widgets/datagrid/etalons/datagrid_edit_state_management_remove_row_2_desktop (fluent.blue.light).png deleted file mode 100644 index cd188d21e33b..000000000000 Binary files a/apps/demos/testing/widgets/datagrid/etalons/datagrid_edit_state_management_remove_row_2_desktop (fluent.blue.light).png and /dev/null differ diff --git a/apps/demos/testing/widgets/datagrid/etalons/datagrid_edit_state_management_remove_row_2_desktop (material.blue.light).png b/apps/demos/testing/widgets/datagrid/etalons/datagrid_edit_state_management_remove_row_2_desktop (material.blue.light).png deleted file mode 100644 index d62993be50ad..000000000000 Binary files a/apps/demos/testing/widgets/datagrid/etalons/datagrid_edit_state_management_remove_row_2_desktop (material.blue.light).png and /dev/null differ diff --git a/apps/demos/testing/widgets/datagrid/etalons/datagrid_edit_state_management_update_row_1_desktop (fluent.blue.light).png b/apps/demos/testing/widgets/datagrid/etalons/datagrid_edit_state_management_update_row_1_desktop (fluent.blue.light).png deleted file mode 100644 index 19b20c59a9e4..000000000000 Binary files a/apps/demos/testing/widgets/datagrid/etalons/datagrid_edit_state_management_update_row_1_desktop (fluent.blue.light).png and /dev/null differ diff --git a/apps/demos/testing/widgets/datagrid/etalons/datagrid_edit_state_management_update_row_1_desktop (material.blue.light).png b/apps/demos/testing/widgets/datagrid/etalons/datagrid_edit_state_management_update_row_1_desktop (material.blue.light).png deleted file mode 100644 index f15c23c85ed3..000000000000 Binary files a/apps/demos/testing/widgets/datagrid/etalons/datagrid_edit_state_management_update_row_1_desktop (material.blue.light).png and /dev/null differ diff --git a/apps/demos/testing/widgets/datagrid/etalons/datagrid_edit_state_management_update_row_2_desktop (fluent.blue.light).png b/apps/demos/testing/widgets/datagrid/etalons/datagrid_edit_state_management_update_row_2_desktop (fluent.blue.light).png deleted file mode 100644 index c54e6b39d71a..000000000000 Binary files a/apps/demos/testing/widgets/datagrid/etalons/datagrid_edit_state_management_update_row_2_desktop (fluent.blue.light).png and /dev/null differ diff --git a/apps/demos/testing/widgets/datagrid/etalons/datagrid_edit_state_management_update_row_2_desktop (material.blue.light).png b/apps/demos/testing/widgets/datagrid/etalons/datagrid_edit_state_management_update_row_2_desktop (material.blue.light).png deleted file mode 100644 index 35500b8c259b..000000000000 Binary files a/apps/demos/testing/widgets/datagrid/etalons/datagrid_edit_state_management_update_row_2_desktop (material.blue.light).png and /dev/null differ diff --git a/apps/demos/testing/widgets/datagrid/etalons/datagrid_edit_state_management_update_row_3_desktop (fluent.blue.light).png b/apps/demos/testing/widgets/datagrid/etalons/datagrid_edit_state_management_update_row_3_desktop (fluent.blue.light).png deleted file mode 100644 index ecb11e5cf72c..000000000000 Binary files a/apps/demos/testing/widgets/datagrid/etalons/datagrid_edit_state_management_update_row_3_desktop (fluent.blue.light).png and /dev/null differ diff --git a/apps/demos/testing/widgets/datagrid/etalons/datagrid_edit_state_management_update_row_3_desktop (material.blue.light).png b/apps/demos/testing/widgets/datagrid/etalons/datagrid_edit_state_management_update_row_3_desktop (material.blue.light).png deleted file mode 100644 index f66765be02f5..000000000000 Binary files a/apps/demos/testing/widgets/datagrid/etalons/datagrid_edit_state_management_update_row_3_desktop (material.blue.light).png and /dev/null differ diff --git a/apps/demos/testing/widgets/datagrid/etalons/datagrid_edit_state_management_update_row_4_desktop (fluent.blue.light).png b/apps/demos/testing/widgets/datagrid/etalons/datagrid_edit_state_management_update_row_4_desktop (fluent.blue.light).png deleted file mode 100644 index b31727fb2467..000000000000 Binary files a/apps/demos/testing/widgets/datagrid/etalons/datagrid_edit_state_management_update_row_4_desktop (fluent.blue.light).png and /dev/null differ diff --git a/apps/demos/testing/widgets/datagrid/etalons/datagrid_edit_state_management_update_row_4_desktop (material.blue.light).png b/apps/demos/testing/widgets/datagrid/etalons/datagrid_edit_state_management_update_row_4_desktop (material.blue.light).png deleted file mode 100644 index cdd24252e733..000000000000 Binary files a/apps/demos/testing/widgets/datagrid/etalons/datagrid_edit_state_management_update_row_4_desktop (material.blue.light).png and /dev/null differ diff --git a/apps/demos/testing/widgets/datagrid/etalons/datagrid_edit_state_management_update_row_5_desktop (fluent.blue.light).png b/apps/demos/testing/widgets/datagrid/etalons/datagrid_edit_state_management_update_row_5_desktop (fluent.blue.light).png deleted file mode 100644 index bd94d8b6a5e6..000000000000 Binary files a/apps/demos/testing/widgets/datagrid/etalons/datagrid_edit_state_management_update_row_5_desktop (fluent.blue.light).png and /dev/null differ diff --git a/apps/demos/testing/widgets/datagrid/etalons/datagrid_edit_state_management_update_row_5_desktop (material.blue.light).png b/apps/demos/testing/widgets/datagrid/etalons/datagrid_edit_state_management_update_row_5_desktop (material.blue.light).png deleted file mode 100644 index 0a5ba4ae41b6..000000000000 Binary files a/apps/demos/testing/widgets/datagrid/etalons/datagrid_edit_state_management_update_row_5_desktop (material.blue.light).png and /dev/null differ diff --git a/apps/demos/testing/widgets/datagrid/etalons/datagrid_remote_grouping_2_desktop (fluent.blue.light).png b/apps/demos/testing/widgets/datagrid/etalons/datagrid_remote_grouping_2_desktop (fluent.blue.light).png deleted file mode 100644 index c14a48e15262..000000000000 Binary files a/apps/demos/testing/widgets/datagrid/etalons/datagrid_remote_grouping_2_desktop (fluent.blue.light).png and /dev/null differ diff --git a/apps/demos/testing/widgets/datagrid/etalons/datagrid_remote_grouping_expanded (fluent.blue.light).png b/apps/demos/testing/widgets/datagrid/etalons/datagrid_remote_grouping_expanded (fluent.blue.light).png new file mode 100644 index 000000000000..0554f2d61b5c Binary files /dev/null and b/apps/demos/testing/widgets/datagrid/etalons/datagrid_remote_grouping_expanded (fluent.blue.light).png differ diff --git a/apps/demos/testing/widgets/datagrid/etalons/datagrid_remote_grouping_expanded (material.blue.light).png b/apps/demos/testing/widgets/datagrid/etalons/datagrid_remote_grouping_expanded (material.blue.light).png new file mode 100644 index 000000000000..8b5242452aa0 Binary files /dev/null and b/apps/demos/testing/widgets/datagrid/etalons/datagrid_remote_grouping_expanded (material.blue.light).png differ diff --git a/apps/demos/testing/widgets/datagrid/etalons/datagrid_remote_grouping_initial (fluent.blue.light).png b/apps/demos/testing/widgets/datagrid/etalons/datagrid_remote_grouping_initial (fluent.blue.light).png new file mode 100644 index 000000000000..6ca50704a710 Binary files /dev/null and b/apps/demos/testing/widgets/datagrid/etalons/datagrid_remote_grouping_initial (fluent.blue.light).png differ diff --git a/apps/demos/testing/widgets/datagrid/etalons/datagrid_remote_grouping_initial (material.blue.light).png b/apps/demos/testing/widgets/datagrid/etalons/datagrid_remote_grouping_initial (material.blue.light).png new file mode 100644 index 000000000000..e4dca4aa6e97 Binary files /dev/null and b/apps/demos/testing/widgets/datagrid/etalons/datagrid_remote_grouping_initial (material.blue.light).png differ diff --git a/apps/demos/testing/widgets/datagrid/etalons/datagrid_remote_grouping_scrolled (fluent.blue.light).png b/apps/demos/testing/widgets/datagrid/etalons/datagrid_remote_grouping_scrolled (fluent.blue.light).png new file mode 100644 index 000000000000..fa654671092f Binary files /dev/null and b/apps/demos/testing/widgets/datagrid/etalons/datagrid_remote_grouping_scrolled (fluent.blue.light).png differ diff --git a/apps/demos/testing/widgets/datagrid/etalons/datagrid_remote_grouping_2_desktop (material.blue.light).png b/apps/demos/testing/widgets/datagrid/etalons/datagrid_remote_grouping_scrolled (material.blue.light).png similarity index 100% rename from apps/demos/testing/widgets/datagrid/etalons/datagrid_remote_grouping_2_desktop (material.blue.light).png rename to apps/demos/testing/widgets/datagrid/etalons/datagrid_remote_grouping_scrolled (material.blue.light).png diff --git a/apps/demos/utils/visual-tests/matrix-test-helper.ts b/apps/demos/utils/visual-tests/matrix-test-helper.ts index 61dc33afb7c1..20fcb91e9fba 100644 --- a/apps/demos/utils/visual-tests/matrix-test-helper.ts +++ b/apps/demos/utils/visual-tests/matrix-test-helper.ts @@ -4,7 +4,7 @@ import { ClientFunction } from 'testcafe'; import { THEME } from './helpers/theme-utils'; import { gitHubIgnored } from './github-ignored-list'; -export const FRAMEWORKS = { +export const FRAMEWORKS = { jquery: 'jQuery', react: 'React', vue: 'Vue', @@ -184,7 +184,7 @@ function getExplicitTests() { } finally { // eslint-disable-next-line no-extend-native // @ts-expect-error types error - RegExp.prototype.toJSON = oldToJSON; + RegExp.prototype.toJSON = oldToJSON; } } @@ -192,7 +192,7 @@ function getExplicitTests() { } export function shouldRunFramework(currentFramework) { - return !currentFramework + return !currentFramework || !settings.targetFramework || currentFramework.toLowerCase() === settings.targetFramework.toLowerCase(); } @@ -209,8 +209,8 @@ export function shouldRunTestAtIndex(testIndex) { } const SKIPPED_TESTS = { - jQuery: { - DataGrid: [ 'BatchUpdateRequest', 'RemoteGrouping', 'OdataService', 'FilteringAPI', 'EditStateManagement'], + jQuery: { + DataGrid: [ 'OdataService', 'FilteringAPI'], Charts: [ { demo: 'ZoomingAndScrollingAPI', themes: [THEME.material] }, ], @@ -218,7 +218,7 @@ const SKIPPED_TESTS = { Angular: { Charts: ['Crosshair'], Common: ['PopupAndNotificationsOverview'], - DataGrid: [ 'BatchUpdateRequest', 'EditStateManagement', 'Toolbar', 'RemoteGrouping', 'OdataService', 'FilteringAPI'], + DataGrid: [ 'Toolbar', 'OdataService', 'FilteringAPI'], Scheduler: ['ContextMenu'], FileUploader: ['CustomDropzone'], }, @@ -227,14 +227,14 @@ const SKIPPED_TESTS = { Common: ['PopupAndNotificationsOverview'], // NOTE: Context menu item position is different across themes Scheduler: ['ContextMenu'], - DataGrid: [ 'BatchUpdateRequest', 'EditStateManagement', 'Toolbar', 'RemoteGrouping', 'OdataService', 'FilteringAPI'], + DataGrid: [ 'Toolbar', 'OdataService', 'FilteringAPI'], FileUploader: ['CustomDropzone'] }, React: { Charts: ['Crosshair'], Common: ['PopupAndNotificationsOverview'], Scheduler: ['ContextMenu'], - DataGrid: [ 'BatchUpdateRequest', 'EditStateManagement', 'Toolbar', 'RemoteGrouping', 'OdataService', 'FilteringAPI'], + DataGrid: [ 'Toolbar', 'OdataService', 'FilteringAPI'], FileUploader: ['CustomDropzone'] }, }; @@ -328,7 +328,7 @@ export function runManualTestCore( changeTheme(__dirname, `../../Demos/${widget}/${demo}/${FRAMEWORKS[framework]}/index.html`, process.env.THEME); testURL = `http://127.0.0.1:8080/apps/demos/Demos/${widget}/${demo}/${FRAMEWORKS[framework]}/`; } - + const getTestStyles = (demoName) => { switch (demoName) { case 'EditorAppearanceVariants': @@ -342,7 +342,7 @@ export function runManualTestCore( return ''; } }; - + const testStyles = getTestStyles(demo); const clientScripts = [