Skip to content

Commit af36907

Browse files
Attempt 5 (attempt 4 - 20 min)
1 parent 833f144 commit af36907

File tree

6 files changed

+71
-36
lines changed

6 files changed

+71
-36
lines changed

.github/workflows/testcafe_tests.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ env:
1515
NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_TOKEN }}
1616
NX_SKIP_NX_CACHE: ${{ (github.event_name != 'pull_request' || contains( github.event.pull_request.labels.*.name, 'skip-cache')) && 'true' || 'false' }}
1717
BUILD_TEST_INTERNAL_PACKAGE: true
18+
CI: true
1819

1920
jobs:
2021
build:

e2e/testcafe-devextreme/runner.js

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,8 @@ createTestCafe(TESTCAFE_CONFIG)
7171

7272
const args = getArgs();
7373
const testName = args.test.trim();
74-
const reporter = typeof args.reporter === 'string' ? args.reporter.trim() : args.reporter;
74+
// const reporter = typeof args.reporter === 'string' ? args.reporter.trim() : args.reporter;
75+
const reporter = 'list';
7576
const indices = args.indices.trim();
7677
let componentFolder = args.componentFolder.trim();
7778
const file = args.file.trim();
@@ -162,12 +163,20 @@ createTestCafe(TESTCAFE_CONFIG)
162163
}
163164

164165
const runOptions = {
165-
quarantineMode: { successThreshold: 1, attemptLimit: 10 },
166+
quarantineMode: { successThreshold: 1, attemptLimit: 5 },
166167
};
167168

169+
const attemptsCounter = new Map();
170+
168171
runOptions.hooks = {
169172
test: {
170173
before: async(t) => {
174+
const testName = t.testRun.test.name;
175+
const prev = attemptsCounter.get(testName) || 0;
176+
attemptsCounter.set(testName, prev + 1);
177+
178+
console.log(`▶️ ${testName}, attempt №${prev + 1}`);
179+
171180
const [width, height] = DEFAULT_BROWSER_SIZE;
172181
await t.resizeWindow(width, height);
173182

@@ -227,7 +236,7 @@ function getArgs() {
227236
browsers: 'chrome',
228237
test: '',
229238
// reporter: [process.env.CI === 'true' ? 'list' : 'spec'],
230-
reporter: 'spec',
239+
reporter: 'list',
231240
componentFolder: '',
232241
file: '*',
233242
cache: true,

e2e/testcafe-devextreme/tests/cardView/columnSortable/visual.ts

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -79,35 +79,35 @@ test('dropzone appear in headerPanel when drag from columnChooser a column', asy
7979
],
8080
}));
8181

82-
test('dropzone appears in headerPanel when drag from columnChooser a column with allowReordering: false', async (t) => {
83-
const { takeScreenshot, compareResults } = createScreenshotsComparer(t);
84-
85-
const cardView = new CardView(CARD_VIEW_SELECTOR);
86-
const columnElement = getColumnItem(cardView, 0, 'columnChooser');
87-
88-
await cardView.apiShowColumnChooser();
89-
90-
await triggerDragStart(columnElement);
91-
await t.wait(500); // wait for dropzone animation to finish
92-
await testScreenshot(t, takeScreenshot, 'card-view_column-sortable_header-panel_dropzone_1.png', { element: cardView.element });
93-
94-
await triggerDragEnd(columnElement);
95-
await t.wait(500); // wait for dropzone animation to finish
96-
await testScreenshot(t, takeScreenshot, 'card-view_column-sortable_header-panel_dropzone_2.png', { element: cardView.element });
97-
98-
await t
99-
.expect(compareResults.isValid())
100-
.ok(compareResults.errorMessages());
101-
102-
await a11yCheck(t, {}, CARD_VIEW_SELECTOR);
103-
}).before(async () => createWidget('dxCardView', {
104-
allowColumnReordering: true,
105-
columnChooser: {
106-
enabled: true,
107-
},
108-
height: 600,
109-
columns: [
110-
{ dataField: 'Column 1' },
111-
{ dataField: 'Column 2', visible: false, allowReordering: false },
112-
],
113-
}));
82+
// test('dropzone appears in headerPanel when drag from columnChooser a column with allowReordering: false', async (t) => {
83+
// const { takeScreenshot, compareResults } = createScreenshotsComparer(t);
84+
85+
// const cardView = new CardView(CARD_VIEW_SELECTOR);
86+
// const columnElement = getColumnItem(cardView, 0, 'columnChooser');
87+
88+
// await cardView.apiShowColumnChooser();
89+
90+
// await triggerDragStart(columnElement);
91+
// await t.wait(500); // wait for dropzone animation to finish
92+
// await testScreenshot(t, takeScreenshot, 'card-view_column-sortable_header-panel_dropzone_1.png', { element: cardView.element });
93+
94+
// await triggerDragEnd(columnElement);
95+
// await t.wait(500); // wait for dropzone animation to finish
96+
// await testScreenshot(t, takeScreenshot, 'card-view_column-sortable_header-panel_dropzone_2.png', { element: cardView.element });
97+
98+
// await t
99+
// .expect(compareResults.isValid())
100+
// .ok(compareResults.errorMessages());
101+
102+
// await a11yCheck(t, {}, CARD_VIEW_SELECTOR);
103+
// }).before(async () => createWidget('dxCardView', {
104+
// allowColumnReordering: true,
105+
// columnChooser: {
106+
// enabled: true,
107+
// },
108+
// height: 600,
109+
// columns: [
110+
// { dataField: 'Column 1' },
111+
// { dataField: 'Column 2', visible: false, allowReordering: false },
112+
// ],
113+
// }));

packages/devextreme-scss/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
},
2121
"scripts": {
2222
"build": "gulp",
23+
"build:ci": "gulp style-compiler-themes-ci",
2324
"lint": "stylelint scss/widgets",
2425
"test": "jest --no-coverage --runInBand --config=./tests/jest.config.json",
2526
"watch": "gulp watch"

packages/devextreme-scss/project.json

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,27 @@
3434
"{projectRoot}/**/*"
3535
],
3636
"cache": true
37+
},
38+
"build-ci": {
39+
"executor": "nx:run-script",
40+
"options": {
41+
"script": "build:ci"
42+
},
43+
"inputs": [
44+
"{projectRoot}/build/**/*",
45+
"{projectRoot}/fonts/**/*",
46+
"{projectRoot}/icons/**/*",
47+
"{projectRoot}/images/**/*",
48+
"{projectRoot}/scss/**/*",
49+
"{projectRoot}/gulpfile.js"
50+
],
51+
"outputs": [
52+
"{projectRoot}/scss/bundles",
53+
"{workspaceRoot}/packages/devextreme/artifacts/css/dx.*.css",
54+
"{workspaceRoot}/packages/devextreme/artifacts/css/fonts",
55+
"{workspaceRoot}/packages/devextreme/artifacts/css/icons"
56+
],
57+
"cache": true
3758
}
3859
},
3960
"tags": []

tools/scripts/build-all.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,10 @@ if (!devMode) {
5555
if (devMode) {
5656
sh.exec('pnpx nx build devextreme');
5757
} else {
58-
sh.exec('pnpx nx build devextreme-scss');
58+
const isCI = process.env.CI === 'true';
59+
const scssCommand = isCI ? 'pnpx nx build-ci devextreme-scss' : 'pnpx nx build devextreme-scss';
60+
61+
sh.exec(scssCommand);
5962
sh.exec('pnpx nx build-dist devextreme --skipNxCache', {
6063
env: {
6164
...sh.env,

0 commit comments

Comments
 (0)