From aba1c07a3ea9284df911338461d8b1e2d2d6607e Mon Sep 17 00:00:00 2001
From: Eric Eastwood <contact@ericeastwood.com>
Date: Fri, 16 Feb 2018 15:51:38 -0600
Subject: [PATCH] Fix "Remove source branch" button in MR widget during MWPS
 state

Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/4281
---
 ...mr_widget_merge_when_pipeline_succeeds.vue |  2 +-
 ...814-fix-remove-source-branch-when-mwps.yml |  6 ++++++
 ...user_merges_when_pipeline_succeeds_spec.rb |  6 ++++++
 ...idget_merge_when_pipeline_succeeds_spec.js | 20 +++++++------------
 4 files changed, 20 insertions(+), 14 deletions(-)
 create mode 100644 changelogs/unreleased/42814-fix-remove-source-branch-when-mwps.yml

diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merge_when_pipeline_succeeds.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merge_when_pipeline_succeeds.vue
index de98a77be6f..7ff7fc7988a 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merge_when_pipeline_succeeds.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merge_when_pipeline_succeeds.vue
@@ -63,7 +63,7 @@
         };
 
         this.isRemovingSourceBranch = true;
-        this.service.mergeResource.save(options)
+        this.service.merge(options)
           .then(res => res.data)
           .then((data) => {
             if (data.status === 'merge_when_pipeline_succeeds') {
diff --git a/changelogs/unreleased/42814-fix-remove-source-branch-when-mwps.yml b/changelogs/unreleased/42814-fix-remove-source-branch-when-mwps.yml
new file mode 100644
index 00000000000..08e77ee7c3b
--- /dev/null
+++ b/changelogs/unreleased/42814-fix-remove-source-branch-when-mwps.yml
@@ -0,0 +1,6 @@
+---
+title: Fix "Remove source branch" button in Merge request widget during merge when pipeline
+  succeeds state
+merge_request: 17192
+author:
+type: fixed
diff --git a/spec/features/merge_request/user_merges_when_pipeline_succeeds_spec.rb b/spec/features/merge_request/user_merges_when_pipeline_succeeds_spec.rb
index 890774922aa..db92a3504f3 100644
--- a/spec/features/merge_request/user_merges_when_pipeline_succeeds_spec.rb
+++ b/spec/features/merge_request/user_merges_when_pipeline_succeeds_spec.rb
@@ -125,6 +125,12 @@ describe 'Merge request > User merges when pipeline succeeds', :js do
       expect(page).to have_content "canceled the automatic merge"
     end
 
+    it 'allows to remove source branch' do
+      click_link "Remove source branch"
+
+      expect(page).to have_content "The source branch will be removed"
+    end
+
     context 'when pipeline succeeds' do
       before do
         build.success
diff --git a/spec/javascripts/vue_mr_widget/components/states/mr_widget_merge_when_pipeline_succeeds_spec.js b/spec/javascripts/vue_mr_widget/components/states/mr_widget_merge_when_pipeline_succeeds_spec.js
index dd907ad9015..d47815a5b5a 100644
--- a/spec/javascripts/vue_mr_widget/components/states/mr_widget_merge_when_pipeline_succeeds_spec.js
+++ b/spec/javascripts/vue_mr_widget/components/states/mr_widget_merge_when_pipeline_succeeds_spec.js
@@ -1,5 +1,6 @@
 import Vue from 'vue';
 import mwpsComponent from '~/vue_merge_request_widget/components/states/mr_widget_merge_when_pipeline_succeeds.vue';
+import MRWidgetService from '~/vue_merge_request_widget/services/mr_widget_service';
 import eventHub from '~/vue_merge_request_widget/event_hub';
 import mountComponent from 'spec/helpers/vue_mount_component_helper';
 
@@ -25,12 +26,7 @@ describe('MRWidgetMergeWhenPipelineSucceeds', () => {
         targetBranchPath,
         targetBranch,
       },
-      service: {
-        cancelAutomaticMerge() {},
-        mergeResource: {
-          save() {},
-        },
-      },
+      service: new MRWidgetService({}),
     });
   });
 
@@ -90,18 +86,16 @@ describe('MRWidgetMergeWhenPipelineSucceeds', () => {
 
     describe('removeSourceBranch', () => {
       it('should set flag and call service then request main component to update the widget', (done) => {
-        spyOn(vm.service.mergeResource, 'save').and.returnValue(new Promise((resolve) => {
-          resolve({
-            data: {
-              status: 'merge_when_pipeline_succeeds',
-            },
-          });
+        spyOn(vm.service, 'merge').and.returnValue(Promise.resolve({
+          data: {
+            status: 'merge_when_pipeline_succeeds',
+          },
         }));
 
         vm.removeSourceBranch();
         setTimeout(() => {
           expect(eventHub.$emit).toHaveBeenCalledWith('MRWidgetUpdateRequested');
-          expect(vm.service.mergeResource.save).toHaveBeenCalledWith({
+          expect(vm.service.merge).toHaveBeenCalledWith({
             sha,
             merge_when_pipeline_succeeds: true,
             should_remove_source_branch: true,