diff options
| author | XhmikosR <[email protected]> | 2019-02-26 13:20:34 +0200 |
|---|---|---|
| committer | XhmikosR <[email protected]> | 2019-03-11 17:01:28 +0200 |
| commit | 46c037410b8c7eaab3cf50a5cf44093aa2fd41f4 (patch) | |
| tree | cb8c857562c4d3f819a5a8fcc563bc8f2c126e4e /js/tests | |
| parent | 44e6abcba50309df4fae56a9c7ef79145b64a356 (diff) | |
| download | bootstrap-46c037410b8c7eaab3cf50a5cf44093aa2fd41f4.tar.xz bootstrap-46c037410b8c7eaab3cf50a5cf44093aa2fd41f4.zip | |
Comply to the new rules.
Diffstat (limited to 'js/tests')
| -rw-r--r-- | js/tests/browsers.js | 4 | ||||
| -rw-r--r-- | js/tests/integration/bundle.js | 4 | ||||
| -rw-r--r-- | js/tests/karma.conf.js | 4 | ||||
| -rw-r--r-- | js/tests/unit/alert.js | 2 | ||||
| -rw-r--r-- | js/tests/unit/button.js | 2 | ||||
| -rw-r--r-- | js/tests/unit/carousel.js | 18 | ||||
| -rw-r--r-- | js/tests/unit/collapse.js | 18 | ||||
| -rw-r--r-- | js/tests/unit/dropdown.js | 6 | ||||
| -rw-r--r-- | js/tests/unit/modal.js | 13 | ||||
| -rw-r--r-- | js/tests/unit/popover.js | 10 | ||||
| -rw-r--r-- | js/tests/unit/scrollspy.js | 6 | ||||
| -rw-r--r-- | js/tests/unit/tab.js | 8 | ||||
| -rw-r--r-- | js/tests/unit/toast.js | 5 | ||||
| -rw-r--r-- | js/tests/unit/tooltip.js | 14 | ||||
| -rw-r--r-- | js/tests/unit/util/index.js | 10 |
15 files changed, 64 insertions, 60 deletions
diff --git a/js/tests/browsers.js b/js/tests/browsers.js index 2341f58ab..859f9505c 100644 --- a/js/tests/browsers.js +++ b/js/tests/browsers.js @@ -13,8 +13,8 @@ const browsers = { base: 'BrowserStack', os: 'OS X', os_version: 'High Sierra', - browser : 'Chrome', - browser_version : 'latest' + browser: 'Chrome', + browser_version: 'latest' }, firefoxMac: { base: 'BrowserStack', diff --git a/js/tests/integration/bundle.js b/js/tests/integration/bundle.js index f2d3b0d7b..5597cd063 100644 --- a/js/tests/integration/bundle.js +++ b/js/tests/integration/bundle.js @@ -2,6 +2,6 @@ import 'popper.js' import bootstrap from '../../../dist/js/bootstrap' window.addEventListener('load', () => { - Array.from(document.querySelectorAll('[data-toggle="tooltip"]')) - .map((tooltipNode) => new bootstrap.Tooltip(tooltipNode)) + [...document.querySelectorAll('[data-toggle="tooltip"]')] + .map(tooltipNode => new bootstrap.Tooltip(tooltipNode)) }) diff --git a/js/tests/karma.conf.js b/js/tests/karma.conf.js index 46df7ae10..122d95753 100644 --- a/js/tests/karma.conf.js +++ b/js/tests/karma.conf.js @@ -8,7 +8,7 @@ const { browsersKeys } = require('./browsers') -const env = process.env +const { env } = process const bundle = env.BUNDLE === 'true' const browserStack = env.BROWSER === 'true' const debug = env.DEBUG === 'true' @@ -173,7 +173,7 @@ conf.plugins = plugins conf.reporters = reporters conf.files = files -module.exports = (karmaConfig) => { +module.exports = karmaConfig => { // possible values: karmaConfig.LOG_DISABLE || karmaConfig.LOG_ERROR || karmaConfig.LOG_WARN || karmaConfig.LOG_INFO || karmaConfig.LOG_DEBUG conf.logLevel = karmaConfig.LOG_ERROR || karmaConfig.LOG_WARN karmaConfig.set(conf) diff --git a/js/tests/unit/alert.js b/js/tests/unit/alert.js index 4fa9ca19f..c03435618 100644 --- a/js/tests/unit/alert.js +++ b/js/tests/unit/alert.js @@ -1,7 +1,7 @@ $(function () { 'use strict' - var Alert = typeof window.bootstrap !== 'undefined' ? window.bootstrap.Alert : window.Alert + var Alert = typeof window.bootstrap === 'undefined' ? window.Alert : window.bootstrap.Alert QUnit.module('alert plugin') diff --git a/js/tests/unit/button.js b/js/tests/unit/button.js index bd393078b..d351cc770 100644 --- a/js/tests/unit/button.js +++ b/js/tests/unit/button.js @@ -1,7 +1,7 @@ $(function () { 'use strict' - var Button = typeof window.bootstrap !== 'undefined' ? window.bootstrap.Button : window.Button + var Button = typeof window.bootstrap === 'undefined' ? window.Button : window.bootstrap.Button QUnit.module('button plugin') diff --git a/js/tests/unit/carousel.js b/js/tests/unit/carousel.js index a45ef4564..02a0c8a77 100644 --- a/js/tests/unit/carousel.js +++ b/js/tests/unit/carousel.js @@ -1,7 +1,7 @@ $(function () { 'use strict' - window.Carousel = typeof bootstrap !== 'undefined' ? bootstrap.Carousel : Carousel + window.Carousel = typeof bootstrap === 'undefined' ? Carousel : bootstrap.Carousel var originWinPointerEvent = window.PointerEvent window.MSPointerEvent = null @@ -65,8 +65,8 @@ $(function () { $el.bootstrapCarousel() try { $el.bootstrapCarousel('noMethod') - } catch (err) { - assert.strictEqual(err.message, 'No method named "noMethod"') + } catch (error) { + assert.strictEqual(error.message, 'No method named "noMethod"') } }) @@ -89,8 +89,8 @@ $(function () { try { $('<div/>').bootstrapCarousel(config) - } catch (err) { - message = err.message + } catch (error) { + message = error.message } assert.ok(message === expectedMessage, 'correct error message') @@ -102,8 +102,8 @@ $(function () { try { $('<div/>').bootstrapCarousel(config) - } catch (err) { - message = err.message + } catch (error) { + message = error.message } assert.ok(message === expectedMessage, 'correct error message') @@ -161,6 +161,7 @@ $(function () { }, 0) $carousel[0].removeEventListener('slide.bs.carousel', onSlide) } + $carousel[0].addEventListener('slide.bs.carousel', onSlide) function onSlid() { @@ -173,6 +174,7 @@ $(function () { }, 0) $carousel[0].removeEventListener('slid.bs.carousel', onSlid) } + $carousel[0].addEventListener('slid.bs.carousel', onSlid) $carousel.bootstrapCarousel('next') @@ -682,6 +684,7 @@ $(function () { assert.strictEqual(event.defaultPrevented, false) $template[0].removeEventListener('keydown', handlerKeydown) } + $template[0].addEventListener('keydown', handlerKeydown) // arrow down @@ -694,6 +697,7 @@ $(function () { $template[0].addEventListener('keydown', handlerKeydown2) done() } + $template[0].addEventListener('keydown', handlerKeydown2) // arrow up diff --git a/js/tests/unit/collapse.js b/js/tests/unit/collapse.js index b21c18b8e..a051d4f5c 100644 --- a/js/tests/unit/collapse.js +++ b/js/tests/unit/collapse.js @@ -1,7 +1,7 @@ $(function () { 'use strict' - var Collapse = typeof window.bootstrap !== 'undefined' ? window.bootstrap.Collapse : window.Collapse + var Collapse = typeof window.bootstrap === 'undefined' ? window.Collapse : window.bootstrap.Collapse QUnit.module('collapse plugin') @@ -33,8 +33,8 @@ $(function () { $el.bootstrapCollapse() try { $el.bootstrapCollapse('noMethod') - } catch (err) { - assert.strictEqual(err.message, 'No method named "noMethod"') + } catch (error) { + assert.strictEqual(error.message, 'No method named "noMethod"') } }) @@ -459,7 +459,7 @@ $(function () { '<div class="card"/>' + '</div>' var showFired = false - var $groups = $(accordionHTML).appendTo('#qunit-fixture').find('.card') + var $groups = $(accordionHTML).appendTo('#qunit-fixture').find('.card') var $target1 = $('<a role="button" data-toggle="collapse" href="#body1"/>').appendTo($groups.eq(0)) @@ -470,7 +470,7 @@ $(function () { }) var $target2 = $('<a role="button" data-toggle="collapse" href="#body2"/>').appendTo($groups.eq(1)) - var $body2 = $('<div id="body2" class="collapse" data-parent="#accordion"/>').appendTo($groups.eq(1)) + var $body2 = $('<div id="body2" class="collapse" data-parent="#accordion"/>').appendTo($groups.eq(1)) $target2[0].dispatchEvent(new Event('click')) @@ -607,8 +607,8 @@ $(function () { var $collapseTwoOne = $('#collapseTwoOne') var $collapseTwoTwo = $('#collapseTwoTwo') var collapsedElements = { - one : false, - two : false + one: false, + two: false } function firstTest() { @@ -838,7 +838,7 @@ $(function () { parent: $('.my-collapse') }) assert.ok(true, 'collapse correctly created') - } catch (err) { + } catch (error) { assert.ok(false, 'collapse not created') } }) @@ -859,7 +859,7 @@ $(function () { parent: $('.my-collapse')[0] }) assert.ok(true, 'collapse correctly created') - } catch (err) { + } catch (error) { assert.ok(false, 'collapse not created') } }) diff --git a/js/tests/unit/dropdown.js b/js/tests/unit/dropdown.js index d1f13c8ee..63f83b3bb 100644 --- a/js/tests/unit/dropdown.js +++ b/js/tests/unit/dropdown.js @@ -1,7 +1,7 @@ $(function () { 'use strict' - var Dropdown = typeof window.bootstrap !== 'undefined' ? window.bootstrap.Dropdown : window.Dropdown + var Dropdown = typeof window.bootstrap === 'undefined' ? window.Dropdown : window.bootstrap.Dropdown QUnit.module('dropdowns plugin') @@ -34,8 +34,8 @@ $(function () { $el.bootstrapDropdown() try { $el.bootstrapDropdown('noMethod') - } catch (err) { - assert.strictEqual(err.message, 'No method named "noMethod"') + } catch (error) { + assert.strictEqual(error.message, 'No method named "noMethod"') } }) diff --git a/js/tests/unit/modal.js b/js/tests/unit/modal.js index 6025a6570..87d778b86 100644 --- a/js/tests/unit/modal.js +++ b/js/tests/unit/modal.js @@ -1,8 +1,8 @@ $(function () { 'use strict' - window.Util = typeof bootstrap !== 'undefined' ? bootstrap.Util : Util - var Modal = typeof window.bootstrap !== 'undefined' ? window.bootstrap.Modal : window.Modal + window.Util = typeof bootstrap === 'undefined' ? Util : bootstrap.Util + var Modal = typeof window.bootstrap === 'undefined' ? window.Modal : window.bootstrap.Modal QUnit.module('modal plugin') @@ -45,8 +45,8 @@ $(function () { $el.bootstrapModal() try { $el.bootstrapModal('noMethod') - } catch (err) { - assert.strictEqual(err.message, 'No method named "noMethod"') + } catch (error) { + assert.strictEqual(error.message, 'No method named "noMethod"') } }) @@ -460,8 +460,8 @@ $(function () { var originalPadding = $body.css('padding-right') // Hide scrollbars to prevent the body overflowing - $body.css('overflow', 'hidden') // Real scrollbar (for in-browser testing) - $('html').css('padding-right', '0px') // Simulated scrollbar (for PhantomJS) + $body.css('overflow', 'hidden') // Real scrollbar (for in-browser testing) + $('html').css('padding-right', '0px') // Simulated scrollbar (for PhantomJS) $('<div id="modal-test"><div class="modal-dialog" /></div>') .on('shown.bs.modal', function () { @@ -758,6 +758,7 @@ $(function () { document.removeEventListener('focusin', focusInListener) done() } + document.addEventListener('focusin', focusInListener) var focusInEvent = new Event('focusin') diff --git a/js/tests/unit/popover.js b/js/tests/unit/popover.js index ac5c54757..3782ed7ee 100644 --- a/js/tests/unit/popover.js +++ b/js/tests/unit/popover.js @@ -1,7 +1,7 @@ $(function () { 'use strict' - var Popover = typeof window.bootstrap !== 'undefined' ? window.bootstrap.Popover : window.Popover + var Popover = typeof window.bootstrap === 'undefined' ? window.Popover : window.bootstrap.Popover QUnit.module('popover plugin') @@ -34,8 +34,8 @@ $(function () { $el.bootstrapPopover() try { $el.bootstrapPopover('noMethod') - } catch (err) { - assert.strictEqual(err.message, 'No method named "noMethod"') + } catch (error) { + assert.strictEqual(error.message, 'No method named "noMethod"') } }) @@ -367,8 +367,8 @@ $(function () { try { $('<div data-toggle="popover" data-title="some title" data-content="@Johann-S" style="display: none"/>').bootstrapPopover('show') - } catch (err) { - assert.strictEqual(err.message, 'Please use show on visible elements') + } catch (error) { + assert.strictEqual(error.message, 'Please use show on visible elements') done() } }) diff --git a/js/tests/unit/scrollspy.js b/js/tests/unit/scrollspy.js index 153067699..41a155b7a 100644 --- a/js/tests/unit/scrollspy.js +++ b/js/tests/unit/scrollspy.js @@ -1,7 +1,7 @@ $(function () { 'use strict' - var ScrollSpy = typeof window.bootstrap !== 'undefined' ? window.bootstrap.ScrollSpy : window.ScrollSpy + var ScrollSpy = typeof window.bootstrap === 'undefined' ? window.ScrollSpy : window.bootstrap.ScrollSpy QUnit.module('scrollspy plugin') @@ -33,8 +33,8 @@ $(function () { $el.bootstrapScrollspy() try { $el.bootstrapScrollspy('noMethod') - } catch (err) { - assert.strictEqual(err.message, 'No method named "noMethod"') + } catch (error) { + assert.strictEqual(error.message, 'No method named "noMethod"') } }) diff --git a/js/tests/unit/tab.js b/js/tests/unit/tab.js index 0675126f8..827fb707c 100644 --- a/js/tests/unit/tab.js +++ b/js/tests/unit/tab.js @@ -33,8 +33,8 @@ $(function () { $el.bootstrapTab() try { $el.bootstrapTab('noMethod') - } catch (err) { - assert.strictEqual(err.message, 'No method named "noMethod"') + } catch (error) { + assert.strictEqual(error.message, 'No method named "noMethod"') } }) @@ -96,7 +96,7 @@ $(function () { QUnit.test('should activate element by tab id in nav list', function (assert) { assert.expect(2) - var tabsHTML = '<nav class="nav">' + + var tabsHTML = '<nav class="nav">' + '<a href="#home">Home</a>' + '<a href="#profile">Profile</a>' + '</nav>' @@ -112,7 +112,7 @@ $(function () { QUnit.test('should activate element by tab id in list group', function (assert) { assert.expect(2) - var tabsHTML = '<div class="list-group">' + + var tabsHTML = '<div class="list-group">' + '<a href="#home">Home</a>' + '<a href="#profile">Profile</a>' + '</div>' diff --git a/js/tests/unit/toast.js b/js/tests/unit/toast.js index ffd929646..57f953bd1 100644 --- a/js/tests/unit/toast.js +++ b/js/tests/unit/toast.js @@ -41,8 +41,8 @@ $(function () { try { $el.bootstrapToast('noMethod') - } catch (err) { - assert.strictEqual(err.message, 'No method named "noMethod"') + } catch (error) { + assert.strictEqual(error.message, 'No method named "noMethod"') } }) @@ -208,7 +208,6 @@ $(function () { .bootstrapToast('show') }) - QUnit.test('should close toast when close element with data-dismiss attribute is set', function (assert) { assert.expect(2) var done = assert.async() diff --git a/js/tests/unit/tooltip.js b/js/tests/unit/tooltip.js index 3bc91046b..c9cd2a10c 100644 --- a/js/tests/unit/tooltip.js +++ b/js/tests/unit/tooltip.js @@ -1,7 +1,7 @@ $(function () { 'use strict' - var Tooltip = typeof window.bootstrap !== 'undefined' ? window.bootstrap.Tooltip : window.Tooltip + var Tooltip = typeof window.bootstrap === 'undefined' ? window.Tooltip : window.bootstrap.Tooltip QUnit.module('tooltip plugin') @@ -34,8 +34,8 @@ $(function () { $el.bootstrapTooltip() try { $el.bootstrapTooltip('noMethod') - } catch (err) { - assert.strictEqual(err.message, 'No method named "noMethod"') + } catch (error) { + assert.strictEqual(error.message, 'No method named "noMethod"') } }) @@ -231,8 +231,8 @@ $(function () { try { $('<div title="tooltip title" style="display: none"/>').bootstrapTooltip('show') - } catch (err) { - assert.strictEqual(err.message, 'Please use show on visible elements') + } catch (error) { + assert.strictEqual(error.message, 'Please use show on visible elements') done() } }) @@ -336,7 +336,7 @@ $(function () { assert.expect(3) var $tooltip = $('<div/>') .bootstrapTooltip() - .on('click.foo', function () {}) // eslint-disable-line no-empty-function + .on('click.foo', function () {}) // eslint-disable-line no-empty-function assert.ok(Tooltip._getInstance($tooltip[0]), 'tooltip has data') @@ -557,7 +557,7 @@ $(function () { try { $tooltip.bootstrapTooltip('show') - } catch (err) { + } catch (error) { passed = false } diff --git a/js/tests/unit/util/index.js b/js/tests/unit/util/index.js index 2d52ca59a..19d3891d3 100644 --- a/js/tests/unit/util/index.js +++ b/js/tests/unit/util/index.js @@ -44,8 +44,8 @@ $(function () { try { Util.typeCheckConfig(namePlugin, config, defaultType) - } catch (err) { - assert.strictEqual(err.message, 'COLLAPSE: Option "parent" provided type "number" but expected type "(string|element)".') + } catch (error) { + assert.strictEqual(error.message, 'COLLAPSE: Option "parent" provided type "number" but expected type "(string|element)".') } }) @@ -139,9 +139,7 @@ $(function () { assert.expect(1) var $div = $('<div id="test"></div>').appendTo($('#qunit-fixture')) - if (!document.documentElement.attachShadow) { - assert.equal(null, Util.findShadowRoot($div[0])) - } else { + if (document.documentElement.attachShadow) { var sandbox = sinon.createSandbox() sandbox.replace(document.documentElement, 'attachShadow', function () { @@ -151,6 +149,8 @@ $(function () { assert.equal(null, Util.findShadowRoot($div[0])) sandbox.restore() + } else { + assert.equal(null, Util.findShadowRoot($div[0])) } }) |
