diff options
author | Douwe Maan <douwe@gitlab.com> | 2019-07-24 18:41:55 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2019-07-24 18:41:55 +0000 |
commit | 60701f5c52077b4aafd87012a4beb3d6fcc6ad37 (patch) | |
tree | 98099c8f9dee31e6131edbaea7feeeec345ba6e3 /spec/helpers | |
parent | 85a304d2ac8bf52a4d8dd5e3fccd2e3ec6b7d595 (diff) | |
parent | f5ec6b4e1296475aa4930b504ed2e3d329631fcb (diff) | |
download | gitlab-ce-60701f5c52077b4aafd87012a4beb3d6fcc6ad37.tar.gz |
Merge branch '62217-follow-up-from-fix-display-of-promote-to-group-label' into 'master'
Remove project param from `#show_label_issuables_link?`
Closes #62217
See merge request gitlab-org/gitlab-ce!31038
Diffstat (limited to 'spec/helpers')
-rw-r--r-- | spec/helpers/labels_helper_spec.rb | 24 |
1 files changed, 3 insertions, 21 deletions
diff --git a/spec/helpers/labels_helper_spec.rb b/spec/helpers/labels_helper_spec.rb index 314305d7a8e..4f1cab38f34 100644 --- a/spec/helpers/labels_helper_spec.rb +++ b/spec/helpers/labels_helper_spec.rb @@ -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 |