Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'spec/services/merge_requests/post_merge_service_spec.rb')
-rw-r--r--spec/services/merge_requests/post_merge_service_spec.rb26
1 files changed, 0 insertions, 26 deletions
diff --git a/spec/services/merge_requests/post_merge_service_spec.rb b/spec/services/merge_requests/post_merge_service_spec.rb
index f0885365f96..e486daae15e 100644
--- a/spec/services/merge_requests/post_merge_service_spec.rb
+++ b/spec/services/merge_requests/post_merge_service_spec.rb
@@ -106,32 +106,6 @@ RSpec.describe MergeRequests::PostMergeService do
expect(merge_request.reload).to be_merged
end
end
-
- context 'when async_mr_close_issue feature flag is disabled' do
- before do
- stub_feature_flags(async_mr_close_issue: false)
- end
-
- it 'executes Issues::CloseService' do
- expect_next_instance_of(Issues::CloseService) do |close_service|
- expect(close_service).to receive(:execute).with(issue, commit: merge_request)
- end
-
- subject
-
- expect(merge_request.reload).to be_merged
- end
-
- it 'marks MR as merged regardless of errors when closing issues' do
- expect_next_instance_of(Issues::CloseService) do |close_service|
- allow(close_service).to receive(:execute).with(issue, commit: merge_request).and_raise(RuntimeError)
- end
-
- expect { subject }.to raise_error(RuntimeError)
-
- expect(merge_request.reload).to be_merged
- end
- end
end
context 'when the merge request has review apps' do