diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2019-04-18 23:17:04 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2019-04-18 23:17:04 +0000 |
| commit | 9ec37d3dc1c1969be743a0c283242dc462a8f466 (patch) | |
| tree | fa60348cdd475c6febfaf76cad849e7960479158 | |
| parent | a82f553b15d9ac488def6a70b9bfe3215e9ae66f (diff) | |
| parent | 70abf0a006f2445a4b39070da996a2bdaf4f77ff (diff) | |
| download | gitlab-ce-9ec37d3dc1c1969be743a0c283242dc462a8f466.tar.gz | |
Merge branch 'winh-abuse_reports_spec-timeout' into 'master'
Increase timeout for abuse_reports_spec.js to 500ms
Closes gitlab-ee#11229
See merge request gitlab-org/gitlab-ce!27502
| -rw-r--r-- | spec/frontend/pages/admin/abuse_reports/abuse_reports_spec.js | 3 |
1 files changed, 3 insertions, 0 deletions
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 7e9aec84016..f163bdd9913 100644 --- a/spec/frontend/pages/admin/abuse_reports/abuse_reports_spec.js +++ b/spec/frontend/pages/admin/abuse_reports/abuse_reports_spec.js @@ -1,6 +1,9 @@ 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'; |