Commit 1ec4418f authored by Samantha Ming's avatar Samantha Ming Committed by Phil Hughes

Pass approval rules into MR create

- Rules are loaded for the current target branch
parent 921ccfd8
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
= _('From <code>%{source_title}</code> into').html_safe % { source_title: source_title } = _('From <code>%{source_title}</code> into').html_safe % { source_title: source_title }
- if issuable.new_record? - if issuable.new_record?
%code= target_title %code#js-target-branch-title= target_title
&nbsp; &nbsp;
= link_to _('Change branches'), mr_change_branches_path(issuable) = link_to _('Change branches'), mr_change_branches_path(issuable)
- elsif issuable.for_fork? - elsif issuable.for_fork?
......
...@@ -29,9 +29,15 @@ export default { ...@@ -29,9 +29,15 @@ export default {
removeModalId() { removeModalId() {
return `${this.settings.prefix}-approvals-remove-modal`; return `${this.settings.prefix}-approvals-remove-modal`;
}, },
targetBranch() {
if (this.settings.prefix === 'mr-edit' && !this.settings.mrSettingsPath) {
return this.settings.mrCreateTargetBranch;
}
return null;
},
}, },
created() { mounted() {
this.fetchRules(); return this.fetchRules(this.targetBranch);
}, },
methods: { methods: {
...mapActions(['fetchRules']), ...mapActions(['fetchRules']),
......
...@@ -12,11 +12,16 @@ export default function mountApprovalInput(el) { ...@@ -12,11 +12,16 @@ export default function mountApprovalInput(el) {
return null; return null;
} }
const mrCreateTargetBranch = el.dataset.mrSettingsPath
? null
: document.querySelector('#js-target-branch-title')?.textContent;
const store = createStore(mrEditModule(), { const store = createStore(mrEditModule(), {
...el.dataset, ...el.dataset,
prefix: 'mr-edit', prefix: 'mr-edit',
canEdit: parseBoolean(el.dataset.canEdit), canEdit: parseBoolean(el.dataset.canEdit),
allowMultiRule: parseBoolean(el.dataset.allowMultiRule), allowMultiRule: parseBoolean(el.dataset.allowMultiRule),
mrCreateTargetBranch,
}); });
return new Vue({ return new Vue({
......
---
title: Support inapplicable rules when creating MR
merge_request: 27971
author:
type: fixed
...@@ -47,6 +47,49 @@ describe('EE Approvals App', () => { ...@@ -47,6 +47,49 @@ describe('EE Approvals App', () => {
jest.spyOn(store.modules.createModal.actions, 'open'); jest.spyOn(store.modules.createModal.actions, 'open');
}); });
describe('targetBranch', () => {
const targetBranchName = 'development';
beforeEach(() => {
store.state.settings.mrCreateTargetBranch = targetBranchName;
});
it('passes the target branch name in fetchRules for MR create path', () => {
store.state.settings.prefix = 'mr-edit';
store.state.settings.mrSettingsPath = null;
factory();
expect(store.modules.approvals.actions.fetchRules).toHaveBeenCalledWith(
expect.anything(),
targetBranchName,
undefined,
);
});
it('does not pass the target branch name in fetchRules for MR edit path', () => {
store.state.settings.prefix = 'mr-edit';
store.state.settings.mrSettingsPath = 'some/path';
factory();
expect(store.modules.approvals.actions.fetchRules).toHaveBeenCalledWith(
expect.anything(),
null,
undefined,
);
});
it('does not pass the target branch name in fetchRules for project settings path', () => {
store.state.settings.prefix = 'project-settings';
factory();
expect(store.modules.approvals.actions.fetchRules).toHaveBeenCalledWith(
expect.anything(),
null,
undefined,
);
});
});
describe('when allow multi rule', () => { describe('when allow multi rule', () => {
beforeEach(() => { beforeEach(() => {
store.state.settings.allowMultiRule = true; store.state.settings.allowMultiRule = 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