diff options
author | Eric Eastwood <contact@ericeastwood.com> | 2017-08-31 19:46:18 -0500 |
---|---|---|
committer | Eric Eastwood <contact@ericeastwood.com> | 2017-09-18 18:06:39 -0500 |
commit | 5ecfd3cd0f6be51d4e01292b0c5583427d73aa8d (patch) | |
tree | f51e560435c96326f07dd7c6a623172b9679390c /spec/features | |
parent | f0b089cf7881a0eed7f3aefe22d5b3006a39023d (diff) | |
download | gitlab-ce-5ecfd3cd0f6be51d4e01292b0c5583427d73aa8d.tar.gz |
Fix MR widget with external CI services/integrations33287-fix-mr-widget-errors-with-external-services
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/33287
The MR widget was trying to render the pipelines section when
there are no GitLab CI pipelines which was throwing some NPE
errors.
Diffstat (limited to 'spec/features')
-rw-r--r-- | spec/features/merge_requests/widget_spec.rb | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/spec/features/merge_requests/widget_spec.rb b/spec/features/merge_requests/widget_spec.rb index fd991293ee9..443b596b3c6 100644 --- a/spec/features/merge_requests/widget_spec.rb +++ b/spec/features/merge_requests/widget_spec.rb @@ -142,6 +142,24 @@ describe 'Merge request', :js do end end + context 'view merge request where project has CI setup but no CI status' do + before do + pipeline = create(:ci_pipeline, project: project, + sha: merge_request.diff_head_sha, + ref: merge_request.source_branch) + create(:ci_build, pipeline: pipeline) + + visit project_merge_request_path(project, merge_request) + end + + it 'has pipeline error text' do + # Wait for the `ci_status` and `merge_check` requests + wait_for_requests + + expect(page).to have_text('Could not connect to the CI server. Please check your settings and try again') + end + end + context 'view merge request with MWPS enabled but automatically merge fails' do before do merge_request.update( |