Merge pull request #8614 from cvrebert/grunt

Switch from `make` to `grunt`
Rebase of #7786 against soon-to-be 3.0.0-rc.1

1 files changed, 8 insertions, 7 deletions

diff --git a/js/tests/unit/button.js b/js/tests/unit/button.js
index 0f8988a7d..41ddb5c2f 100644
--- a/js/tests/unit/button.js
+++ b/js/tests/unit/button.js
@@ -40,14 +40,15 @@ $(function () {
           ok(btn.hasClass('disabled'), 'btn has disabled class')
           start()
           stop()
+          btn.button('reset')
+          equals(btn.html(), 'mdo', 'btn text equals mdo')
+          setTimeout(function () {
+            ok(!btn.attr('disabled'), 'btn is not disabled')
+            ok(!btn.hasClass('disabled'), 'btn does not have disabled class')
+            start()
+          }, 0)
         }, 0)
-        btn.button('reset')
-        equals(btn.html(), 'mdo', 'btn text equals mdo')
-        setTimeout(function () {
-          ok(!btn.attr('disabled'), 'btn is not disabled')
-          ok(!btn.hasClass('disabled'), 'btn does not have disabled class')
-          start()
-        }, 0)
+
       })
 
       test("should toggle active", function () {