Merge pull request #15933 from twbs/qunit-module-hooks

Unit tests: Use new names of module hooks

1 files changed, 2 insertions, 2 deletions

diff --git a/js/tests/unit/button.js b/js/tests/unit/button.js
index d173916a0..5a547a370 100644
--- a/js/tests/unit/button.js
+++ b/js/tests/unit/button.js
@@ -8,11 +8,11 @@ $(function () {
   })
 
   QUnit.module('button', {
-    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.bootstrapButton = $.fn.button.noConflict()
     },
-    teardown: function () {
+    afterEach: function () {
       $.fn.button = $.fn.bootstrapButton
       delete $.fn.bootstrapButton
     }