rewrite tooltip unit tests

build/build-plugins.js

@@ -42,7 +42,7 @@ const bsPlugins = {
   ScrollSpy: path.resolve(__dirname, '../js/src/scrollspy.js'),
   Tab: path.resolve(__dirname, '../js/src/tab.js'),
   Toast: path.resolve(__dirname, '../js/src/toast/toast.js'),
-  Tooltip: path.resolve(__dirname, '../js/src/tooltip.js')
+  Tooltip: path.resolve(__dirname, '../js/src/tooltip/tooltip.js')
 }
 const rootPath = '../js/dist/'
 

js/index.esm.js

@@ -15,7 +15,7 @@ import Popover from './src/popover/popover'
 import ScrollSpy from './src/scrollspy'
 import Tab from './src/tab'
 import Toast from './src/toast/toast'
-import Tooltip from './src/tooltip'
+import Tooltip from './src/tooltip/tooltip'
 
 export {
   Alert,

js/index.umd.js

@@ -15,7 +15,7 @@ import Popover from './src/popover/popover'
 import ScrollSpy from './src/scrollspy'
 import Tab from './src/tab'
 import Toast from './src/toast/toast'
-import Tooltip from './src/tooltip'
+import Tooltip from './src/tooltip/tooltip'
 
 export default {
   Alert,

js/src/popover/popover.js

@@ -8,7 +8,7 @@
 import { jQuery as $ } from '../util/index'
 import Data from '../dom/data'
 import SelectorEngine from '../dom/selector-engine'
-import Tooltip from '../tooltip'
+import Tooltip from '../tooltip/tooltip'
 
 /**
  * ------------------------------------------------------------------------

js/src/popover/popover.spec.js

@@ -16,8 +16,8 @@ describe('Popover', () => {
 
     const popoverList = makeArray(document.querySelectorAll('.popover'))
 
-    popoverList.forEach(backdrop => {
+    popoverList.forEach(popoverEl => {
-      document.body.removeChild(backdrop)
+      document.body.removeChild(popoverEl)
     })
   })
 

js/src/tooltip/tooltip.js

@@ -16,16 +16,16 @@ import {
   makeArray,
   noop,
   typeCheckConfig
-} from './util/index'
+} from '../util/index'
 import {
   DefaultWhitelist,
   sanitizeHtml
-} from './util/sanitizer'
+} from '../util/sanitizer'
-import Data from './dom/data'
+import Data from '../dom/data'
-import EventHandler from './dom/event-handler'
+import EventHandler from '../dom/event-handler'
-import Manipulator from './dom/manipulator'
+import Manipulator from '../dom/manipulator'
 import Popper from 'popper.js'
-import SelectorEngine from './dom/selector-engine'
+import SelectorEngine from '../dom/selector-engine'
 
 /**
  * ------------------------------------------------------------------------
@@ -290,7 +290,7 @@ class Tooltip {
         this.config.placement
 
       const attachment = this._getAttachment(placement)
-      this.addAttachmentClass(attachment)
+      this._addAttachmentClass(attachment)
 
       const container = this._getContainer()
       Data.setData(tip, this.constructor.DATA_KEY, this)
@@ -360,7 +360,7 @@ class Tooltip {
     }
   }
 
-  hide(callback) {
+  hide() {
     const tip = this.getTipElement()
     const complete = () => {
       if (this._hoverState !== HoverState.SHOW && tip.parentNode) {
@@ -370,15 +370,9 @@ class Tooltip {
       this._cleanTipClass()
       this.element.removeAttribute('aria-describedby')
       EventHandler.trigger(this.element, this.constructor.Event.HIDDEN)
-      if (this._popper !== null) {
       this._popper.destroy()
     }
 
-      if (callback) {
-        callback()
-      }
-    }
-
     const hideEvent = EventHandler.trigger(this.element, this.constructor.Event.HIDE)
     if (hideEvent.defaultPrevented) {
       return
@@ -421,10 +415,6 @@ class Tooltip {
     return Boolean(this.getTitle())
   }
 
-  addAttachmentClass(attachment) {
-    this.getTipElement().classList.add(`${CLASS_PREFIX}-${attachment}`)
-  }
-
   getTipElement() {
     if (this.tip) {
       return this.tip
@@ -449,7 +439,7 @@ class Tooltip {
       return
     }
 
-    if (typeof content === 'object' && (content.nodeType || content.jquery)) {
+    if (typeof content === 'object' && isElement(content)) {
       if (content.jquery) {
         content = content[0]
       }
@@ -492,6 +482,10 @@ class Tooltip {
 
   // Private
 
+  _addAttachmentClass(attachment) {
+    this.getTipElement().classList.add(`${CLASS_PREFIX}-${attachment}`)
+  }
+
   _getOffset() {
     const offset = {}
 
@@ -757,7 +751,7 @@ class Tooltip {
     const popperInstance = popperData.instance
     this.tip = popperInstance.popper
     this._cleanTipClass()
-    this.addAttachmentClass(this._getAttachment(popperData.placement))
+    this._addAttachmentClass(this._getAttachment(popperData.placement))
   }
 
   _fixTransition() {
@@ -810,7 +804,7 @@ class Tooltip {
  * ------------------------------------------------------------------------
  * add .tooltip to jQuery only if jQuery is present
  */
-
+/* istanbul ignore if */
 if (typeof $ !== 'undefined') {
   const JQUERY_NO_CONFLICT = $.fn[NAME]
   $.fn[NAME] = Tooltip._jQueryInterface