Skip to content

Commit 58d0914

Browse files
revert some changes
1 parent 115d3d8 commit 58d0914

File tree

14 files changed

+28
-39
lines changed

14 files changed

+28
-39
lines changed

.github/workflows/testcafe_tests.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,12 @@ jobs:
6262
path: |
6363
${{ env.STORE_PATH }}
6464
.nx/cache
65-
node_modules/.cache
6665
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
6766
restore-keys: |
6867
${{ runner.os }}-pnpm-store
6968
7069
- name: Install dependencies
71-
run: pnpm install --frozen-lockfile --prefer-offline
70+
run: pnpm install --frozen-lockfile
7271

7372
- name: Build
7473
shell: bash
@@ -167,18 +166,17 @@ jobs:
167166
path: |
168167
${{ env.STORE_PATH }}
169168
.nx/cache
170-
node_modules/.cache
171169
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
172170
restore-keys: |
173171
${{ runner.os }}-pnpm-store
174172
175173
- name: Install dependencies
176-
run: pnpm install --frozen-lockfile --prefer-offline
174+
run: pnpm install --frozen-lockfile
177175

178176
- name: Run TestCafe tests
179177
working-directory: ./e2e/testcafe-devextreme
180178
env:
181-
NODE_OPTIONS: --max-old-space-size=8192 --max-semi-space-size=1024
179+
NODE_OPTIONS: --max-old-space-size=8192
182180
run: |
183181
if [ "${{ matrix.ARGS.theme }}" != "" ]; then
184182
THEME="--theme ${{ matrix.ARGS.theme }}"

e2e/testcafe-devextreme/runner.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,7 @@ async function main() {
161161
console.info('Browsers:', browsers);
162162

163163
const failedTests: Set<string> = new Set();
164+
let isRetryRun = false;
164165

165166
const createRunner = (filterByFailedTests = false) => {
166167
const runner: Runner = testCafe!.createRunner()
@@ -282,7 +283,7 @@ async function main() {
282283
after: async (t: TestController) => {
283284
await clearTestPage(t);
284285

285-
if (args.retryFailed) {
286+
if (args.retryFailed && !isRetryRun) {
286287
// @ts-expect-error ts-errors
287288
const { test, errs } = t.testRun;
288289
if (errs && errs.length > 0) {
@@ -325,11 +326,13 @@ async function main() {
325326
const testsToRetry = new Set(failedTests);
326327
failedTests.clear();
327328

329+
isRetryRun = true;
328330
const retryRunner = createRunner(true);
329331
failedCount = await retry(
330332
() => retryRunner.run(runOptions),
331333
LAUNCH_RETRY_ATTEMPTS,
332334
);
335+
isRetryRun = false;
333336

334337
attemptsLeft -= 1;
335338

@@ -340,7 +343,7 @@ async function main() {
340343
console.info('='.repeat(60));
341344
console.info(`Tests retried: ${testsToRetry.size}`);
342345
console.info(`Still failing: ${failedCount}`);
343-
console.info(`Passed on this attempt: ${testsToRetry.size - failedCount}`);
346+
console.info(`Passed on this attempt: ${Math.max(0, testsToRetry.size - failedCount)}`);
344347
console.info('='.repeat(60));
345348
console.info('\n');
346349
/* eslint-enable no-console */

e2e/testcafe-devextreme/tests/cardView/keyboardNavigation/header.functional.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { addFocusableElementBefore } from '../../../helpers/domUtils';
88
// It triggers this event on document level and process keyboard navigation action immediately.
99
// Therefore, it's impossible to test switching focus between areas in TestCafe
1010
// Because this feature works with event bubbling + inert attribute
11-
fixture`KeyboardNavigation.Header`
11+
fixture.disablePageReloads`KeyboardNavigation.Header`
1212
.page(url(__dirname, '../../container.html'));
1313

1414
const CARD_VIEW_SELECTOR = '#container';

e2e/testcafe-devextreme/tests/common/treeList/focusedRow.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const clearLocalStorage = ClientFunction(() => {
77
(window as any).localStorage.removeItem('mystate');
88
});
99

10-
fixture`Focused row`
10+
fixture.disablePageReloads`Focused row`
1111
.page(url(__dirname, '../../container.html'));
1212

1313
const getItems = (): Record<string, unknown>[] => {

e2e/testcafe-devextreme/tests/common/treeList/keyboardNavigation/keyboardNavigation.functional.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ test('TreeList - Template button in a data row isn\'t navigable with Tab button
103103
}, '#otherContainer');
104104
});
105105

106-
test.meta({ unstable: true })('TreeList - Keyboard navigation on Expand/Collapse buttons is broken if the mouse used before (T1234949)', async (t) => {
106+
test('TreeList - Keyboard navigation on Expand/Collapse buttons is broken if the mouse used before (T1234949)', async (t) => {
107107
const treeList = new TreeList('#container');
108108
const target = treeList.getDataRow(0).getDataCell(0);
109109

e2e/testcafe-devextreme/tests/common/treeList/scrolling.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ const scrollWindowTo = async (position: object) => {
1919
)();
2020
};
2121

22-
fixture`Virtual Scrolling`
22+
fixture.disablePageReloads`Virtual Scrolling`
2323
.page(url(__dirname, '../../container.html'));
2424

2525
function generateData(rowCount): Record<string, unknown>[] {

e2e/testcafe-devextreme/tests/common/treeList/selection.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { createWidget } from '../../../helpers/createWidget';
77
import { tasksApiMock } from './apiMocks/tasksApiMock';
88
import { testScreenshot } from '../../../helpers/themeUtils';
99

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

1313
// T1109666

e2e/testcafe-devextreme/tests/dataGrid/common/editing.ts

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2796,8 +2796,7 @@ test('Cells should be focused correctly on click when cell editing mode is used
27962796

27972797
// act
27982798
await t
2799-
.click(dataGrid.getDataCell(0, 0).getEditor().element)
2800-
.wait(50);
2799+
.click(dataGrid.getDataCell(0, 0).getEditor().element);
28012800

28022801
// assert
28032802
await t
@@ -2810,8 +2809,7 @@ test('Cells should be focused correctly on click when cell editing mode is used
28102809
await t
28112810
.typeText(dataGrid.getDataCell(0, 0).getEditor().element, '1')
28122811
.wait(50)
2813-
.click(dataGrid.getDataCell(1, 0).getEditor().element)
2814-
.wait(50);
2812+
.click(dataGrid.getDataCell(1, 0).getEditor().element);
28152813

28162814
// assert
28172815
await t
@@ -2826,8 +2824,7 @@ test('Cells should be focused correctly on click when cell editing mode is used
28262824
await t
28272825
.typeText(dataGrid.getDataCell(1, 0).getEditor().element, '2')
28282826
.wait(50)
2829-
.click(dataGrid.getDataCell(2, 0).getEditor().element)
2830-
.wait(50);
2827+
.click(dataGrid.getDataCell(2, 0).getEditor().element);
28312828

28322829
// assert
28332830
await t
@@ -2842,8 +2839,7 @@ test('Cells should be focused correctly on click when cell editing mode is used
28422839
await t
28432840
.typeText(dataGrid.getDataCell(2, 0).getEditor().element, '3')
28442841
.wait(50)
2845-
.click(dataGrid.getDataCell(1, 0).getEditor().element)
2846-
.wait(50);
2842+
.click(dataGrid.getDataCell(1, 0).getEditor().element);
28472843

28482844
// assert
28492845
await t
@@ -2858,8 +2854,7 @@ test('Cells should be focused correctly on click when cell editing mode is used
28582854
await t
28592855
.typeText(dataGrid.getDataCell(1, 0).getEditor().element, '2')
28602856
.wait(50)
2861-
.click(dataGrid.getDataCell(0, 0).getEditor().element)
2862-
.wait(50);
2857+
.click(dataGrid.getDataCell(0, 0).getEditor().element);
28632858

28642859
// assert
28652860
await t

e2e/testcafe-devextreme/tests/dataGrid/common/keyboardNavigation/columnReordering.visual.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1355,7 +1355,6 @@ test('reorder column to left when adaptability is enabled and there are hidden c
13551355
.expect(firstHeader.element.textContent)
13561356
.contains('Field');
13571357

1358-
await t.debug();
13591358
await testScreenshot(t, takeScreenshot, `reorder_column_when_there_are_async_templates_and_renderAsync_=_${renderAsync}.png`, { element: dataGrid.element });
13601359

13611360
await t.expect(compareResults.isValid())

e2e/testcafe-devextreme/tests/dataGrid/common/keyboardNavigation/keyboardNavigation.visual.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@ test('Focus the first cell in the firs row when pressing the Ctrl+Home key', asy
404404
showBorders: true,
405405
}));
406406

407-
test.meta({ unstable: true })('Navigate to last cell in the last row when pressing the Ctrl+End key', async (t) => {
407+
test('Navigate to last cell in the last row when pressing the Ctrl+End key', async (t) => {
408408
// arrange
409409
const dataGrid = new DataGrid('#container');
410410
const { takeScreenshot, compareResults } = createScreenshotsComparer(t);

0 commit comments

Comments
 (0)