summaryrefslogtreecommitdiff
path: root/spec/services/merge_requests/mergeability
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-10-28 12:10:22 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-10-28 12:10:22 +0000
commitd2f4295270852f1ec4b9736f1db493421729474d (patch)
treec3bb3833ab7b6039a6b7223cc26745d373295fa3 /spec/services/merge_requests/mergeability
parent89cbcca95d58b6185098c13467d2382032f11774 (diff)
downloadgitlab-ce-d2f4295270852f1ec4b9736f1db493421729474d.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/services/merge_requests/mergeability')
-rw-r--r--spec/services/merge_requests/mergeability/run_checks_service_spec.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/services/merge_requests/mergeability/run_checks_service_spec.rb b/spec/services/merge_requests/mergeability/run_checks_service_spec.rb
index 170d99f4642..71ad23bc68c 100644
--- a/spec/services/merge_requests/mergeability/run_checks_service_spec.rb
+++ b/spec/services/merge_requests/mergeability/run_checks_service_spec.rb
@@ -8,7 +8,7 @@ RSpec.describe MergeRequests::Mergeability::RunChecksService do
let_it_be(:merge_request) { create(:merge_request) }
describe '#CHECKS' do
- it 'contains every subclass of the base checks service' do
+ it 'contains every subclass of the base checks service', :eager_load do
expect(described_class::CHECKS).to contain_exactly(*MergeRequests::Mergeability::CheckBaseService.subclasses)
end
end
@@ -19,7 +19,7 @@ RSpec.describe MergeRequests::Mergeability::RunChecksService do
let(:params) { {} }
let(:success_result) { Gitlab::MergeRequests::Mergeability::CheckResult.success }
- context 'when every check is skipped' do
+ context 'when every check is skipped', :eager_load do
before do
MergeRequests::Mergeability::CheckBaseService.subclasses.each do |subclass|
expect_next_instance_of(subclass) do |service|