Merge branch '2.0-wip'

Conflicts:
	.gitignore
	LICENSE
	Makefile
	bootstrap.css
	bootstrap.min.css
	docs/assets/js/application.js
	docs/assets/js/google-code-prettify/prettify.css
	docs/index.html
	docs/javascript.html
	examples/container-app.html
	examples/fluid.html
	examples/hero.html
	js/bootstrap-alerts.js
	js/bootstrap-dropdown.js
	js/bootstrap-modal.js
	js/bootstrap-popover.js
	js/bootstrap-scrollspy.js
	js/bootstrap-tabs.js
	js/bootstrap-twipsy.js
	js/tests/index.html
	js/tests/unit/bootstrap-modal.js
	js/tests/unit/bootstrap-popover.js
	js/tests/unit/bootstrap-tabs.js
	lib/forms.less
	lib/mixins.less
	lib/patterns.less
	lib/scaffolding.less
	lib/tables.less

1 files changed, 45 insertions, 0 deletions

diff --git a/js/tests/unit/bootstrap-tab.js b/js/tests/unit/bootstrap-tab.js
new file mode 100644
index 000000000..18f490fa5
--- /dev/null
+++ b/js/tests/unit/bootstrap-tab.js
@@ -0,0 +1,45 @@
+$(function () {
+
+    module("bootstrap-tabs")
+
+      test("should be defined on jquery object", function () {
+        ok($(document.body).tab, 'tabs method is defined')
+      })
+
+      test("should return element", function () {
+        ok($(document.body).tab()[0] == document.body, 'document.body returned')
+      })
+
+      test("should activate element by tab id", function () {
+        var tabsHTML =
+            '<ul class="tabs">'
+          + '<li><a href="#home">Home</a></li>'
+          + '<li><a href="#profile">Profile</a></li>'
+          + '</ul>'
+
+        $('<ul><li id="home"></li><li id="profile"></li></ul>').appendTo("#qunit-fixture")
+
+        $(tabsHTML).find('li:last a').tab('show')
+        equals($("#qunit-fixture").find('.active').attr('id'), "profile")
+
+        $(tabsHTML).find('li:first a').tab('show')
+        equals($("#qunit-fixture").find('.active').attr('id'), "home")
+      })
+
+      test("should activate element by tab id", function () {
+        var pillsHTML =
+            '<ul class="pills">'
+          + '<li><a href="#home">Home</a></li>'
+          + '<li><a href="#profile">Profile</a></li>'
+          + '</ul>'
+
+        $('<ul><li id="home"></li><li id="profile"></li></ul>').appendTo("#qunit-fixture")
+
+        $(pillsHTML).find('li:last a').tab('show')
+        equals($("#qunit-fixture").find('.active').attr('id'), "profile")
+
+        $(pillsHTML).find('li:first a').tab('show')
+        equals($("#qunit-fixture").find('.active').attr('id'), "home")
+      })
+
+})
\ No newline at end of file