diff options
| author | Winnie Hellmann <winnie@gitlab.com> | 2019-05-17 10:08:20 +0000 |
|---|---|---|
| committer | Tim Zallmann <tzallmann@gitlab.com> | 2019-05-17 10:08:20 +0000 |
| commit | 9012d309f13ec7595f2495d73549ded81432fb13 (patch) | |
| tree | bdbfbf5bc8ced482d9555d1c59f44a14d50dcde9 | |
| parent | f2cb5220112f1f7fe4c29c4b07998f77a67291a2 (diff) | |
| download | gitlab-ce-9012d309f13ec7595f2495d73549ded81432fb13.tar.gz | |
Increase Jest timeout to 500ms
| -rw-r--r-- | spec/frontend/gfm_auto_complete_spec.js | 3 | ||||
| -rw-r--r-- | spec/frontend/notes/components/discussion_notes_spec.js | 3 | ||||
| -rw-r--r-- | spec/frontend/pages/admin/abuse_reports/abuse_reports_spec.js | 3 | ||||
| -rw-r--r-- | spec/frontend/test_setup.js | 2 |
4 files changed, 1 insertions, 10 deletions
diff --git a/spec/frontend/gfm_auto_complete_spec.js b/spec/frontend/gfm_auto_complete_spec.js index 3886853f3c1..8af49fd47a2 100644 --- a/spec/frontend/gfm_auto_complete_spec.js +++ b/spec/frontend/gfm_auto_complete_spec.js @@ -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', () => { diff --git a/spec/frontend/notes/components/discussion_notes_spec.js b/spec/frontend/notes/components/discussion_notes_spec.js index 7e037beca9d..c3204b3aaa0 100644 --- a/spec/frontend/notes/components/discussion_notes_spec.js +++ b/spec/frontend/notes/components/discussion_notes_spec.js @@ -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 => { diff --git a/spec/frontend/pages/admin/abuse_reports/abuse_reports_spec.js b/spec/frontend/pages/admin/abuse_reports/abuse_reports_spec.js index f163bdd9913..7e9aec84016 100644 --- a/spec/frontend/pages/admin/abuse_reports/abuse_reports_spec.js +++ b/spec/frontend/pages/admin/abuse_reports/abuse_reports_spec.js @@ -1,9 +1,6 @@ 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'; diff --git a/spec/frontend/test_setup.js b/spec/frontend/test_setup.js index f0d62a3c41c..c24f0bc4776 100644 --- a/spec/frontend/test_setup.js +++ b/spec/frontend/test_setup.js @@ -15,7 +15,7 @@ afterEach(() => }), ); -initializeTestTimeout(300); +initializeTestTimeout(500); // fail tests for unmocked requests beforeEach(done => { |