From 22f8da985a8919eb350bbcacb89f176cecf986bc Mon Sep 17 00:00:00 2001 From: Nick Thomas Date: Thu, 16 May 2019 11:53:09 +0100 Subject: [PATCH] Fix a broken spec for EE --- spec/services/merge_requests/rebase_service_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/services/merge_requests/rebase_service_spec.rb b/spec/services/merge_requests/rebase_service_spec.rb index 0c4433453ac..7e2f03d1097 100644 --- a/spec/services/merge_requests/rebase_service_spec.rb +++ b/spec/services/merge_requests/rebase_service_spec.rb @@ -58,7 +58,7 @@ describe MergeRequests::RebaseService do context 'with deprecated step rebase feature' do before do - allow(Feature).to receive(:disabled?).with(:two_step_rebase, anything).and_return(true) + stub_feature_flags(two_step_rebase: false) end it_behaves_like 'sequence of failure and success'