2 files changed, 2 insertions, 10 deletions
diff --git a/spec/services/notes/create_service_spec.rb b/spec/services/notes/create_service_spec.rb
index 7c0d4b756bd..1e5536a2d0b 100644
--- a/spec/services/notes/create_service_spec.rb
+++ b/spec/services/notes/create_service_spec.rb
@@ -163,14 +163,6 @@ RSpec.describe Notes::CreateService do
           expect(note.note_diff_file).to be_present
           expect(note.diff_note_positions).to be_present
         end
-
-        it 'does not create diff positions merge_ref_head_comments is disabled' do
-          stub_feature_flags(merge_ref_head_comments: false)
-
-          expect(Discussions::CaptureDiffNotePositionService).not_to receive(:new)
-
-          described_class.new(project_with_repo, user, new_opts).execute
-        end
       end
 
       context 'when DiffNote is a reply' do
@@ -437,7 +429,7 @@ RSpec.describe Notes::CreateService do
         expect do
           existing_note
 
-          Timecop.freeze(Time.current + 1.minute) { subject }
+          travel_to(Time.current + 1.minute) { subject }
 
           existing_note.reload
         end.to change { existing_note.type }.from(nil).to('DiscussionNote')
diff --git a/spec/services/notes/update_service_spec.rb b/spec/services/notes/update_service_spec.rb
index 47b8ba0cd72..66efdf8abe7 100644
--- a/spec/services/notes/update_service_spec.rb
+++ b/spec/services/notes/update_service_spec.rb
@@ -42,7 +42,7 @@ RSpec.describe Notes::UpdateService do
     end
 
     it 'does not update the note when params is blank' do
-      Timecop.freeze(1.day.from_now) do
+      travel_to(1.day.from_now) do
         expect { update_note({}) }.not_to change { note.reload.updated_at }
       end
     end