Skip to content

Grids: use Fluent theme in QUnit tests (TreeList, Gantt) #34616

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
anna-shakhova wants to merge 3 commits into
base: 26_1
Choose a base branch
from
Open

Grids: use Fluent theme in QUnit tests (TreeList, Gantt) #34616

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
011f77e
Grids: use Fluent theme in QUnit tests (TreeList)
anna-shakhova Aug 3, 2026
17c0c35
Grids: use Fluent theme in QUnit tests (Gantt)
anna-shakhova Aug 3, 2026
da482d7
pass all options to createInstance
anna-shakhova Aug 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions packages/devextreme/testing/tests/DevExpress.ui.widgets.treeList/rowDragging.tests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
import 'fluent_blue_light.css!';

import 'ui/data_grid';
import 'ui/tree_list';

import $ from 'jquery';
import pointerMock from '../../helpers/pointerMock.js';
import { setupTreeListModules } from '../../helpers/treeListMocks.js';

QUnit.testStart(function() {
const markup =
`<style>
Expand All @@ -16,15 +25,6 @@ QUnit.testStart(function() {
$('#qunit-fixture').html(markup);
});

import 'generic_light.css!';

import 'ui/data_grid';
import 'ui/tree_list';

import $ from 'jquery';
import pointerMock from '../../helpers/pointerMock.js';
import { setupTreeListModules } from '../../helpers/treeListMocks.js';

const generateData = function(rowCount) {
let i;
const result = [];
Expand Down Expand Up @@ -100,7 +100,7 @@ QUnit.module('Drag and Drop nodes', moduleConfig, () => {
rowsView.render($testElement);

// act
const pointer = pointerMock(rowsView.getRowElement(0)).start().down().move(0, 70);
const pointer = pointerMock(rowsView.getRowElement(0)).start().down().move(0, 100);

// assert
const $draggableElement = $('body').children('.dx-sortable-dragging');
Expand Down Expand Up @@ -130,7 +130,7 @@ QUnit.module('Drag and Drop nodes', moduleConfig, () => {
rowsView.render($testElement);

// act
const pointer = pointerMock(rowsView.getRowElement(0)).start().down().move(0, 50);
const pointer = pointerMock(rowsView.getRowElement(0)).start().down().move(0, 75);

// assert
const $placeholderElement = $('body').children('.dx-sortable-placeholder');
Expand Down
33 changes: 16 additions & 17 deletions packages/devextreme/testing/tests/DevExpress.ui.widgets.treeList/treeList.tests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,4 @@
QUnit.testStart(function() {
const markup =
'<!--qunit-fixture-->\
<div id="container">\
<div id="treeList">\
</div>\
</div>\
';

$('#qunit-fixture').html(markup);
// $('body').append(markup);
});

import 'generic_light.css!';
import 'fluent_blue_light.css!';
import $ from 'jquery';
import { noop } from 'core/utils/common';
import devices from '__internal/core/m_devices';
Expand All @@ -25,6 +12,18 @@ import pointerMock from '../../helpers/pointerMock.js';
import { CLICK_EVENT } from '../../helpers/grid/keyboardNavigationHelper.js';
import { createEvent } from 'common/core/events/utils/index';

QUnit.testStart(function() {
const markup =
'<!--qunit-fixture-->\
<div id="container">\
<div id="treeList">\
</div>\
</div>\
';

$('#qunit-fixture').html(markup);
});

fx.off = true;

const defaultModuleConfig = {
Expand Down Expand Up @@ -937,7 +936,7 @@ QUnit.module('Option Changed', defaultModuleConfig, () => {
// T576806
QUnit.test('Pages should be correctly loaded after change dataSource and selectedRowKeys options', function(assert) {
const treeList = createTreeList({
height: 1500,
height: 2160,
autoExpandAll: true
});

Expand Down Expand Up @@ -1454,7 +1453,7 @@ QUnit.module('Focused Row', defaultModuleConfig, () => {
QUnit.test('TreeList with focusedRowKey', function(assert) {
// arrange, act
const treeList = createTreeList({
height: 105,
height: 170,
keyExpr: 'id',
dataSource: generateData(10),
paging: {
Expand All @@ -1478,7 +1477,7 @@ QUnit.module('Focused Row', defaultModuleConfig, () => {
QUnit.test('TreeList with remoteOperations and focusedRowKey', function(assert) {
// arrange, act
const treeList = createTreeList({
height: 105,
height: 170,
keyExpr: 'id',
dataSource: generateData(10),
remoteOperations: true,
Expand Down
4 changes: 2 additions & 2 deletions ...xtreme/testing/tests/DevExpress.ui.widgets.treeList/virtualScrolling.integration.tests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import $ from 'jquery';
import { TreeListWrapper } from '../../helpers/wrappers/dataGridWrappers.js';
import { generateNestedData } from '../../helpers/treeListMocks.js';

import 'generic_light.css!';
import 'fluent_blue_light.css!';

const treeListWrapper = new TreeListWrapper('#treeList');

Expand Down Expand Up @@ -58,7 +58,7 @@ QUnit.module('Virtual Scrolling', baseModuleConfig, () => {

const treeList = $('#treeList').dxTreeList({
dataSource: data,
height: 500,
height: 720,
autoExpandAll: true,
wordWrapEnabled: true,
columns: [{
Expand Down
2 changes: 1 addition & 1 deletion packages/devextreme/testing/tests/DevExpress.ui.widgets/gantt.tests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import $ from 'jquery';
import 'generic_light.css!';
import 'fluent_blue_light.css!';
import 'gantt.css!';
import 'ui/gantt';

Expand Down
24 changes: 18 additions & 6 deletions packages/devextreme/testing/tests/DevExpress.ui.widgets/ganttParts/dataSource.tests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,15 @@ QUnit.module('DataSources', moduleConfig, () => {
assert.equal(updatedTask.end, dataToUpdate.end, 'new task end is updated');
});
test('removing', function(assert) {
this.createInstance(options.allSourcesOptions);
this.instance.option('editing.enabled', true);
this.instance.option('selectedRowKey', 3);
this.createInstance({
...options.allSourcesOptions,
// explicit height: the treeList is virtual, so the inserted task must fit the render window
height: 700,
selectedRowKey: 3,
editing: {
enabled: true,
},
});
this.clock.tick(10);

const removedTaskId = 3;
Expand Down Expand Up @@ -116,9 +122,15 @@ QUnit.module('DataSources', moduleConfig, () => {
{ dataField: 'progress', caption: 'progress' },
{ dataField: 'end', caption: 'End Date' }
];
this.createInstance(options.allSourcesOptions);
this.instance.option('columns', columns);
this.instance.option('editing.enabled', true);
this.createInstance({
...options.allSourcesOptions,
// explicit height: the treeList is virtual, so the inserted task must fit the render window
height: 700,
columns,
editing: {
enabled: true,
},
});
this.clock.tick(10);
const taskData = {
start: new Date('2019-02-21'),
Expand Down
Loading