diff options
Diffstat (limited to 'spec/controllers/projects/merge_requests_controller_spec.rb')
-rw-r--r-- | spec/controllers/projects/merge_requests_controller_spec.rb | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/spec/controllers/projects/merge_requests_controller_spec.rb b/spec/controllers/projects/merge_requests_controller_spec.rb index 9b37c46fd86..93d5e7eff6c 100644 --- a/spec/controllers/projects/merge_requests_controller_spec.rb +++ b/spec/controllers/projects/merge_requests_controller_spec.rb @@ -2048,21 +2048,6 @@ RSpec.describe Projects::MergeRequestsController do end end - context 'with SELECT FOR UPDATE lock' do - before do - stub_feature_flags(merge_request_rebase_nowait_lock: false) - end - - it 'executes rebase' do - allow_any_instance_of(MergeRequest).to receive(:with_lock).with(true).and_call_original - expect(RebaseWorker).to receive(:perform_async) - - post_rebase - - expect(response).to have_gitlab_http_status(:ok) - end - end - context 'with NOWAIT lock' do it 'returns a 409' do allow_any_instance_of(MergeRequest).to receive(:with_lock).with('FOR UPDATE NOWAIT').and_raise(ActiveRecord::LockWaitTimeout) |