Add latest changes from gitlab-org/gitlab@15-4-stable-eev15.4.0-rc42

1 files changed, 17 insertions, 2 deletions

diff --git a/spec/requests/api/graphql/work_item_spec.rb b/spec/requests/api/graphql/work_item_spec.rb
index 34644e5893a..e4bb4109c76 100644
--- a/spec/requests/api/graphql/work_item_spec.rb
+++ b/spec/requests/api/graphql/work_item_spec.rb
@@ -14,7 +14,10 @@ RSpec.describe 'Query.work_item(id)' do
       project: project,
       description: '- List item',
       start_date: Date.today,
-      due_date: 1.week.from_now
+      due_date: 1.week.from_now,
+      created_at: 1.week.ago,
+      last_edited_at: 1.day.ago,
+      last_edited_by: guest
     )
   end
 
@@ -67,6 +70,12 @@ RSpec.describe 'Query.work_item(id)' do
               ... on WorkItemWidgetDescription {
                 description
                 descriptionHtml
+                edited
+                lastEditedBy {
+                  webPath
+                  username
+                }
+                lastEditedAt
               }
             }
           GRAPHQL
@@ -79,7 +88,13 @@ RSpec.describe 'Query.work_item(id)' do
               hash_including(
                 'type' => 'DESCRIPTION',
                 'description' => work_item.description,
-                'descriptionHtml' => ::MarkupHelper.markdown_field(work_item, :description, {})
+                'descriptionHtml' => ::MarkupHelper.markdown_field(work_item, :description, {}),
+                'edited' => true,
+                'lastEditedAt' => work_item.last_edited_at.iso8601,
+                'lastEditedBy' => {
+                  'webPath' => "/#{guest.full_path}",
+                  'username' => guest.username
+                }
               )
             )
           )