Add latest changes from gitlab-org/gitlab@13-8-stable-eev13.8.0-rc42

1 files changed, 2 insertions, 0 deletions

diff --git a/spec/support/shared_examples/requests/api/resolvable_discussions_shared_examples.rb b/spec/support/shared_examples/requests/api/resolvable_discussions_shared_examples.rb
index 5748e873fd4..460e8d57a2b 100644
--- a/spec/support/shared_examples/requests/api/resolvable_discussions_shared_examples.rb
+++ b/spec/support/shared_examples/requests/api/resolvable_discussions_shared_examples.rb
@@ -9,6 +9,7 @@ RSpec.shared_examples 'resolvable discussions API' do |parent_type, noteable_typ
       expect(response).to have_gitlab_http_status(:ok)
       expect(json_response['notes'].size).to eq(1)
       expect(json_response['notes'][0]['resolved']).to eq(true)
+      expect(Time.parse(json_response['notes'][0]['resolved_at'])).to be_like_time(note.reload.resolved_at)
     end
 
     it "unresolves discussion if resolved is false" do
@@ -18,6 +19,7 @@ RSpec.shared_examples 'resolvable discussions API' do |parent_type, noteable_typ
       expect(response).to have_gitlab_http_status(:ok)
       expect(json_response['notes'].size).to eq(1)
       expect(json_response['notes'][0]['resolved']).to eq(false)
+      expect(json_response['notes'][0]['resolved_at']).to be_nil
     end
 
     it "returns a 400 bad request error if resolved parameter is not passed" do