diff options
author | Fatih Acet <acetfatih@gmail.com> | 2017-02-07 21:21:30 +0000 |
---|---|---|
committer | Fatih Acet <acetfatih@gmail.com> | 2017-02-07 21:21:30 +0000 |
commit | 71c80375474e0bda201de07870587b0bb8553069 (patch) | |
tree | 1b4aa9316ba709a534f06522d8224d78fd38ccf0 /spec/features | |
parent | 9aafb2a6d3c1b2588ef0689d6919014150123e64 (diff) | |
parent | d410c937a509c46cd1de807937b8d74bf383070c (diff) | |
download | gitlab-ce-71c80375474e0bda201de07870587b0bb8553069.tar.gz |
Merge branch 'fix/gb/invalid-new-merge-request-api' into 'master'
Fix rendering pipelines for a new merge request
See merge request !9032
Diffstat (limited to 'spec/features')
-rw-r--r-- | spec/features/merge_requests/create_new_mr_spec.rb | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/spec/features/merge_requests/create_new_mr_spec.rb b/spec/features/merge_requests/create_new_mr_spec.rb index f1b68a39343..e853fb7e016 100644 --- a/spec/features/merge_requests/create_new_mr_spec.rb +++ b/spec/features/merge_requests/create_new_mr_spec.rb @@ -84,4 +84,24 @@ feature 'Create New Merge Request', feature: true, js: true do expect(page).not_to have_selector('#error_explanation') expect(page).not_to have_content('The form contains the following error') end + + context 'when a new merge request has a pipeline' do + let!(:pipeline) do + create(:ci_pipeline, sha: project.commit('fix').id, + ref: 'fix', + project: project) + end + + it 'shows pipelines for a new merge request' do + visit new_namespace_project_merge_request_path( + project.namespace, project, + merge_request: { target_branch: 'master', source_branch: 'fix' }) + + page.within('.merge-request') do + click_link 'Pipelines' + + expect(page).to have_content "##{pipeline.id}" + end + end + end end |