Skip to content

Commit 9098954

Browse files
authored
Demos: unskip Scheduler tests in fluent & generic themes (#30870)
1 parent a2b1124 commit 9098954

File tree

4 files changed

+11
-15
lines changed

4 files changed

+11
-15
lines changed

apps/demos/testing/skipped-tests.js

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,6 @@ export const skippedTests = {
4949
{ demo: 'Markers', themes: [THEME.generic, THEME.material, THEME.fluent] },
5050
{ demo: 'Routes', themes: [THEME.generic, THEME.material, THEME.fluent] },
5151
],
52-
Scheduler: [
53-
{ demo: 'Overview', themes: [THEME.fluent, THEME.material] },
54-
],
5552
PivotGrid: [
5653
{ demo: 'Overview', themes: [THEME.material] },
5754
{ demo: 'ChartIntegration', themes: [THEME.material] },
@@ -117,7 +114,7 @@ export const skippedTests = {
117114
{ demo: 'ContextMenu', themes: [THEME.material] },
118115
],
119116
Scheduler: [
120-
{ demo: 'Overview', themes: [THEME.fluent, THEME.material] },
117+
// NOTE: 'GroupByDate' demo has problems with rendering
121118
{ demo: 'GroupByDate', themes: [THEME.fluent, THEME.material] },
122119
],
123120
List: [

apps/demos/testing/widgets/scheduler/contextMenuIntegration.test.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,13 @@ runManualTest('Scheduler', 'ContextMenu', (test) => {
1515
await testScreenshot(t, takeScreenshot, 'scheduler_contextMenu_init.png');
1616

1717
await t
18-
.rightClick('.dx-scheduler-appointment');
18+
.rightClick('.dx-scheduler-appointment')
19+
.expect(Selector('.dx-context-menu').exists).ok('Context menu should appear after right click');
1920
await testScreenshot(t, takeScreenshot, 'scheduler_contextMenu_click.png');
2021

2122
await t
22-
.rightClick(Selector('.dx-scheduler-date-table-cell').nth(6));
23+
.rightClick(Selector('.dx-scheduler-date-table-cell').nth(6))
24+
.expect(Selector('.dx-context-menu').exists).ok('Context menu should appear after right click on cell');
2325
await testScreenshot(t, takeScreenshot, 'scheduler_contextMenu_cell_click.png');
2426

2527
await t

apps/demos/utils/visual-tests/matrix-test-helper.js

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -243,11 +243,7 @@ const SKIPPED_TESTS = {
243243
{ demo: 'StatePersistence', themes: [THEME.generic, THEME.fluent, THEME.material] },
244244
],
245245
Scheduler: [
246-
'DragAndDrop',
247-
{ demo: 'Overview', themes: [THEME.generic, THEME.fluent, THEME.material] },
248-
{ demo: 'Resources', themes: [THEME.fluent] },
249-
{ demo: 'CellTemplates', themes: [THEME.generic, THEME.material, THEME.fluent] },
250-
{ demo: 'Resources', themes: [THEME.generic, THEME.material, THEME.fluent] },
246+
// NOTE: Context menu appearance is different in comparison to other frameworks
251247
{ demo: 'ContextMenu', themes: [THEME.generic, THEME.fluent, THEME.material] },
252248
],
253249
Sortable: [
@@ -296,7 +292,7 @@ const SKIPPED_TESTS = {
296292
{ demo: 'CustomDropzone', themes: [THEME.generic, THEME.material, THEME.fluent] },
297293
],
298294
Scheduler: [
299-
{ demo: 'Overview', themes: [THEME.generic, THEME.fluent, THEME.material] },
295+
// NOTE: Context menu item position is different across themes
300296
{ demo: 'ContextMenu', themes: [THEME.generic, THEME.fluent, THEME.material] },
301297
],
302298
},
@@ -326,8 +322,7 @@ const SKIPPED_TESTS = {
326322
{ demo: 'StatePersistence', themes: [THEME.generic, THEME.fluent, THEME.material] },
327323
],
328324
Scheduler: [
329-
{ demo: 'Overview', themes: [THEME.fluent, THEME.material] },
330-
{ demo: 'Templates', themes: [THEME.fluent, THEME.material] },
325+
// NOTE: Context menu item position is different across themes
331326
{ demo: 'ContextMenu', themes: [THEME.generic, THEME.fluent, THEME.material] },
332327
],
333328
FileUploader: [

e2e/testcafe-devextreme/tests/navigation/contextMenu/contextMenu.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@ test('Context menu should be shown in the same position when item was added in r
1313

1414
await t
1515
.click(target)
16-
.expect(contextMenu.overlay.getContent().getStyleProperty('visibility')).eql('visible');
16+
.expect(Selector('.dx-context-menu').exists).ok('Context menu element should exist')
17+
.expect(contextMenu.overlay.getContent().getStyleProperty('visibility'))
18+
.eql('visible');
1719

1820
const initialOverlayOffset = await contextMenu.overlay.getOverlayOffset();
1921

0 commit comments

Comments
 (0)