From 29a16fbf9efe57144fd25e83786c1e0bd6126cba Mon Sep 17 00:00:00 2001 From: Shinya Maeda Date: Fri, 24 May 2019 17:52:51 +0700 Subject: [PATCH] Add auto merge strategies AddToMergeTrainWhenPipelineSucceeds and MergeTrain --- spec/services/auto_merge_service_spec.rb | 4 ++-- 1 file 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