From 3b11951c2439cae2a917f1ec736245f163be839e Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Sat, 29 Jan 2022 00:14:30 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- .../projects/merge_requests_controller_spec.rb | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) (limited to 'spec/controllers/projects/merge_requests_controller_spec.rb') diff --git a/spec/controllers/projects/merge_requests_controller_spec.rb b/spec/controllers/projects/merge_requests_controller_spec.rb index d20bb2b16e5..3ac59d8e43a 100644 --- a/spec/controllers/projects/merge_requests_controller_spec.rb +++ b/spec/controllers/projects/merge_requests_controller_spec.rb @@ -57,19 +57,13 @@ RSpec.describe Projects::MergeRequestsController do merge_request.mark_as_unchecked! end - context 'check_mergeability_async_in_widget feature flag is disabled' do - before do - stub_feature_flags(check_mergeability_async_in_widget: false) + 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) end - 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) - end - - go - end + go end end -- cgit v1.2.1