diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2019-06-12 13:47:24 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2019-06-12 13:47:24 +0000 |
| commit | 4716cae4f8339a1668a11e7397c94ee468d2aead (patch) | |
| tree | c484dd9328850ff8de0a4b07f70a15fb07667926 | |
| parent | 6766a88adeee7c28b456eee47155a8a318ce1b0a (diff) | |
| parent | 29a16fbf9efe57144fd25e83786c1e0bd6126cba (diff) | |
| download | gitlab-ce-4716cae4f8339a1668a11e7397c94ee468d2aead.tar.gz | |
Merge branch 'add-merge-train-auto-merge-strategy-ce' into 'master'
(CE Port) [New Auto Merge Strategy] Merge Train
See merge request gitlab-org/gitlab-ce!29485
| -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 |