remove old references to jquery and some fixes

5 files changed, 15 insertions, 15 deletions

diff --git a/js/tests/unit/alert.js b/js/tests/unit/alert.js
index 588908d66..3fe796e28 100644
--- a/js/tests/unit/alert.js
+++ b/js/tests/unit/alert.js
@@ -91,7 +91,7 @@ $(function () {
     var done = assert.async()
     var $el = $('<div/>')
     var $alert = $el.bootstrapAlert()
-    var alertInstance = $alert.data('bs.alert')
+    var alertInstance = Data.getData($alert[0], 'bs.alert')
 
     $alert.one('closed.bs.alert', function () {
       assert.ok('alert closed')
@@ -107,11 +107,11 @@ $(function () {
     var $el = $('<div/>')
     var $alert = $el.bootstrapAlert()
 
-    assert.ok(typeof $alert.data('bs.alert') !== 'undefined')
+    assert.ok(typeof Data.getData($alert[0], 'bs.alert') !== 'undefined')
 
-    $alert.data('bs.alert').dispose()
+    Data.getData($alert[0], 'bs.alert').dispose()
 
-    assert.ok(typeof $alert.data('bs.button') === 'undefined')
+    assert.ok(Data.getData($alert[0], 'bs.alert') === null)
   })
 
   QUnit.test('should return alert version', function (assert) {
diff --git a/js/tests/unit/button.js b/js/tests/unit/button.js
index c162e3a9f..0fa19d154 100644
--- a/js/tests/unit/button.js
+++ b/js/tests/unit/button.js
@@ -208,11 +208,11 @@ $(function () {
     var $el = $('<div/>')
     var $button = $el.bootstrapButton()
 
-    assert.ok(typeof $button.data('bs.button') !== 'undefined')
+    assert.ok(typeof Data.getData($button[0], 'bs.button') !== 'undefined')
 
-    $button.data('bs.button').dispose()
+    Data.getData($button[0], 'bs.button').dispose()
 
-    assert.ok(typeof $button.data('bs.button') === 'undefined')
+    assert.ok(Data.getData($button[0], 'bs.button') === null)
   })
 
   QUnit.test('should return button version', function (assert) {
diff --git a/js/tests/unit/dropdown.js b/js/tests/unit/dropdown.js
index 2595ec27b..c94b8a441 100644
--- a/js/tests/unit/dropdown.js
+++ b/js/tests/unit/dropdown.js
@@ -1025,7 +1025,7 @@ $(function () {
       .find('[data-toggle="dropdown"]')
       .bootstrapDropdown()
 
-    var dropdown = $dropdown.data('bs.dropdown')
+    var dropdown = Data.getData($dropdown[0], 'bs.dropdown')
     dropdown.toggle()
     assert.ok(dropdown._popper)
 
@@ -1053,7 +1053,7 @@ $(function () {
       .find('[data-toggle="dropdown"]')
       .bootstrapDropdown()
 
-    var dropdown = $dropdown.data('bs.dropdown')
+    var dropdown = Data.getData($dropdown[0], 'bs.dropdown')
     var spyDetectNavbar = sinon.spy(dropdown, '_detectNavbar')
 
     dropdown.update()
@@ -1078,7 +1078,7 @@ $(function () {
       .find('[data-toggle="dropdown"]')
       .bootstrapDropdown()
 
-    var dropdown = $dropdown.data('bs.dropdown')
+    var dropdown = Data.getData($dropdown[0], 'bs.dropdown')
     dropdown.toggle()
 
     assert.ok(dropdown._popper)
@@ -1109,7 +1109,7 @@ $(function () {
       .find('[data-toggle="dropdown"]')
       .bootstrapDropdown()
 
-    var dropdown = $dropdown.data('bs.dropdown')
+    var dropdown = Data.getData($dropdown[0], 'bs.dropdown')
 
     assert.notOk(dropdown._popper)
     assert.ok(dropdown._menu !== null)
diff --git a/js/tests/unit/popover.js b/js/tests/unit/popover.js
index da436ad28..0dd9c98e3 100644
--- a/js/tests/unit/popover.js
+++ b/js/tests/unit/popover.js
@@ -279,14 +279,14 @@ $(function () {
       })
       .one('shown.bs.popover', function () {
         assert.notEqual($('.popover').length, 0, 'popover was inserted')
-        $div.find('a').trigger('click')
+        EventHandler.trigger($div.find('a')[0], 'click')
       })
       .one('hidden.bs.popover', function () {
         assert.strictEqual($('.popover').length, 0, 'popover was removed')
         done()
       })
 
-    $div.find('a').trigger('click')
+    EventHandler.trigger($div.find('a')[0], 'click')
   })
 
   QUnit.test('should detach popover content rather than removing it so that event handlers are left intact', function (assert) {
diff --git a/js/tests/unit/tooltip.js b/js/tests/unit/tooltip.js
index d2729fa64..081cbb109 100644
--- a/js/tests/unit/tooltip.js
+++ b/js/tests/unit/tooltip.js
@@ -1000,7 +1000,7 @@ $(function () {
       .appendTo('#qunit-fixture')
       .bootstrapTooltip()
 
-    var tooltip = $tooltip.data('bs.tooltip')
+    var tooltip = Data.getData($tooltip[0], 'bs.tooltip')
     tooltip.show()
     assert.ok(tooltip._popper)
 
@@ -1016,7 +1016,7 @@ $(function () {
       .appendTo('#qunit-fixture')
       .bootstrapTooltip()
 
-    var tooltip = $tooltip.data('bs.tooltip')
+    var tooltip = Data.getData($tooltip[0], 'bs.tooltip')
     tooltip.update()
 
     assert.ok(tooltip._popper === null)