diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2018-12-14 19:40:14 +0300 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2018-12-14 19:43:09 +0300 |
| commit | 1f3cd9be6a986a3618840ab90a7b2a5757ecab72 (patch) | |
| tree | 9b2cfc7f5f70700fa593cca9098c56b6810f489d /spec/features | |
| parent | 0a69dbd23da6f625adfc09d7c98fdd1cafe39f4e (diff) | |
Resolve a transient failure in MWPS feature spec
When this spec is run in a certain order, there appeared to be a timing
issue with opening the "Merge when pipeline succeeds" drop-down menu. We
now explicitly wait for any pending requests to complete before clicking
the drop-down.
Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/6770
Diffstat (limited to 'spec/features')
| -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' |