From: XhmikosR <xhmikosr@gmail.com>
Date: Fri, 27 Nov 2020 12:14:32 +0000 (+0200)
Subject: Merge duplicate test.
X-Git-Tag: v4.6.1~16
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=77e0855e5e22cb0c1e78e7792662167594005758;p=thirdparty%2Fbootstrap.git

Merge duplicate test.
---

diff --git a/js/tests/unit/dropdown.js b/js/tests/unit/dropdown.js
index f46763d281..ba9d5b92ec 100644
--- a/js/tests/unit/dropdown.js
+++ b/js/tests/unit/dropdown.js
@@ -1227,7 +1227,7 @@ $(function () {
   })
 
   QUnit.test('should show dropdown', function (assert) {
-    assert.expect(2)
+    assert.expect(3)
 
     var dropdownHTML =
       '<div class="dropdown">' +
@@ -1248,6 +1248,7 @@ $(function () {
     $dropdown
       .parent('.dropdown')
       .on('show.bs.dropdown', function () {
+        assert.strictEqual(dropdown._popper, null)
         assert.ok(true, 'show was fired')
       })
       .on('shown.bs.dropdown', function () {
@@ -1335,39 +1336,6 @@ $(function () {
     assert.false($dropdown.parent('.dropdown').hasClass('show'), 'dropdown menu is still hidden')
   })
 
-  QUnit.test('should show dropdown', function (assert) {
-    assert.expect(3)
-
-    var dropdownHTML =
-      '<div class="dropdown">' +
-      '  <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown</a>' +
-      '  <div class="dropdown-menu">' +
-      '    <a class="dropdown-item" href="#">Another link</a>' +
-      '  </div>' +
-      '</div>'
-
-    var $dropdown = $(dropdownHTML)
-      .appendTo('#qunit-fixture')
-      .find('[data-toggle="dropdown"]')
-      .bootstrapDropdown()
-
-    var dropdown = $dropdown.data('bs.dropdown')
-    var done = assert.async()
-
-    $dropdown
-      .parent('.dropdown')
-      .on('show.bs.dropdown', function () {
-        assert.strictEqual(dropdown._popper, null)
-        assert.ok(true, 'show was fired')
-      })
-      .on('shown.bs.dropdown', function () {
-        assert.true($dropdown.parent('.dropdown').hasClass('show'), 'dropdown menu is shown')
-        done()
-      })
-
-    dropdown.show()
-  })
-
   QUnit.test('should prevent default event on show method call', function (assert) {
     assert.expect(1)