2017-01-24 05:59:33 -05:00
|
|
|
require 'rails_helper'
|
|
|
|
|
|
|
|
describe 'Merge request', :feature, :js do
|
|
|
|
include WaitForAjax
|
|
|
|
|
|
|
|
let(:project) { create(:project) }
|
|
|
|
let(:user) { create(:user) }
|
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
|
|
|
|
|
|
|
|
expect(page).to have_selector('.accept_merge_request')
|
|
|
|
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) }
|
|
|
|
let!(:deployment) { create(:deployment, environment: environment, ref: 'feature', sha: merge_request.diff_head_sha) }
|
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}")
|
|
|
|
expect(find('.js-environment-link')[:href]).to include(environment.formatted_external_url)
|
|
|
|
end
|
|
|
|
end
|
2017-01-24 05:59:33 -05:00
|
|
|
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)
|
|
|
|
click_button 'Accept Merge Request'
|
|
|
|
wait_for_ajax
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'updates the MR widget' do
|
|
|
|
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
|