,
@@ -36,7 +40,7 @@ export async function testScreenshot(
.ok();
if (shouldTestInCompact) {
- const themeName = (theme ?? process.env.theme) ?? 'generic.light';
+ const themeName = (theme ?? process.env.theme) ?? defaultThemeName;
await changeTheme(`${themeName}.compact`);
await compactCallBack?.();
@@ -46,5 +50,5 @@ export async function testScreenshot(
.ok();
}
- await changeTheme(process.env.theme ?? 'generic.light');
+ await changeTheme(process.env.theme ?? defaultThemeName);
}
diff --git a/packages/devextreme/testing/testcafe/tests/common/etalons/Icon set (fluent-blue-light).png b/packages/devextreme/testing/testcafe/tests/common/etalons/Icon set (fluent-blue-light).png
new file mode 100644
index 000000000000..63c0875b0547
Binary files /dev/null and b/packages/devextreme/testing/testcafe/tests/common/etalons/Icon set (fluent-blue-light).png differ
diff --git a/packages/devextreme/testing/testcafe/tests/common/etalons/Icon set (generic-light).png b/packages/devextreme/testing/testcafe/tests/common/etalons/Icon set (generic-light).png
index 72fd5a5172fe..5e639fb7fc57 100644
Binary files a/packages/devextreme/testing/testcafe/tests/common/etalons/Icon set (generic-light).png and b/packages/devextreme/testing/testcafe/tests/common/etalons/Icon set (generic-light).png differ
diff --git a/packages/devextreme/testing/testcafe/tests/common/etalons/Icon set (material-blue-light).png b/packages/devextreme/testing/testcafe/tests/common/etalons/Icon set (material-blue-light).png
index c98f648e101a..d145a96fb2f9 100644
Binary files a/packages/devextreme/testing/testcafe/tests/common/etalons/Icon set (material-blue-light).png and b/packages/devextreme/testing/testcafe/tests/common/etalons/Icon set (material-blue-light).png differ
diff --git a/packages/devextreme/testing/testcafe/tests/common/etalons/SVG icon set (fluent-blue-light).png b/packages/devextreme/testing/testcafe/tests/common/etalons/SVG icon set (fluent-blue-light).png
new file mode 100644
index 000000000000..3b586090ad4a
Binary files /dev/null and b/packages/devextreme/testing/testcafe/tests/common/etalons/SVG icon set (fluent-blue-light).png differ
diff --git a/packages/devextreme/testing/testcafe/tests/common/etalons/SVG icon set (generic-light).png b/packages/devextreme/testing/testcafe/tests/common/etalons/SVG icon set (generic-light).png
index 13389ee7acd2..e20183402518 100644
Binary files a/packages/devextreme/testing/testcafe/tests/common/etalons/SVG icon set (generic-light).png and b/packages/devextreme/testing/testcafe/tests/common/etalons/SVG icon set (generic-light).png differ
diff --git a/packages/devextreme/testing/testcafe/tests/common/etalons/SVG icon set (material-blue-light).png b/packages/devextreme/testing/testcafe/tests/common/etalons/SVG icon set (material-blue-light).png
index 828c8462af70..e69fdd291760 100644
Binary files a/packages/devextreme/testing/testcafe/tests/common/etalons/SVG icon set (material-blue-light).png and b/packages/devextreme/testing/testcafe/tests/common/etalons/SVG icon set (material-blue-light).png differ
diff --git a/packages/devextreme/testing/testcafe/tests/common/icons.ts b/packages/devextreme/testing/testcafe/tests/common/icons.ts
index cefdad2e1e90..3ae840ea2107 100644
--- a/packages/devextreme/testing/testcafe/tests/common/icons.ts
+++ b/packages/devextreme/testing/testcafe/tests/common/icons.ts
@@ -2,7 +2,7 @@
/* eslint-disable no-restricted-syntax */
import { createScreenshotsComparer } from 'devextreme-screenshot-comparer';
import { ClientFunction } from 'testcafe';
-import { isMaterial, testScreenshot } from '../../helpers/themeUtils';
+import { getThemeName, testScreenshot } from '../../helpers/themeUtils';
import url from '../../helpers/getPageUrl';
import {
appendElementTo,
@@ -129,9 +129,9 @@ const iconSet = {
exportxlsx: '\f060',
exportpdf: '\f061',
exportselected: '\f06d',
- 'orders-box': '\f06e',
+ ordersbox: '\f06e',
warning: '\f06b',
- 'task-helpneeded': '\f06f',
+ taskhelpneeded: '\f06f',
more: '\f06c',
square: '\f067',
clearsquare: '\f068',
@@ -173,7 +173,7 @@ const iconSet = {
mention: '\f090',
variable: '\f091',
clearformat: '\f092',
- 'account-box': '\f094',
+ accountbox: '\f094',
fullscreen: '\f11a',
hierarchy: '\f124',
docfile: '\f111',
@@ -238,11 +238,11 @@ const iconSet = {
imgarunlock: '\f157',
bell: '\f158',
sun: '\f159',
- 'task-complete': '\f15b',
- 'task-rejected': '\f15c',
- 'task-inprogress': '\f15d',
- 'task-stop': '\f15e',
- 'clear-circle': '\f15f',
+ taskcomplete: '\f15b',
+ taskrejected: '\f15c',
+ taskinprogress: '\f15d',
+ taskstop: '\f15e',
+ clearcircle: '\f15f',
send: '\f160', // material only
pinmap: '\f161', // material only
photooutline: '\f162',
@@ -317,15 +317,15 @@ test('SVG icon set', async (t) => {
fontSize: '10px',
});
- const isMaterialTheme = isMaterial();
+ const themeName = getThemeName();
await ClientFunction(() => {
$(`#${id}`)
- .append($(`
`))
+ .append($(`
`))
.append($('').text(`${iconName}`));
}, {
dependencies: {
- ICON_CLASS, id, iconName, glyph, isMaterialTheme,
+ ICON_CLASS, id, iconName, glyph, themeName,
},
})();
}
diff --git a/packages/devextreme/testing/testcafe/tests/container.html b/packages/devextreme/testing/testcafe/tests/container.html
index ec1a3adb0627..417709a9fb0d 100644
--- a/packages/devextreme/testing/testcafe/tests/container.html
+++ b/packages/devextreme/testing/testcafe/tests/container.html
@@ -11,6 +11,7 @@
+