Skip to content

Commit 5d18af4

Browse files
GoodDayForSurfGoodDayForSurf
authored
Merge branch '25_2' into 25_2_demos_vue_ts_scheduler
2 parents ef11325 + 1116e88 commit 5d18af4

File tree

318 files changed

+168
-145
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

318 files changed

+168
-145
lines changed

‎.github/workflows/demos_visual_tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ jobs:
174174
if: matrix.STRATEGY == 'accessibility'
175175
uses: actions/upload-artifact@v4
176176
with:
177-
name: accessibility-reports-${{ env.JOB_NAME }}
177+
name: accessibility-reports-${{ env.JOB_NAME }}-${{ matrix.THEME }}
178178
path: apps/demos/testing/artifacts/axe-reports/*
179179
if-no-files-found: ignore
180180

‎.github/workflows/testcafe_tests.yml‎

Lines changed: 14 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ env:
1919
jobs:
2020
build:
2121
name: build
22-
strategy:
23-
fail-fast: false
2422

2523
runs-on: devextreme-shr2
2624
timeout-minutes: 15
@@ -79,24 +77,11 @@ jobs:
7977
fail-fast: false
8078
matrix:
8179
ARGS: [
82-
{ componentFolder: "accessibility", name: "accessibility (1/4)", indices: "1/4" },
83-
{ componentFolder: "accessibility", name: "accessibility (2/4)", indices: "2/4" },
84-
{ componentFolder: "accessibility", name: "accessibility (3/4)", indices: "3/4" },
85-
{ componentFolder: "accessibility", name: "accessibility (4/4)", indices: "4/4" },
86-
{ componentFolder: "accessibility", name: "accessibility - material (1/4)", theme: "material.blue.light", indices: "1/4" },
87-
{ componentFolder: "accessibility", name: "accessibility - material (2/4)", theme: "material.blue.light", indices: "2/4" },
88-
{ componentFolder: "accessibility", name: "accessibility - material (3/4)", theme: "material.blue.light", indices: "3/4" },
89-
{ componentFolder: "accessibility", name: "accessibility - material (4/4)", theme: "material.blue.light", indices: "4/4" },
90-
{ componentFolder: "accessibility", name: "accessibility - fluent (1/4)", theme: "fluent.blue.light", indices: "1/4" },
91-
{ componentFolder: "accessibility", name: "accessibility - fluent (2/4)", theme: "fluent.blue.light", indices: "2/4" },
92-
{ componentFolder: "accessibility", name: "accessibility - fluent (3/4)", theme: "fluent.blue.light", indices: "3/4" },
93-
{ componentFolder: "accessibility", name: "accessibility - fluent (4/4)", theme: "fluent.blue.light", indices: "4/4" },
80+
{ componentFolder: "accessibility", name: "accessibility - fluent (1/2)", theme: "fluent.blue.light", indices: "1/2" },
81+
{ componentFolder: "accessibility", name: "accessibility - fluent (2/2)", theme: "fluent.blue.light", indices: "2/2" },
9482
{ componentFolder: "common", name: "common" },
9583
{ componentFolder: "common", name: "common - material", theme: 'material.blue.light' },
9684
{ componentFolder: "common", name: "common - fluent", theme: 'fluent.blue.light' },
97-
{ componentFolder: "chat", name: "chat" },
98-
{ componentFolder: "chat", name: "chat - material", theme: 'material.blue.light' },
99-
{ componentFolder: "chat", name: "chat - fluent", theme: 'fluent.blue.light' },
10085
{ componentFolder: "treeList", name: "treeList", concurrency: 1 },
10186
{ componentFolder: "dataGrid/common", name: "dataGrid / common (1/5)", indices: "1/5" },
10287
{ componentFolder: "dataGrid/common", name: "dataGrid / common (2/5)", indices: "2/5" },
@@ -123,24 +108,21 @@ jobs:
123108
{ componentFolder: "scheduler/viewOffset/markup", name: "scheduler / offset markups" },
124109
{ componentFolder: "scheduler/timezones", name: "scheduler / timezones (Europe/Berlin)", timezone: "Europe/Berlin" },
125110
{ componentFolder: "scheduler/timezones", name: "scheduler / timezones (America/Los_Angeles)", timezone: "America/Los_Angeles" },
126-
{ componentFolder: "editors", name: "editors (1/3)", indices: "1/3" },
127-
{ componentFolder: "editors", name: "editors (2/3)", indices: "2/3" },
128-
{ componentFolder: "editors", name: "editors (3/3)", indices: "3/3" },
129-
{ componentFolder: "editors", name: "editors - material (1/3)", indices: "1/3", theme: 'material.blue.light' },
130-
{ componentFolder: "editors", name: "editors - material (2/3)", indices: "2/3", theme: 'material.blue.light' },
131-
{ componentFolder: "editors", name: "editors - material (3/3)", indices: "3/3", theme: 'material.blue.light' },
132-
{ componentFolder: "editors", name: "editors - fluent (1/3)", indices: "1/3", theme: 'fluent.blue.light' },
133-
{ componentFolder: "editors", name: "editors - fluent (2/3)", indices: "2/3", theme: 'fluent.blue.light' },
134-
{ componentFolder: "editors", name: "editors - fluent (3/3)", indices: "3/3", theme: 'fluent.blue.light' },
135-
{ componentFolder: "htmlEditor", name: "htmlEditor", concurrency: 1 },
136-
{ componentFolder: "htmlEditor", name: "htmlEditor - material", theme: 'material.blue.light', concurrency: 1 },
137-
{ componentFolder: "htmlEditor", name: "htmlEditor - fluent", theme: 'fluent.blue.light', concurrency: 1 },
111+
{ componentFolder: "editors", name: "editors (1/4)", indices: "1/4" },
112+
{ componentFolder: "editors", name: "editors (2/4)", indices: "2/4" },
113+
{ componentFolder: "editors", name: "editors (3/4)", indices: "3/4" },
114+
{ componentFolder: "editors", name: "editors (4/4)", indices: "4/4" },
115+
{ componentFolder: "editors", name: "editors - material (1/4)", indices: "1/4", theme: 'material.blue.light' },
116+
{ componentFolder: "editors", name: "editors - material (2/4)", indices: "2/4", theme: 'material.blue.light' },
117+
{ componentFolder: "editors", name: "editors - material (3/4)", indices: "3/4", theme: 'material.blue.light' },
118+
{ componentFolder: "editors", name: "editors - material (4/4)", indices: "4/4", theme: 'material.blue.light' },
119+
{ componentFolder: "editors", name: "editors - fluent (1/4)", indices: "1/4", theme: 'fluent.blue.light' },
120+
{ componentFolder: "editors", name: "editors - fluent (2/4)", indices: "2/4", theme: 'fluent.blue.light' },
121+
{ componentFolder: "editors", name: "editors - fluent (3/4)", indices: "3/4", theme: 'fluent.blue.light' },
122+
{ componentFolder: "editors", name: "editors - fluent (4/4)", indices: "4/4", theme: 'fluent.blue.light' },
138123
{ componentFolder: "navigation", name: "navigation" },
139124
{ componentFolder: "navigation", name: "navigation - material", theme: 'material.blue.light' },
140125
{ componentFolder: "navigation", name: "navigation - fluent", theme: 'fluent.blue.light' },
141-
{ componentFolder: "fileManager", name: "fileManager" },
142-
{ componentFolder: "fileManager", name: "fileManager - material", theme: 'material.blue.light' },
143-
{ componentFolder: "fileManager", name: "fileManager - fluent", theme: 'fluent.blue.light' },
144126
{ componentFolder: "filterBuilder", name: "filterBuilder" },
145127
{ componentFolder: "filterBuilder", name: "filterBuilder - material", theme: 'material.blue.light' },
146128
{ componentFolder: "filterBuilder", name: "filterBuilder - fluent", theme: 'fluent.blue.light' },
@@ -149,9 +131,6 @@ jobs:
149131
# { componentFolder: "pagination", name: "pagination - material", theme: 'material.blue.light' },
150132
{ componentFolder: "pagination", name: "pagination - fluent", theme: 'fluent.blue.light' },
151133
{ componentFolder: "gantt", name: "gantt" },
152-
{ componentFolder: "fileUploader", name: "fileUploader" },
153-
{ componentFolder: "fileUploader", name: "fileUploader - material", theme: 'material.blue.light' },
154-
{ componentFolder: "fileUploader", name: "fileUploader - fluent", theme: 'fluent.blue.light' },
155134
]
156135
runs-on: devextreme-shr2
157136
timeout-minutes: 45

‎e2e/testcafe-devextreme/tests/accessibility/chat.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { Message, User, Properties } from 'devextreme/ui/chat.d';
22
import url from '../../helpers/getPageUrl';
33
import { testAccessibility, Configuration } from '../../helpers/accessibility/test';
44
import { Options } from '../../helpers/generateOptionMatrix';
5-
import { avatarUrl } from '../chat/data';
5+
import { avatarUrl } from '../editors/chat/data';
66

77
fixture.disablePageReloads`Accessibility`
88
.page(url(__dirname, '../container.html'));

e2e/testcafe-devextreme/tests/chat/alertList.ts renamed to e2e/testcafe-devextreme/tests/editors/chat/alertList.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ import { createScreenshotsComparer } from 'devextreme-screenshot-comparer';
22
import Chat from 'devextreme-testcafe-models/chat';
33
import { ClientFunction } from 'testcafe';
44
import { createUser } from './data';
5-
import url from '../../helpers/getPageUrl';
6-
import { createWidget } from '../../helpers/createWidget';
7-
import { getFullThemeName, testScreenshot } from '../../helpers/themeUtils';
5+
import url from '../../../helpers/getPageUrl';
6+
import { createWidget } from '../../../helpers/createWidget';
7+
import { getFullThemeName, testScreenshot } from '../../../helpers/themeUtils';
88

9-
fixture.disablePageReloads`ChatAlertList`
10-
.page(url(__dirname, '../container.html'));
9+
fixture`ChatAlertList`
10+
.page(url(__dirname, '../../container.html'));
1111

1212
test.clientScripts([
1313
{ module: 'mockdate' },

e2e/testcafe-devextreme/tests/chat/avatar.ts renamed to e2e/testcafe-devextreme/tests/editors/chat/avatar.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import { createScreenshotsComparer } from 'devextreme-screenshot-comparer';
22
import Chat from 'devextreme-testcafe-models/chat';
33
import { createUser, generateMessages, avatarUrl } from './data';
4-
import url from '../../helpers/getPageUrl';
5-
import { createWidget } from '../../helpers/createWidget';
6-
import { testScreenshot } from '../../helpers/themeUtils';
7-
import { appendElementTo } from '../../helpers/domUtils';
4+
import url from '../../../helpers/getPageUrl';
5+
import { createWidget } from '../../../helpers/createWidget';
6+
import { testScreenshot } from '../../../helpers/themeUtils';
7+
import { appendElementTo } from '../../../helpers/domUtils';
88

99
fixture.disablePageReloads`ChatAvatar`
10-
.page(url(__dirname, '../container.html'));
10+
.page(url(__dirname, '../../container.html'));
1111

1212
test('Chat: avatar', async (t) => {
1313
const { takeScreenshot, compareResults } = createScreenshotsComparer(t);

e2e/testcafe-devextreme/tests/chat/confirmationPopup.ts renamed to e2e/testcafe-devextreme/tests/editors/chat/confirmationPopup.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import { createScreenshotsComparer } from 'devextreme-screenshot-comparer';
22
import Chat from 'devextreme-testcafe-models/chat';
33
import { createUser } from './data';
4-
import url from '../../helpers/getPageUrl';
5-
import { createWidget } from '../../helpers/createWidget';
6-
import { testScreenshot } from '../../helpers/themeUtils';
4+
import url from '../../../helpers/getPageUrl';
5+
import { createWidget } from '../../../helpers/createWidget';
6+
import { testScreenshot } from '../../../helpers/themeUtils';
77

88
fixture.disablePageReloads`ChatConfirmationPopup`.page(
9-
url(__dirname, '../container.html'),
9+
url(__dirname, '../../container.html'),
1010
);
1111

1212
test('Chat: confirmation popup', async (t) => {

e2e/testcafe-devextreme/tests/chat/data/index.ts renamed to e2e/testcafe-devextreme/tests/editors/chat/data/index.ts

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,10 @@ export const getLongText = (useLineBreaks = false, length = 1): string => {
2929
const longItemArray = Array(length).fill(longItem);
3030
const longString = longItemArray.join('');
3131

32-
const result = `${UUID}:${useLineBreaks ? lineBreaks : ''}${longString}`;
33-
34-
return result;
32+
return `${UUID}:${useLineBreaks ? lineBreaks : ''}${longString}`;
3533
};
3634

37-
export const getShortText = (useLineBreaks = false): string => {
38-
const value = `Short${useLineBreaks ? lineBreaks : ' '}text`;
39-
40-
return value;
41-
};
35+
export const getShortText = (useLineBreaks = false): string => `Short${useLineBreaks ? lineBreaks : ' '}text`;
4236

4337
export const generateMessages = (
4438
length: number,
@@ -49,8 +43,8 @@ export const generateMessages = (
4943
coefficient = 4,
5044
n = 1,
5145
isEdited = false,
52-
): Message[] => {
53-
const messages = Array.from({ length: length * n }, (_, i) => {
46+
): Message[] => (
47+
Array.from({ length: length * n }, (_, i) => {
5448
const text = useLongText
5549
? getLongText(useLineBreaks)
5650
: getShortText(useLineBreaks);
@@ -63,18 +57,14 @@ export const generateMessages = (
6357
return i % coefficient === 0 ? userFirst : userSecond;
6458
};
6559

66-
const item = {
60+
return {
6761
timestamp,
6862
author: getAuthor(),
6963
text,
7064
isEdited,
7165
};
72-
73-
return item;
74-
});
75-
76-
return messages;
77-
};
66+
})
67+
);
7868

7969
export const generateImageMessage = (
8070
user: User,

e2e/testcafe-devextreme/tests/chat/etalons/Alertlist appearance in RTL mode (fluent-blue-light).png renamed to e2e/testcafe-devextreme/tests/editors/chat/etalons/Alertlist appearance in RTL mode (fluent-blue-light).png

File renamed without changes.

e2e/testcafe-devextreme/tests/chat/etalons/Alertlist appearance in RTL mode (generic-light).png renamed to e2e/testcafe-devextreme/tests/editors/chat/etalons/Alertlist appearance in RTL mode (generic-light).png

File renamed without changes.

e2e/testcafe-devextreme/tests/chat/etalons/Alertlist appearance in RTL mode (material-blue-light).png renamed to e2e/testcafe-devextreme/tests/editors/chat/etalons/Alertlist appearance in RTL mode (material-blue-light).png

File renamed without changes.

0 commit comments

Comments
 (0)