kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Set up merge request from fork more simply.

This commit is contained in:
Bryce Johnson 2017-05-24 17:39:36 -04:00
parent 7e1e13899e
commit 9b479f4305
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
spec/features/merge_requests/widget_spec.rb
View File

@ -209,22 +209,14 @@ describe 'Merge request', :feature, :js do
context 'user can merge into source project but cannot push to fork', js: true do
let(:fork_project) { create(:project, :public) }
let!(:merge_request_from_fork) do
create(:forked_project_link, forked_to_project: fork_project,
forked_from_project: project)
create(:merge_request_with_diffs, source_project: fork_project,
target_project: project)
end
let(:user2) { create(:user) }
before do
project.team << [user2, :master]
logout
login_as user2
visit namespace_project_merge_request_path(project.namespace, project, merge_request_from_fork)
merge_request.update(target_project: fork_project)
visit namespace_project_merge_request_path(project.namespace, project, merge_request)
end
it 'user can merge into the source project' do