diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2019-05-22 18:45:27 +0700 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2019-06-03 13:15:29 +0700 |
| commit | d4b46936633a3b2a0248b4572b4a1dc7b2ba8531 (patch) | |
| tree | bf5c1cf5a8ebf1568ca62576d63ff793ce29764f /spec/frontend | |
| parent | 96744d0befd7e298c08e6d20a4f504086a717c35 (diff) | |
| download | gitlab-ce-d4b46936633a3b2a0248b4572b4a1dc7b2ba8531.tar.gz | |
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/frontend')
| -rw-r--r-- | spec/frontend/vue_mr_widget/stores/get_state_key_spec.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/frontend/vue_mr_widget/stores/get_state_key_spec.js b/spec/frontend/vue_mr_widget/stores/get_state_key_spec.js index b356ea85cad..9797549498b 100644 --- a/spec/frontend/vue_mr_widget/stores/get_state_key_spec.js +++ b/spec/frontend/vue_mr_widget/stores/get_state_key_spec.js @@ -31,7 +31,7 @@ describe('getStateKey', () => { expect(bound()).toEqual('notAllowedToMerge'); - context.mergeWhenPipelineSucceeds = true; + context.autoMergeEnabled = true; expect(bound()).toEqual('mergeWhenPipelineSucceeds'); |