diff options
Diffstat (limited to 'js/tests')
| -rw-r--r-- | js/tests/unit/dropdown.js | 2 | ||||
| -rw-r--r-- | js/tests/unit/tab.js | 22 | ||||
| -rw-r--r-- | js/tests/visual/dropdown.html | 26 | ||||
| -rw-r--r-- | js/tests/visual/scrollspy.html | 2 | ||||
| -rw-r--r-- | js/tests/visual/tab.html | 2 |
5 files changed, 38 insertions, 16 deletions
diff --git a/js/tests/unit/dropdown.js b/js/tests/unit/dropdown.js index e4b959ea1..b71a125df 100644 --- a/js/tests/unit/dropdown.js +++ b/js/tests/unit/dropdown.js @@ -752,7 +752,7 @@ $(function () { var done = assert.async() var html = '<nav class="navbar navbar-expand-md navbar-light bg-light">' + '<div class="dropdown">' + - ' <a class="nav-link dropdown-toggle" href="#" id="dropdown" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Dropdown</a>' + + ' <a class="nav-link dropdown-toggle" href="#" id="dropdown" data-toggle="dropdown" aria-expanded="false">Dropdown</a>' + ' <div class="dropdown-menu" aria-labelledby="dropdown">' + ' <a class="dropdown-item" href="#">Action</a>' + ' <a class="dropdown-item" href="#">Another action</a>' + diff --git a/js/tests/unit/tab.js b/js/tests/unit/tab.js index a0c4ddf15..9c9b286f0 100644 --- a/js/tests/unit/tab.js +++ b/js/tests/unit/tab.js @@ -345,6 +345,28 @@ $(function () { assert.notOk($tabs.find('li:last-child .dropdown-menu a:first-child').hasClass('active')) }) + QUnit.test('should support li > .dropdown-item', function (assert) { + assert.expect(2) + var tabsHTML = [ + '<ul class="nav nav-tabs">', + ' <li class="nav-item"><a class="nav-link active" href="#home" data-toggle="tab">Home</a></li>', + ' <li class="nav-item"><a class="nav-link" href="#profile" data-toggle="tab">Profile</a></li>', + ' <li class="nav-item dropdown">', + ' <a class="nav-link dropdown-toggle" data-toggle="dropdown" href="#">Dropdown</a>', + ' <ul class="dropdown-menu">', + ' <li><a class="dropdown-item" href="#dropdown1" id="dropdown1-tab" data-toggle="tab">@fat</a></li>', + ' <li><a class="dropdown-item" href="#dropdown2" id="dropdown2-tab" data-toggle="tab">@mdo</a></li>', + ' </ul>', + ' </li>', + '</ul>' + ].join('') + var $tabs = $(tabsHTML).appendTo('#qunit-fixture') + + $tabs.find('.dropdown-item').trigger('click') + assert.ok($tabs.find('.dropdown-item').hasClass('active')) + assert.notOk($tabs.find('.nav-link:not(.dropdown-toggle)').hasClass('active')) + }) + QUnit.test('Nested tabs', function (assert) { assert.expect(2) var done = assert.async() diff --git a/js/tests/visual/dropdown.html b/js/tests/visual/dropdown.html index da1e7d6a3..2ec1a0962 100644 --- a/js/tests/visual/dropdown.html +++ b/js/tests/visual/dropdown.html @@ -28,7 +28,7 @@ <a class="nav-link" href="#">Link</a> </li> <li class="nav-item dropdown"> - <a class="nav-link dropdown-toggle" href="#" id="dropdown" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Dropdown</a> + <a class="nav-link dropdown-toggle" href="#" id="dropdown" data-toggle="dropdown" aria-expanded="false">Dropdown</a> <div class="dropdown-menu" aria-labelledby="dropdown"> <a class="dropdown-item" href="#">Action</a> <a class="dropdown-item" href="#">Another action</a> @@ -50,7 +50,7 @@ <a class="nav-link" href="#">Link</a> </li> <li class="nav-item dropdown"> - <a class="nav-link dropdown-toggle" href="#" id="dropdown2" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Dropdown</a> + <a class="nav-link dropdown-toggle" href="#" id="dropdown2" data-toggle="dropdown" aria-expanded="false">Dropdown</a> <div class="dropdown-menu" aria-labelledby="dropdown2"> <a class="dropdown-item" href="#">Action</a> <a class="dropdown-item" href="#">Another action</a> @@ -63,7 +63,7 @@ <div class="col-sm-12 mt-4"> <div class="btn-group dropup"> <button type="button" class="btn btn-secondary">Dropup split</button> - <button type="button" class="btn btn-secondary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> + <button type="button" class="btn btn-secondary dropdown-toggle" data-toggle="dropdown" aria-expanded="false"> <span class="sr-only">Dropup split</span> </button> <div class="dropdown-menu"> @@ -74,7 +74,7 @@ </div> <div class="btn-group dropup"> - <button type="button" class="btn btn-secondary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Dropup</button> + <button type="button" class="btn btn-secondary dropdown-toggle" data-toggle="dropdown" aria-expanded="false">Dropup</button> <div class="dropdown-menu"> <a class="dropdown-item" href="#">Action</a> <a class="dropdown-item" href="#">Another action</a> @@ -83,7 +83,7 @@ </div> <div class="btn-group"> - <button type="button" class="btn btn-secondary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> + <button type="button" class="btn btn-secondary dropdown-toggle" data-toggle="dropdown" aria-expanded="false"> This dropdown's menu is right-aligned </button> <div class="dropdown-menu dropdown-menu-right"> @@ -97,7 +97,7 @@ <div class="col-sm-12 mt-4"> <div class="btn-group dropup" role="group"> <a href="#" class="btn btn-secondary">Dropup split align right</a> - <button type="button" id="dropdown-page-subheader-button-3" class="btn btn-secondary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> + <button type="button" id="dropdown-page-subheader-button-3" class="btn btn-secondary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown" aria-expanded="false"> <span class="sr-only">Product actions</span> </button> <div class="dropdown-menu dropdown-menu-right"> @@ -107,7 +107,7 @@ </div> </div> <div class="btn-group dropup"> - <button type="button" class="btn btn-secondary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Dropup align right</button> + <button type="button" class="btn btn-secondary dropdown-toggle" data-toggle="dropdown" aria-expanded="false">Dropup align right</button> <div class="dropdown-menu dropdown-menu-right"> <button class="dropdown-item" type="button">Action</button> <button class="dropdown-item" type="button">Another action</button> @@ -119,7 +119,7 @@ <div class="col-sm-12 mt-4"> <div class="btn-group dropright" role="group"> <a href="#" class="btn btn-secondary">Dropright split</a> - <button type="button" id="dropdown-page-subheader-button-4" class="btn btn-secondary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> + <button type="button" id="dropdown-page-subheader-button-4" class="btn btn-secondary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown" aria-expanded="false"> <span class="sr-only">Product actions</span> </button> <div class="dropdown-menu"> @@ -129,7 +129,7 @@ </div> </div> <div class="btn-group dropright"> - <button class="btn btn-secondary dropdown-toggle" type="button" id="dropdownMenuRight" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> + <button class="btn btn-secondary dropdown-toggle" type="button" id="dropdownMenuRight" data-toggle="dropdown" aria-expanded="false"> Dropright </button> <div class="dropdown-menu" aria-labelledby="dropdownMenuRight"> @@ -141,7 +141,7 @@ <!-- dropleft --> <div class="btn-group dropleft" role="group"> <a href="#" class="btn btn-secondary">Dropleft split</a> - <button type="button" id="dropdown-page-subheader-button-5" class="btn btn-secondary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> + <button type="button" id="dropdown-page-subheader-button-5" class="btn btn-secondary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown" aria-expanded="false"> <span class="sr-only">Product actions</span> </button> <div class="dropdown-menu"> @@ -151,7 +151,7 @@ </div> </div> <div class="btn-group dropleft"> - <button class="btn btn-secondary dropdown-toggle" type="button" id="dropleftMenu" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> + <button class="btn btn-secondary dropdown-toggle" type="button" id="dropleftMenu" data-toggle="dropdown" aria-expanded="false"> Dropleft </button> <div class="dropdown-menu" aria-labelledby="dropleftMenu"> @@ -177,7 +177,7 @@ <div class="col-sm-3 mt-4"> <div class="btn-group dropdown"> <button type="button" class="btn btn-secondary">Dropdown reference</button> - <button type="button" class="btn btn-secondary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" data-reference="parent"> + <button type="button" class="btn btn-secondary dropdown-toggle" data-toggle="dropdown" aria-expanded="false" data-reference="parent"> <span class="sr-only">Dropdown split</span> </button> <div class="dropdown-menu"> @@ -189,7 +189,7 @@ </div> <div class="col-sm-3 mt-4"> <div class="dropdown"> - <button class="btn btn-secondary dropdown-toggle" type="button" id="dropdownMenuButton" data-toggle="dropdown" data-display="static" aria-haspopup="true" aria-expanded="false"> + <button class="btn btn-secondary dropdown-toggle" type="button" id="dropdownMenuButton" data-toggle="dropdown" data-display="static" aria-expanded="false"> Dropdown menu without Popper.js </button> <div class="dropdown-menu" aria-labelledby="dropdownMenuButton"> diff --git a/js/tests/visual/scrollspy.html b/js/tests/visual/scrollspy.html index b9f36c496..b1f8cbcda 100644 --- a/js/tests/visual/scrollspy.html +++ b/js/tests/visual/scrollspy.html @@ -24,7 +24,7 @@ <a class="nav-link" href="#mdo">@mdo</a> </li> <li class="nav-item dropdown"> - <a class="nav-link dropdown-toggle" href="#" id="dropdown" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Dropdown</a> + <a class="nav-link dropdown-toggle" href="#" id="dropdown" data-toggle="dropdown" aria-expanded="false">Dropdown</a> <div class="dropdown-menu" aria-labelledby="dropdown"> <a class="dropdown-item" href="#one">One</a> <a class="dropdown-item" href="#two">Two</a> diff --git a/js/tests/visual/tab.html b/js/tests/visual/tab.html index 1ffedec95..fd4a7c68a 100644 --- a/js/tests/visual/tab.html +++ b/js/tests/visual/tab.html @@ -164,7 +164,7 @@ <a class="nav-link nav-item active" data-toggle="tab" href="#home5">Home</a> <a class="nav-link nav-item" data-toggle="tab" href="#profile5">Profile</a> <div class="nav-item dropdown"> - <a class="nav-link dropdown-toggle" href="#" id="dropdown5" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Dropdown</a> + <a class="nav-link dropdown-toggle" href="#" id="dropdown5" data-toggle="dropdown" aria-expanded="false">Dropdown</a> <div class="dropdown-menu" aria-labelledby="dropdown5"> <a class="dropdown-item" data-toggle="tab" href="#fat5">@fat</a> <a class="dropdown-item" data-toggle="tab" href="#mdo5">@mdo</a> |
