2017-01-24 05:59:33 -05:00
|
|
|
require 'rails_helper'
|
|
|
|
|
|
|
|
describe 'Merge request', :feature, :js do
|
|
|
|
let(:user) { create(:user) }
|
2017-02-14 17:08:30 -05:00
|
|
|
let(:project) { create(:project) }
|
2017-02-02 11:57:41 -05:00
|
|
|
let(:merge_request) { create(:merge_request, source_project: project) }
|
2017-01-24 05:59:33 -05:00
|
|
|
|
|
|
|
before do
|
|
|
|
project.team << [user, :master]
|
|
|
|
login_as(user)
|
2017-02-02 11:57:41 -05:00
|
|
|
end
|
2017-01-24 05:59:33 -05:00
|
|
|
|
2017-02-02 11:57:41 -05:00
|
|
|
context 'new merge request' do
|
|
|
|
before do
|
|
|
|
visit new_namespace_project_merge_request_path(
|
|
|
|
project.namespace,
|
|
|
|
project,
|
|
|
|
merge_request: {
|
|
|
|
source_project_id: project.id,
|
|
|
|
target_project_id: project.id,
|
|
|
|
source_branch: 'feature',
|
|
|
|
target_branch: 'master'
|
|
|
|
}
|
|
|
|
)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'shows widget status after creating new merge request' do
|
|
|
|
click_button 'Submit merge request'
|
|
|
|
|
|
|
|
wait_for_ajax
|
|
|
|
|
2017-02-14 17:08:30 -05:00
|
|
|
expect(page).to have_selector('.accept-merge-request')
|
2017-05-09 00:15:34 -04:00
|
|
|
expect(find('.accept-merge-request')['disabled']).not_to be(true)
|
2017-02-02 11:57:41 -05:00
|
|
|
end
|
2017-01-24 05:59:33 -05:00
|
|
|
end
|
|
|
|
|
2017-02-02 11:57:41 -05:00
|
|
|
context 'view merge request' do
|
|
|
|
let!(:environment) { create(:environment, project: project) }
|
2017-03-07 06:24:11 -05:00
|
|
|
|
|
|
|
let!(:deployment) do
|
|
|
|
create(:deployment, environment: environment,
|
|
|
|
ref: 'feature',
|
|
|
|
sha: merge_request.diff_head_sha)
|
|
|
|
end
|
2017-01-24 05:59:33 -05:00
|
|
|
|
2017-02-02 11:57:41 -05:00
|
|
|
before do
|
|
|
|
visit namespace_project_merge_request_path(project.namespace, project, merge_request)
|
|
|
|
end
|
2017-01-24 05:59:33 -05:00
|
|
|
|
2017-02-02 11:57:41 -05:00
|
|
|
it 'shows environments link' do
|
|
|
|
wait_for_ajax
|
2017-01-24 05:59:33 -05:00
|
|
|
|
2017-02-02 11:57:41 -05:00
|
|
|
page.within('.mr-widget-heading') do
|
|
|
|
expect(page).to have_content("Deployed to #{environment.name}")
|
2017-05-09 00:15:34 -04:00
|
|
|
expect(find('.js-deploy-url')[:href]).to include(environment.formatted_external_url)
|
2017-02-02 11:57:41 -05:00
|
|
|
end
|
|
|
|
end
|
2017-02-14 17:08:30 -05:00
|
|
|
|
|
|
|
it 'shows green accept merge request button' do
|
|
|
|
# Wait for the `ci_status` and `merge_check` requests
|
|
|
|
wait_for_ajax
|
2017-05-09 00:15:34 -04:00
|
|
|
expect(page).to have_selector('.accept-merge-request')
|
|
|
|
expect(find('.accept-merge-request')['disabled']).not_to be(true)
|
2017-02-14 17:08:30 -05:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'view merge request with external CI service' do
|
|
|
|
before do
|
|
|
|
create(:service, project: project,
|
|
|
|
active: true,
|
|
|
|
type: 'CiService',
|
|
|
|
category: 'ci')
|
|
|
|
|
|
|
|
visit namespace_project_merge_request_path(project.namespace, project, merge_request)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'has danger button while waiting for external CI status' do
|
|
|
|
# Wait for the `ci_status` and `merge_check` requests
|
|
|
|
wait_for_ajax
|
|
|
|
expect(page).to have_selector('.accept-merge-request.btn-danger')
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'view merge request with failed GitLab CI pipelines' do
|
|
|
|
before do
|
|
|
|
commit_status = create(:commit_status, project: project, status: 'failed')
|
|
|
|
pipeline = create(:ci_pipeline, project: project,
|
|
|
|
sha: merge_request.diff_head_sha,
|
|
|
|
ref: merge_request.source_branch,
|
|
|
|
status: 'failed',
|
|
|
|
statuses: [commit_status])
|
|
|
|
create(:ci_build, :pending, pipeline: pipeline)
|
|
|
|
|
2017-03-28 16:04:14 -04:00
|
|
|
merge_request.update(head_pipeline: pipeline)
|
2017-03-22 15:36:14 -04:00
|
|
|
|
2017-02-14 17:08:30 -05:00
|
|
|
visit namespace_project_merge_request_path(project.namespace, project, merge_request)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'has danger button when not succeeded' do
|
|
|
|
# Wait for the `ci_status` and `merge_check` requests
|
|
|
|
wait_for_ajax
|
|
|
|
expect(page).to have_selector('.accept-merge-request.btn-danger')
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2017-03-07 06:24:11 -05:00
|
|
|
context 'when merge request is in the blocked pipeline state' do
|
|
|
|
before do
|
2017-03-22 15:36:14 -04:00
|
|
|
pipeline = create(
|
|
|
|
:ci_pipeline,
|
|
|
|
project: project,
|
|
|
|
sha: merge_request.diff_head_sha,
|
|
|
|
ref: merge_request.source_branch,
|
|
|
|
status: :manual
|
|
|
|
)
|
|
|
|
|
2017-03-28 16:04:14 -04:00
|
|
|
merge_request.update(head_pipeline: pipeline)
|
2017-03-07 06:24:11 -05:00
|
|
|
|
|
|
|
visit namespace_project_merge_request_path(project.namespace,
|
|
|
|
project,
|
|
|
|
merge_request)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'shows information about blocked pipeline' do
|
|
|
|
expect(page).to have_content("Pipeline blocked")
|
|
|
|
expect(page).to have_content(
|
|
|
|
"The pipeline for this merge request requires a manual action")
|
|
|
|
expect(page).to have_css('.ci-status-icon-manual')
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2017-02-14 17:08:30 -05:00
|
|
|
context 'view merge request with MWBS button' do
|
|
|
|
before do
|
|
|
|
commit_status = create(:commit_status, project: project, status: 'pending')
|
|
|
|
pipeline = create(:ci_pipeline, project: project,
|
|
|
|
sha: merge_request.diff_head_sha,
|
|
|
|
ref: merge_request.source_branch,
|
|
|
|
status: 'pending',
|
|
|
|
statuses: [commit_status])
|
|
|
|
create(:ci_build, :pending, pipeline: pipeline)
|
|
|
|
|
2017-03-28 16:04:14 -04:00
|
|
|
merge_request.update(head_pipeline: pipeline)
|
2017-03-22 15:36:14 -04:00
|
|
|
|
2017-02-14 17:08:30 -05:00
|
|
|
visit namespace_project_merge_request_path(project.namespace, project, merge_request)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'has info button when MWBS button' do
|
|
|
|
# Wait for the `ci_status` and `merge_check` requests
|
|
|
|
wait_for_ajax
|
2017-05-09 00:15:34 -04:00
|
|
|
expect(page).to have_selector('.accept-merge-request.btn-info')
|
|
|
|
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
|
2017-02-14 17:08:30 -05:00
|
|
|
end
|
2017-01-24 05:59:33 -05:00
|
|
|
end
|
2017-02-14 09:13:35 -05:00
|
|
|
|
2017-04-19 16:12:48 -04:00
|
|
|
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
|
|
|
|
|
2017-02-14 09:13:35 -05:00
|
|
|
context 'merge error' do
|
|
|
|
before do
|
|
|
|
allow_any_instance_of(Repository).to receive(:merge).and_return(false)
|
|
|
|
visit namespace_project_merge_request_path(project.namespace, project, merge_request)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'updates the MR widget' do
|
2017-05-09 00:15:34 -04:00
|
|
|
click_button 'Merge'
|
|
|
|
|
2017-02-14 09:13:35 -05:00
|
|
|
page.within('.mr-widget-body') do
|
|
|
|
expect(page).to have_content('Conflicts detected during merge')
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
2017-01-24 05:59:33 -05:00
|
|
|
end
|