kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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

Browse source 
Init MR Popovers on system note mounted

Closes #60855

See merge request gitlab-org/gitlab-ce!27747
This commit is contained in:
Filipa Lacerda 2019-04-29 09:16:03 +00:00
commit 7d29dbe49d
3 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/assets/javascripts/vue_shared/components/notes/system_note.vue
View file

@ -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>

5
changelogs/unreleased/60855-mr-popover-is-not-attached-in-system-notes.yml Normal file
View file

@ -0,0 +1,5 @@
---
title: Fix bug where system note MR has no popover
merge_request: 27747
author:
type: fixed

7
spec/frontend/vue_shared/components/notes/system_note_spec.js
View file

@ -1,6 +1,9 @@
import Vue from 'vue';
import issueSystemNote from '~/vue_shared/components/notes/system_note.vue';
import createStore from '~/notes/stores';
import initMRPopovers from '~/mr_popover/index';
jest.mock('~/mr_popover/index', () => jest.fn());
describe('system note component', () => {
let vm;
@ -56,4 +59,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(initMRPopovers).toHaveBeenCalled();
});
});