aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Thornton <[email protected]>2012-01-22 19:44:02 -0800
committerJacob Thornton <[email protected]>2012-01-22 19:44:02 -0800
commit9dcc16fa8c8c009c46ffe43a07969e5cd196e562 (patch)
treeadc5ac03d84eb20e4455bf1a4cf2de603d121348
parent5217131657afbb14bd497d21d72f5383756f0ed1 (diff)
parent0bc458dfd2931f9aa5a817734240b6e3797250a8 (diff)
downloadbootstrap-9dcc16fa8c8c009c46ffe43a07969e5cd196e562.tar.xz
bootstrap-9dcc16fa8c8c009c46ffe43a07969e5cd196e562.zip
Merge pull request #1024 from gnuwilliam/master
Buttons Tests
-rw-r--r--js/tests/unit/bootstrap-buttons.js16
1 files changed, 12 insertions, 4 deletions
diff --git a/js/tests/unit/bootstrap-buttons.js b/js/tests/unit/bootstrap-buttons.js
index 9784f5222..9554bf2d4 100644
--- a/js/tests/unit/bootstrap-buttons.js
+++ b/js/tests/unit/bootstrap-buttons.js
@@ -15,8 +15,12 @@ $(function () {
equals(btn.html(), 'mdo', 'btn text equals mdo')
btn.button('loading')
equals(btn.html(), 'fat', 'btn text equals fat')
- ok(btn.attr('disabled'), 'btn is disabled')
- ok(btn.hasClass('disabled'), 'btn has disabled class')
+ stop()
+ setTimeout(function() {
+ start()
+ ok(btn.attr('disabled'), 'btn is disabled')
+ ok(btn.hasClass('disabled'), 'btn has disabled class')
+ }, 0)
})
test("should return reset state", function () {
@@ -24,8 +28,12 @@ $(function () {
equals(btn.html(), 'mdo', 'btn text equals mdo')
btn.button('loading')
equals(btn.html(), 'fat', 'btn text equals fat')
- ok(btn.attr('disabled'), 'btn is disabled')
- ok(btn.hasClass('disabled'), 'btn is disabled')
+ stop()
+ setTimeout(function() {
+ start()
+ ok(btn.attr('disabled'), 'btn is disabled')
+ ok(btn.hasClass('disabled'), 'btn is disabled')
+ }, 0)
btn.button('reset')
equals(btn.html(), 'mdo', 'btn text equals mdo')
ok(!btn.attr('disabled'), 'btn is not disabled')