diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-12-14 21:06:56 +0000 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2019-01-16 14:18:55 -0600 |
| commit | 3879ba7799a41e702e69dc33300d4461d8ebf53c (patch) | |
| tree | 8740e8d838fcb40d5a502b6739db18ee3b1a6138 | |
| parent | 59d7962173301dacf27510217bca83b98d41ff82 (diff) | |
| download | gitlab-ce-3879ba7799a41e702e69dc33300d4461d8ebf53c.tar.gz | |
Merge branch 'rs-transient-failure' into 'master'
Resolve a transient failure in MWPS feature spec
Closes gitlab-ee#6770
See merge request gitlab-org/gitlab-ce!23838
| -rw-r--r-- | spec/features/merge_request/user_merges_when_pipeline_succeeds_spec.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/spec/features/merge_request/user_merges_when_pipeline_succeeds_spec.rb b/spec/features/merge_request/user_merges_when_pipeline_succeeds_spec.rb index 53ed5d78598..29b3d2b629b 100644 --- a/spec/features/merge_request/user_merges_when_pipeline_succeeds_spec.rb +++ b/spec/features/merge_request/user_merges_when_pipeline_succeeds_spec.rb @@ -88,6 +88,8 @@ describe 'Merge request > User merges when pipeline succeeds', :js do describe 'enabling Merge when pipeline succeeds via dropdown' do it 'activates the Merge when pipeline succeeds feature' do + wait_for_requests + find('.js-merge-moment').click click_link 'Merge when pipeline succeeds' |