diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-08-01 10:40:07 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-08-01 10:40:07 +0000 |
| commit | 6a1bc3d86b3d5f758106e11527a44e6defd07f9a (patch) | |
| tree | 225ce32f1e68d8b03d67032ba9a304997753e2c7 | |
| parent | 6cccf59cb447fed490c5975e8e7fec6d28b2446b (diff) | |
| parent | f6e6d374d927e31f99ac3a0b324ed6f14ecff542 (diff) | |
| download | gitlab-ce-6a1bc3d86b3d5f758106e11527a44e6defd07f9a.tar.gz | |
Merge branch 'rails5-fix-flaky-spec-user-uses-shortcuts' into 'master'
Rails5: fix flaky spec
See merge request gitlab-org/gitlab-ce!20953
| -rw-r--r-- | changelogs/unreleased/rails5-fix-flaky-spec-user-uses-shortcuts.yml | 5 | ||||
| -rw-r--r-- | spec/features/projects/user_uses_shortcuts_spec.rb | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/changelogs/unreleased/rails5-fix-flaky-spec-user-uses-shortcuts.yml b/changelogs/unreleased/rails5-fix-flaky-spec-user-uses-shortcuts.yml new file mode 100644 index 00000000000..5f2504c604d --- /dev/null +++ b/changelogs/unreleased/rails5-fix-flaky-spec-user-uses-shortcuts.yml @@ -0,0 +1,5 @@ +--- +title: 'Rails5: fix flaky spec' +merge_request: 20953 +author: Jasper Maes +type: fixed diff --git a/spec/features/projects/user_uses_shortcuts_spec.rb b/spec/features/projects/user_uses_shortcuts_spec.rb index df9ee69aadb..64f9a4fcd39 100644 --- a/spec/features/projects/user_uses_shortcuts_spec.rb +++ b/spec/features/projects/user_uses_shortcuts_spec.rb @@ -9,6 +9,8 @@ describe 'User uses shortcuts', :js do sign_in(user) visit(project_path(project)) + + wait_for_requests end context 'when navigating to the Project pages' do |