Minor cleanups based on reviewjprovazn-label-presenter

2 files changed, 6 insertions, 10 deletions

diff --git a/app/presenters/label_presenter.rb b/app/presenters/label_presenter.rb
index f2fe20ecd7c..5227ef353c3 100644
--- a/app/presenters/label_presenter.rb
+++ b/app/presenters/label_presenter.rb
@@ -38,10 +38,6 @@ class LabelPresenter < Gitlab::View::Presenter::Delegated
   private
 
   def context_subject
-    issuable_subject || label_subject
-  end
-
-  def label_subject
-    label.respond_to?(:subject) ? label.subject : nil
+    issuable_subject || label.try(:subject)
   end
 end
diff --git a/spec/presenters/label_presenter_spec.rb b/spec/presenters/label_presenter_spec.rb
index 132717fe2af..fae8188670f 100644
--- a/spec/presenters/label_presenter_spec.rb
+++ b/spec/presenters/label_presenter_spec.rb
@@ -5,10 +5,10 @@ require 'spec_helper'
 describe LabelPresenter do
   include Gitlab::Routing.url_helpers
 
-  let(:group) { create(:group) }
-  let(:project) { create(:project, group: group) }
-  let(:label) { create(:label, project: project).present(issuable_subject: project) }
-  let(:group_label) { create(:group_label, group: group).present(issuable_subject: project) }
+  set(:group) { create(:group) }
+  set(:project) { create(:project, group: group) }
+  let(:label) { build_stubbed(:label, project: project).present(issuable_subject: project) }
+  let(:group_label) { build_stubbed(:group_label, group: group).present(issuable_subject: project) }
 
   describe '#edit_path' do
     context 'with group label' do
@@ -40,7 +40,7 @@ describe LabelPresenter do
 
   describe '#filter_path' do
     context 'with group as context subject' do
-      let(:label_in_group) { create(:label, project: project).present(issuable_subject: group) }
+      let(:label_in_group) { build_stubbed(:label, project: project).present(issuable_subject: group) }
       subject { label_in_group.filter_path }
 
       it { is_expected.to eq(issues_group_path(group, label_name: [label_in_group.title])) }