diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2017-04-20 13:45:40 +0300 |
---|---|---|
committer | James Lopez <james@jameslopez.es> | 2017-04-20 15:34:04 +0300 |
commit | 9cc8444a52fec03b38d82e9556ea8b9a6de5b1b3 (patch) | |
tree | 8b18763075541551900770f04d5d0fb4aa3596fc /spec | |
parent | bd2c22d65518e5c581f30099fd24aea07622306f (diff) |
Merge branch 'fix/29125' into 'master'
Port of fix/29125-ee to CE
Closes #29125
See merge request !10796
Diffstat (limited to 'spec')
-rw-r--r-- | spec/features/merge_requests/widget_spec.rb | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/spec/features/merge_requests/widget_spec.rb b/spec/features/merge_requests/widget_spec.rb index c2db7d8da3c..67184e05d09 100644 --- a/spec/features/merge_requests/widget_spec.rb +++ b/spec/features/merge_requests/widget_spec.rb @@ -141,6 +141,27 @@ describe 'Merge request', :feature, :js do end end + context 'view merge request with MWPS enabled but automatically merge fails' do + before do + merge_request.update( + merge_when_pipeline_succeeds: true, + merge_user: merge_request.author, + merge_error: 'Something went wrong' + ) + + visit namespace_project_merge_request_path(project.namespace, project, merge_request) + end + + it 'shows information about the merge error' do + # Wait for the `ci_status` and `merge_check` requests + wait_for_ajax + + page.within('.mr-widget-body') do + expect(page).to have_content('Something went wrong') + end + end + end + context 'merge error' do before do allow_any_instance_of(Repository).to receive(:merge).and_return(false) |