diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 15:10:18 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 15:10:18 +0300 |
commit | 111e0ef1fa06e79adf73a34ebd14f71bfeb99bff (patch) | |
tree | f3280afa857d3357006ada7e9a4483c8c6994584 /spec/controllers/projects | |
parent | 22e9f240efba67d752e33ebdb8ba8205f187dc83 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/controllers/projects')
-rw-r--r-- | spec/controllers/projects/merge_requests/content_controller_spec.rb | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/spec/controllers/projects/merge_requests/content_controller_spec.rb b/spec/controllers/projects/merge_requests/content_controller_spec.rb index 0eaa528a330..0116071bddf 100644 --- a/spec/controllers/projects/merge_requests/content_controller_spec.rb +++ b/spec/controllers/projects/merge_requests/content_controller_spec.rb @@ -57,17 +57,6 @@ RSpec.describe Projects::MergeRequests::ContentController do expect(response.headers['Poll-Interval']).to eq('10000') end - context 'when async_mergeability_check param is passed' do - it 'checks mergeability asynchronously' do - expect_next_instance_of(MergeRequests::MergeabilityCheckService) do |service| - expect(service).not_to receive(:execute) - expect(service).to receive(:async_execute).and_call_original - end - - do_request(:widget, { async_mergeability_check: true }) - end - end - context 'merged merge request' do let(:merge_request) do create(:merged_merge_request, :with_test_reports, target_project: project, source_project: project) |