diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2019-05-22 14:45:27 +0300 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2019-06-03 09:15:29 +0300 |
| commit | d4b46936633a3b2a0248b4572b4a1dc7b2ba8531 (patch) | |
| tree | bf5c1cf5a8ebf1568ca62576d63ff793ce29764f /spec/factories/merge_requests.rb | |
| parent | 96744d0befd7e298c08e6d20a4f504086a717c35 (diff) | |
Abstract auto merge processes
We have one auto merge strategy today - Merge When Pipeline
Succeeds.
In order to add more strategies for Merge Train feature,
we abstract the architecture to be more extensible.
Removed arguments
Fix spec
Diffstat (limited to 'spec/factories/merge_requests.rb')
| -rw-r--r-- | spec/factories/merge_requests.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/factories/merge_requests.rb b/spec/factories/merge_requests.rb index e8df5094b83..0b6a43b13a9 100644 --- a/spec/factories/merge_requests.rb +++ b/spec/factories/merge_requests.rb @@ -95,7 +95,8 @@ FactoryBot.define do end trait :merge_when_pipeline_succeeds do - merge_when_pipeline_succeeds true + auto_merge_enabled true + auto_merge_strategy AutoMergeService::STRATEGY_MERGE_WHEN_PIPELINE_SUCCEEDS merge_user { author } end |