Merge branch 'master' into 56937-edit-knative-domain-after-it-has-been-deployed56937-edit-knative-domain-after-it-has-been-deployed

1 files changed, 8 insertions, 1 deletions

diff --git a/spec/services/notes/create_service_spec.rb b/spec/services/notes/create_service_spec.rb
index 48f1d696ff6..1645b67c329 100644
--- a/spec/services/notes/create_service_spec.rb
+++ b/spec/services/notes/create_service_spec.rb
@@ -311,7 +311,14 @@ describe Notes::CreateService do
         end
 
         it 'converts existing note to DiscussionNote' do
-          expect { subject }.to change { existing_note.reload.type }.from(nil).to('DiscussionNote')
+          expect do
+            existing_note
+
+            Timecop.freeze(Time.now + 1.minute) { subject }
+
+            existing_note.reload
+          end.to change { existing_note.type }.from(nil).to('DiscussionNote')
+             .and change { existing_note.updated_at }
         end
       end
     end