Skip to content

Commit bdfba8d

Browse files
authored
CI: small configuration improvements (DevExpress#29211)
1 parent bb06846 commit bdfba8d

File tree

7 files changed

+13
-6
lines changed

7 files changed

+13
-6
lines changed

.github/workflows/qunit_tests-renovation.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ jobs:
7676
- name: Run QUnit tests
7777
uses: ./.github/actions/run-qunit-tests
7878
with:
79+
name: Constel ${{ matrix.CONSTEL }}
7980
constel: ${{ matrix.CONSTEL }}
8081
useCsp: "false"
8182

.github/workflows/testcafe_tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ jobs:
142142
{ componentFolder: "filterBuilder", name: "filterBuilder - fluent", theme: 'fluent.blue.light' },
143143
]
144144
runs-on: devextreme-shr2
145-
timeout-minutes: 90
145+
timeout-minutes: 45
146146

147147
steps:
148148
- name: Set machine timezone
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
module.exports = {
2+
DEFAULT_BROWSER_SIZE: [1200, 800],
3+
};

e2e/testcafe-devextreme/helpers/restoreBrowserSize.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1+
// eslint-disable-next-line import/extensions
2+
import { DEFAULT_BROWSER_SIZE } from './const.js';
3+
14
// eslint-disable-next-line @typescript-eslint/no-type-alias
25
type BrowserSizeType = [width: number, height: number];
3-
const DEFAULT_BROWSER_SIZE: BrowserSizeType = [1200, 800];
46

57
const restoreBrowserSize = async (t: TestController):
68
Promise<any> => {

e2e/testcafe-devextreme/helpers/safeSizeTest.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ const decorateTestCafeAfter = (
5656
const safeSizeTest = (
5757
name: string,
5858
testFunction: TestCafeFn,
59-
size: BrowserSizeType = DEFAULT_BROWSER_SIZE,
59+
size: BrowserSizeType = DEFAULT_BROWSER_SIZE as BrowserSizeType,
6060
): TestFn => {
6161
const testCafeTest = test(name, testFunction);
6262

e2e/testcafe-devextreme/runner.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ const fs = require('fs');
66
const process = require('process');
77
const parseArgs = require('minimist');
88
const { globSync } = require('glob');
9+
const { DEFAULT_BROWSER_SIZE } = require('./helpers/const');
910
const testPageUtils = require('./helpers/clearPage');
1011
require('nconf').argv();
1112

@@ -167,8 +168,8 @@ createTestCafe(TESTCAFE_CONFIG)
167168
runOptions.hooks = {
168169
test: {
169170
before: async(t) => {
170-
// TODO: Move to a single const (look at restoreBrowserSize helper module)
171-
await t.resizeWindow(1200, 800);
171+
const [width, height] = DEFAULT_BROWSER_SIZE;
172+
await t.resizeWindow(width, height);
172173

173174
if(args.shadowDom) {
174175
await addShadowRootTree(t);

packages/devextreme/testing/runner/Views/Main/RunAll.cshtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
$(function() {
6060
var ROOT_URL = "@Url.Content("~/")";
6161
62-
var TEST_TIMEOUT_SECONDS = 30,
62+
var TEST_TIMEOUT_SECONDS = 45,
6363
TEST_TIMEOUT = TEST_TIMEOUT_SECONDS * 1000,
6464
WORKER_NAME_PREFIX = "workerFrame",
6565
busyCount = 0,

0 commit comments

Comments
 (0)