diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2019-05-24 13:52:51 +0300 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2019-06-12 14:28:40 +0300 |
| commit | 29a16fbf9efe57144fd25e83786c1e0bd6126cba (patch) | |
| tree | bfd976b743ad942368678acee4b65b21440c7a6d /spec/services/auto_merge_service_spec.rb | |
| parent | 9eb40fbfd63799a1cbdb219b4b9ff7a1fa8d6430 (diff) | |
Add auto merge strategies
AddToMergeTrainWhenPipelineSucceeds and MergeTrain
Diffstat (limited to 'spec/services/auto_merge_service_spec.rb')
| -rw-r--r-- | spec/services/auto_merge_service_spec.rb | 4 |
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 |