Commit d11fbccc authored by Bob Van Landuyt's avatar Bob Van Landuyt

Address frontend feedback

parent 1558bd12
...@@ -10,8 +10,9 @@ ...@@ -10,8 +10,9 @@
}, },
}; };
</script> </script>
<template> <template>
<section class="mr-info-list mr-maintainer-edit"> <section class="mr-info-list mr-links">
<p v-if="maintainerEditAllowed"> <p v-if="maintainerEditAllowed">
{{ s__("mrWidget|Allows edits from maintainers") }} {{ s__("mrWidget|Allows edits from maintainers") }}
</p> </p>
......
...@@ -453,8 +453,7 @@ ...@@ -453,8 +453,7 @@
} }
} }
.mr-links, .mr-links {
.mr-maintainer-edit {
padding-left: $status-icon-size + $status-icon-margin; padding-left: $status-icon-size + $status-icon-margin;
} }
......
# Allow maintainer pushes for merge requests accross forks # Allow maintainer pushes for merge requests across forks
This feature is available for merge requests across forked projects that are This feature is available for merge requests across forked projects that are
publicly accessible. It makes it easier for maintainers of projects to collaborate publicly accessible. It makes it easier for maintainers of projects to collaborate
......
...@@ -2,22 +2,39 @@ import Vue from 'vue'; ...@@ -2,22 +2,39 @@ import Vue from 'vue';
import maintainerEditComponent from '~/vue_merge_request_widget/components/mr_widget_maintainer_edit.vue'; import maintainerEditComponent from '~/vue_merge_request_widget/components/mr_widget_maintainer_edit.vue';
import mountComponent from 'spec/helpers/vue_mount_component_helper'; import mountComponent from 'spec/helpers/vue_mount_component_helper';
describe('MRWidgetAuthor', () => { describe('RWidgetMaintainerEdit', () => {
let Component;
let vm; let vm;
beforeEach(() => { beforeEach(() => {
const Component = Vue.extend(maintainerEditComponent); Component = Vue.extend(maintainerEditComponent);
});
afterEach(() => {
vm.$destroy();
});
describe('when a maintainer is allowed to edit', () => {
beforeEach(() => {
vm = mountComponent(Component, { vm = mountComponent(Component, {
maintainerEditAllowed: true, maintainerEditAllowed: true,
}); });
}); });
afterEach(() => { it('it renders the message', () => {
vm.$destroy(); expect(vm.$el.textContent.trim()).toEqual('Allows edits from maintainers');
});
}); });
it('renders the message when maintainers are allowed to edit', () => { describe('when a maintainer is not allowed to edit', () => {
expect(vm.$el.textContent.trim()).toEqual('Allows edits from maintainers'); beforeEach(() => {
vm = mountComponent(Component, {
maintainerEditAllowed: false,
});
});
it('hides the message', () => {
expect(vm.$el.textContent.trim()).toEqual('');
});
}); });
}); });
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