diff options
Diffstat (limited to 'spec/services/merge_requests/mergeability/run_checks_service_spec.rb')
-rw-r--r-- | spec/services/merge_requests/mergeability/run_checks_service_spec.rb | 22 |
1 files changed, 5 insertions, 17 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 cf34923795e..c56b38bccc1 100644 --- a/spec/services/merge_requests/mergeability/run_checks_service_spec.rb +++ b/spec/services/merge_requests/mergeability/run_checks_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe MergeRequests::Mergeability::RunChecksService do +RSpec.describe MergeRequests::Mergeability::RunChecksService, :clean_gitlab_redis_cache do subject(:run_checks) { described_class.new(merge_request: merge_request, params: {}) } describe '#execute' do @@ -104,18 +104,6 @@ RSpec.describe MergeRequests::Mergeability::RunChecksService do expect(execute.success?).to eq(true) end end - - context 'when mergeability_caching is turned off' do - before do - stub_feature_flags(mergeability_caching: false) - end - - it 'does not call the results store' do - expect(Gitlab::MergeRequests::Mergeability::ResultsStore).not_to receive(:new) - - expect(execute.success?).to eq(true) - end - end end end @@ -161,11 +149,11 @@ RSpec.describe MergeRequests::Mergeability::RunChecksService do let_it_be(:merge_request) { create(:merge_request) } context 'when the execute method has been executed' do - before do - run_checks.execute - end - context 'when all the checks succeed' do + before do + run_checks.execute + end + it 'returns nil' do expect(failure_reason).to eq(nil) end |