diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb index 6598cafeba086287d619e1b1d0302d6c0f551a18..04d0226ac22d5a265b1f21fc625e84b45e2531ba 100644 --- a/spec/models/merge_request_spec.rb +++ b/spec/models/merge_request_spec.rb @@ -6023,12 +6023,10 @@ def transition! allow(merge_request_diff).to receive(:patch_id_sha).and_return(nil) allow(merge_request).to receive(:diff_refs).and_return(diff_refs) - allow_next_instance_of(Repository) do |repo| - allow(repo) - .to receive(:get_patch_id) - .with(diff_refs.base_sha, diff_refs.head_sha) - .and_return(patch_id) - end + allow(merge_request.project.repository) + .to receive(:get_patch_id) + .with(diff_refs.base_sha, diff_refs.head_sha) + .and_return(patch_id) end it { is_expected.to eq(patch_id) }