From 2705a15deaef07b1a38a53b9539d02f8ad499ce3 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Fri, 13 May 2022 09:07:54 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 spec/serializers/issue_board_entity_spec.rb        | 16 ++++++++++++++++
 spec/serializers/issue_entity_spec.rb              | 13 +++++++++++++
 .../linked_project_issue_entity_spec.rb            | 22 +++++++++++++++++++++-
 3 files changed, 50 insertions(+), 1 deletion(-)

(limited to 'spec/serializers')

diff --git a/spec/serializers/issue_board_entity_spec.rb b/spec/serializers/issue_board_entity_spec.rb
index 30423ceba6d..b8e2bfeaa3d 100644
--- a/spec/serializers/issue_board_entity_spec.rb
+++ b/spec/serializers/issue_board_entity_spec.rb
@@ -3,6 +3,8 @@
 require 'spec_helper'
 
 RSpec.describe IssueBoardEntity do
+  include Gitlab::Routing.url_helpers
+
   let_it_be(:project)   { create(:project) }
   let_it_be(:resource)  { create(:issue, project: project) }
   let_it_be(:user)      { create(:user) }
@@ -40,4 +42,18 @@ RSpec.describe IssueBoardEntity do
 
     expect(subject).to include(labels: array_including(hash_including(:id, :title, :color, :description, :text_color, :priority)))
   end
+
+  describe 'real_path' do
+    it 'has an issue path' do
+      expect(subject[:real_path]).to eq(project_issue_path(project, resource.iid))
+    end
+
+    context 'when issue is of type task' do
+      let(:resource) { create(:issue, :task, project: project) }
+
+      it 'has a work item path' do
+        expect(subject[:real_path]).to eq(project_work_items_path(project, resource.id))
+      end
+    end
+  end
 end
diff --git a/spec/serializers/issue_entity_spec.rb b/spec/serializers/issue_entity_spec.rb
index 76f8cf644c6..6ccb3dbc657 100644
--- a/spec/serializers/issue_entity_spec.rb
+++ b/spec/serializers/issue_entity_spec.rb
@@ -3,6 +3,8 @@
 require 'spec_helper'
 
 RSpec.describe IssueEntity do
+  include Gitlab::Routing.url_helpers
+
   let(:project)  { create(:project) }
   let(:resource) { create(:issue, project: project) }
   let(:user)     { create(:user) }
@@ -11,6 +13,17 @@ RSpec.describe IssueEntity do
 
   subject { described_class.new(resource, request: request).as_json }
 
+  describe 'web_url' do
+    context 'when issue is of type task' do
+      let(:resource) { create(:issue, :task, project: project) }
+
+      # This was already a path and not a url when the work items change was introduced
+      it 'has a work item path' do
+        expect(subject[:web_url]).to eq(project_work_items_path(project, resource.id))
+      end
+    end
+  end
+
   it 'has Issuable attributes' do
     expect(subject).to include(:id, :iid, :author_id, :description, :lock_version, :milestone_id,
                                :title, :updated_by_id, :created_at, :updated_at, :milestone, :labels)
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
-- 
cgit v1.2.3