summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2018-03-12 14:41:13 +0000
committerPhil Hughes <me@iamphill.com>2018-03-12 14:41:13 +0000
commit5b4a3977f185464ca769d3ae6f962f7906ee3c1c (patch)
treecb15d515c18979158c4d03d8f5438f25562162c7
parent277fac40f10cf918d63ca558175c7b3e17fdd2e9 (diff)
downloadgitlab-ce-5b4a3977f185464ca769d3ae6f962f7906ee3c1c.tar.gz
fixed spec
-rw-r--r--spec/javascripts/vue_mr_widget/mr_widget_options_spec.js1
1 files changed, 1 insertions, 0 deletions
diff --git a/spec/javascripts/vue_mr_widget/mr_widget_options_spec.js b/spec/javascripts/vue_mr_widget/mr_widget_options_spec.js
index e04f844a702..32876ca66ac 100644
--- a/spec/javascripts/vue_mr_widget/mr_widget_options_spec.js
+++ b/spec/javascripts/vue_mr_widget/mr_widget_options_spec.js
@@ -427,6 +427,7 @@ describe('mrWidgetOptions', () => {
it('renders when user cannot remove branch and branch should be removed', (done) => {
vm.mr.canRemoveSourceBranch = false;
vm.mr.shouldRemoveSourceBranch = true;
+ vm.mr.state = 'readyToMerge';
vm.$nextTick(() => {
const tooltip = vm.$el.querySelector('.fa-question-circle');