From 0d33455ef486d0cf06cb29d427efda57f42f7ea9 Mon Sep 17 00:00:00 2001
From: John-Philip Johansson <seriema@gmail.com>
Date: Sat, 4 May 2013 16:55:52 +0200
Subject: Replace Makefile with GruntJS

A rebase (against soon-to-be 3.0.0-rc.1) & squash of
https://github.com/twbs/bootstrap/pull/7786 AKA
https://github.com/twitter/bootstrap/pull/7786
originally by
@seriema
@mokkabonna
@jojohess

Rebased by @cvrebert
---
 js/tests/unit/button.js | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'js/tests/unit/button.js')

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 () {
-- 
cgit v1.2.3