Commit 7d094c6b authored by Paul Slaughter's avatar Paul Slaughter

Merge branch '293654-fix-flaky-test' into 'master'

Adjust testing library timeouts

See merge request gitlab-org/gitlab!50274
parents 04dd5762 97eef848
...@@ -45,9 +45,9 @@ export const getEditorValue = async () => { ...@@ -45,9 +45,9 @@ export const getEditorValue = async () => {
return window.monaco.editor.getModel(uri).getValue(); return window.monaco.editor.getModel(uri).getValue();
}; };
const findTreeBody = () => screen.findByTestId('ide-tree-body', {}, { timeout: 5000 }); const findTreeBody = () => screen.findByTestId('ide-tree-body');
const findRootActions = () => screen.findByTestId('ide-root-actions', {}, { timeout: 7000 }); const findRootActions = () => screen.findByTestId('ide-root-actions');
const findFileRowContainer = (row = null) => const findFileRowContainer = (row = null) =>
row ? Promise.resolve(row.parentElement) : findTreeBody(); row ? Promise.resolve(row.parentElement) : findTreeBody();
......
...@@ -3,9 +3,7 @@ import { screen } from '@testing-library/dom'; ...@@ -3,9 +3,7 @@ import { screen } from '@testing-library/dom';
import * as ideHelper from './helpers/ide_helper'; import * as ideHelper from './helpers/ide_helper';
import startWebIDE from './helpers/start'; import startWebIDE from './helpers/start';
// https://gitlab.com/gitlab-org/gitlab/-/issues/293654#note_466432769 describe('IDE: User opens a file in the Web IDE', () => {
// eslint-disable-next-line jest/no-disabled-tests
describe.skip('IDE: User opens a file in the Web IDE', () => {
useOverclockTimers(); useOverclockTimers();
let vm; let vm;
......
...@@ -3,3 +3,4 @@ import './setup_globals'; ...@@ -3,3 +3,4 @@ import './setup_globals';
import './setup_axios'; import './setup_axios';
import './setup_serializers'; import './setup_serializers';
import './setup_mock_server'; import './setup_mock_server';
import './setup_testing_library';
import { configure } from '@testing-library/dom';
configure({ asyncUtilTimeout: 10000 });
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment