Commit 4f1ba59b authored by Jose Ivan Vargas's avatar Jose Ivan Vargas

Merge branch 'pb-fix-failed-merge-immediately' into 'master'

Fix merge immediately danger modal

See merge request gitlab-org/gitlab!69488
parents 8d704120 300653a5
...@@ -396,7 +396,7 @@ export default { ...@@ -396,7 +396,7 @@ export default {
} }
}, },
onMergeImmediatelyConfirmation() { onMergeImmediatelyConfirmation() {
this.handleMergeButtonClick(false, true); this.handleMergeButtonClick(false, true, true);
}, },
initiateMergePolling() { initiateMergePolling() {
simplePoll( simplePoll(
......
...@@ -385,7 +385,8 @@ describe('ReadyToMerge', () => { ...@@ -385,7 +385,8 @@ describe('ReadyToMerge', () => {
return wrapper.vm.$nextTick(); return wrapper.vm.$nextTick();
}) })
.then(() => { .then(() => {
expect(vm.handleMergeButtonClick).toHaveBeenCalled(); // false (no auto merge), true (merge immediately), true (confirmation clicked)
expect(vm.handleMergeButtonClick).toHaveBeenCalledWith(false, true, true);
}); });
}); });
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment