Merge branch 'live-trace-v2' into live-trace-v2-efficient-destroy-all

2 files changed, 4 insertions, 8 deletions

diff --git a/spec/models/ci/build_trace_chunk_spec.rb b/spec/models/ci/build_trace_chunk_spec.rb
index 991f501f633..46d09dff52c 100644
--- a/spec/models/ci/build_trace_chunk_spec.rb
+++ b/spec/models/ci/build_trace_chunk_spec.rb
@@ -75,7 +75,7 @@ describe Ci::BuildTraceChunk, :clean_gitlab_redis_shared_state do
         let(:value) { 'a' * described_class::CHUNK_SIZE }
 
         it 'schedules stashing data' do
-          expect(BuildTraceChunkFlushToDbWorker).to receive(:perform_async).once
+          expect(Ci::BuildTraceChunkFlushWorker).to receive(:perform_async).once
 
           subject
         end
@@ -112,7 +112,7 @@ describe Ci::BuildTraceChunk, :clean_gitlab_redis_shared_state do
 
       context 'when fullfilled chunk size' do
         it 'does not schedule stashing data' do
-          expect(BuildTraceChunkFlushToDbWorker).not_to receive(:perform_async)
+          expect(Ci::BuildTraceChunkFlushWorker).not_to receive(:perform_async)
 
           subject
         end
@@ -141,11 +141,7 @@ describe Ci::BuildTraceChunk, :clean_gitlab_redis_shared_state do
       context 'when offset is bigger than data size' do
         let(:offset) { data.bytesize + 1 }
 
-        it do
-          expect_any_instance_of(described_class).not_to receive(:append) { }
-
-          subject
-        end
+        it { expect { subject }.to raise_error('Offset is out of range') }
       end
 
       context 'when offset is 10' do
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb
index becb146422e..5a9aa7c7d1b 100644
--- a/spec/models/merge_request_spec.rb
+++ b/spec/models/merge_request_spec.rb
@@ -1213,7 +1213,7 @@ describe MergeRequest do
     it 'enqueues MergeWorker job and updates merge_jid' do
       merge_request = create(:merge_request)
       user_id = double(:user_id)
-      params = double(:params)
+      params = {}
       merge_jid = 'hash-123'
 
       expect(MergeWorker).to receive(:perform_async).with(merge_request.id, user_id, params) do