Merge branch 'tc-only-mr-button-if-allowed' into 'master'
Only show Merge Request button when user can create a MR See merge request !8639
This commit is contained in:
commit
c1313dc52d
|
@ -3,7 +3,7 @@ module CompareHelper
|
||||||
from.present? &&
|
from.present? &&
|
||||||
to.present? &&
|
to.present? &&
|
||||||
from != to &&
|
from != to &&
|
||||||
project.feature_available?(:merge_requests, current_user) &&
|
can?(current_user, :create_merge_request, project) &&
|
||||||
project.repository.branch_names.include?(from) &&
|
project.repository.branch_names.include?(from) &&
|
||||||
project.repository.branch_names.include?(to)
|
project.repository.branch_names.include?(to)
|
||||||
end
|
end
|
||||||
|
|
|
@ -0,0 +1,4 @@
|
||||||
|
---
|
||||||
|
title: Only show Merge Request button when user can create a MR
|
||||||
|
merge_request: 8639
|
||||||
|
author:
|
|
@ -0,0 +1,108 @@
|
||||||
|
require 'spec_helper'
|
||||||
|
|
||||||
|
feature 'Merge Request button', feature: true do
|
||||||
|
shared_examples 'Merge Request button only shown when allowed' do
|
||||||
|
let(:user) { create(:user) }
|
||||||
|
let(:project) { create(:project, :public) }
|
||||||
|
let(:forked_project) { create(:project, :public, forked_from_project: project) }
|
||||||
|
|
||||||
|
context 'not logged in' do
|
||||||
|
it 'does not show Create Merge Request button' do
|
||||||
|
visit url
|
||||||
|
|
||||||
|
within("#content-body") do
|
||||||
|
expect(page).not_to have_link(label)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'logged in as developer' do
|
||||||
|
before do
|
||||||
|
login_as(user)
|
||||||
|
project.team << [user, :developer]
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'shows Create Merge Request button' do
|
||||||
|
href = new_namespace_project_merge_request_path(project.namespace,
|
||||||
|
project,
|
||||||
|
merge_request: { source_branch: 'feature',
|
||||||
|
target_branch: 'master' })
|
||||||
|
|
||||||
|
visit url
|
||||||
|
|
||||||
|
within("#content-body") do
|
||||||
|
expect(page).to have_link(label, href: href)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'merge requests are disabled' do
|
||||||
|
before do
|
||||||
|
project.project_feature.update!(merge_requests_access_level: ProjectFeature::DISABLED)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'does not show Create Merge Request button' do
|
||||||
|
visit url
|
||||||
|
|
||||||
|
within("#content-body") do
|
||||||
|
expect(page).not_to have_link(label)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'logged in as non-member' do
|
||||||
|
before do
|
||||||
|
login_as(user)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'does not show Create Merge Request button' do
|
||||||
|
visit url
|
||||||
|
|
||||||
|
within("#content-body") do
|
||||||
|
expect(page).not_to have_link(label)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'on own fork of project' do
|
||||||
|
let(:user) { forked_project.owner }
|
||||||
|
|
||||||
|
it 'shows Create Merge Request button' do
|
||||||
|
href = new_namespace_project_merge_request_path(forked_project.namespace,
|
||||||
|
forked_project,
|
||||||
|
merge_request: { source_branch: 'feature',
|
||||||
|
target_branch: 'master' })
|
||||||
|
|
||||||
|
visit fork_url
|
||||||
|
|
||||||
|
within("#content-body") do
|
||||||
|
expect(page).to have_link(label, href: href)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'on branches page' do
|
||||||
|
it_behaves_like 'Merge Request button only shown when allowed' do
|
||||||
|
let(:label) { 'Merge Request' }
|
||||||
|
let(:url) { namespace_project_branches_path(project.namespace, project) }
|
||||||
|
let(:fork_url) { namespace_project_branches_path(forked_project.namespace, forked_project) }
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'on compare page' do
|
||||||
|
it_behaves_like 'Merge Request button only shown when allowed' do
|
||||||
|
let(:label) { 'Create Merge Request' }
|
||||||
|
let(:url) { namespace_project_compare_path(project.namespace, project, from: 'master', to: 'feature') }
|
||||||
|
let(:fork_url) { namespace_project_compare_path(forked_project.namespace, forked_project, from: 'master', to: 'feature') }
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'on commits page' do
|
||||||
|
it_behaves_like 'Merge Request button only shown when allowed' do
|
||||||
|
let(:label) { 'Create Merge Request' }
|
||||||
|
let(:url) { namespace_project_commits_path(project.namespace, project, 'feature') }
|
||||||
|
let(:fork_url) { namespace_project_commits_path(forked_project.namespace, forked_project, 'feature') }
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
Loading…
Reference in New Issue