Skip to content

Commit 8dc2154

Browse files
Merge remote-tracking branch 'my/25_1_ng_nested_fix' into 25_1_ng_nested_fix
2 parents 1e5c26b + 7327864 commit 8dc2154

3 files changed

Lines changed: 261 additions & 159 deletions

File tree

packages/devextreme/js/__internal/grids/grid_core/master_detail/m_master_detail.integration.test.ts

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
import { afterEach } from 'node:test';
2-
3-
import { describe, expect, it } from '@jest/globals';
4-
import $ from 'jquery';
1+
import {
2+
afterEach, describe, expect, it,
3+
} from '@jest/globals';
4+
import type { dxElementWrapper } from '@js/core/renderer';
5+
import $ from '@js/core/renderer';
56

67
import type { Properties as DataGridProperties } from '../../../../ui/data_grid';
78
import DataGrid from '../../../../ui/data_grid';
@@ -16,7 +17,7 @@ const GRID_CONTAINER_ID = 'gridContainer';
1617

1718
const createDataGrid = async (
1819
options: DataGridProperties = {},
19-
): Promise<{ $container: JQuery; instance: DataGrid }> => new Promise((resolve) => {
20+
): Promise<{ $container: dxElementWrapper; instance: DataGrid }> => new Promise((resolve) => {
2021
const $container = $('<div>')
2122
.attr('id', GRID_CONTAINER_ID)
2223
.appendTo(document.body);

0 commit comments

Comments
 (0)