Add latest changes from gitlab-org/gitlab@master

1 files changed, 0 insertions, 36 deletions

diff --git a/spec/requests/api/merge_requests_spec.rb b/spec/requests/api/merge_requests_spec.rb
index f4cac0854e7..702c8885155 100644
--- a/spec/requests/api/merge_requests_spec.rb
+++ b/spec/requests/api/merge_requests_spec.rb
@@ -167,42 +167,6 @@ RSpec.describe API::MergeRequests, :aggregate_failures, feature_category: :sourc
               expect(merge_request.reload.merge_status).to eq('unchecked')
             end
           end
-
-          context 'when restrict_merge_status_recheck FF is disabled' do
-            before do
-              stub_feature_flags(restrict_merge_status_recheck: false)
-            end
-
-            context 'with batched_api_mergeability_checks FF on' do
-              it 'checks mergeability asynchronously in batch', :sidekiq_inline do
-                get(api(endpoint_path, user2), params: { with_merge_status_recheck: true })
-
-                expect_successful_response_with_paginated_array
-
-                expect(merge_request.reload.merge_status).to eq('can_be_merged')
-              end
-            end
-
-            context 'with batched_api_mergeability_checks FF off' do
-              before do
-                stub_feature_flags(batched_api_mergeability_checks: false)
-              end
-
-              context 'with merge status recheck projection' do
-                it 'does enqueue a merge status recheck' do
-                  expect_next_instances_of(check_service_class, (1..2)) do |service|
-                    expect(service).not_to receive(:execute)
-                    expect(service).to receive(:async_execute).and_call_original
-                  end
-
-                  get(api(endpoint_path, user2), params: { with_merge_status_recheck: true })
-
-                  expect_successful_response_with_paginated_array
-                  expect(mr_entity['merge_status']).to eq('checking')
-                end
-              end
-            end
-          end
         end
       end