diff options
| author | Heinrich Fenkart <[email protected]> | 2015-02-26 08:36:17 +0100 |
|---|---|---|
| committer | Heinrich Fenkart <[email protected]> | 2015-02-26 08:36:17 +0100 |
| commit | c65deddcced37ae7df2d5a7676cef9d9ff1729a9 (patch) | |
| tree | 5945eab4ea69507a3c4315780ef03c1be89b8e0e /js/tests/unit/tooltip.js | |
| parent | 4cb39987f07ca50d9466fabdb0814ad7c6f71c05 (diff) | |
| parent | 9afb61fffddb00b35e36427c216c51aa2e20dd9e (diff) | |
| download | bootstrap-c65deddcced37ae7df2d5a7676cef9d9ff1729a9.tar.xz bootstrap-c65deddcced37ae7df2d5a7676cef9d9ff1729a9.zip | |
Merge pull request #15933 from twbs/qunit-module-hooks
Unit tests: Use new names of module hooks
Diffstat (limited to 'js/tests/unit/tooltip.js')
| -rw-r--r-- | js/tests/unit/tooltip.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/tests/unit/tooltip.js b/js/tests/unit/tooltip.js index e5d1ad966..e5409189b 100644 --- a/js/tests/unit/tooltip.js +++ b/js/tests/unit/tooltip.js @@ -8,11 +8,11 @@ $(function () { }) QUnit.module('tooltip', { - setup: function () { + beforeEach: function () { // Run all tests in noConflict mode -- it's the only way to ensure that the plugin works in noConflict mode $.fn.bootstrapTooltip = $.fn.tooltip.noConflict() }, - teardown: function () { + afterEach: function () { $.fn.tooltip = $.fn.bootstrapTooltip delete $.fn.bootstrapTooltip } |