Fix "Remove source branch" button in MR widget during MWPS state
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/4281
This commit is contained in:
parent
7734e85bc6
commit
aba1c07a3e
4 changed files with 20 additions and 14 deletions
|
@ -63,7 +63,7 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
this.isRemovingSourceBranch = true;
|
this.isRemovingSourceBranch = true;
|
||||||
this.service.mergeResource.save(options)
|
this.service.merge(options)
|
||||||
.then(res => res.data)
|
.then(res => res.data)
|
||||||
.then((data) => {
|
.then((data) => {
|
||||||
if (data.status === 'merge_when_pipeline_succeeds') {
|
if (data.status === 'merge_when_pipeline_succeeds') {
|
||||||
|
|
|
@ -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
|
|
@ -125,6 +125,12 @@ describe 'Merge request > User merges when pipeline succeeds', :js do
|
||||||
expect(page).to have_content "canceled the automatic merge"
|
expect(page).to have_content "canceled the automatic merge"
|
||||||
end
|
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
|
context 'when pipeline succeeds' do
|
||||||
before do
|
before do
|
||||||
build.success
|
build.success
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
import Vue from 'vue';
|
import Vue from 'vue';
|
||||||
import mwpsComponent from '~/vue_merge_request_widget/components/states/mr_widget_merge_when_pipeline_succeeds.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 eventHub from '~/vue_merge_request_widget/event_hub';
|
||||||
import mountComponent from 'spec/helpers/vue_mount_component_helper';
|
import mountComponent from 'spec/helpers/vue_mount_component_helper';
|
||||||
|
|
||||||
|
@ -25,12 +26,7 @@ describe('MRWidgetMergeWhenPipelineSucceeds', () => {
|
||||||
targetBranchPath,
|
targetBranchPath,
|
||||||
targetBranch,
|
targetBranch,
|
||||||
},
|
},
|
||||||
service: {
|
service: new MRWidgetService({}),
|
||||||
cancelAutomaticMerge() {},
|
|
||||||
mergeResource: {
|
|
||||||
save() {},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -90,18 +86,16 @@ describe('MRWidgetMergeWhenPipelineSucceeds', () => {
|
||||||
|
|
||||||
describe('removeSourceBranch', () => {
|
describe('removeSourceBranch', () => {
|
||||||
it('should set flag and call service then request main component to update the widget', (done) => {
|
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) => {
|
spyOn(vm.service, 'merge').and.returnValue(Promise.resolve({
|
||||||
resolve({
|
data: {
|
||||||
data: {
|
status: 'merge_when_pipeline_succeeds',
|
||||||
status: 'merge_when_pipeline_succeeds',
|
},
|
||||||
},
|
|
||||||
});
|
|
||||||
}));
|
}));
|
||||||
|
|
||||||
vm.removeSourceBranch();
|
vm.removeSourceBranch();
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
expect(eventHub.$emit).toHaveBeenCalledWith('MRWidgetUpdateRequested');
|
expect(eventHub.$emit).toHaveBeenCalledWith('MRWidgetUpdateRequested');
|
||||||
expect(vm.service.mergeResource.save).toHaveBeenCalledWith({
|
expect(vm.service.merge).toHaveBeenCalledWith({
|
||||||
sha,
|
sha,
|
||||||
merge_when_pipeline_succeeds: true,
|
merge_when_pipeline_succeeds: true,
|
||||||
should_remove_source_branch: true,
|
should_remove_source_branch: true,
|
||||||
|
|
Loading…
Reference in a new issue