diff options
| author | Rémy Coutable <remy@rymai.me> | 2019-01-16 10:43:03 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2019-01-16 10:43:03 +0000 |
| commit | ea0b73360143b6ae4bc44535c0492c53be27ea52 (patch) | |
| tree | 9bea398708325b3f15cfe8fca696309ac74b8175 | |
| parent | 7017cba31bd64a37fe550fc8431f847b8221cf37 (diff) | |
| parent | e1466177d4ead01745e20166b3b0b8dc471e7319 (diff) | |
| download | gitlab-ce-ea0b73360143b6ae4bc44535c0492c53be27ea52.tar.gz | |
Merge branch 'fix-user-merges-immediately-transient-spec' into 'master'
Fixed transient user merges immediately spec
Closes gitlab-ee#9206
See merge request gitlab-org/gitlab-ce!24421
| -rw-r--r-- | spec/features/merge_request/user_merges_immediately_spec.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/spec/features/merge_request/user_merges_immediately_spec.rb b/spec/features/merge_request/user_merges_immediately_spec.rb index ea61f9675bc..84636ae355c 100644 --- a/spec/features/merge_request/user_merges_immediately_spec.rb +++ b/spec/features/merge_request/user_merges_immediately_spec.rb @@ -25,6 +25,8 @@ describe 'Merge requests > User merges immediately', :js do end it 'enables merge immediately' do + wait_for_requests + page.within '.mr-widget-body' do find('.dropdown-toggle').click |