Commit 29a16fbf authored by Shinya Maeda's avatar Shinya Maeda

Add auto merge strategies

AddToMergeTrainWhenPipelineSucceeds and MergeTrain
parent 9eb40fbf
...@@ -10,8 +10,8 @@ describe AutoMergeService do ...@@ -10,8 +10,8 @@ describe AutoMergeService do
describe '.all_strategies' do describe '.all_strategies' do
subject { described_class.all_strategies } subject { described_class.all_strategies }
it 'returns all strategies' do it 'includes merge when pipeline succeeds' do
is_expected.to eq(AutoMergeService::STRATEGIES) is_expected.to include(AutoMergeService::STRATEGY_MERGE_WHEN_PIPELINE_SUCCEEDS)
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment