Commit 55767af4 authored by Filipa Lacerda's avatar Filipa Lacerda

Merge branch '60855-mr-popover-is-not-attached-in-system-notes' into 'master'

Resolve "MR Popover is not attached in system notes"

Closes #60855

See merge request gitlab-org/gitlab-ce!27589
parents d1ac44ae 41ff0d1e
......@@ -22,6 +22,7 @@ import noteHeader from '~/notes/components/note_header.vue';
import Icon from '~/vue_shared/components/icon.vue';
import TimelineEntryItem from './timeline_entry_item.vue';
import { spriteIcon } from '../../../lib/utils/common_utils';
import initMRPopovers from '~/mr_popover/';
const MAX_VISIBLE_COMMIT_LIST_COUNT = 3;
......@@ -71,6 +72,9 @@ export default {
);
},
},
mounted() {
initMRPopovers(this.$el.querySelectorAll('.gfm-merge_request'));
},
};
</script>
......
---
title: Fix bug where system note MR has no popover
merge_request: 27589
author:
type: fixed
......@@ -5,8 +5,10 @@ import createStore from '~/notes/stores';
describe('system note component', () => {
let vm;
let props;
let initMRPopoversSpy;
beforeEach(() => {
initMRPopoversSpy = spyOnDependency(issueSystemNote, 'initMRPopovers');
props = {
note: {
id: '1424',
......@@ -56,4 +58,8 @@ describe('system note component', () => {
it('removes wrapping paragraph from note HTML', () => {
expect(vm.$el.querySelector('.system-note-message').innerHTML).toEqual('<span>closed</span>');
});
it('should initMRPopovers onMount', () => {
expect(initMRPopoversSpy).toHaveBeenCalled();
});
});
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