summaryrefslogtreecommitdiff
path: root/spec/services/auto_merge_service_spec.rb
diff options
context:
space:
mode:
Diffstat (limited to 'spec/services/auto_merge_service_spec.rb')
-rw-r--r--spec/services/auto_merge_service_spec.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/services/auto_merge_service_spec.rb b/spec/services/auto_merge_service_spec.rb
index 7e9c412adb3..93a22e60498 100644
--- a/spec/services/auto_merge_service_spec.rb
+++ b/spec/services/auto_merge_service_spec.rb
@@ -10,8 +10,8 @@ describe AutoMergeService do
describe '.all_strategies' do
subject { described_class.all_strategies }
- it 'returns all strategies' do
- is_expected.to eq(AutoMergeService::STRATEGIES)
+ it 'includes merge when pipeline succeeds' do
+ is_expected.to include(AutoMergeService::STRATEGY_MERGE_WHEN_PIPELINE_SUCCEEDS)
end
end