Scheduler: use testScreenshot utility in e2e tests: dragAndDrop, virtualScrolling

Author: anna-shakhova

e2e/testcafe-devextreme/tests/scheduler/common/dragAndDrop/T1017720.ts

@@ -2,6 +2,7 @@ import { ClientFunction } from 'testcafe';
 import { createScreenshotsComparer } from 'devextreme-screenshot-comparer';
 import { extend } from 'devextreme/core/utils/extend';
 import Scheduler from 'devextreme-testcafe-models/scheduler';
+import { testScreenshot } from '../../../../helpers/themeUtils';
 import { createWidget } from '../../../../helpers/createWidget';
 import url from '../../../../helpers/getPageUrl';
 
@@ -13,15 +14,15 @@ test('Drag-n-drop appointment above SVG element(T1017720)', async (t) => {
   const { takeScreenshot, compareResults } = createScreenshotsComparer(t);
   const draggableAppointment = scheduler.getAppointment('text');
 
-  await t
-    .drag(draggableAppointment.element, 330, 0)
-    .expect(await takeScreenshot('drag-n-drop-to-right(T1017720).png', scheduler.workSpace))
-    .ok()
+  await t.drag(draggableAppointment.element, 330, 0);
+
+  await testScreenshot(t, takeScreenshot, 'drag-n-drop-to-right(T1017720).png', { element: scheduler.workSpace });
 
-    .drag(draggableAppointment.element, -330, 70)
-    .expect(await takeScreenshot('drag-n-drop-to-left(T1017720).png', scheduler.workSpace))
-    .ok()
+  await t.drag(draggableAppointment.element, -330, 70);
 
+  await testScreenshot(t, takeScreenshot, 'drag-n-drop-to-left(T1017720).png', { element: scheduler.workSpace });
+
+  await t
     .expect(compareResults.isValid())
     .ok(compareResults.errorMessages());
 }).before(async () => {

e2e/testcafe-devextreme/tests/scheduler/common/dragAndDrop/appointmentCollector.ts

@@ -4,6 +4,7 @@ import { appointmentCollectorData } from './init/widget.data';
 import createScheduler from './init/widget.setup';
 import { createWidget } from '../../../../helpers/createWidget';
 import url from '../../../../helpers/getPageUrl';
+import { testScreenshot } from '../../../../helpers/themeUtils';
 
 fixture.disablePageReloads`Drag-and-drop behaviour for the appointment tooltip`
   .page(url(__dirname, '../../../container.html'));
@@ -55,9 +56,11 @@ test('Drag-n-drop to the cell on the left should work in week view (T1005115)',
       appointmentTooltipItem.element,
       scheduler.getDateTableCell(2, 2),
       { speed: 0.5 },
-    )
-    .expect(await takeScreenshot('drag-n-drop-from-tooltip-to-left-cell-in-week.png', scheduler.workSpace))
-    .ok()
+    );
+
+  await testScreenshot(t, takeScreenshot, 'drag-n-drop-from-tooltip-to-left-cell-in-week.png', { element: scheduler.workSpace });
+
+  await t
     .expect(compareResults.isValid())
     .ok(compareResults.errorMessages());
 }).before(async () => createWidget('dxScheduler', {
@@ -118,11 +121,11 @@ test('Drag-n-drop to the cell below should work in month view (T1005115)', async
       appointmentTooltipItem.element,
       scheduler.getDateTableCell(1, 3),
       { speed: 0.5 },
-    )
+    );
 
-    .expect(await takeScreenshot('drag-n-drop-from-tooltip-to-cell-below-in-month.png', scheduler.workSpace))
-    .ok()
+  await testScreenshot(t, takeScreenshot, 'drag-n-drop-from-tooltip-to-cell-below-in-month.png', { element: scheduler.workSpace });
 
+  await t
     .expect(compareResults.isValid())
     .ok(compareResults.errorMessages());
 }).before(async () => createWidget('dxScheduler', {

e2e/testcafe-devextreme/tests/scheduler/common/dragAndDrop/basic.ts

@@ -3,6 +3,7 @@ import Scheduler from 'devextreme-testcafe-models/scheduler';
 import { dataSource } from './init/widget.data';
 import createScheduler from './init/widget.setup';
 import url from '../../../../helpers/getPageUrl';
+import { testScreenshot } from '../../../../helpers/themeUtils';
 
 fixture.disablePageReloads`Drag-and-drop appointments in the Scheduler basic views`
   .page(url(__dirname, '../../../container.html'));
@@ -125,7 +126,6 @@ test('Drag recurrent appointment occurrence from collector (T832887)', async (t)
 
 test('Drag-n-drop the appointment to the left column to the cell that has the same time', async (t) => {
   const scheduler = new Scheduler('#container');
-  const screenshotZone = scheduler.workSpace;
   const { takeScreenshot, compareResults } = createScreenshotsComparer(t);
   const draggableAppointment = scheduler.getAppointment('Test appointment');
 
@@ -136,7 +136,7 @@ test('Drag-n-drop the appointment to the left column to the cell that has the sa
       { speed: 0.5 },
     );
 
-  await takeScreenshot('drag-n-drop-appointment-to-left-column.png', screenshotZone);
+  await testScreenshot(t, takeScreenshot, 'drag-n-drop-appointment-to-left-column.png', { element: scheduler.workSpace });
 
   await t.expect(compareResults.isValid())
     .ok(compareResults.errorMessages());