Scheduler: use testScreenshot utility in e2e tests: a11y, agenda

Author: anna-shakhova

e2e/testcafe-devextreme/tests/scheduler/common/a11y/contrast.ts

@@ -2,34 +2,24 @@ import Scheduler from 'devextreme-testcafe-models/scheduler';
 import { createScreenshotsComparer } from 'devextreme-screenshot-comparer';
 import { createWidget } from '../../../../helpers/createWidget';
 import url from '../../../../helpers/getPageUrl';
-import { changeTheme } from '../../../../helpers/changeTheme';
-import { Themes } from '../../../../helpers/themes';
+import { testScreenshot } from '../../../../helpers/themeUtils';
 
 fixture.disablePageReloads`a11y - contrast`
   .page(url(__dirname, '../../../container.html'));
 
-[
-  Themes.genericLight,
-  Themes.genericDark,
-  Themes.fluentBlue,
-  Themes.fluentBlueDark,
-].forEach((theme) => {
-  test(`Scheduler a11y: Insufficient contrast of day numbers in the MonthView (${theme})`, async (t) => {
-    const scheduler = new Scheduler('#container');
-    const { takeScreenshot, compareResults } = createScreenshotsComparer(t);
+test('Scheduler a11y: Insufficient contrast of day numbers in the MonthView', async (t) => {
+  const scheduler = new Scheduler('#container');
+  const { takeScreenshot, compareResults } = createScreenshotsComparer(t);
 
-    await t
-      .expect(await takeScreenshot(`month_day_number_contrast-${theme}`, scheduler.element))
-      .ok()
-      .expect(compareResults.isValid())
-      .ok(compareResults.errorMessages());
-  }).before(async () => {
-    await createWidget('dxScheduler', {
-      dataSource: [],
-      currentView: 'month',
-      currentDate: new Date(2020, 10, 25),
-    });
-  }).after(async () => {
-    await changeTheme(Themes.genericLight);
+  await testScreenshot(t, takeScreenshot, 'month_day_number_contrast.png', { element: scheduler.element });
+
+  await t
+    .expect(compareResults.isValid())
+    .ok(compareResults.errorMessages());
+}).before(async () => {
+  await createWidget('dxScheduler', {
+    dataSource: [],
+    currentView: 'month',
+    currentDate: new Date(2020, 10, 25),
   });
 });

…day_number_contrast-fluent.blue.dark.png …_day_number_contrast (generic.light).pnge2e/testcafe-devextreme/tests/scheduler/common/a11y/etalons/month_day_number_contrast-fluent.blue.dark.png renamed to e2e/testcafe-devextreme/tests/scheduler/common/a11y/etalons/month_day_number_contrast (generic.light).png e2e/testcafe-devextreme/tests/scheduler/common/a11y/etalons/month_day_number_contrast-fluent.blue.dark.png renamed to e2e/testcafe-devextreme/tests/scheduler/common/a11y/etalons/month_day_number_contrast (generic.light).png

@@ -1,7 +1,8 @@
-import { compareScreenshot } from 'devextreme-screenshot-comparer';
+import { createScreenshotsComparer } from 'devextreme-screenshot-comparer';
 import { createWidget } from '../../../../helpers/createWidget';
 import url from '../../../../helpers/getPageUrl';
 import { safeSizeTest } from '../../../../helpers/safeSizeTest';
+import { testScreenshot } from '../../../../helpers/themeUtils';
 import { ADAPTIVE_SIZE } from '../const';
 
 fixture.disablePageReloads`Agenda:adaptive`
@@ -62,7 +63,13 @@ Promise<void> => {
     text: 'groups',
   }].forEach((testCase) => {
     safeSizeTest(testCase.text, async (t) => {
-      await t.expect(await compareScreenshot(t, `agenda-${testCase.text}-adaptive-rtl=${rtlEnabled}.png`)).ok();
+      const { takeScreenshot, compareResults } = createScreenshotsComparer(t);
+
+      await testScreenshot(t, takeScreenshot, `agenda-${testCase.text}-adaptive-rtl=${rtlEnabled}.png`);
+
+      await t
+        .expect(compareResults.isValid())
+        .ok(compareResults.errorMessages());
     }, ADAPTIVE_SIZE)
       .before(async () => createScheduler(testCase.groups, rtlEnabled));
   });