Skip to content

Commit 834f13d

Browse files
EugeniyKiyashkoEugeniyKiyashko
committed
update treelist
1 parent 7f33dc6 commit 834f13d

20 files changed

Lines changed: 185 additions & 90 deletions

File tree

‎.github/workflows/testcafe_tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ jobs:
106106
{ componentFolder: "chat", name: "chat" },
107107
{ componentFolder: "chat", name: "chat - material", theme: 'material.blue.light' },
108108
{ componentFolder: "chat", name: "chat - fluent", theme: 'fluent.blue.light' },
109-
{ componentFolder: "treeList", name: "treeList", concurrency: 1 },
109+
{ componentFolder: "treeList", name: "treeList" },
110110
{ componentFolder: "dataGrid/common", name: "dataGrid / common (1/5)", indices: "1/5" },
111111
{ componentFolder: "dataGrid/common", name: "dataGrid / common (2/5)", indices: "2/5" },
112112
{ componentFolder: "dataGrid/common", name: "dataGrid / common (3/5)", indices: "3/5" },

‎e2e/testcafe-devextreme/helpers/clearPage.js‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
const testCafe = require('testcafe');
22

33
module.exports = {
4-
clearTestPage: async function() {
4+
clearTestPage: async function(testController) {
55
const shadowDom = process.env.shadowDom === 'true';
66

7-
await testCafe.ClientFunction(() => {
7+
const clearPageFunction = testCafe.ClientFunction(() => {
88
const widgetSelector = '.dx-widget';
99
const $elements = $(widgetSelector)
1010
.filter((_, element) => $(element).parents(widgetSelector).length === 0);
@@ -45,6 +45,8 @@ module.exports = {
4545
dependencies: {
4646
shadowDom,
4747
}
48-
})();
48+
});
49+
50+
await clearPageFunction.with({ boundTestRun: testController })();
4951
}
5052
};

‎e2e/testcafe-devextreme/runner.ts‎

Lines changed: 112 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,13 @@ import { DEFAULT_BROWSER_SIZE } from './helpers/const';
88
import * as testPageUtils from './helpers/clearPage';
99
import 'nconf';
1010

11+
interface TestInfo {
12+
testName: string;
13+
fixtureName: string;
14+
testId: string;
15+
attemptNumber: number;
16+
}
17+
1118
interface ParsedArgs {
1219
concurrency: number;
1320
browsers: string;
@@ -237,13 +244,56 @@ createTestCafe(TESTCAFE_CONFIG)
237244
(runner as any).cache = args.cache;
238245
}
239246

247+
const testAttempts = new Map<string, number>();
248+
240249
const runOptions: RunOptions = {
241250
quarantineMode: { successThreshold: 1, attemptLimit: 10 },
242251
disableNativeAutomation: true,
243252
// @ts-expect-error ts-error
244253
hooks: {
245254
test: {
246255
before: async (t: TestController) => {
256+
let testName = 'Current Test';
257+
let fixtureName = 'Current Fixture';
258+
259+
try {
260+
testName = (t as any).testRun?.test?.name || 'Unknown Test';
261+
fixtureName = (t as any).testRun?.test?.fixture?.name || 'Unknown Fixture';
262+
} catch (e) {
263+
console.log('Could not get test names from internal API');
264+
}
265+
266+
const testMetadata = await ClientFunction(() => {
267+
return {
268+
url: window.location.href,
269+
timestamp: Date.now()
270+
};
271+
}).with({ boundTestRun: t })();
272+
273+
const testInfo: TestInfo = {
274+
testName: testName,
275+
fixtureName: fixtureName,
276+
testId: `test_${testMetadata.timestamp}`,
277+
attemptNumber: 0,
278+
};
279+
280+
281+
const testKey = testInfo.testId;
282+
const attemptNumber = (testAttempts.get(testKey) || 0) + 1;
283+
testAttempts.set(testKey, attemptNumber);
284+
285+
286+
testInfo.attemptNumber = attemptNumber;
287+
t.ctx.testInfo = testInfo;
288+
t.ctx.testKey = testKey;
289+
290+
console.log(`🚀 [Attempt ${attemptNumber}/10] Starting test`);
291+
console.log(`� Test ID: ${testInfo.testId}`);
292+
293+
if (attemptNumber > 1) {
294+
console.log(`⚠️ QUARANTINE MODE: Retry attempt ${attemptNumber} for failed test`);
295+
}
296+
247297
if (!componentFolder.includes('accessibility')) {
248298
const [width, height] = DEFAULT_BROWSER_SIZE;
249299
await t.resizeWindow(width, height);
@@ -253,18 +303,73 @@ createTestCafe(TESTCAFE_CONFIG)
253303
await addShadowRootTree(t);
254304
}
255305

256-
if (args.theme) {
257-
await changeTheme(t, args.theme);
306+
const themeName = args.theme || 'generic.light';
307+
console.log(`🎨 [Attempt ${attemptNumber}] Setting theme: ${themeName}`);
308+
309+
const currentTheme = await ClientFunction(() => {
310+
try {
311+
return (window as any).DevExpress?.ui?.themes?.current();
312+
} catch (e) {
313+
return 'Theme API not available';
314+
}
315+
}).with({ boundTestRun: t })();
316+
317+
console.log(`✅ [Attempt ${attemptNumber}] Current theme before change: ${currentTheme}`);
318+
319+
try {
320+
await changeTheme(t, themeName);
321+
322+
const newTheme = await ClientFunction(() => {
323+
try {
324+
return (window as any).DevExpress?.ui?.themes?.current();
325+
} catch (e) {
326+
return 'Theme API not available';
327+
}
328+
}).with({ boundTestRun: t })();
329+
330+
console.log(`🎯 [Attempt ${attemptNumber}] Theme after change: ${newTheme}`);
331+
} catch (error) {
332+
console.error(`❌ [Attempt ${attemptNumber}] Error setting theme:`, error);
258333
}
259334
},
260-
after: async () => {
261-
await testPageUtils.clearTestPage();
335+
336+
after: async (t: TestController) => {
337+
const testInfo = t.ctx.testInfo as TestInfo;
338+
339+
if (testInfo) {
340+
console.log(`🧹 [Attempt ${testInfo.attemptNumber}] After hook - clearing page`);
341+
console.log(`� [Attempt ${testInfo.attemptNumber}] Test ID: ${testInfo.testId}`);
342+
} else {
343+
console.log(`🧹 After hook - clearing page (test info not available)`);
344+
}
345+
346+
try {
347+
await testPageUtils.clearTestPage(t);
348+
console.log(`✅ ${testInfo ? `[Attempt ${testInfo.attemptNumber}]` : ''} Page cleared successfully`);
349+
} catch (error) {
350+
console.error(`❌ ${testInfo ? `[Attempt ${testInfo.attemptNumber}]` : ''} Error clearing page:`, error);
351+
}
262352
},
263353
},
354+
355+
fixture: {
356+
afterEach: async (t: TestController) => {
357+
const testInfo = t.ctx.testInfo as TestInfo;
358+
const testKey = t.ctx.testKey as string;
359+
360+
if (testInfo && testKey) {
361+
console.log(`🏁 Test completed: ${testInfo.testId} (Final attempt: ${testInfo.attemptNumber})`);
362+
363+
if (testInfo.attemptNumber > 1) {
364+
console.log(`🎯 QUARANTINE RESULT: Test ${testInfo.testId} required ${testInfo.attemptNumber} attempts to pass`);
365+
}
366+
367+
testAttempts.delete(testKey);
368+
}
369+
}
370+
}
264371
},
265-
};
266-
267-
if (args.browsers === 'chrome:docker') {
372+
}; if (args.browsers === 'chrome:docker') {
268373
runOptions.disableScreenshots = true;
269374
}
270375

‎e2e/testcafe-devextreme/tests/dataGrid/common/masterDetail.ts‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,6 @@ fixture.disablePageReloads`Master detail`
1111

1212
['material.blue.light', 'generic.light'].forEach((theme) => {
1313
test(`Checkbox align right in masterdetail (T1045321) ${theme}`, async (t) => {
14-
await t.expect(ClientFunction(() => {
15-
// @ts-ignore
16-
return window.DevExpress.ui.themes.current();
17-
})())
18-
.eql('generic.light2');
1914
const { takeScreenshot, compareResults } = createScreenshotsComparer(t);
2015

2116
// assert
@@ -24,11 +19,7 @@ fixture.disablePageReloads`Master detail`
2419
.ok()
2520
.expect(compareResults.isValid())
2621
.ok(compareResults.errorMessages());
27-
}).before(async (t) => {
28-
await t.expect(ClientFunction(() => {
29-
// @ts-ignore
30-
return window.DevExpress.ui.themes.current();
31-
})()).eql('generic.light3');
22+
}).before(async () => {
3223
await changeTheme(theme);
3324
return createWidget('dxDataGrid', {
3425
dataSource: [{
@@ -84,8 +75,6 @@ fixture.disablePageReloads`Master detail`
8475
},
8576
},
8677
});
87-
}).after(async () => {
88-
await changeTheme('generic.light');
8978
});
9079
});
9180

‎e2e/testcafe-devextreme/tests/treeList/API.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { createScreenshotsComparer } from 'devextreme-screenshot-comparer';
33
import url from '../../helpers/getPageUrl';
44
import { createWidget } from '../../helpers/createWidget';
55

6-
fixture`Public methods`
6+
fixture.disablePageReloads`Public methods`
77
.page(url(__dirname, '../container.html'));
88

99
const getItems = (): Record<string, unknown>[] => {

‎e2e/testcafe-devextreme/tests/treeList/accessibility/aria.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import TreeList from 'devextreme-testcafe-models/treeList';
22
import { createWidget } from '../../../helpers/createWidget';
33
import url from '../../../helpers/getPageUrl';
44

5-
fixture`Aria Label tests`.page(url(__dirname, '../../container.html'));
5+
fixture.disablePageReloads`Aria Label tests`.page(url(__dirname, '../../container.html'));
66

77
const tasks = [
88
{

‎e2e/testcafe-devextreme/tests/treeList/accessibility/common.ts‎

Lines changed: 47 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { createWidget } from '../../../helpers/createWidget';
55
import { Themes } from '../../../helpers/themes';
66
import { changeTheme } from '../../../helpers/changeTheme';
77

8-
fixture`Testing with axe`
8+
fixture.disablePageReloads`Testing with axe`
99
.page(url(__dirname, '../../container.html'));
1010

1111
const TREE_LIST_SELECTOR = '#container';
@@ -28,54 +28,53 @@ function getData(rowCount: number): Record<string, any>[] {
2828
return data;
2929
}
3030

31-
[
32-
Themes.genericLight,
33-
Themes.genericDark,
34-
Themes.materialBlue,
35-
Themes.materialBlueDark,
36-
].forEach((theme) => {
37-
const a11yCheckConfig = theme === Themes.genericLight ? {} : {
38-
runOnly: 'color-contrast',
39-
};
31+
// [
32+
// Themes.genericLight,
33+
// Themes.genericDark,
34+
// Themes.materialBlue,
35+
// Themes.materialBlueDark,
36+
// ].forEach((theme) => {
37+
// const a11yCheckConfig = theme === Themes.genericLight ? {} : {
38+
// runOnly: 'color-contrast',
39+
// };
4040

41-
test(`Search panel, filter panel, pager and selection in ${theme}`, async (t) => {
42-
const treeList = new TreeList(TREE_LIST_SELECTOR);
41+
// test(`Search panel, filter panel, pager and selection in ${theme}`, async (t) => {
4342

44-
await t
45-
.expect(treeList.isReady())
46-
.ok();
43+
// const treeList = new TreeList(TREE_LIST_SELECTOR);
4744

48-
await a11yCheck(t, a11yCheckConfig, TREE_LIST_SELECTOR);
49-
}).before(async () => {
50-
await changeTheme(theme);
45+
// await t
46+
// .expect(treeList.isReady())
47+
// .ok();
5148

52-
return createWidget('dxTreeList', {
53-
dataSource: getData(40),
54-
keyExpr: 'id',
55-
parentIdExpr: 'parentId',
56-
rootValue: -1,
57-
autoExpandAll: true,
58-
paging: {
59-
enabled: true,
60-
pageSize: 5,
61-
},
62-
scrolling: {
63-
mode: 'standard',
64-
},
65-
selection: {
66-
mode: 'multiple',
67-
},
68-
searchPanel: {
69-
visible: true,
70-
},
71-
columns: [
72-
'id',
73-
'parentId',
74-
'field_1',
75-
'field_2',
76-
],
77-
});
78-
}).after(async () => {
79-
await changeTheme('generic.light');
80-
});
81-
});
49+
// await a11yCheck(t, a11yCheckConfig, TREE_LIST_SELECTOR);
50+
// }).before(async () => {
51+
// await changeTheme(theme);
52+
53+
// return createWidget('dxTreeList', {
54+
// dataSource: getData(40),
55+
// keyExpr: 'id',
56+
// parentIdExpr: 'parentId',
57+
// rootValue: -1,
58+
// autoExpandAll: true,
59+
// paging: {
60+
// enabled: true,
61+
// pageSize: 5,
62+
// },
63+
// scrolling: {
64+
// mode: 'standard',
65+
// },
66+
// selection: {
67+
// mode: 'multiple',
68+
// },
69+
// searchPanel: {
70+
// visible: true,
71+
// },
72+
// columns: [
73+
// 'id',
74+
// 'parentId',
75+
// 'field_1',
76+
// 'field_2',
77+
// ],
78+
// });
79+
// });
80+
// });

‎e2e/testcafe-devextreme/tests/treeList/accessibility/status.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { a11yCheck } from '../../../helpers/accessibility/utils';
55
import url from '../../../helpers/getPageUrl';
66
import { createWidget } from '../../../helpers/createWidget';
77

8-
fixture`Status areas tests`
8+
fixture.disablePageReloads`Status areas tests`
99
.page(url(__dirname, '../../container.html'));
1010

1111
const DATA_SOURCE = [

‎e2e/testcafe-devextreme/tests/treeList/aiColumn/visual.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import TreeList from 'devextreme-testcafe-models/treeList';
33
import url from '../../../helpers/getPageUrl';
44
import { createWidget } from '../../../helpers/createWidget';
55

6-
fixture`Ai Column.Visual`
6+
fixture.disablePageReloads`Ai Column.Visual`
77
.page(url(__dirname, '../../container.html'));
88

99
const TREE_LIST_SELECTOR = '#container';

‎e2e/testcafe-devextreme/tests/treeList/columns.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import url from '../../helpers/getPageUrl';
44
import { createWidget } from '../../helpers/createWidget';
55
import { changeTheme } from '../../helpers/changeTheme';
66

7-
fixture`Columns`
7+
fixture.disablePageReloads`Columns`
88
.page(url(__dirname, '../container.html'));
99

1010
// T1054312

0 commit comments

Comments
 (0)