diff options
Diffstat (limited to 'spec/services/merge_requests/merge_orchestration_service_spec.rb')
-rw-r--r-- | spec/services/merge_requests/merge_orchestration_service_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/services/merge_requests/merge_orchestration_service_spec.rb b/spec/services/merge_requests/merge_orchestration_service_spec.rb index da37cc97857..ebcd2f0e277 100644 --- a/spec/services/merge_requests/merge_orchestration_service_spec.rb +++ b/spec/services/merge_requests/merge_orchestration_service_spec.rb @@ -64,7 +64,7 @@ RSpec.describe MergeRequests::MergeOrchestrationService do context 'when merge request is not mergeable' do before do - allow(merge_request).to receive(:mergeable_state?) { false } + allow(merge_request).to receive(:mergeable?) { false } end it 'does nothing' do @@ -87,7 +87,7 @@ RSpec.describe MergeRequests::MergeOrchestrationService do context 'when merge request is not mergeable' do before do - allow(merge_request).to receive(:mergeable_state?) { false } + allow(merge_request).to receive(:mergeable?) { false } end it { is_expected.to eq(false) } |