Merge branch 'gt-use-gl-tooltip-directive' into 'master'

Use `gl-tooltip` directive in badges, cycle analytics, and diffs

See merge request gitlab-org/gitlab-ce!22770

2 files changed, 0 insertions, 23 deletions

diff --git a/spec/javascripts/issue_show/components/edited_spec.js b/spec/javascripts/issue_show/components/edited_spec.js
index 7f09db837bb..a1683f060c0 100644
--- a/spec/javascripts/issue_show/components/edited_spec.js
+++ b/spec/javascripts/issue_show/components/edited_spec.js
@@ -46,14 +46,4 @@ describe('edited', () => {
     expect(editedComponent.$el.querySelector('.author-link')).toBeFalsy();
     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');
-  });
 });
diff --git a/spec/javascripts/vue_shared/components/time_ago_tooltip_spec.js b/spec/javascripts/vue_shared/components/time_ago_tooltip_spec.js
index 745571d0a97..536bb57b946 100644
--- a/spec/javascripts/vue_shared/components/time_ago_tooltip_spec.js
+++ b/spec/javascripts/vue_shared/components/time_ago_tooltip_spec.js
@@ -26,24 +26,11 @@ describe('Time ago with tooltip component', () => {
       formatDate('2017-05-08T14:57:39.781Z'),
     );
 
-    expect(vm.$el.getAttribute('data-placement')).toEqual('top');
-
     const timeago = getTimeago();
 
     expect(vm.$el.textContent.trim()).toEqual(timeago.format('2017-05-08T14:57:39.781Z'));
   });
 
-  it('should render tooltip placed in bottom', () => {
-    vm = new TimeagoTooltip({
-      propsData: {
-        time: '2017-05-08T14:57:39.781Z',
-        tooltipPlacement: 'bottom',
-      },
-    }).$mount();
-
-    expect(vm.$el.getAttribute('data-placement')).toEqual('bottom');
-  });
-
   it('should render provided html class', () => {
     vm = new TimeagoTooltip({
       propsData: {