Address frontend feedback
This commit is contained in:
parent
1558bd1263
commit
d11fbccc8d
|
@ -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 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.mr-links,
|
.mr-links {
|
||||||
.mr-maintainer-edit {
|
|
||||||
padding-left: $status-icon-size + $status-icon-margin;
|
padding-left: $status-icon-size + $status-icon-margin;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Binary file not shown.
Before Width: | Height: | Size: 491 KiB After Width: | Height: | Size: 97 KiB |
|
@ -1,4 +1,4 @@
|
||||||
# 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';
|
||||||
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);
|
||||||
|
|
||||||
vm = mountComponent(Component, {
|
|
||||||
maintainerEditAllowed: true,
|
|
||||||
});
|
|
||||||
});
|
});
|
||||||
|
|
||||||
afterEach(() => {
|
afterEach(() => {
|
||||||
vm.$destroy();
|
vm.$destroy();
|
||||||
});
|
});
|
||||||
|
|
||||||
it('renders the message when maintainers are allowed to edit', () => {
|
describe('when a maintainer is allowed to edit', () => {
|
||||||
|
beforeEach(() => {
|
||||||
|
vm = mountComponent(Component, {
|
||||||
|
maintainerEditAllowed: true,
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it('it renders the message', () => {
|
||||||
expect(vm.$el.textContent.trim()).toEqual('Allows edits from maintainers');
|
expect(vm.$el.textContent.trim()).toEqual('Allows edits from maintainers');
|
||||||
});
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('when a maintainer is not allowed to edit', () => {
|
||||||
|
beforeEach(() => {
|
||||||
|
vm = mountComponent(Component, {
|
||||||
|
maintainerEditAllowed: false,
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it('hides the message', () => {
|
||||||
|
expect(vm.$el.textContent.trim()).toEqual('');
|
||||||
|
});
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
Loading…
Reference in New Issue