Remove project from show_label_issuables_link?
The project param is unnecessary here
This commit is contained in:
parent
17fe03078d
commit
f5ec6b4e12
3 changed files with 7 additions and 26 deletions
|
@ -4,11 +4,10 @@ module LabelsHelper
|
|||
extend self
|
||||
include ActionView::Helpers::TagHelper
|
||||
|
||||
def show_label_issuables_link?(label, issuables_type, current_user: nil, project: nil)
|
||||
def show_label_issuables_link?(label, issuables_type, current_user: nil)
|
||||
return true unless label.project_label?
|
||||
return true unless project
|
||||
|
||||
project.feature_available?(issuables_type, current_user)
|
||||
label.project.feature_available?(issuables_type, current_user)
|
||||
end
|
||||
|
||||
# Link to a Label
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
- force_priority = local_assigns.fetch(:force_priority, false)
|
||||
- subject_or_group_defined = defined?(@project) || defined?(@group)
|
||||
- show_label_issues_link = subject_or_group_defined && show_label_issuables_link?(label, :issues, project: @project)
|
||||
- show_label_merge_requests_link = subject_or_group_defined && show_label_issuables_link?(label, :merge_requests, project: @project)
|
||||
- show_label_issues_link = subject_or_group_defined && show_label_issuables_link?(label, :issues)
|
||||
- show_label_merge_requests_link = subject_or_group_defined && show_label_issuables_link?(label, :merge_requests)
|
||||
|
||||
.label-name
|
||||
= render_label(label, tooltip: false)
|
||||
|
|
|
@ -3,10 +3,8 @@ require 'spec_helper'
|
|||
describe LabelsHelper do
|
||||
describe '#show_label_issuables_link?' do
|
||||
shared_examples 'a valid response to show_label_issuables_link?' do |issuables_type, when_enabled = true, when_disabled = false|
|
||||
let(:context_project) { project }
|
||||
|
||||
context "when asking for a #{issuables_type} link" do
|
||||
subject { show_label_issuables_link?(label.present(issuable_subject: nil), issuables_type, project: context_project) }
|
||||
subject { show_label_issuables_link?(label.present(issuable_subject: nil), issuables_type) }
|
||||
|
||||
context "when #{issuables_type} are enabled for the project" do
|
||||
let(:project) { create(:project, "#{issuables_type}_access_level": ProjectFeature::ENABLED) }
|
||||
|
@ -39,27 +37,11 @@ describe LabelsHelper do
|
|||
let(:label) { create(:group_label, group: group, title: 'bug') }
|
||||
|
||||
context 'when asking for an issue link' do
|
||||
context 'in the context of a project' do
|
||||
it_behaves_like 'a valid response to show_label_issuables_link?', :issues, true, true
|
||||
end
|
||||
|
||||
context 'in the context of a group' do
|
||||
let(:context_project) { nil }
|
||||
|
||||
it_behaves_like 'a valid response to show_label_issuables_link?', :issues, true, true
|
||||
end
|
||||
it_behaves_like 'a valid response to show_label_issuables_link?', :issues, true, true
|
||||
end
|
||||
|
||||
context 'when asking for a merge requests link' do
|
||||
context 'in the context of a project' do
|
||||
it_behaves_like 'a valid response to show_label_issuables_link?', :merge_requests, true, true
|
||||
end
|
||||
|
||||
context 'in the context of a group' do
|
||||
let(:context_project) { nil }
|
||||
|
||||
it_behaves_like 'a valid response to show_label_issuables_link?', :merge_requests, true, true
|
||||
end
|
||||
it_behaves_like 'a valid response to show_label_issuables_link?', :merge_requests, true, true
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue