summaryrefslogtreecommitdiff
path: root/spec/frontend
diff options
context:
space:
mode:
authorNathan Friend <nathan@gitlab.com>2019-05-30 13:47:39 -0300
committerShinya Maeda <shinya@gitlab.com>2019-06-03 13:15:31 +0700
commit84e550fad9c95dd19bb1739fc48ef6694c9f737d (patch)
tree5471107593ffda8c25813a0df7b7bdffc3170cdb /spec/frontend
parentd4b46936633a3b2a0248b4572b4a1dc7b2ba8531 (diff)
downloadgitlab-ce-abstract-auto-merge.tar.gz
Fix frontend tests related to autoMergeStrategyabstract-auto-merge
A few minor frontend changes to complete the refactoring from MWPS to the more generic autoMergeStrategy.
Diffstat (limited to 'spec/frontend')
-rw-r--r--spec/frontend/vue_mr_widget/stores/get_state_key_spec.js6
1 files changed, 3 insertions, 3 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 9797549498b..0f5d47b3bfe 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
@@ -4,7 +4,7 @@ describe('getStateKey', () => {
it('should return proper state name', () => {
const context = {
mergeStatus: 'checked',
- mergeWhenPipelineSucceeds: false,
+ autoMergeEnabled: false,
canMerge: true,
onlyAllowMergeIfPipelineSucceeds: false,
isPipelineFailed: false,
@@ -33,7 +33,7 @@ describe('getStateKey', () => {
context.autoMergeEnabled = true;
- expect(bound()).toEqual('mergeWhenPipelineSucceeds');
+ expect(bound()).toEqual('autoMergeEnabled');
context.isSHAMismatch = true;
@@ -80,7 +80,7 @@ describe('getStateKey', () => {
it('returns rebased state key', () => {
const context = {
mergeStatus: 'checked',
- mergeWhenPipelineSucceeds: false,
+ autoMergeEnabled: false,
canMerge: true,
onlyAllowMergeIfPipelineSucceeds: true,
isPipelineFailed: true,