aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-02-06 23:42:02 -0800
committerMark Otto <[email protected]>2012-02-06 23:42:02 -0800
commita10c23f1aa971819d5d978e2e1ea55aab3de9d16 (patch)
tree29fb4af835c90a508aabed4372934a63263e1a8c
parent1a97cce19bf4e4be082d8724a30b3c1425c660b4 (diff)
parent6325402372bb6187fa0bda99ff33223215133043 (diff)
downloadbootstrap-a10c23f1aa971819d5d978e2e1ea55aab3de9d16.tar.xz
bootstrap-a10c23f1aa971819d5d978e2e1ea55aab3de9d16.zip
Merge branch 'CaryLandholt-master' into 2.0.1-wip
-rw-r--r--js/tests/unit/bootstrap-button.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/tests/unit/bootstrap-button.js b/js/tests/unit/bootstrap-button.js
index 59e8f33bc..8aed857e1 100644
--- a/js/tests/unit/bootstrap-button.js
+++ b/js/tests/unit/bootstrap-button.js
@@ -3,7 +3,7 @@ $(function () {
module("bootstrap-buttons")
test("should be defined on jquery object", function () {
- ok($(document.body).button, 'tabs method is defined')
+ ok($(document.body).button, 'button method is defined')
})
test("should return element", function () {