diff options
author | Johann-S <johann.servoire@gmail.com> | 2017-04-14 14:30:55 +0300 |
---|---|---|
committer | Johann-S <johann.servoire@gmail.com> | 2017-05-14 12:41:19 +0300 |
commit | 69de65180f750cadf5f96a774d2524f69d19beab (patch) | |
tree | 586ca6f93813762dc90466b22cf419bd61635dd2 /js/tests | |
parent | c21a2b0d92ca78b63bb9ec21ca0fbf9e9206a18e (diff) |
Fix unit tests + Update Popper to 1.6.0
Diffstat (limited to 'js/tests')
-rw-r--r-- | js/tests/unit/dropdown.js | 48 | ||||
-rw-r--r-- | js/tests/unit/popover.js | 15 | ||||
-rw-r--r-- | js/tests/unit/tooltip.js | 64 | ||||
-rw-r--r-- | js/tests/visual/tooltip.html | 18 |
4 files changed, 58 insertions, 87 deletions
diff --git a/js/tests/unit/dropdown.js b/js/tests/unit/dropdown.js index a15eb52450..1dd675b0b6 100644 --- a/js/tests/unit/dropdown.js +++ b/js/tests/unit/dropdown.js @@ -275,20 +275,20 @@ $(function () { $first.parent('.dropdown') .on('shown.bs.dropdown', function () { assert.strictEqual($first.parents('.show').length, 1, '"show" class added on click') - assert.strictEqual($('#qunit-fixture .show').length, 1, 'only one dropdown is shown') + assert.strictEqual($('#qunit-fixture .dropdown-menu.show').length, 1, 'only one dropdown is shown') $(document.body).trigger('click') }).on('hidden.bs.dropdown', function () { - assert.strictEqual($('#qunit-fixture .show').length, 0, '"show" class removed') + assert.strictEqual($('#qunit-fixture .dropdown-menu.show').length, 0, '"show" class removed') $last.trigger('click') }) $last.parent('.btn-group') .on('shown.bs.dropdown', function () { assert.strictEqual($last.parent('.show').length, 1, '"show" class added on click') - assert.strictEqual($('#qunit-fixture .show').length, 1, 'only one dropdown is shown') + assert.strictEqual($('#qunit-fixture .dropdown-menu.show').length, 1, 'only one dropdown is shown') $(document.body).trigger('click') }).on('hidden.bs.dropdown', function () { - assert.strictEqual($('#qunit-fixture .show').length, 0, '"show" class removed') + assert.strictEqual($('#qunit-fixture .dropdown-menu.show').length, 0, '"show" class removed') done() }) $first.trigger('click') @@ -321,24 +321,24 @@ $(function () { $first.parent('.dropdown') .on('shown.bs.dropdown', function () { assert.strictEqual($first.parents('.show').length, 1, '"show" class added on click') - assert.strictEqual($('#qunit-fixture .show').length, 1, 'only one dropdown is shown') + assert.strictEqual($('#qunit-fixture .dropdown-menu.show').length, 1, 'only one dropdown is shown') var e = $.Event('keyup') e.which = 9 // Tab $(document.body).trigger(e) }).on('hidden.bs.dropdown', function () { - assert.strictEqual($('#qunit-fixture .show').length, 0, '"show" class removed') + assert.strictEqual($('#qunit-fixture .dropdown-menu.show').length, 0, '"show" class removed') $last.trigger('click') }) $last.parent('.btn-group') .on('shown.bs.dropdown', function () { assert.strictEqual($last.parent('.show').length, 1, '"show" class added on click') - assert.strictEqual($('#qunit-fixture .show').length, 1, 'only one dropdown is shown') + assert.strictEqual($('#qunit-fixture .dropdown-menu.show').length, 1, 'only one dropdown is shown') var e = $.Event('keyup') e.which = 9 // Tab $(document.body).trigger(e) }).on('hidden.bs.dropdown', function () { - assert.strictEqual($('#qunit-fixture .show').length, 0, '"show" class removed') + assert.strictEqual($('#qunit-fixture .dropdown-menu.show').length, 0, '"show" class removed') done() }) $first.trigger('click') @@ -552,7 +552,7 @@ $(function () { }) QUnit.test('should not close the dropdown if the user clicks on a text field', function (assert) { - assert.expect(1) + assert.expect(2) var done = assert.async() var dropdownHTML = '<div class="dropdown">' + '<button type="button" data-toggle="dropdown">Dropdown</button>' @@ -565,23 +565,23 @@ $(function () { .find('[data-toggle="dropdown"]') .bootstrapDropdown() + var $textfield = $('#textField') + $textfield.on('click', function () { + assert.ok($dropdown.parent('.dropdown').hasClass('show'), 'dropdown menu is shown') + done() + }) + $dropdown .parent('.dropdown') .on('shown.bs.dropdown', function () { - $('#textField').trigger('click') - assert.ok($dropdown.parent('.dropdown').hasClass('show'), 'dropdown menu is shown') - setTimeout(function () { - done() - }, 300) - }) - .on('hidden.bs.dropdown', function () { assert.ok($dropdown.parent('.dropdown').hasClass('show'), 'dropdown menu is shown') + $textfield.trigger($.Event('click')) }) $dropdown.trigger('click') }) QUnit.test('should not close the dropdown if the user clicks on a textarea', function (assert) { - assert.expect(1) + assert.expect(2) var done = assert.async() var dropdownHTML = '<div class="dropdown">' + '<button type="button" data-toggle="dropdown">Dropdown</button>' @@ -594,17 +594,17 @@ $(function () { .find('[data-toggle="dropdown"]') .bootstrapDropdown() + var $textarea = $('#textArea') + $textarea.on('click', function () { + assert.ok($dropdown.parent('.dropdown').hasClass('show'), 'dropdown menu is shown') + done() + }) + $dropdown .parent('.dropdown') .on('shown.bs.dropdown', function () { - $('#textArea').trigger('click') - assert.ok($dropdown.parent('.dropdown').hasClass('show'), 'dropdown menu is shown') - setTimeout(function () { - done() - }, 300) - }) - .on('hidden.bs.dropdown', function () { assert.ok($dropdown.parent('.dropdown').hasClass('show'), 'dropdown menu is shown') + $textarea.trigger($.Event('click')) }) $dropdown.trigger('click') }) diff --git a/js/tests/unit/popover.js b/js/tests/unit/popover.js index eaa9fa0c0d..a7762bfaba 100644 --- a/js/tests/unit/popover.js +++ b/js/tests/unit/popover.js @@ -47,13 +47,18 @@ $(function () { QUnit.test('should render popover element', function (assert) { assert.expect(2) - var $popover = $('<a href="#" title="mdo" data-content="https://twitter.com/mdo">@mdo</a>') + var done = assert.async() + $('<a href="#" title="mdo" data-content="https://twitter.com/mdo">@mdo</a>') .appendTo('#qunit-fixture') + .on('shown.bs.popover', function () { + assert.notEqual($('.popover').length, 0, 'popover was inserted') + $(this).bootstrapPopover('hide') + }) + .on('hidden.bs.popover', function () { + assert.strictEqual($('.popover').length, 0, 'popover removed') + done() + }) .bootstrapPopover('show') - - assert.notEqual($('.popover').length, 0, 'popover was inserted') - $popover.bootstrapPopover('hide') - assert.strictEqual($('.popover').length, 0, 'popover removed') }) QUnit.test('should store popover instance in popover data object', function (assert) { diff --git a/js/tests/unit/tooltip.js b/js/tests/unit/tooltip.js index 0bb90156b9..f47a97e30c 100644 --- a/js/tests/unit/tooltip.js +++ b/js/tests/unit/tooltip.js @@ -383,8 +383,6 @@ $(function () { var $tooltip = $($(this).data('bs.tooltip').tip) assert.ok($tooltip.hasClass('bs-tooltip-right')) assert.ok($tooltip.attr('style') === undefined) - $(this).bootstrapTooltip('hide') - $container.remove() $styles.remove() done() }) @@ -475,32 +473,19 @@ $(function () { }) .appendTo('#qunit-fixture') - $('#qunit-fixture').css({ - position : 'relative', - top : '0px', - left : '0px' - }) - - var $trigger = $container + $container .find('a') .css('margin-top', 200) .bootstrapTooltip({ placement: 'top', animate: false }) - .bootstrapTooltip('show') - - var $tooltip = $($trigger.data('bs.tooltip').tip) - - setTimeout(function () { - assert.ok(Math.round($tooltip.offset().top + $tooltip.outerHeight()) <= Math.round($trigger.offset().top)) - $('#qunit-fixture').css({ - position : 'absolute', - top : '-10000px', - left : '-10000px' + .on('shown.bs.tooltip', function () { + var $tooltip = $($(this).data('bs.tooltip').tip) + assert.ok(Math.round($tooltip.offset().top + $tooltip.outerHeight()) >= Math.round($(this).offset().top)) + done() }) - done() - }, 0) + .bootstrapTooltip('show') }) QUnit.test('should show tooltip if leave event hasn\'t occurred before delay expires', function (assert) { @@ -702,43 +687,6 @@ $(function () { assert.strictEqual(currentUid, $('#tt-content').text()) }) - QUnit.test('should correctly position tooltips on transformed elements', function (assert) { - var styleProps = document.documentElement.style - if (!('transform' in styleProps) && !('webkitTransform' in styleProps) && !('msTransform' in styleProps)) { - assert.expect(0) - return - } - assert.expect(2) - - var done = assert.async() - - var styles = '<style>' - + '#qunit-fixture { top: 0; left: 0; }' - + '.tooltip, .tooltip *, .tooltip *:before, .tooltip *:after { box-sizing: border-box; }' - + '.tooltip { position: absolute; }' - + '.tooltip .tooltip-inner { width: 24px; height: 24px; font-family: Helvetica; }' - + '#target { position: absolute; top: 100px; left: 50px; width: 100px; height: 200px; -webkit-transform: rotate(270deg); -ms-transform: rotate(270deg); transform: rotate(270deg); }' - + '</style>' - var $styles = $(styles).appendTo('head') - - var $element = $('<div id="target" title="1"/>').appendTo('#qunit-fixture') - - $element - .on('shown.bs.tooltip', function () { - var offset = $('.tooltip').offset() - $styles.remove() - assert.ok(Math.abs(offset.left - 88) <= 1, 'tooltip has correct horizontal location') - assert.ok(Math.abs(offset.top - 126) <= 1, 'tooltip has correct vertical location') - $element.bootstrapTooltip('hide') - done() - }) - .bootstrapTooltip({ - trigger: 'manual' - }) - - $element.bootstrapTooltip('show') - }) - QUnit.test('should do nothing when an attempt is made to hide an uninitialized tooltip', function (assert) { assert.expect(1) diff --git a/js/tests/visual/tooltip.html b/js/tests/visual/tooltip.html index 9fbd196b6f..c45926eba9 100644 --- a/js/tests/visual/tooltip.html +++ b/js/tests/visual/tooltip.html @@ -5,6 +5,19 @@ <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"> <link rel="stylesheet" href="../../../dist/css/bootstrap.min.css"> <title>Tooltip</title> + <style> + #target { + border: 1px solid; + width: 100px; + height: 50px; + border: 1px solid; + margin-left: 50px; + -webkit-transform: rotate(270deg); + -ms-transform: rotate(270deg); + transform: rotate(270deg); + margin-top: 100px; + } + </style> </head> <body> <div class="container"> @@ -34,6 +47,7 @@ <circle cx="15" cy="10" r="10" fill="#62448F" data-toggle="tooltip" data-placement="top" title="Tooltip on SVG" /> </svg> </p> + <div id="target" title="Test tooltip on transformed element"></div> </div> <script src="../../../docs/assets/js/vendor/jquery-slim.min.js"></script> @@ -44,6 +58,10 @@ <script> $(function () { $('[data-toggle="tooltip"]').tooltip() + $('#target').tooltip({ + placement : 'top', + trigger : 'manual' + }).tooltip('show') }) </script> </body> |