Commit 4d674bd3 authored by Phil Hughes's avatar Phil Hughes

Merge branch 'rename-merge-request-widget-author-component' into 'master'

Rename merge request widget author component

See merge request gitlab-org/gitlab-ce!19079
parents 879ddf72 385c0779
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
import tooltip from '../../vue_shared/directives/tooltip'; import tooltip from '../../vue_shared/directives/tooltip';
export default { export default {
name: 'MRWidgetAuthor', name: 'MrWidgetAuthor',
directives: { directives: {
tooltip, tooltip,
}, },
......
<script> <script>
import mrWidgetAuthor from './mr_widget_author.vue'; import MrWidgetAuthor from './mr_widget_author.vue';
export default { export default {
name: 'MRWidgetAuthorTime', name: 'MRWidgetAuthorTime',
components: { components: {
mrWidgetAuthor, MrWidgetAuthor,
}, },
props: { props: {
actionText: { actionText: {
......
<script> <script>
import Flash from '../../../flash'; import Flash from '../../../flash';
import statusIcon from '../mr_widget_status_icon.vue'; import statusIcon from '../mr_widget_status_icon.vue';
import mrWidgetAuthor from '../../components/mr_widget_author.vue'; import MrWidgetAuthor from '../../components/mr_widget_author.vue';
import eventHub from '../../event_hub'; import eventHub from '../../event_hub';
export default { export default {
name: 'MRWidgetMergeWhenPipelineSucceeds', name: 'MRWidgetMergeWhenPipelineSucceeds',
components: { components: {
mrWidgetAuthor, MrWidgetAuthor,
statusIcon, statusIcon,
}, },
props: { props: {
......
---
title: Rename merge request widget author component
merge_request: 19079
author: George Tsiolis
type: changed
import Vue from 'vue'; import Vue from 'vue';
import authorComponent from '~/vue_merge_request_widget/components/mr_widget_author.vue'; import MrWidgetAuthor from '~/vue_merge_request_widget/components/mr_widget_author.vue';
import mountComponent from 'spec/helpers/vue_mount_component_helper'; import mountComponent from 'spec/helpers/vue_mount_component_helper';
describe('MRWidgetAuthor', () => { describe('MrWidgetAuthor', () => {
let vm; let vm;
beforeEach(() => { beforeEach(() => {
const Component = Vue.extend(authorComponent); const Component = Vue.extend(MrWidgetAuthor);
vm = mountComponent(Component, { vm = mountComponent(Component, {
author: { author: {
......
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