datagrid change theme

Author: EugeniyKiyashko

e2e/testcafe-devextreme/runner.ts

@@ -278,11 +278,13 @@ createTestCafe(TESTCAFE_CONFIG)
               await addShadowRootTree(t);
             }
 
-            const currentTheme = await getCurrentTheme(t) || 'generic.light';
-            const newTheme = args.theme || 'generic.light';
+             if (!componentFolder.includes('dataGrid')) {
+              const currentTheme = await getCurrentTheme(t) || 'generic.light';
+              const newTheme = args.theme || 'generic.light';
 
-            if (currentTheme !== newTheme) {
-              await changeTheme(t, newTheme);
+              if (currentTheme !== newTheme) {
+                await changeTheme(t, newTheme);
+              }
             }
           },
           after: async (t: TestController) => {

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

@@ -1,9 +1,9 @@
 import TreeList from 'devextreme-testcafe-models/treeList';
 import { createWidget } from '../../../helpers/createWidget';
 import url from '../../../helpers/getPageUrl';
-import { isMaterial } from '../../../helpers/themeUtils';
 
-fixture`TreeList - Aria Label`.page(url(__dirname, '../../container.html'));
+fixture`TreeList - Aria Label`
+  .page(url(__dirname, '../../container.html'));
 
 const tasks = [
   {
@@ -74,7 +74,7 @@ const options = {
   ],
 };
 
-test.meta({ unstable: !!isMaterial() })('Aria expanded should be toggled true on Ctrl + → keypress', async (t) => {
+test('Aria expanded should be toggled true on Ctrl + → keypress', async (t) => {
   const treeList = new TreeList('#container');
   const expandableRow = treeList.getDataRow(0).element;
   const expandableCells = [
@@ -85,11 +85,9 @@ test.meta({ unstable: !!isMaterial() })('Aria expanded should be toggled true on
 
   await t
     .expect(treeList.getContainer().getAttribute('aria-label'))
-    .eql(isMaterial()
-      ? 'Tree list with 3 rows and 3 columns. Press Ctrl + right arrow to expand the focused node and Ctrl + left arrow to collapse it'
-      : 'Tree list with 1 rows and 3 columns. Press Ctrl + right arrow to expand the focused node and Ctrl + left arrow to collapse it')
+    .eql('Tree list with 1 rows and 3 columns. Press Ctrl + right arrow to expand the focused node and Ctrl + left arrow to collapse it')
     .expect(expandableRow.getAttribute('aria-expanded'))
-    .eql(isMaterial() ? 'true' : 'false');
+    .eql('false');
 
   // eslint-disable-next-line no-restricted-syntax
   for (const cell of expandableCells) {
@@ -106,7 +104,10 @@ test.meta({ unstable: !!isMaterial() })('Aria expanded should be toggled true on
   for (const cell of expandableCells) {
     await t.expect(cell.getAttribute('aria-expanded')).eql('true');
   }
-}).before(async () => createWidget('dxTreeList', options));
+}).before(async () => createWidget('dxTreeList', {
+  ...options,
+  expandedRowKeys: [0],
+}));
 
 test('Aria expanded should be toggled false on Ctrl + ← keypress', async (t) => {
   const treeList = new TreeList('#container');
@@ -138,7 +139,7 @@ test('Aria expanded should be toggled false on Ctrl + ← keypress', async (t) =
   for (const cell of expandableCells) {
     await t.expect(cell.getAttribute('aria-expanded')).eql('false');
   }
-}).before(async () => {
-  options.expandedRowKeys = [1];
-  await createWidget('dxTreeList', options);
-});
+}).before(async () => createWidget('dxTreeList', {
+  ...options,
+  expandedRowKeys: [1],
+}));