2017-09-20 15:41:11 +00:00
|
|
|
require 'spec_helper'
|
|
|
|
|
|
|
|
feature 'Creating a merge request from a fork', :js do
|
2017-09-29 08:04:50 +00:00
|
|
|
include ProjectForksHelper
|
|
|
|
|
2017-09-20 15:41:11 +00:00
|
|
|
let(:user) { create(:user) }
|
|
|
|
let(:project) { create(:project, :public, :repository) }
|
2017-09-29 08:04:50 +00:00
|
|
|
let!(:source_project) do
|
|
|
|
fork_project(project, user,
|
|
|
|
repository: true,
|
|
|
|
namespace: user.namespace)
|
|
|
|
end
|
2017-09-20 15:41:11 +00:00
|
|
|
|
|
|
|
before do
|
|
|
|
source_project.add_master(user)
|
|
|
|
|
|
|
|
sign_in(user)
|
|
|
|
end
|
|
|
|
|
|
|
|
shared_examples 'create merge request to other project' do
|
|
|
|
it 'has all possible target projects' do
|
|
|
|
visit project_new_merge_request_path(source_project)
|
|
|
|
|
|
|
|
first('.js-target-project').click
|
|
|
|
|
|
|
|
within('.dropdown-target-project .dropdown-content') do
|
|
|
|
expect(page).to have_content(project.full_path)
|
|
|
|
expect(page).to have_content(target_project.full_path)
|
|
|
|
expect(page).to have_content(source_project.full_path)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'allows creating the merge request to another target project' do
|
|
|
|
visit project_merge_requests_path(source_project)
|
|
|
|
|
|
|
|
page.within '.content' do
|
|
|
|
click_link 'New merge request'
|
|
|
|
end
|
|
|
|
|
|
|
|
find('.js-source-branch', match: :first).click
|
|
|
|
find('.dropdown-source-branch .dropdown-content a', match: :first).click
|
|
|
|
|
|
|
|
first('.js-target-project').click
|
|
|
|
find('.dropdown-target-project .dropdown-content a', text: target_project.full_path).click
|
|
|
|
|
|
|
|
click_button 'Compare branches and continue'
|
|
|
|
|
|
|
|
wait_for_requests
|
|
|
|
|
|
|
|
expect { click_button 'Submit merge request' }
|
|
|
|
.to change { target_project.merge_requests.reload.size }.by(1)
|
|
|
|
end
|
2017-09-21 16:34:32 +00:00
|
|
|
|
|
|
|
it 'updates the branches when selecting a new target project' do
|
|
|
|
target_project_member = target_project.owner
|
|
|
|
CreateBranchService.new(target_project, target_project_member)
|
|
|
|
.execute('a-brand-new-branch-to-test', 'master')
|
|
|
|
visit project_new_merge_request_path(source_project)
|
|
|
|
|
|
|
|
first('.js-target-project').click
|
|
|
|
find('.dropdown-target-project .dropdown-content a', text: target_project.full_path).click
|
|
|
|
|
|
|
|
wait_for_requests
|
|
|
|
|
|
|
|
first('.js-target-branch').click
|
|
|
|
|
|
|
|
within('.dropdown-target-branch .dropdown-content') do
|
|
|
|
expect(page).to have_content('a-brand-new-branch-to-test')
|
|
|
|
end
|
|
|
|
end
|
2017-09-20 15:41:11 +00:00
|
|
|
end
|
|
|
|
|
|
|
|
context 'creating to the source of a fork' do
|
2017-09-29 08:04:50 +00:00
|
|
|
let!(:target_project) { project }
|
2017-09-20 15:41:11 +00:00
|
|
|
|
|
|
|
it_behaves_like('create merge request to other project')
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'creating to a sibling of a fork' do
|
2017-09-29 08:04:50 +00:00
|
|
|
let!(:target_project) do
|
|
|
|
other_user = create(:user)
|
|
|
|
fork_project(project, other_user,
|
|
|
|
repository: true,
|
|
|
|
namespace: other_user.namespace)
|
|
|
|
end
|
2017-09-20 15:41:11 +00:00
|
|
|
|
|
|
|
it_behaves_like('create merge request to other project')
|
|
|
|
end
|
|
|
|
end
|