Add latest changes from gitlab-org/gitlab@master

1 files changed, 18 insertions, 0 deletions

diff --git a/spec/models/label_note_spec.rb b/spec/models/label_note_spec.rb
index ee4822c653d..145ddd44834 100644
--- a/spec/models/label_note_spec.rb
+++ b/spec/models/label_note_spec.rb
@@ -3,6 +3,8 @@
 require 'spec_helper'
 
 RSpec.describe LabelNote do
+  include Gitlab::Routing.url_helpers
+
   let_it_be(:project) { create(:project, :repository) }
   let_it_be(:user) { create(:user) }
   let_it_be(:label) { create(:label, project: project) }
@@ -14,11 +16,27 @@ RSpec.describe LabelNote do
     let_it_be(:resource) { create(:issue, project: project) }
 
     it_behaves_like 'label note created from events'
+
+    it 'includes a link to the list of issues filtered by the label' do
+      note = described_class.from_events([
+        create(:resource_label_event, label: label, issue: resource)
+      ])
+
+      expect(note.note_html).to include(project_issues_path(project, label_name: label.title))
+    end
   end
 
   context 'when resource is merge request' do
     let_it_be(:resource) { create(:merge_request, source_project: project, target_project: project) }
 
     it_behaves_like 'label note created from events'
+
+    it 'includes a link to the list of merge requests filtered by the label' do
+      note = described_class.from_events([
+        create(:resource_label_event, label: label, merge_request: resource)
+      ])
+
+      expect(note.note_html).to include(project_merge_requests_path(project, label_name: label.title))
+    end
   end
 end