Commit c38d624b authored by Filipa Lacerda's avatar Filipa Lacerda

Merge branch 'fix-timeago-tooltip-attribute' into 'master'

Fix invalid attribute used for time-ago-tooltip component

Closes #37163

See merge request !13899
parents d540d43e cc81a40d
...@@ -37,7 +37,7 @@ export default { ...@@ -37,7 +37,7 @@ export default {
Edited Edited
<time-ago-tooltip <time-ago-tooltip
v-if="updatedAt" v-if="updatedAt"
placement="bottom" tooltip-placement="bottom"
:time="updatedAt" :time="updatedAt"
/> />
<span <span
......
...@@ -46,4 +46,14 @@ describe('edited', () => { ...@@ -46,4 +46,14 @@ describe('edited', () => {
expect(editedComponent.$el.querySelector('.author_link')).toBeFalsy(); expect(editedComponent.$el.querySelector('.author_link')).toBeFalsy();
expect(editedComponent.$el.querySelector('time')).toBeTruthy(); expect(editedComponent.$el.querySelector('time')).toBeTruthy();
}); });
it('renders time ago tooltip at the bottom', () => {
const editedComponent = new EditedComponent({
propsData: {
updatedAt: '2017-05-15T12:31:04.428Z',
},
}).$mount();
expect(editedComponent.$el.querySelector('time').dataset.placement).toEqual('bottom');
});
}); });
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