Add latest changes from gitlab-org/gitlab@15-0-stable-eev15.0.0-rc42

1 files changed, 21 insertions, 1 deletions

diff --git a/spec/serializers/linked_project_issue_entity_spec.rb b/spec/serializers/linked_project_issue_entity_spec.rb
index 864b5c45599..b28b00bd8e1 100644
--- a/spec/serializers/linked_project_issue_entity_spec.rb
+++ b/spec/serializers/linked_project_issue_entity_spec.rb
@@ -3,6 +3,8 @@
 require 'spec_helper'
 
 RSpec.describe LinkedProjectIssueEntity do
+  include Gitlab::Routing.url_helpers
+
   let_it_be(:user) { create(:user) }
   let_it_be(:project) { create(:project) }
   let_it_be(:issue_link) { create(:issue_link) }
@@ -17,7 +19,25 @@ RSpec.describe LinkedProjectIssueEntity do
     issue_link.target.project.add_developer(user)
   end
 
+  subject(:serialized_entity) { entity.as_json }
+
   describe 'issue_link_type' do
-    it { expect(entity.as_json).to include(link_type: 'relates_to') }
+    it { is_expected.to include(link_type: 'relates_to') }
+  end
+
+  describe 'path' do
+    it 'returns an issue path' do
+      expect(serialized_entity).to include(path: project_issue_path(related_issue.project, related_issue.iid))
+    end
+
+    context 'when related issue is a task' do
+      before do
+        related_issue.update!(issue_type: :task, work_item_type: WorkItems::Type.default_by_type(:task))
+      end
+
+      it 'returns a work items path' do
+        expect(serialized_entity).to include(path: project_work_items_path(related_issue.project, related_issue.id))
+      end
+    end
   end
 end