Add latest changes from gitlab-org/gitlab@master

1 files changed, 6 insertions, 3 deletions

diff --git a/spec/workers/ci/archive_traces_cron_worker_spec.rb b/spec/workers/ci/archive_traces_cron_worker_spec.rb
index fc700c15b10..789e83783bb 100644
--- a/spec/workers/ci/archive_traces_cron_worker_spec.rb
+++ b/spec/workers/ci/archive_traces_cron_worker_spec.rb
@@ -35,8 +35,9 @@ describe Ci::ArchiveTracesCronWorker do
     it_behaves_like 'archives trace'
 
     it 'executes service' do
-      expect_any_instance_of(Ci::ArchiveTraceService)
-        .to receive(:execute).with(build, anything)
+      expect_next_instance_of(Ci::ArchiveTraceService) do |instance|
+        expect(instance).to receive(:execute).with(build, anything)
+      end
 
       subject
     end
@@ -64,7 +65,9 @@ describe Ci::ArchiveTracesCronWorker do
 
       before do
         allow(Gitlab::ErrorTracking).to receive(:track_and_raise_for_dev_exception)
-        allow_any_instance_of(Gitlab::Ci::Trace).to receive(:archive!).and_raise('Unexpected error')
+        allow_next_instance_of(Gitlab::Ci::Trace) do |instance|
+          allow(instance).to receive(:archive!).and_raise('Unexpected error')
+        end
       end
 
       it 'puts a log' do