Skip to content

Commit b51a868

Browse files
e2e tests: remove safeTestSize utility
1 parent a3a77e8 commit b51a868

File tree

77 files changed

+602
-759
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+602
-759
lines changed

e2e/testcafe-devextreme/helpers/safeSizeTest.ts

Lines changed: 0 additions & 74 deletions
This file was deleted.

e2e/testcafe-devextreme/runner.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,10 @@ createTestCafe(TESTCAFE_CONFIG)
265265

266266
await t.hover('html');
267267

268-
const [width, height] = DEFAULT_BROWSER_SIZE;
268+
// @ts-expect-error ts-errors
269+
const { meta } = t.testRun.test;
270+
271+
const [width, height] = meta?.browserSize || DEFAULT_BROWSER_SIZE;
269272
await t.resizeWindow(width, height);
270273
} else {
271274
await loadAxeCore(t);

e2e/testcafe-devextreme/tests/cardView/editing/editing.visual.ts

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import url from '../../../helpers/getPageUrl';
44
import { createWidget } from '../../../helpers/createWidget';
55
import { columns, data } from '../helpers/simpleArrayData';
66
import { testScreenshot } from '../../../helpers/themeUtils';
7-
import { safeSizeTest } from '../../../helpers/safeSizeTest';
87

98
fixture.disablePageReloads`CardView - Editing`
109
.page(url(__dirname, '../../container.html'));
@@ -22,7 +21,7 @@ const baseConfig = {
2221
},
2322
};
2423

25-
safeSizeTest('default render', async (t) => {
24+
test.meta({ browserSize: [1100, 700] })('default render', async (t) => {
2625
const cardView = new CardView(CARD_VIEW_SELECTOR);
2726
const { takeScreenshot, compareResults } = createScreenshotsComparer(t);
2827

@@ -31,9 +30,9 @@ safeSizeTest('default render', async (t) => {
3130
await t
3231
.expect(compareResults.isValid())
3332
.ok(compareResults.errorMessages());
34-
}, [1100, 700]).before(async () => createWidget('dxCardView', baseConfig));
33+
}).before(async () => createWidget('dxCardView', baseConfig));
3534

36-
safeSizeTest('render of add card popup', async (t) => {
35+
test.meta({ browserSize: [1100, 700] })('render of add card popup', async (t) => {
3736
const cardView = new CardView(CARD_VIEW_SELECTOR);
3837
const { takeScreenshot, compareResults } = createScreenshotsComparer(t);
3938

@@ -43,9 +42,9 @@ safeSizeTest('render of add card popup', async (t) => {
4342
await t
4443
.expect(compareResults.isValid())
4544
.ok(compareResults.errorMessages());
46-
}, [1100, 700]).before(async () => createWidget('dxCardView', baseConfig));
45+
}).before(async () => createWidget('dxCardView', baseConfig));
4746

48-
safeSizeTest('render of edit card popup', async (t) => {
47+
test.meta({ browserSize: [1100, 700] })('render of edit card popup', async (t) => {
4948
const cardView = new CardView(CARD_VIEW_SELECTOR);
5049
const { takeScreenshot, compareResults } = createScreenshotsComparer(t);
5150

@@ -55,4 +54,4 @@ safeSizeTest('render of edit card popup', async (t) => {
5554
await t
5655
.expect(compareResults.isValid())
5756
.ok(compareResults.errorMessages());
58-
}, [1100, 700]).before(async () => createWidget('dxCardView', baseConfig));
57+
}).before(async () => createWidget('dxCardView', baseConfig));

e2e/testcafe-devextreme/tests/cardView/loadPanel.visual.ts

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,13 @@ import { createScreenshotsComparer } from 'devextreme-screenshot-comparer';
33
import { testScreenshot } from '../../helpers/themeUtils';
44
import url from '../../helpers/getPageUrl';
55
import { createWidget } from '../../helpers/createWidget';
6-
import { safeSizeTest } from '../../helpers/safeSizeTest';
76

87
fixture.disablePageReloads`CardView - LoadPanel`
98
.page(url(__dirname, '../container.html'));
109

1110
const CARD_VIEW_SELECTOR = '#container';
1211

13-
safeSizeTest('Default render', async (t) => {
12+
test.meta({ browserSize: [800, 800] })('Default render', async (t) => {
1413
const cardView = new CardView(CARD_VIEW_SELECTOR);
1514
const { takeScreenshot, compareResults } = createScreenshotsComparer(t);
1615

@@ -19,7 +18,7 @@ safeSizeTest('Default render', async (t) => {
1918
await t
2019
.expect(compareResults.isValid())
2120
.ok(compareResults.errorMessages());
22-
}, [800, 800]).before(async () => createWidget('dxCardView', {
21+
}).before(async () => createWidget('dxCardView', {
2322
width: 500,
2423
height: 300,
2524
dataSource: {
@@ -29,15 +28,15 @@ safeSizeTest('Default render', async (t) => {
2928
columns: ['A', 'B', 'C', 'D'],
3029
}));
3130

32-
safeSizeTest('Default render when CardView has a large height', async (t) => {
31+
test.meta({ browserSize: [800, 800] })('Default render when CardView has a large height', async (t) => {
3332
const { takeScreenshot, compareResults } = createScreenshotsComparer(t);
3433

3534
await testScreenshot(t, takeScreenshot, 'load-panel-with-large-height.png');
3635

3736
await t
3837
.expect(compareResults.isValid())
3938
.ok(compareResults.errorMessages());
40-
}, [800, 800]).before(async () => createWidget('dxCardView', {
39+
}).before(async () => createWidget('dxCardView', {
4140
width: 500,
4241
height: 3000,
4342
dataSource: {
@@ -47,7 +46,7 @@ safeSizeTest('Default render when CardView has a large height', async (t) => {
4746
columns: ['A', 'B', 'C', 'D'],
4847
}));
4948

50-
safeSizeTest('The load panel should match the size of the component’s root container', async (t) => {
49+
test.meta({ browserSize: [800, 800] })('The load panel should match the size of the component’s root container', async (t) => {
5150
const cardView = new CardView(CARD_VIEW_SELECTOR);
5251
const loadPanel = cardView.getLoadPanel();
5352
const cardViewOffset = await cardView.getElementOffset();
@@ -59,7 +58,7 @@ safeSizeTest('The load panel should match the size of the component’s root con
5958
.eql(300)
6059
.expect(loadPanel.getShadowOffset())
6160
.eql(cardViewOffset);
62-
}, [800, 800]).before(async () => createWidget('dxCardView', {
61+
}).before(async () => createWidget('dxCardView', {
6362
width: 500,
6463
height: 300,
6564
dataSource: {

e2e/testcafe-devextreme/tests/cardView/sorting/behavior.themes.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import url from '../../../helpers/getPageUrl';
44
import { createWidget } from '../../../helpers/createWidget';
55
import { data } from '../helpers/simpleArrayData';
66
import { testScreenshot } from '../../../helpers/themeUtils';
7-
import { safeSizeTest } from '../../../helpers/safeSizeTest';
87

98
fixture.disablePageReloads`CardView - Sorting Behavior - Themes`
109
.page(url(__dirname, '../../container.html'));
@@ -16,7 +15,7 @@ const baseConfig = {
1615
height: 500,
1716
};
1817

19-
safeSizeTest('Default render', async (t) => {
18+
test('Default render', async (t) => {
2019
const { takeScreenshot, compareResults } = createScreenshotsComparer(t);
2120
const cardView = new CardView(CARD_VIEW_SELECTOR);
2221

@@ -45,7 +44,7 @@ safeSizeTest('Default render', async (t) => {
4544
});
4645
});
4746

48-
safeSizeTest('Default multiple sorting render', async (t) => {
47+
test('Default multiple sorting render', async (t) => {
4948
const { takeScreenshot, compareResults } = createScreenshotsComparer(t);
5049
const cardView = new CardView(CARD_VIEW_SELECTOR);
5150
await testScreenshot(t, takeScreenshot, 'cardview_headers_with_multiple_sorting_render.png', { element: cardView.element });

e2e/testcafe-devextreme/tests/common/treeList/adaptiveRow.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
import TreeList from 'devextreme-testcafe-models/treeList';
22
import url from '../../../helpers/getPageUrl';
33
import { createWidget } from '../../../helpers/createWidget';
4-
import { safeSizeTest } from '../../../helpers/safeSizeTest';
54

65
fixture.disablePageReloads`Adaptive Row`
76
.page(url(__dirname, '../container.html'));
87

9-
safeSizeTest('Should be shown and hidden when the window is resized', async (t) => {
8+
test.meta({ browserSize: [400, 400] })('Should be shown and hidden when the window is resized', async (t) => {
109
const treeList = new TreeList('#container');
1110
await treeList.isReady();
1211

@@ -20,7 +19,7 @@ safeSizeTest('Should be shown and hidden when the window is resized', async (t)
2019

2120
await t.expect(treeList.isAdaptiveColumnHidden()).ok();
2221
await t.expect(treeList.getAdaptiveRow(0).element.exists).notOk();
23-
}, [400, 400]).before(async () => createWidget('dxTreeList', {
22+
}).before(async () => createWidget('dxTreeList', {
2423
dataSource: [{
2524
ID: 1,
2625
Head_ID: -1,

e2e/testcafe-devextreme/tests/common/treeList/scrolling.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import TreeList from 'devextreme-testcafe-models/treeList';
44
import CheckBox from 'devextreme-testcafe-models/checkBox';
55
import url from '../../../helpers/getPageUrl';
66
import { createWidget } from '../../../helpers/createWidget';
7-
import { safeSizeTest } from '../../../helpers/safeSizeTest';
87
import { testScreenshot } from '../../../helpers/themeUtils';
98

109
const scrollWindowTo = async (position: object) => {
@@ -106,7 +105,7 @@ test('The vertical scroll bar of the container\'s parent should not be displayed
106105
});
107106

108107
// T1189118
109-
safeSizeTest('All items should be selected after select all and scroll down', async (t) => {
108+
test.meta({ browserSize: [800, 800] })('All items should be selected after select all and scroll down', async (t) => {
110109
// arrange
111110
const treeList = new TreeList('#container');
112111
const { takeScreenshot, compareResults } = createScreenshotsComparer(t);
@@ -133,7 +132,7 @@ safeSizeTest('All items should be selected after select all and scroll down', as
133132
await t
134133
.expect(compareResults.isValid())
135134
.ok(compareResults.errorMessages());
136-
}, [800, 800]).before(async () => createWidget('dxTreeList', {
135+
}).before(async () => createWidget('dxTreeList', {
137136
dataSource: generateData(100),
138137
height: 400,
139138
rootValue: -1,

e2e/testcafe-devextreme/tests/common/treeList/stickyColumns/stickyColumns.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import { createScreenshotsComparer } from 'devextreme-screenshot-comparer';
22
import TreeList from 'devextreme-testcafe-models/treeList';
33
import { createWidget } from '../../../../helpers/createWidget';
44
import url from '../../../../helpers/getPageUrl';
5-
import { safeSizeTest } from '../../../../helpers/safeSizeTest';
65
import { testScreenshot } from '../../../../helpers/themeUtils';
76

87
const TREE_LIST_SELECTOR = '#container';
@@ -13,7 +12,7 @@ fixture.disablePageReloads`Sticky columns - Drag and Drop`
1312
// visual: generic.light
1413
// visual: material.blue.light
1514
// visual: fluent.blue.light
16-
safeSizeTest('Header hover should display correctly when there are fixed columns', async (t) => {
15+
test.meta({ browserSize: [900, 800] })('Header hover should display correctly when there are fixed columns', async (t) => {
1716
const { takeScreenshot, compareResults } = createScreenshotsComparer(t);
1817
const treeList = new TreeList(TREE_LIST_SELECTOR);
1918
const headerCell = treeList.getHeaders().getHeaderRow(0).getHeaderCell(13);
@@ -29,7 +28,7 @@ safeSizeTest('Header hover should display correctly when there are fixed columns
2928
await t
3029
.expect(compareResults.isValid())
3130
.ok(compareResults.errorMessages());
32-
}, [900, 800])
31+
})
3332
.before(async () => {
3433
await createWidget('dxTreeList', {
3534
dataSource: new Array(20).fill(null).map((_, index) => {

e2e/testcafe-devextreme/tests/container.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,10 @@
2222
<script type="text/javascript" src="../../../packages/devextreme/artifacts/js/jquery.min.js"></script>
2323
<script type="text/javascript" src="../../../packages/devextreme/artifacts/js/dx-quill.min.js"></script>
2424
<script type="text/javascript" src="../../../packages/devextreme/artifacts/js/dx-gantt.min.js"></script>
25+
<script type="text/javascript" src="../../../packages/devextreme/artifacts/js/dx-gantt.min.js"></script>
2526
<script type="text/javascript" src="../../../packages/devextreme/artifacts/js/dx.all.js"></script>
2627
<script type="text/javascript" src="../../../packages/devextreme/artifacts/js/dx.aspnet.data.js"></script>
28+
2729
<style>
2830
* { caret-color: transparent !important; }
2931
.dx-scheduler .dx-scrollable-scroll { visibility: hidden !important; }

e2e/testcafe-devextreme/tests/dataGrid/common/adaptiveRow.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
import DataGrid from 'devextreme-testcafe-models/dataGrid';
22
import url from '../../../helpers/getPageUrl';
33
import { createWidget } from '../../../helpers/createWidget';
4-
import { safeSizeTest } from '../../../helpers/safeSizeTest';
54

65
fixture.disablePageReloads`Adaptive Row`
76
.page(url(__dirname, '../../container.html'));
87

9-
safeSizeTest('Should be shown and hidden when the window is resized', async (t) => {
8+
test.meta({ browserSize: [400, 400] })('Should be shown and hidden when the window is resized', async (t) => {
109
const dataGrid = new DataGrid('#container');
1110
await dataGrid.isReady();
1211

@@ -20,7 +19,7 @@ safeSizeTest('Should be shown and hidden when the window is resized', async (t)
2019

2120
await t.expect(dataGrid.isAdaptiveColumnHidden()).ok();
2221
await t.expect(dataGrid.getAdaptiveRow(0).element.exists).notOk();
23-
}, [400, 400]).before(async () => createWidget('dxDataGrid', {
22+
}).before(async () => createWidget('dxDataGrid', {
2423
dataSource: [{
2524
ID: 1,
2625
Head_ID: -1,

0 commit comments

Comments
 (0)