Commit 0b12a574 authored by Tim Zallmann's avatar Tim Zallmann

Merge branch 'winh-increase-jest-timeout' into 'master'

Increase Jest timeout to 500ms

See merge request gitlab-org/gitlab-ce!28383
parents f2cb5220 9012d309
......@@ -7,11 +7,8 @@ import 'jquery.caret';
import 'at.js';
import { TEST_HOST } from 'helpers/test_constants';
import { setTestTimeout } from 'helpers/timeout';
import { getJSONFixture } from 'helpers/fixtures';
setTestTimeout(500);
const labelsFixture = getJSONFixture('autocomplete_sources/labels.json');
describe('GfmAutoComplete', () => {
......
......@@ -8,7 +8,6 @@ import PlaceholderSystemNote from '~/vue_shared/components/notes/placeholder_sys
import SystemNote from '~/vue_shared/components/notes/system_note.vue';
import TimelineEntryItem from '~/vue_shared/components/notes/timeline_entry_item.vue';
import createStore from '~/notes/stores';
import { setTestTimeout } from 'helpers/timeout';
import {
noteableDataMock,
discussionMock,
......@@ -18,8 +17,6 @@ import {
const localVue = createLocalVue();
describe('DiscussionNotes', () => {
setTestTimeout(500);
let wrapper;
const createComponent = props => {
......
import $ from 'jquery';
import '~/lib/utils/text_utility';
import AbuseReports from '~/pages/admin/abuse_reports/abuse_reports';
import { setTestTimeout } from 'helpers/timeout';
setTestTimeout(500);
describe('Abuse Reports', () => {
const FIXTURE = 'abuse_reports/abuse_reports_list.html';
......
......@@ -15,7 +15,7 @@ afterEach(() =>
}),
);
initializeTestTimeout(300);
initializeTestTimeout(500);
// fail tests for unmocked requests
beforeEach(done => {
......
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