Merge branch 'v4' of https://github.com/twbs/derpstrap into v4

Conflicts: dist/css/bootstrap.css dist/css/bootstrap.css.map docs/assets/css/docs.min.css
author: Mark Otto <[email protected]> 2015-05-27 15:49:55 -0700
committer: Mark Otto <[email protected]> 2015-05-27 15:49:55 -0700
commit: 663576a7ae77fb3f6143ce59ea16511cdaf8e9c3 (patch)
tree: 4c205f99d57e85308abc01ee431b6008bdf8c641 /js/tests
parent: bd971c49b0883452af2e1278a8628eaf351504a1 (diff)
parent: 3fe894ba3620c7e5d2e040f83948488d1911aedc (diff)
download: bootstrap-663576a7ae77fb3f6143ce59ea16511cdaf8e9c3.tar.xz
bootstrap-663576a7ae77fb3f6143ce59ea16511cdaf8e9c3.zip
22 files changed, 1037 insertions, 1060 deletions
diff --git a/js/tests/closure.html b/js/tests/closure.html
deleted file mode 100644
index 82c65f62b..000000000
--- a/js/tests/closure.html
+++ /dev/null
@@ -1,83 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>Bootstrap Plugin Test Suite</title>
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-
-    <!-- jQuery -->
-    <script src="vendor/jquery.min.js"></script>
-
-    <!-- QUnit -->
-    <link rel="stylesheet" href="vendor/qunit.css" media="screen">
-    <script src="vendor/qunit.js"></script>
-    <style>
-      #qunit-tests > li.pass {
-        display: none;/* Make it easier to see failing tests in Sauce screencasts */
-      }
-
-      #qunit-fixture {
-        top: 0;
-        left: 0;
-      }
-    </style>
-    <script>
-      // See https://github.com/axemclion/grunt-saucelabs#test-result-details-with-qunit
-      var log = []
-      QUnit.done(function (testResults) {
-        var tests = []
-        for (var i = 0, len = log.length; i < len; i++) {
-          var details = log[i]
-          tests.push({
-            name: details.name,
-            result: details.result,
-            expected: details.expected,
-            actual: details.actual,
-            source: details.source
-          })
-        }
-        testResults.tests = tests
-
-        window.global_test_results = testResults
-      })
-
-      QUnit.testStart(function (testDetails) {
-        $(window).scrollTop(0)
-        QUnit.log = function (details) {
-          if (!details.result) {
-            details.name = testDetails.name
-            log.push(details)
-          }
-        }
-      })
-
-      // Cleanup
-      QUnit.testDone(function () {
-        $('#qunit-fixture').empty()
-        $('#modal-test, .modal-backdrop').remove()
-      })
-    </script>
-
-    <!-- Plugin sources -->
-    <script src="../../dist/js/bootstrap.min.js"></script>
-
-    <!-- Unit tests -->
-    <script src="unit/alert.js"></script>
-    <script src="unit/button.js"></script>
-    <script src="unit/carousel.js"></script>
-    <script src="unit/collapse.js"></script>
-    <script src="unit/dropdown.js"></script>
-    <script src="unit/modal.js"></script>
-    <script src="unit/scrollspy.js"></script>
-    <script src="unit/tab.js"></script>
-    <script src="unit/tooltip.js"></script>
-    <script src="unit/popover.js"></script>
-
-  </head>
-  <body>
-    <div id="qunit-container">
-      <div id="qunit"></div>
-      <div id="qunit-fixture"></div>
-    </div>
-  </body>
-</html>
diff --git a/js/tests/index.html b/js/tests/index.html
index d1ec0a7f4..0e2bdd012 100644
--- a/js/tests/index.html
+++ b/js/tests/index.html
@@ -7,6 +7,7 @@
 
     <!-- jQuery -->
     <script src="vendor/jquery.min.js"></script>
+    <script src="vendor/tether.min.js"></script>
     <script>
       // Disable jQuery event aliases to ensure we don't accidentally use any of them
       (function () {
@@ -129,18 +130,18 @@
       })();
     </script>
 
-    <!-- Plugin sources -->
-    <script src="../../js/util.js"></script>
-    <script src="../../js/alert.js"></script>
-    <script src="../../js/button.js"></script>
-    <script src="../../js/carousel.js"></script>
-    <script src="../../js/collapse.js"></script>
-    <script src="../../js/dropdown.js"></script>
-    <script src="../../js/modal.js"></script>
-    <script src="../../js/scrollspy.js"></script>
-    <script src="../../js/tab.js"></script>
-    <script src="../../js/tooltip.js"></script>
-    <script src="../../js/popover.js"></script>
+    <!-- es6 Plugin sources -->
+    <script src="../../js/dist/util.js"></script>
+    <script src="../../js/dist/alert.js"></script>
+    <script src="../../js/dist/button.js"></script>
+    <script src="../../js/dist/carousel.js"></script>
+    <script src="../../js/dist/collapse.js"></script>
+    <script src="../../js/dist/dropdown.js"></script>
+    <script src="../../js/dist/modal.js"></script>
+    <script src="../../js/dist/scrollspy.js"></script>
+    <script src="../../js/dist/tab.js"></script>
+    <script src="../../js/dist/tooltip.js"></script>
+    <script src="../../js/dist/popover.js"></script>
 
     <!-- Unit tests -->
     <script src="unit/alert.js"></script>
diff --git a/js/tests/unit/alert.js b/js/tests/unit/alert.js
index 6be990a51..97818960a 100644
--- a/js/tests/unit/alert.js
+++ b/js/tests/unit/alert.js
@@ -38,7 +38,8 @@ $(function () {
         + '<a class="close" href="#" data-dismiss="alert">×</a>'
         + '<p><strong>Holy guacamole!</strong> Best check yo self, you\'re not looking too good.</p>'
         + '</div>'
-    var $alert = $(alertHTML).bootstrapAlert()
+
+    var $alert = $(alertHTML).bootstrapAlert().appendTo($('#qunit-fixture'))
 
     $alert.find('.close').trigger('click')
 
diff --git a/js/tests/unit/button.js b/js/tests/unit/button.js
index 08b071d65..5648506cf 100644
--- a/js/tests/unit/button.js
+++ b/js/tests/unit/button.js
@@ -1,83 +1,79 @@
 $(function () {
   'use strict';
 
-  module('button plugin')
+  QUnit.module('button plugin')
 
-  test('should be defined on jquery object', function () {
-    ok($(document.body).button, 'button method is defined')
+  QUnit.test('should be defined on jquery object', function (assert) {
+    assert.expect(1)
+    assert.ok($(document.body).button, 'button method is defined')
   })
 
-  module('button', {
-    setup: function () {
+  QUnit.module('button', {
+    beforeEach: function () {
       // Run all tests in noConflict mode -- it's the only way to ensure that the plugin works in noConflict mode
       $.fn.bootstrapButton = $.fn.button.noConflict()
     },
-    teardown: function () {
+    afterEach: function () {
       $.fn.button = $.fn.bootstrapButton
       delete $.fn.bootstrapButton
     }
   })
 
-  test('should provide no conflict', function () {
-    strictEqual($.fn.button, undefined, 'button was set back to undefined (org value)')
+  QUnit.test('should provide no conflict', function (assert) {
+    assert.expect(1)
+    assert.strictEqual($.fn.button, undefined, 'button was set back to undefined (org value)')
   })
 
-  test('should return jquery collection containing the element', function () {
+  QUnit.test('should return jquery collection containing the element', function (assert) {
+    assert.expect(2)
     var $el = $('<div/>')
     var $button = $el.bootstrapButton()
-    ok($button instanceof $, 'returns jquery collection')
-    strictEqual($button[0], $el[0], 'collection contains element')
+    assert.ok($button instanceof $, 'returns jquery collection')
+    assert.strictEqual($button[0], $el[0], 'collection contains element')
   })
 
-  test('should toggle active', function () {
+  QUnit.test('should toggle active', function (assert) {
+    assert.expect(2)
     var $btn = $('<button class="btn" data-toggle="button">mdo</button>')
-    ok(!$btn.hasClass('active'), 'btn does not have active class')
+    assert.ok(!$btn.hasClass('active'), 'btn does not have active class')
     $btn.bootstrapButton('toggle')
-    ok($btn.hasClass('active'), 'btn has class active')
+    assert.ok($btn.hasClass('active'), 'btn has class active')
   })
 
-  test('should toggle active when btn children are clicked', function () {
+  QUnit.test('should toggle active when btn children are clicked', function (assert) {
+    assert.expect(2)
     var $btn = $('<button class="btn" data-toggle="button">mdo</button>')
     var $inner = $('<i/>')
     $btn
       .append($inner)
       .appendTo('#qunit-fixture')
-    ok(!$btn.hasClass('active'), 'btn does not have active class')
-    $inner.click()
-    ok($btn.hasClass('active'), 'btn has class active')
+    assert.ok(!$btn.hasClass('active'), 'btn does not have active class')
+    $inner.trigger('click')
+    assert.ok($btn.hasClass('active'), 'btn has class active')
   })
 
-  test('should toggle aria-pressed', function () {
+  QUnit.test('should toggle aria-pressed', function (assert) {
+    assert.expect(2)
     var $btn = $('<button class="btn" data-toggle="button" aria-pressed="false">redux</button>')
-    equal($btn.attr('aria-pressed'), 'false', 'btn aria-pressed state is false')
+    assert.strictEqual($btn.attr('aria-pressed'), 'false', 'btn aria-pressed state is false')
     $btn.bootstrapButton('toggle')
-    equal($btn.attr('aria-pressed'), 'true', 'btn aria-pressed state is true')
+    assert.strictEqual($btn.attr('aria-pressed'), 'true', 'btn aria-pressed state is true')
   })
 
-  test('should toggle aria-pressed when btn children are clicked', function () {
+  QUnit.test('should toggle aria-pressed when btn children are clicked', function (assert) {
+    assert.expect(2)
     var $btn = $('<button class="btn" data-toggle="button" aria-pressed="false">redux</button>')
     var $inner = $('<i/>')
     $btn
       .append($inner)
       .appendTo('#qunit-fixture')
-    equal($btn.attr('aria-pressed'), 'false', 'btn aria-pressed state is false')
-    $inner.click()
-    equal($btn.attr('aria-pressed'), 'true', 'btn aria-pressed state is true')
+    assert.strictEqual($btn.attr('aria-pressed'), 'false', 'btn aria-pressed state is false')
+    $inner.trigger('click')
+    assert.strictEqual($btn.attr('aria-pressed'), 'true', 'btn aria-pressed state is true')
   })
 
-  test('should toggle active when btn children are clicked within btn-group', function () {
-    var $btngroup = $('<div class="btn-group" data-toggle="buttons"/>')
-    var $btn = $('<button class="btn">fat</button>')
-    var $inner = $('<i/>')
-    $btngroup
-      .append($btn.append($inner))
-      .appendTo('#qunit-fixture')
-    ok(!$btn.hasClass('active'), 'btn does not have active class')
-    $inner.click()
-    ok($btn.hasClass('active'), 'btn has class active')
-  })
-
-  test('should check for closest matching toggle', function () {
+  QUnit.test('should check for closest matching toggle', function (assert) {
+    assert.expect(12)
     var groupHTML = '<div class="btn-group" data-toggle="buttons">'
       + '<label class="btn btn-primary active">'
       + '<input type="radio" name="options" id="option1" checked="true"> Option 1'
@@ -94,21 +90,21 @@ $(function () {
     var $btn1 = $group.children().eq(0)
     var $btn2 = $group.children().eq(1)
 
-    ok($btn1.hasClass('active'), 'btn1 has active class')
-    ok($btn1.find('input').prop('checked'), 'btn1 is checked')
-    ok(!$btn2.hasClass('active'), 'btn2 does not have active class')
-    ok(!$btn2.find('input').prop('checked'), 'btn2 is not checked')
-    $btn2.find('input').click()
-    ok(!$btn1.hasClass('active'), 'btn1 does not have active class')
-    ok(!$btn1.find('input').prop('checked'), 'btn1 is checked')
-    ok($btn2.hasClass('active'), 'btn2 has active class')
-    ok($btn2.find('input').prop('checked'), 'btn2 is checked')
+    assert.ok($btn1.hasClass('active'), 'btn1 has active class')
+    assert.ok($btn1.find('input').prop('checked'), 'btn1 is checked')
+    assert.ok(!$btn2.hasClass('active'), 'btn2 does not have active class')
+    assert.ok(!$btn2.find('input').prop('checked'), 'btn2 is not checked')
+    $btn2.find('input').trigger('click')
+    assert.ok(!$btn1.hasClass('active'), 'btn1 does not have active class')
+    assert.ok(!$btn1.find('input').prop('checked'), 'btn1 is not checked')
+    assert.ok($btn2.hasClass('active'), 'btn2 has active class')
+    assert.ok($btn2.find('input').prop('checked'), 'btn2 is checked')
 
-    $btn2.find('input').click() // clicking an already checked radio should not un-check it
-    ok(!$btn1.hasClass('active'), 'btn1 does not have active class')
-    ok(!$btn1.find('input').prop('checked'), 'btn1 is checked')
-    ok($btn2.hasClass('active'), 'btn2 has active class')
-    ok($btn2.find('input').prop('checked'), 'btn2 is checked')
+    $btn2.find('input').trigger('click') // clicking an already checked radio should not un-check it
+    assert.ok(!$btn1.hasClass('active'), 'btn1 does not have active class')
+    assert.ok(!$btn1.find('input').prop('checked'), 'btn1 is not checked')
+    assert.ok($btn2.hasClass('active'), 'btn2 has active class')
+    assert.ok($btn2.find('input').prop('checked'), 'btn2 is checked')
   })
 
 })
diff --git a/js/tests/unit/carousel.js b/js/tests/unit/carousel.js
index 2ad2c6734..017bd9bee 100644
--- a/js/tests/unit/carousel.js
+++ b/js/tests/unit/carousel.js
@@ -1,49 +1,86 @@
 $(function () {
   'use strict';
 
-  module('carousel plugin')
+  QUnit.module('carousel plugin')
 
-  test('should be defined on jQuery object', function () {
-    ok($(document.body).carousel, 'carousel method is defined')
+  QUnit.test('should be defined on jQuery object', function (assert) {
+    assert.expect(1)
+    assert.ok($(document.body).carousel, 'carousel method is defined')
   })
 
-  module('carousel', {
-    setup: function () {
+  QUnit.module('carousel', {
+    beforeEach: function () {
       // Run all tests in noConflict mode -- it's the only way to ensure that the plugin works in noConflict mode
       $.fn.bootstrapCarousel = $.fn.carousel.noConflict()
     },
-    teardown: function () {
+    afterEach: function () {
       $.fn.carousel = $.fn.bootstrapCarousel
       delete $.fn.bootstrapCarousel
     }
   })
 
-  test('should provide no conflict', function () {
-    strictEqual($.fn.carousel, undefined, 'carousel was set back to undefined (orig value)')
+  QUnit.test('should provide no conflict', function (assert) {
+    assert.expect(1)
+    assert.strictEqual($.fn.carousel, undefined, 'carousel was set back to undefined (orig value)')
   })
 
-  test('should return jquery collection containing the element', function () {
+  QUnit.test('should return jquery collection containing the element', function (assert) {
+    assert.expect(2)
     var $el = $('<div/>')
     var $carousel = $el.bootstrapCarousel()
-    ok($carousel instanceof $, 'returns jquery collection')
-    strictEqual($carousel[0], $el[0], 'collection contains element')
+    assert.ok($carousel instanceof $, 'returns jquery collection')
+    assert.strictEqual($carousel[0], $el[0], 'collection contains element')
   })
 
-  test('should not fire slid when slide is prevented', function (assert) {
+  QUnit.test('should type check config options', function (assert) {
+    assert.expect(2)
+
+    var message
+    var expectedMessage = 'CAROUSEL: Option "interval" provided type "string" but expected type "(number|boolean)".'
+    var config = {
+      interval: 'fat sux'
+    }
+
+    try {
+      $('<div/>').bootstrapCarousel(config)
+    } catch (e) {
+      message = e.message
+    }
+
+    assert.ok(message === expectedMessage, 'correct error message')
+
+    config = {
+      keyboard: document.createElement('div')
+    }
+    expectedMessage = 'CAROUSEL: Option "keyboard" provided type "element" but expected type "boolean".'
+
+    try {
+      $('<div/>').bootstrapCarousel(config)
+    } catch (e) {
+      message = e.message
+    }
+
+    assert.ok(message === expectedMessage, 'correct error message')
+  })
+
+
+  QUnit.test('should not fire slid when slide is prevented', function (assert) {
+    assert.expect(1)
     var done = assert.async()
     $('<div class="carousel"/>')
       .on('slide.bs.carousel', function (e) {
         e.preventDefault()
-        ok(true, 'slide event fired')
+        assert.ok(true, 'slide event fired')
         done()
       })
       .on('slid.bs.carousel', function () {
-        ok(false, 'slid event fired')
+        assert.ok(false, 'slid event fired')
       })
       .bootstrapCarousel('next')
   })
 
-  test('should reset when slide is prevented', function (assert) {
+  QUnit.test('should reset when slide is prevented', function (assert) {
+    assert.expect(6)
     var carouselHTML = '<div id="carousel-example-generic" class="carousel slide">'
         + '<ol class="carousel-indicators">'
         + '<li data-target="#carousel-example-generic" data-slide-to="0" class="active"/>'
@@ -71,24 +108,25 @@ $(function () {
       .one('slide.bs.carousel', function (e) {
         e.preventDefault()
         setTimeout(function () {
-          ok($carousel.find('.carousel-item:eq(0)').is('.active'), 'first item still active')
-          ok($carousel.find('.carousel-indicators li:eq(0)').is('.active'), 'first indicator still active')
+          assert.ok($carousel.find('.carousel-item:eq(0)').is('.active'), 'first item still active')
+          assert.ok($carousel.find('.carousel-indicators li:eq(0)').is('.active'), 'first indicator still active')
           $carousel.bootstrapCarousel('next')
         }, 0)
       })
       .one('slid.bs.carousel', function () {
         setTimeout(function () {
-          ok(!$carousel.find('.carousel-item:eq(0)').is('.active'), 'first item still active')
-          ok(!$carousel.find('.carousel-indicators li:eq(0)').is('.active'), 'first indicator still active')
-          ok($carousel.find('.carousel-item:eq(1)').is('.active'), 'second item active')
-          ok($carousel.find('.carousel-indicators li:eq(1)').is('.active'), 'second indicator active')
+          assert.ok(!$carousel.find('.carousel-item:eq(0)').is('.active'), 'first item still active')
+          assert.ok(!$carousel.find('.carousel-indicators li:eq(0)').is('.active'), 'first indicator still active')
+          assert.ok($carousel.find('.carousel-item:eq(1)').is('.active'), 'second item active')
+          assert.ok($carousel.find('.carousel-indicators li:eq(1)').is('.active'), 'second indicator active')
           done()
         }, 0)
       })
       .bootstrapCarousel('next')
   })
 
-  test('should fire slide event with direction', function (assert) {
+  QUnit.test('should fire slide event with direction', function (assert) {
+    assert.expect(4)
     var carouselHTML = '<div id="myCarousel" class="carousel slide">'
         + '<div class="carousel-inner">'
         + '<div class="carousel-item active">'
@@ -128,13 +166,13 @@ $(function () {
 
     $carousel
       .one('slide.bs.carousel', function (e) {
-        ok(e.direction, 'direction present on next')
-        strictEqual(e.direction, 'left', 'direction is left on next')
+        assert.ok(e.direction, 'direction present on next')
+        assert.strictEqual(e.direction, 'left', 'direction is left on next')
 
         $carousel
           .one('slide.bs.carousel', function (e) {
-            ok(e.direction, 'direction present on prev')
-            strictEqual(e.direction, 'right', 'direction is right on prev')
+            assert.ok(e.direction, 'direction present on prev')
+            assert.strictEqual(e.direction, 'right', 'direction is right on prev')
             done()
           })
           .bootstrapCarousel('prev')
@@ -142,7 +180,8 @@ $(function () {
       .bootstrapCarousel('next')
   })
 
-  test('should fire slid event with direction', function (assert) {
+  QUnit.test('should fire slid event with direction', function (assert) {
+    assert.expect(4)
     var carouselHTML = '<div id="myCarousel" class="carousel slide">'
         + '<div class="carousel-inner">'
         + '<div class="carousel-item active">'
@@ -182,13 +221,13 @@ $(function () {
 
     $carousel
       .one('slid.bs.carousel', function (e) {
-        ok(e.direction, 'direction present on next')
-        strictEqual(e.direction, 'left', 'direction is left on next')
+        assert.ok(e.direction, 'direction present on next')
+        assert.strictEqual(e.direction, 'left', 'direction is left on next')
 
         $carousel
           .one('slid.bs.carousel', function (e) {
-            ok(e.direction, 'direction present on prev')
-            strictEqual(e.direction, 'right', 'direction is right on prev')
+            assert.ok(e.direction, 'direction present on prev')
+            assert.strictEqual(e.direction, 'right', 'direction is right on prev')
             done()
           })
           .bootstrapCarousel('prev')
@@ -196,7 +235,8 @@ $(function () {
       .bootstrapCarousel('next')
   })
 
-  test('should fire slide event with relatedTarget', function (assert) {
+  QUnit.test('should fire slide event with relatedTarget', function (assert) {
+    assert.expect(2)
     var template = '<div id="myCarousel" class="carousel slide">'
         + '<div class="carousel-inner">'
         + '<div class="carousel-item active">'
@@ -235,14 +275,15 @@ $(function () {
 
     $(template)
       .on('slide.bs.carousel', function (e) {
-        ok(e.relatedTarget, 'relatedTarget present')
-        ok($(e.relatedTarget).hasClass('carousel-item'), 'relatedTarget has class "carousel-item"')
+        assert.ok(e.relatedTarget, 'relatedTarget present')
+        assert.ok($(e.relatedTarget).hasClass('carousel-item'), 'relatedTarget has class "item"')
         done()
       })
       .bootstrapCarousel('next')
   })
 
-  test('should fire slid event with relatedTarget', function (assert) {
+  QUnit.test('should fire slid event with relatedTarget', function (assert) {
+    assert.expect(2)
     var template = '<div id="myCarousel" class="carousel slide">'
         + '<div class="carousel-inner">'
         + '<div class="carousel-item active">'
@@ -281,14 +322,15 @@ $(function () {
 
     $(template)
       .on('slid.bs.carousel', function (e) {
-        ok(e.relatedTarget, 'relatedTarget present')
-        ok($(e.relatedTarget).hasClass('carousel-item'), 'relatedTarget has class "carousel-item"')
+        assert.ok(e.relatedTarget, 'relatedTarget present')
+        assert.ok($(e.relatedTarget).hasClass('carousel-item'), 'relatedTarget has class "item"')
         done()
       })
       .bootstrapCarousel('next')
   })
 
-  test('should set interval from data attribute', function () {
+  QUnit.test('should set interval from data attribute', function (assert) {
+    assert.expect(4)
     var templateHTML = '<div id="myCarousel" class="carousel slide">'
         + '<div class="carousel-inner">'
         + '<div class="carousel-item active">'
@@ -322,35 +364,35 @@ $(function () {
         + '<a class="left carousel-control" href="#myCarousel" data-slide="prev">&lsaquo;</a>'
         + '<a class="right carousel-control" href="#myCarousel" data-slide="next">&rsaquo;</a>'
         + '</div>'
-
     var $carousel = $(templateHTML)
     $carousel.attr('data-interval', 1814)
 
     $carousel.appendTo('body')
-    $('[data-slide]').first().click()
-    equal($carousel.data('bs.carousel').getConfig().interval, 1814)
+    $('[data-slide]').first().trigger('click')
+    assert.strictEqual($carousel.data('bs.carousel')._config.interval, 1814)
     $carousel.remove()
 
     $carousel.appendTo('body').attr('data-modal', 'foobar')
-    $('[data-slide]').first().click()
-    equal($carousel.data('bs.carousel').getConfig().interval, 1814, 'even if there is an data-modal attribute set')
+    $('[data-slide]').first().trigger('click')
+    assert.strictEqual($carousel.data('bs.carousel')._config.interval, 1814, 'even if there is an data-modal attribute set')
     $carousel.remove()
 
     $carousel.appendTo('body')
-    $('[data-slide]').first().click()
+    $('[data-slide]').first().trigger('click')
     $carousel.attr('data-interval', 1860)
-    $('[data-slide]').first().click()
-    equal($carousel.data('bs.carousel').getConfig().interval, 1814, 'attributes should be read only on initialization')
+    $('[data-slide]').first().trigger('click')
+    assert.strictEqual($carousel.data('bs.carousel')._config.interval, 1814, 'attributes should be read only on initialization')
     $carousel.remove()
 
     $carousel.attr('data-interval', false)
     $carousel.appendTo('body')
     $carousel.bootstrapCarousel(1)
-    strictEqual($carousel.data('bs.carousel').getConfig().interval, false, 'data attribute has higher priority than default options')
+    assert.strictEqual($carousel.data('bs.carousel')._config.interval, false, 'data attribute has higher priority than default options')
     $carousel.remove()
   })
 
-  test('should skip over non-items when using item indices', function () {
+  QUnit.test('should skip over non-items when using item indices', function (assert) {
+    assert.expect(2)
     var templateHTML = '<div id="myCarousel" class="carousel" data-interval="1814">'
         + '<div class="carousel-inner">'
         + '<div class="carousel-item active">'
@@ -368,14 +410,15 @@ $(function () {
 
     $template.bootstrapCarousel()
 
-    strictEqual($template.find('.carousel-item')[0], $template.find('.active')[0], 'first item active')
+    assert.strictEqual($template.find('.carousel-item')[0], $template.find('.active')[0], 'first item active')
 
     $template.bootstrapCarousel(1)
 
-    strictEqual($template.find('.carousel-item')[1], $template.find('.active')[0], 'second item active')
+    assert.strictEqual($template.find('.carousel-item')[1], $template.find('.active')[0], 'second item active')
   })
 
-  test('should skip over non-items when using next/prev methods', function () {
+  QUnit.test('should skip over non-items when using next/prev methods', function (assert) {
+    assert.expect(2)
     var templateHTML = '<div id="myCarousel" class="carousel" data-interval="1814">'
         + '<div class="carousel-inner">'
         + '<div class="carousel-item active">'
@@ -393,14 +436,15 @@ $(function () {
 
     $template.bootstrapCarousel()
 
-    strictEqual($template.find('.carousel-item')[0], $template.find('.active')[0], 'first item active')
+    assert.strictEqual($template.find('.carousel-item')[0], $template.find('.active')[0], 'first item active')
 
     $template.bootstrapCarousel('next')
 
-    strictEqual($template.find('.carousel-item')[1], $template.find('.active')[0], 'second item active')
+    assert.strictEqual($template.find('.carousel-item')[1], $template.find('.active')[0], 'second item active')
   })
 
-  test('should go to previous item if left arrow key is pressed', function () {
+  QUnit.test('should go to previous item if left arrow key is pressed', function (assert) {
+    assert.expect(2)
     var templateHTML = '<div id="myCarousel" class="carousel" data-interval="false">'
         + '<div class="carousel-inner">'
         + '<div id="first" class="carousel-item">'
@@ -418,14 +462,15 @@ $(function () {
 
     $template.bootstrapCarousel()
 
-    strictEqual($template.find('.carousel-item')[1], $template.find('.active')[0], 'second item active')
+    assert.strictEqual($template.find('.carousel-item')[1], $template.find('.active')[0], 'second item active')
 
     $template.trigger($.Event('keydown', { which: 37 }))
 
-    strictEqual($template.find('.carousel-item')[0], $template.find('.active')[0], 'first item active')
+    assert.strictEqual($template.find('.carousel-item')[0], $template.find('.active')[0], 'first item active')
   })
 
-  test('should go to next item if right arrow key is pressed', function () {
+  QUnit.test('should go to next item if right arrow key is pressed', function (assert) {
+    assert.expect(2)
     var templateHTML = '<div id="myCarousel" class="carousel" data-interval="false">'
         + '<div class="carousel-inner">'
         + '<div id="first" class="carousel-item active">'
@@ -443,14 +488,15 @@ $(function () {
 
     $template.bootstrapCarousel()
 
-    strictEqual($template.find('.carousel-item')[0], $template.find('.active')[0], 'first item active')
+    assert.strictEqual($template.find('.carousel-item')[0], $template.find('.active')[0], 'first item active')
 
     $template.trigger($.Event('keydown', { which: 39 }))
 
-    strictEqual($template.find('.carousel-item')[1], $template.find('.active')[0], 'second item active')
+    assert.strictEqual($template.find('.carousel-item')[1], $template.find('.active')[0], 'second item active')
   })
 
-  test('should support disabling the keyboard navigation', function () {
+  QUnit.test('should support disabling the keyboard navigation', function (assert) {
+    assert.expect(3)
     var templateHTML = '<div id="myCarousel" class="carousel" data-interval="false" data-keyboard="false">'
         + '<div class="carousel-inner">'
         + '<div id="first" class="carousel-item active">'
@@ -468,18 +514,19 @@ $(function () {
 
     $template.bootstrapCarousel()
 
-    strictEqual($template.find('.carousel-item')[0], $template.find('.active')[0], 'first item active')
+    assert.strictEqual($template.find('.carousel-item')[0], $template.find('.active')[0], 'first item active')
 
     $template.trigger($.Event('keydown', { which: 39 }))
 
-    strictEqual($template.find('.carousel-item')[0], $template.find('.active')[0], 'first item still active after right arrow press')
+    assert.strictEqual($template.find('.carousel-item')[0], $template.find('.active')[0], 'first item still active after right arrow press')
 
     $template.trigger($.Event('keydown', { which: 37 }))
 
-    strictEqual($template.find('.carousel-item')[0], $template.find('.active')[0], 'first item still active after left arrow press')
+    assert.strictEqual($template.find('.carousel-item')[0], $template.find('.active')[0], 'first item still active after left arrow press')
   })
 
-  test('should ignore keyboard events within <input>s and <textarea>s', function () {
+  QUnit.test('should ignore keyboard events within <input>s and <textarea>s', function (assert) {
+    assert.expect(7)
     var templateHTML = '<div id="myCarousel" class="carousel" data-interval="false">'
         + '<div class="carousel-inner">'
         + '<div id="first" class="carousel-item active">'
@@ -499,29 +546,30 @@ $(function () {
     var $input = $template.find('#in-put')
     var $textarea = $template.find('#text-area')
 
-    strictEqual($input.length, 1, 'found <input>')
-    strictEqual($textarea.length, 1, 'found <textarea>')
+    assert.strictEqual($input.length, 1, 'found <input>')
+    assert.strictEqual($textarea.length, 1, 'found <textarea>')
 
     $template.bootstrapCarousel()
 
-    strictEqual($template.find('.carousel-item')[0], $template.find('.active')[0], 'first item active')
+    assert.strictEqual($template.find('.carousel-item')[0], $template.find('.active')[0], 'first item active')
 
 
     $input.trigger($.Event('keydown', { which: 39 }))
-    strictEqual($template.find('.carousel-item')[0], $template.find('.active')[0], 'first item still active after right arrow press in <input>')
+    assert.strictEqual($template.find('.carousel-item')[0], $template.find('.active')[0], 'first item still active after right arrow press in <input>')
 
     $input.trigger($.Event('keydown', { which: 37 }))
-    strictEqual($template.find('.carousel-item')[0], $template.find('.active')[0], 'first item still active after left arrow press in <input>')
+    assert.strictEqual($template.find('.carousel-item')[0], $template.find('.active')[0], 'first item still active after left arrow press in <input>')
 
 
     $textarea.trigger($.Event('keydown', { which: 39 }))
-    strictEqual($template.find('.carousel-item')[0], $template.find('.active')[0], 'first item still active after right arrow press in <textarea>')
+    assert.strictEqual($template.find('.carousel-item')[0], $template.find('.active')[0], 'first item still active after right arrow press in <textarea>')
 
     $textarea.trigger($.Event('keydown', { which: 37 }))
-    strictEqual($template.find('.carousel-item')[0], $template.find('.active')[0], 'first item still active after left arrow press in <textarea>')
+    assert.strictEqual($template.find('.carousel-item')[0], $template.find('.active')[0], 'first item still active after left arrow press in <textarea>')
   })
 
-  test('should only add mouseenter and mouseleave listeners when not on mobile', function () {
+  QUnit.test('should only add mouseenter and mouseleave listeners when not on mobile', function (assert) {
+    assert.expect(2)
     var isMobile     = 'ontouchstart' in document.documentElement
     var templateHTML = '<div id="myCarousel" class="carousel" data-interval="false" data-pause="hover">'
         + '<div class="carousel-inner">'
@@ -539,11 +587,12 @@ $(function () {
     var $template = $(templateHTML).bootstrapCarousel()
 
     $.each(['mouseover', 'mouseout'], function (i, type) {
-      strictEqual(type in $._data($template[0], 'events'), !isMobile, 'does' + (isMobile ? ' not' : '') + ' listen for ' + type + ' events')
+      assert.strictEqual(type in $._data($template[0], 'events'), !isMobile, 'does' + (isMobile ? ' not' : '') + ' listen for ' + type + ' events')
     })
   })
 
-  test('should wrap around from end to start when wrap option is true', function (assert) {
+  QUnit.test('should wrap around from end to start when wrap option is true', function (assert) {
+    assert.expect(3)
     var carouselHTML = '<div id="carousel-example-generic" class="carousel slide" data-wrap="true">'
         + '<ol class="carousel-indicators">'
         + '<li data-target="#carousel-example-generic" data-slide-to="0" class="active"/>'
@@ -571,13 +620,13 @@ $(function () {
 
     $carousel
       .one('slid.bs.carousel', function () {
-        strictEqual(getActiveId(), 'two', 'carousel slid from 1st to 2nd slide')
+        assert.strictEqual(getActiveId(), 'two', 'carousel slid from 1st to 2nd slide')
         $carousel
           .one('slid.bs.carousel', function () {
-            strictEqual(getActiveId(), 'three', 'carousel slid from 2nd to 3rd slide')
+            assert.strictEqual(getActiveId(), 'three', 'carousel slid from 2nd to 3rd slide')
             $carousel
               .one('slid.bs.carousel', function () {
-                strictEqual(getActiveId(), 'one', 'carousel wrapped around and slid from 3rd to 1st slide')
+                assert.strictEqual(getActiveId(), 'one', 'carousel wrapped around and slid from 3rd to 1st slide')
                 done()
               })
               .bootstrapCarousel('next')
@@ -587,7 +636,8 @@ $(function () {
       .bootstrapCarousel('next')
   })
 
-  test('should wrap around from start to end when wrap option is true', function (assert) {
+  QUnit.test('should wrap around from start to end when wrap option is true', function (assert) {
+    assert.expect(1)
     var carouselHTML = '<div id="carousel-example-generic" class="carousel slide" data-wrap="true">'
         + '<ol class="carousel-indicators">'
         + '<li data-target="#carousel-example-generic" data-slide-to="0" class="active"/>'
@@ -614,13 +664,14 @@ $(function () {
 
     $carousel
       .on('slid.bs.carousel', function () {
-        strictEqual($carousel.find('.carousel-item.active').attr('id'), 'three', 'carousel wrapped around and slid from 1st to 3rd slide')
+        assert.strictEqual($carousel.find('.carousel-item.active').attr('id'), 'three', 'carousel wrapped around and slid from 1st to 3rd slide')
         done()
       })
       .bootstrapCarousel('prev')
   })
 
-  test('should stay at the end when the next method is called and wrap is false', function (assert) {
+  QUnit.test('should stay at the end when the next method is called and wrap is false', function (assert) {
+    assert.expect(3)
     var carouselHTML = '<div id="carousel-example-generic" class="carousel slide" data-wrap="false">'
         + '<ol class="carousel-indicators">'
         + '<li data-target="#carousel-example-generic" data-slide-to="0" class="active"/>'
@@ -648,16 +699,16 @@ $(function () {
 
     $carousel
       .one('slid.bs.carousel', function () {
-        strictEqual(getActiveId(), 'two', 'carousel slid from 1st to 2nd slide')
+        assert.strictEqual(getActiveId(), 'two', 'carousel slid from 1st to 2nd slide')
         $carousel
           .one('slid.bs.carousel', function () {
-            strictEqual(getActiveId(), 'three', 'carousel slid from 2nd to 3rd slide')
+            assert.strictEqual(getActiveId(), 'three', 'carousel slid from 2nd to 3rd slide')
             $carousel
               .one('slid.bs.carousel', function () {
-                ok(false, 'carousel slid when it should not have slid')
+                assert.ok(false, 'carousel slid when it should not have slid')
               })
               .bootstrapCarousel('next')
-            strictEqual(getActiveId(), 'three', 'carousel did not wrap around and stayed on 3rd slide')
+            assert.strictEqual(getActiveId(), 'three', 'carousel did not wrap around and stayed on 3rd slide')
             done()
           })
           .bootstrapCarousel('next')
@@ -665,7 +716,8 @@ $(function () {
       .bootstrapCarousel('next')
   })
 
-  test('should stay at the start when the prev method is called and wrap is false', function () {
+  QUnit.test('should stay at the start when the prev method is called and wrap is false', function (assert) {
+    assert.expect(1)
     var carouselHTML = '<div id="carousel-example-generic" class="carousel slide" data-wrap="false">'
         + '<ol class="carousel-indicators">'
         + '<li data-target="#carousel-example-generic" data-slide-to="0" class="active"/>'
@@ -690,9 +742,9 @@ $(function () {
 
     $carousel
       .on('slid.bs.carousel', function () {
-        ok(false, 'carousel slid when it should not have slid')
+        assert.ok(false, 'carousel slid when it should not have slid')
       })
       .bootstrapCarousel('prev')
-    strictEqual($carousel.find('.carousel-item.active').attr('id'), 'one', 'carousel did not wrap around and stayed on 1st slide')
+    assert.strictEqual($carousel.find('.carousel-item.active').attr('id'), 'one', 'carousel did not wrap around and stayed on 1st slide')
   })
 })
diff --git a/js/tests/unit/collapse.js b/js/tests/unit/collapse.js
index 0f1b7b119..78fafc6c2 100644
--- a/js/tests/unit/collapse.js
+++ b/js/tests/unit/collapse.js
@@ -355,7 +355,7 @@ $(function () {
 
     $('<div id="body1" aria-expanded="true" class="in"/>').appendTo($groups.eq(0))
 
-    var $target2 = $('<a class="collapsed" data-toggle="collapse" role="button" href="#body2" data-parent="#accordion"/>').appendTo($groups.eq(1))
+    var $target2 = $('<a role="button" data-toggle="collapse" href="#body2" data-parent="#accordion" class="collapsed" />').appendTo($groups.eq(1))
 
     $('<div id="body2" aria-expanded="false"/>').appendTo($groups.eq(1))
 
@@ -400,7 +400,7 @@ $(function () {
 
     $body2
       .toggleClass('in collapsing')
-      .data('bs.collapse').setTransitioning(true)
+      .data('bs.collapse')._isTransitioning = 1
 
     $target1.trigger('click')
 
diff --git a/js/tests/unit/modal.js b/js/tests/unit/modal.js
index 7018b865f..6da09e3c6 100644
--- a/js/tests/unit/modal.js
+++ b/js/tests/unit/modal.js
@@ -1,194 +1,209 @@
 $(function () {
   'use strict';
 
-  module('modal plugin')
+  QUnit.module('modal plugin')
 
-  test('should be defined on jquery object', function () {
-    ok($(document.body).modal, 'modal method is defined')
+  QUnit.test('should be defined on jquery object', function (assert) {
+    assert.expect(1)
+    assert.ok($(document.body).modal, 'modal method is defined')
   })
 
-  module('modal', {
-    setup: function () {
+  QUnit.module('modal', {
+    beforeEach: function () {
       // Run all tests in noConflict mode -- it's the only way to ensure that the plugin works in noConflict mode
       $.fn.bootstrapModal = $.fn.modal.noConflict()
     },
-    teardown: function () {
+    afterEach: function () {
       $.fn.modal = $.fn.bootstrapModal
       delete $.fn.bootstrapModal
     }
   })
 
-  test('should provide no conflict', function () {
-    strictEqual($.fn.modal, undefined, 'modal was set back to undefined (orig value)')
+  QUnit.test('should provide no conflict', function (assert) {
+    assert.expect(1)
+    assert.strictEqual($.fn.modal, undefined, 'modal was set back to undefined (orig value)')
   })
 
-  test('should return jquery collection containing the element', function () {
+  QUnit.test('should return jquery collection containing the element', function (assert) {
+    assert.expect(2)
     var $el = $('<div id="modal-test"/>')
     var $modal = $el.bootstrapModal()
-    ok($modal instanceof $, 'returns jquery collection')
-    strictEqual($modal[0], $el[0], 'collection contains element')
+    assert.ok($modal instanceof $, 'returns jquery collection')
+    assert.strictEqual($modal[0], $el[0], 'collection contains element')
   })
 
-  test('should expose defaults var for settings', function () {
-    ok($.fn.bootstrapModal.Constructor.Defaults, 'default object exposed')
+  QUnit.test('should expose defaults var for settings', function (assert) {
+    assert.expect(1)
+    assert.ok($.fn.bootstrapModal.Constructor.Default, 'default object exposed')
   })
 
-  test('should insert into dom when show method is called', function (assert) {
+  QUnit.test('should insert into dom when show method is called', function (assert) {
+    assert.expect(1)
     var done = assert.async()
 
     $('<div id="modal-test"/>')
       .on('shown.bs.modal', function () {
-        notEqual($('#modal-test').length, 0, 'modal inserted into dom')
+        assert.notEqual($('#modal-test').length, 0, 'modal inserted into dom')
         done()
       })
       .bootstrapModal('show')
   })
 
-  test('should fire show event', function (assert) {
+  QUnit.test('should fire show event', function (assert) {
+    assert.expect(1)
     var done = assert.async()
 
     $('<div id="modal-test"/>')
       .on('show.bs.modal', function () {
-        ok(true, 'show event fired')
+        assert.ok(true, 'show event fired')
         done()
       })
       .bootstrapModal('show')
   })
 
-  test('should not fire shown when show was prevented', function (assert) {
+  QUnit.test('should not fire shown when show was prevented', function (assert) {
+    assert.expect(1)
     var done = assert.async()
 
     $('<div id="modal-test"/>')
       .on('show.bs.modal', function (e) {
         e.preventDefault()
-        ok(true, 'show event fired')
+        assert.ok(true, 'show event fired')
         done()
       })
       .on('shown.bs.modal', function () {
-        ok(false, 'shown event fired')
+        assert.ok(false, 'shown event fired')
       })
       .bootstrapModal('show')
   })
 
-  test('should hide modal when hide is called', function (assert) {
+  QUnit.test('should hide modal when hide is called', function (assert) {
+    assert.expect(3)
     var done = assert.async()
 
     $('<div id="modal-test"/>')
       .on('shown.bs.modal', function () {
-        ok($('#modal-test').is(':visible'), 'modal visible')
-        notEqual($('#modal-test').length, 0, 'modal inserted into dom')
+        assert.ok($('#modal-test').is(':visible'), 'modal visible')
+        assert.notEqual($('#modal-test').length, 0, 'modal inserted into dom')
         $(this).bootstrapModal('hide')
       })
       .on('hidden.bs.modal', function () {
-        ok(!$('#modal-test').is(':visible'), 'modal hidden')
+        assert.ok(!$('#modal-test').is(':visible'), 'modal hidden')
         done()
       })
       .bootstrapModal('show')
   })
 
-  test('should toggle when toggle is called', function (assert) {
+  QUnit.test('should toggle when toggle is called', function (assert) {
+    assert.expect(3)
     var done = assert.async()
 
     $('<div id="modal-test"/>')
       .on('shown.bs.modal', function () {
-        ok($('#modal-test').is(':visible'), 'modal visible')
-        notEqual($('#modal-test').length, 0, 'modal inserted into dom')
+        assert.ok($('#modal-test').is(':visible'), 'modal visible')
+        assert.notEqual($('#modal-test').length, 0, 'modal inserted into dom')
         $(this).bootstrapModal('toggle')
       })
       .on('hidden.bs.modal', function () {
-        ok(!$('#modal-test').is(':visible'), 'modal hidden')
+        assert.ok(!$('#modal-test').is(':visible'), 'modal hidden')
         done()
       })
       .bootstrapModal('toggle')
   })
 
-  test('should remove from dom when click [data-dismiss="modal"]', function (assert) {
+  QUnit.test('should remove from dom when click [data-dismiss="modal"]', function (assert) {
+    assert.expect(3)
     var done = assert.async()
 
     $('<div id="modal-test"><span class="close" data-dismiss="modal"/></div>')
       .on('shown.bs.modal', function () {
-        ok($('#modal-test').is(':visible'), 'modal visible')
-        notEqual($('#modal-test').length, 0, 'modal inserted into dom')
-        $(this).find('.close').click()
+        assert.ok($('#modal-test').is(':visible'), 'modal visible')
+        assert.notEqual($('#modal-test').length, 0, 'modal inserted into dom')
+        $(this).find('.close').trigger('click')
       })
       .on('hidden.bs.modal', function () {
-        ok(!$('#modal-test').is(':visible'), 'modal hidden')
+        assert.ok(!$('#modal-test').is(':visible'), 'modal hidden')
         done()
       })
       .bootstrapModal('toggle')
   })
 
-  test('should allow modal close with "backdrop:false"', function (assert) {
+  QUnit.test('should allow modal close with "backdrop:false"', function (assert) {
+    assert.expect(2)
     var done = assert.async()
 
     $('<div id="modal-test" data-backdrop="false"/>')
       .on('shown.bs.modal', function () {
-        ok($('#modal-test').is(':visible'), 'modal visible')
+        assert.ok($('#modal-test').is(':visible'), 'modal visible')
         $(this).bootstrapModal('hide')
       })
       .on('hidden.bs.modal', function () {
-        ok(!$('#modal-test').is(':visible'), 'modal hidden')
+        assert.ok(!$('#modal-test').is(':visible'), 'modal hidden')
         done()
       })
       .bootstrapModal('show')
   })
 
-  test('should close modal when clicking outside of modal-content', function (assert) {
+  QUnit.test('should close modal when clicking outside of modal-content', function (assert) {
+    assert.expect(3)
     var done = assert.async()
 
     $('<div id="modal-test"><div class="contents"/></div>')
       .on('shown.bs.modal', function () {
-        notEqual($('#modal-test').length, 0, 'modal insterted into dom')
-        $('.contents').click()
-        ok($('#modal-test').is(':visible'), 'modal visible')
-        $('#modal-test .modal-backdrop').click()
+        assert.notEqual($('#modal-test').length, 0, 'modal inserted into dom')
+        $('.contents').trigger('click')
+        assert.ok($('#modal-test').is(':visible'), 'modal visible')
+        $('#modal-test').trigger('click')
       })
       .on('hidden.bs.modal', function () {
-        ok(!$('#modal-test').is(':visible'), 'modal hidden')
+        assert.ok(!$('#modal-test').is(':visible'), 'modal hidden')
         done()
       })
       .bootstrapModal('show')
   })
 
-  test('should close modal when escape key is pressed via keydown', function (assert) {
+  QUnit.test('should close modal when escape key is pressed via keydown', function (assert) {
+    assert.expect(3)
     var done = assert.async()
 
-    var div = $('<div id="modal-test"/>')
-    div
+    var $div = $('<div id="modal-test"/>')
+    $div
       .on('shown.bs.modal', function () {
-        ok($('#modal-test').length, 'modal insterted into dom')
-        ok($('#modal-test').is(':visible'), 'modal visible')
-        div.trigger($.Event('keydown', { which: 27 }))
+        assert.ok($('#modal-test').length, 'modal insterted into dom')
+        assert.ok($('#modal-test').is(':visible'), 'modal visible')
+        $div.trigger($.Event('keydown', { which: 27 }))
 
         setTimeout(function () {
-          ok(!$('#modal-test').is(':visible'), 'modal hidden')
-          div.remove()
+          assert.ok(!$('#modal-test').is(':visible'), 'modal hidden')
+          $div.remove()
           done()
         }, 0)
       })
       .bootstrapModal('show')
   })
 
-  test('should not close modal when escape key is pressed via keyup', function (assert) {
+  QUnit.test('should not close modal when escape key is pressed via keyup', function (assert) {
+    assert.expect(3)
     var done = assert.async()
 
-    var div = $('<div id="modal-test"/>')
-    div
+    var $div = $('<div id="modal-test"/>')
+    $div
       .on('shown.bs.modal', function () {
-        ok($('#modal-test').length, 'modal insterted into dom')
-        ok($('#modal-test').is(':visible'), 'modal visible')
-        div.trigger($.Event('keyup', { which: 27 }))
+        assert.ok($('#modal-test').length, 'modal inserted into dom')
+        assert.ok($('#modal-test').is(':visible'), 'modal visible')
+        $div.trigger($.Event('keyup', { which: 27 }))
 
         setTimeout(function () {
-          ok($('#modal-test').is(':visible'), 'modal still visible')
-          div.remove()
+          assert.ok($div.is(':visible'), 'modal still visible')
+          $div.remove()
           done()
         }, 0)
       })
       .bootstrapModal('show')
   })
 
-  test('should trigger hide event once when clicking outside of modal-content', function (assert) {
+  QUnit.test('should trigger hide event once when clicking outside of modal-content', function (assert) {
+    assert.expect(1)
     var done = assert.async()
 
     var triggered
@@ -196,32 +211,33 @@ $(function () {
     $('<div id="modal-test"><div class="contents"/></div>')
       .on('shown.bs.modal', function () {
         triggered = 0
-        $('#modal-test .modal-backdrop').click()
+        $('#modal-test').trigger('click')
       })
       .on('hide.bs.modal', function () {
         triggered += 1
-        strictEqual(triggered, 1, 'modal hide triggered once')
+        assert.strictEqual(triggered, 1, 'modal hide triggered once')
         done()
       })
       .bootstrapModal('show')
   })
 
-  test('should close reopened modal with [data-dismiss="modal"] click', function (assert) {
+  QUnit.test('should close reopened modal with [data-dismiss="modal"] click', function (assert) {
+    assert.expect(2)
     var done = assert.async()
 
     $('<div id="modal-test"><div class="contents"><div id="close" data-dismiss="modal"/></div></div>')
       .one('shown.bs.modal', function () {
-        $('#close').click()
+        $('#close').trigger('click')
       })
       .one('hidden.bs.modal', function () {
         // after one open-close cycle
-        ok(!$('#modal-test').is(':visible'), 'modal hidden')
+        assert.ok(!$('#modal-test').is(':visible'), 'modal hidden')
         $(this)
           .one('shown.bs.modal', function () {
-            $('#close').click()
+            $('#close').trigger('click')
           })
           .one('hidden.bs.modal', function () {
-            ok(!$('#modal-test').is(':visible'), 'modal hidden')
+            assert.ok(!$('#modal-test').is(':visible'), 'modal hidden')
             done()
           })
           .bootstrapModal('show')
@@ -229,7 +245,8 @@ $(function () {
       .bootstrapModal('show')
   })
 
-  test('should restore focus to toggling element when modal is hidden after having been opened via data-api', function (assert) {
+  QUnit.test('should restore focus to toggling element when modal is hidden after having been opened via data-api', function (assert) {
+    assert.expect(1)
     var done = assert.async()
 
     var $toggleBtn = $('<button data-toggle="modal" data-target="#modal-test"/>').appendTo('#qunit-fixture')
@@ -237,19 +254,20 @@ $(function () {
     $('<div id="modal-test"><div class="contents"><div id="close" data-dismiss="modal"/></div></div>')
       .on('hidden.bs.modal', function () {
         setTimeout(function () {
-          ok($(document.activeElement).is($toggleBtn), 'toggling element is once again focused')
+          assert.ok($(document.activeElement).is($toggleBtn), 'toggling element is once again focused')
           done()
         }, 0)
       })
       .on('shown.bs.modal', function () {
-        $('#close').click()
+        $('#close').trigger('click')
       })
       .appendTo('#qunit-fixture')
 
-    $toggleBtn.click()
+    $toggleBtn.trigger('click')
   })
 
-  test('should not restore focus to toggling element if the associated show event gets prevented', function (assert) {
+  QUnit.test('should not restore focus to toggling element if the associated show event gets prevented', function (assert) {
+    assert.expect(1)
     var done = assert.async()
     var $toggleBtn = $('<button data-toggle="modal" data-target="#modal-test"/>').appendTo('#qunit-fixture')
     var $otherBtn = $('<button id="other-btn"/>').appendTo('#qunit-fixture')
@@ -257,22 +275,103 @@ $(function () {
     $('<div id="modal-test"><div class="contents"><div id="close" data-dismiss="modal"/></div>')
       .one('show.bs.modal', function (e) {
         e.preventDefault()
-        $otherBtn.focus()
+        $otherBtn.trigger('focus')
         setTimeout($.proxy(function () {
           $(this).bootstrapModal('show')
         }, this), 0)
       })
       .on('hidden.bs.modal', function () {
         setTimeout(function () {
-          ok($(document.activeElement).is($otherBtn), 'focus returned to toggling element')
+          assert.ok($(document.activeElement).is($otherBtn), 'focus returned to toggling element')
           done()
         }, 0)
       })
       .on('shown.bs.modal', function () {
-        $('#close').click()
+        $('#close').trigger('click')
       })
       .appendTo('#qunit-fixture')
 
-    $toggleBtn.click()
+    $toggleBtn.trigger('click')
+  })
+
+  QUnit.test('should restore inline body padding after closing', function (assert) {
+    assert.expect(2)
+    var done = assert.async()
+    var originalBodyPad = 0
+    var $body = $(document.body)
+
+    $body.css('padding-right', originalBodyPad)
+
+    $('<div id="modal-test"/>')
+      .on('hidden.bs.modal', function () {
+        var currentBodyPad = parseInt($body.css('padding-right'), 10)
+        assert.notStrictEqual($body.attr('style'), '', 'body has non-empty style attribute')
+        assert.strictEqual(currentBodyPad, originalBodyPad, 'original body padding was not changed')
+        $body.removeAttr('style')
+        done()
+      })
+      .on('shown.bs.modal', function () {
+        $(this).bootstrapModal('hide')
+      })
+      .bootstrapModal('show')
+  })
+
+  QUnit.test('should ignore values set via CSS when trying to restore body padding after closing', function (assert) {
+    assert.expect(1)
+    var done = assert.async()
+    var $body = $(document.body)
+    var $style = $('<style>body { padding-right: 42px; }</style>').appendTo('head')
+
+    $('<div id="modal-test"/>')
+      .on('hidden.bs.modal', function () {
+        assert.ok(!$body.attr('style'), 'body does not have inline padding set')
+        $style.remove()
+        done()
+      })
+      .on('shown.bs.modal', function () {
+        $(this).bootstrapModal('hide')
+      })
+      .bootstrapModal('show')
+  })
+
+  QUnit.test('should ignore other inline styles when trying to restore body padding after closing', function (assert) {
+    assert.expect(2)
+    var done = assert.async()
+    var $body = $(document.body)
+    var $style = $('<style>body { padding-right: 42px; }</style>').appendTo('head')
+
+    $body.css('color', 'red')
+
+    $('<div id="modal-test"/>')
+      .on('hidden.bs.modal', function () {
+        assert.strictEqual($body[0].style.paddingRight, '', 'body does not have inline padding set')
+        assert.strictEqual($body[0].style.color, 'red', 'body still has other inline styles set')
+        $body.removeAttr('style')
+        $style.remove()
+        done()
+      })
+      .on('shown.bs.modal', function () {
+        $(this).bootstrapModal('hide')
+      })
+      .bootstrapModal('show')
+  })
+
+  QUnit.test('should properly restore non-pixel inline body padding after closing', function (assert) {
+    assert.expect(1)
+    var done = assert.async()
+    var $body = $(document.body)
+
+    $body.css('padding-right', '5%')
+
+    $('<div id="modal-test"/>')
+      .on('hidden.bs.modal', function () {
+        assert.strictEqual($body[0].style.paddingRight, '5%', 'body does not have inline padding set')
+        $body.removeAttr('style')
+        done()
+      })
+      .on('shown.bs.modal', function () {
+        $(this).bootstrapModal('hide')
+      })
+      .bootstrapModal('show')
   })
 })
diff --git a/js/tests/unit/phantom.js b/js/tests/unit/phantom.js
index f6f0ac00f..3ed3b3ea3 100644
--- a/js/tests/unit/phantom.js
+++ b/js/tests/unit/phantom.js
@@ -52,9 +52,9 @@
 
   QUnit.moduleDone(function (obj) {
     if (obj.failed === 0) {
-      console.log('\r\u2714 All tests passed in "' + obj.name + '" module')
+      console.log('\r\u221A All tests passed in "' + obj.name + '" module')
     } else {
-      console.log('\u2716 ' + obj.failed + ' tests failed in "' + obj.name + '" module')
+      console.log('\u00D7 ' + obj.failed + ' tests failed in "' + obj.name + '" module')
     }
     sendMessage('qunit.moduleDone', obj.name, obj.failed, obj.passed, obj.total)
   })
diff --git a/js/tests/unit/popover.js b/js/tests/unit/popover.js
index 68525540a..8347e9f03 100644
--- a/js/tests/unit/popover.js
+++ b/js/tests/unit/popover.js
@@ -16,6 +16,7 @@ $(function () {
     afterEach: function () {
       $.fn.popover = $.fn.bootstrapPopover
       delete $.fn.bootstrapPopover
+      $('.popover').remove()
     }
   })
 
@@ -81,6 +82,7 @@ $(function () {
     assert.strictEqual($('.popover .popover-content').text(), 'loves writing tests （╯°□°）╯︵ ┻━┻', 'content correctly inserted')
 
     $popover.bootstrapPopover('hide')
+
     assert.strictEqual($('.popover').length, 0, 'popover was removed')
   })
 
@@ -91,6 +93,7 @@ $(function () {
     var $popover = $('<a href="#">@fat</a>')
       .appendTo('#qunit-fixture')
       .bootstrapPopover({
+        html: true,
         content: function () {
           return $div
         }
@@ -98,14 +101,14 @@ $(function () {
 
     $popover.bootstrapPopover('show')
     assert.notEqual($('.popover').length, 0, 'popover was inserted')
-    assert.equal($('.popover .popover-content').html(), $div, 'content correctly inserted')
+    assert.equal($('.popover .popover-content').html(), $div[0].outerHTML, 'content correctly inserted')
 
     $popover.bootstrapPopover('hide')
     assert.strictEqual($('.popover').length, 0, 'popover was removed')
 
     $popover.bootstrapPopover('show')
     assert.notEqual($('.popover').length, 0, 'popover was inserted')
-    assert.equal($('.popover .popover-content').html(), $div, 'content correctly inserted')
+    assert.equal($('.popover .popover-content').html(), $div[0].outerHTML, 'content correctly inserted')
 
     $popover.bootstrapPopover('hide')
     assert.strictEqual($('.popover').length, 0, 'popover was removed')
@@ -126,7 +129,6 @@ $(function () {
     assert.strictEqual($('.popover').length, 0, 'popover was removed')
   })
 
-
   QUnit.test('should get title and content from attributes ignoring options passed via js', function (assert) {
     assert.expect(4)
     var $popover = $('<a href="#" title="@mdo" data-content="loves data attributes (づ｡◕‿‿◕｡)づ ︵ ┻━┻" >@mdo</a>')
@@ -152,7 +154,7 @@ $(function () {
       .bootstrapPopover({
         title: 'Test',
         content: 'Test',
-        template: '<div class="popover foobar"><div class="popover-arrow"></div><div class="inner"><h3 class="title"/><div class="content"><p/></div></div></div>'
+        template: '<div class="popover foobar"><div class="arrow"></div><div class="inner"><h3 class="title"/><div class="content"><p/></div></div></div>'
       })
 
     $popover.bootstrapPopover('show')
@@ -166,8 +168,7 @@ $(function () {
 
   QUnit.test('should destroy popover', function (assert) {
     assert.expect(7)
-    var $popover = $('<div>Popover trigger</div>')
-      .appendTo('#qunit-fixture')
+    var $popover = $('<div/>')
       .bootstrapPopover({
         trigger: 'hover'
       })
@@ -178,7 +179,7 @@ $(function () {
     assert.strictEqual($._data($popover[0], 'events').click[0].namespace, 'foo', 'popover has extra click.foo event')
 
     $popover.bootstrapPopover('show')
-    $popover.bootstrapPopover('destroy')
+    $popover.bootstrapPopover('dispose')
 
     assert.ok(!$popover.hasClass('in'), 'popover is hidden')
     assert.ok(!$popover.data('popover'), 'popover does not have data')
@@ -230,7 +231,7 @@ $(function () {
             $div
               .one('shown.bs.popover', function () {
                 $('.content-with-handler .btn').trigger('click')
-                $div.bootstrapPopover('destroy')
+                $div.bootstrapPopover('dispose')
                 assert.ok(handlerCalled, 'content\'s event handler still present')
                 done()
               })
@@ -241,24 +242,6 @@ $(function () {
       .bootstrapPopover('show')
   })
 
-  QUnit.test('should throw an error when trying to show a popover on a hidden element', function (assert) {
-    assert.expect(1)
-    var $target = $('<a href="#" title="Another popover" data-content="Body" style="display: none;">I am hidden</a>').appendTo('#qunit-fixture')
-
-    assert.throws(function () {
-      $target.bootstrapPopover('show')
-    }, new Error('Can\'t show a tooltip/popover on a hidden element'))
-
-    $target.remove()
-  })
-
-  QUnit.test('should throw an error when initializing popover on the document object without specifying a delegation selector', function (assert) {
-    assert.expect(1)
-    assert.throws(function () {
-      $(document).bootstrapPopover({ title: 'What am I on?', content: 'My selector is missing' })
-    }, new Error('`selector` option must be specified when initializing popover on the window.document object!'))
-  })
-
   QUnit.test('should do nothing when an attempt is made to hide an uninitialized popover', function (assert) {
     assert.expect(1)
 
@@ -271,4 +254,22 @@ $(function () {
     assert.strictEqual($popover.data('bs.popover'), undefined, 'should not initialize the popover')
   })
 
+  QUnit.test('should fire inserted event', function (assert) {
+    assert.expect(2)
+    var done = assert.async()
+
+    $('<a href="#">@Johann-S</a>')
+      .appendTo('#qunit-fixture')
+      .on('inserted.bs.popover', function () {
+        assert.notEqual($('.popover').length, 0, 'popover was inserted')
+        assert.ok(true, 'inserted event fired')
+        done()
+      })
+      .bootstrapPopover({
+        title: 'Test',
+        content: 'Test'
+      })
+      .bootstrapPopover('show')
+  })
+
 })
diff --git a/js/tests/unit/scrollspy.js b/js/tests/unit/scrollspy.js
index bf5fa0bff..063dfabcf 100644
--- a/js/tests/unit/scrollspy.js
+++ b/js/tests/unit/scrollspy.js
@@ -77,6 +77,51 @@ $(function () {
     $scrollspy.scrollTop(350)
   })
 
+  QUnit.test('should only switch "active" class on current target specified w element', function (assert) {
+    assert.expect(1)
+    var done = assert.async()
+
+    var sectionHTML = '<div id="root" class="active">'
+        + '<div class="topbar">'
+        + '<div class="topbar-inner">'
+        + '<div class="container" id="ss-target">'
+        + '<ul class="nav">'
+        + '<li><a href="#masthead">Overview</a></li>'
+        + '<li><a href="#detail">Detail</a></li>'
+        + '</ul>'
+        + '</div>'
+        + '</div>'
+        + '</div>'
+        + '<div id="scrollspy-example" style="height: 100px; overflow: auto;">'
+        + '<div style="height: 200px;">'
+        + '<h4 id="masthead">Overview</h4>'
+        + '<p style="height: 200px">'
+        + 'Ad leggings keytar, brunch id art party dolor labore.'
+        + '</p>'
+        + '</div>'
+        + '<div style="height: 200px;">'
+        + '<h4 id="detail">Detail</h4>'
+        + '<p style="height: 200px">'
+        + 'Veniam marfa mustache skateboard, adipisicing fugiat velit pitchfork beard.'
+        + '</p>'
+        + '</div>'
+        + '</div>'
+        + '</div>'
+    var $section = $(sectionHTML).appendTo('#qunit-fixture')
+
+    var $scrollspy = $section
+      .show()
+      .find('#scrollspy-example')
+      .bootstrapScrollspy({ target: document.getElementById('#ss-target') })
+
+    $scrollspy.on('scroll.bs.scrollspy', function () {
+      assert.ok($section.hasClass('active'), '"active" class still on root node')
+      done()
+    })
+
+    $scrollspy.scrollTop(350)
+  })
+
   QUnit.test('should correctly select middle navigation option when large offset is used', function (assert) {
     assert.expect(3)
     var done = assert.async()
@@ -275,4 +320,90 @@ $(function () {
       .then(function () { return testElementIsActiveAfterScroll('#li-100-1', '#div-100-1') })
   })
 
+  QUnit.test('should allow passed in option offset method: offset', function (assert) {
+    assert.expect(4)
+
+    var testOffsetMethod = function (type) {
+      var deferred = $.Deferred()
+      var navbarHtml =
+          '<nav class="navbar"' + (type === 'data' ? ' id="navbar-offset-method-menu"' : '') + '>'
+        + '<ul class="nav">'
+        + '<li id="li-' + type + 'm-1"><a href="#div-' + type + 'm-1">div 1</a></li>'
+        + '<li id="li-' + type + 'm-2"><a href="#div-' + type + 'm-2">div 2</a></li>'
+        + '<li id="li-' + type + 'm-3"><a href="#div-' + type + 'm-3">div 3</a></li>'
+        + '</ul>'
+        + '</nav>'
+      var contentHtml =
+          '<div class="content"' + (type === 'data' ? ' data-spy="scroll" data-target="#navbar-offset-method-menu" data-offset="0" data-method="offset"' : '') + ' style="position: relative; overflow: auto; height: 100px">'
+        + '<div id="div-' + type + 'm-1" style="position: relative; height: 200px; padding: 0; margin: 0">div 1</div>'
+        + '<div id="div-' + type + 'm-2" style="position: relative; height: 150px; padding: 0; margin: 0">div 2</div>'
+        + '<div id="div-' + type + 'm-3" style="position: relative; height: 250px; padding: 0; margin: 0">div 3</div>'
+        + '</div>'
+
+
+      $(navbarHtml).appendTo('#qunit-fixture')
+      var $content = $(contentHtml)
+        .appendTo('#qunit-fixture')
+
+      if (type === 'js') $content.bootstrapScrollspy({ target: '.navbar', offset: 0, method: 'offset' })
+      else if (type === 'data') $(window).trigger('load.bs.scrollspy.data-api')
+
+      var $target = $('#div-' + type + 'm-2')
+      var scrollspy = $content.data('bs.scrollspy')
+
+      assert.ok(scrollspy._offsets[1] === $target.offset().top, 'offsed method with ' + type + ' option')
+      assert.ok(scrollspy._offsets[1] !== $target.position().top, 'position method with ' + type + ' option')
+
+      deferred.resolve()
+
+      return deferred.promise()
+    }
+
+    $.when(testOffsetMethod('js'))
+      .then(function () { testOffsetMethod('data') })
+  })
+
+  QUnit.test('should allow passed in option offset method: position', function (assert) {
+    assert.expect(4)
+
+    var testOffsetMethod = function (type) {
+      var deferred = $.Deferred()
+      var navbarHtml =
+          '<nav class="navbar"' + (type === 'data' ? ' id="navbar-offset-method-menu"' : '') + '>'
+        + '<ul class="nav">'
+        + '<li id="li-' + type + 'm-1"><a href="#div-' + type + 'm-1">div 1</a></li>'
+        + '<li id="li-' + type + 'm-2"><a href="#div-' + type + 'm-2">div 2</a></li>'
+        + '<li id="li-' + type + 'm-3"><a href="#div-' + type + 'm-3">div 3</a></li>'
+        + '</ul>'
+        + '</nav>'
+      var contentHtml =
+          '<div class="content"' + (type === 'data' ? ' data-spy="scroll" data-target="#navbar-offset-method-menu" data-offset="0" data-method="position"' : '') + ' style="position: relative; overflow: auto; height: 100px">'
+        + '<div id="div-' + type + 'm-1" style="position: relative; height: 200px; padding: 0; margin: 0">div 1</div>'
+        + '<div id="div-' + type + 'm-2" style="position: relative; height: 150px; padding: 0; margin: 0">div 2</div>'
+        + '<div id="div-' + type + 'm-3" style="position: relative; height: 250px; padding: 0; margin: 0">div 3</div>'
+        + '</div>'
+
+
+      $(navbarHtml).appendTo('#qunit-fixture')
+      var $content = $(contentHtml)
+        .appendTo('#qunit-fixture')
+
+      if (type === 'js') $content.bootstrapScrollspy({ target: '.navbar', offset: 0, method: 'position' })
+      else if (type === 'data') $(window).trigger('load.bs.scrollspy.data-api')
+
+      var $target = $('#div-' + type + 'm-2')
+      var scrollspy = $content.data('bs.scrollspy')
+
+      assert.ok(scrollspy._offsets[1] !== $target.offset().top, 'offsed method with ' + type + ' option')
+      assert.ok(scrollspy._offsets[1] === $target.position().top, 'position method with ' + type + ' option')
+
+      deferred.resolve()
+
+      return deferred.promise()
+    }
+
+    $.when(testOffsetMethod('js'))
+      .then(function () { testOffsetMethod('data') })
+  })
+
 })
diff --git a/js/tests/unit/tooltip.js b/js/tests/unit/tooltip.js
index e1205b4c0..f4deb29f8 100644
--- a/js/tests/unit/tooltip.js
+++ b/js/tests/unit/tooltip.js
@@ -1,696 +1,395 @@
 $(function () {
   'use strict';
 
-  module('tooltip plugin')
+  QUnit.module('tooltip plugin')
 
-  test('should be defined on jquery object', function () {
-    ok($(document.body).tooltip, 'tooltip method is defined')
+  QUnit.test('should be defined on jquery object', function (assert) {
+    assert.expect(1)
+    assert.ok($(document.body).tooltip, 'tooltip method is defined')
   })
 
-  module('tooltip', {
-    setup: function () {
+  QUnit.module('tooltip', {
+    beforeEach: function () {
       // Run all tests in noConflict mode -- it's the only way to ensure that the plugin works in noConflict mode
       $.fn.bootstrapTooltip = $.fn.tooltip.noConflict()
     },
-    teardown: function () {
+    afterEach: function () {
       $.fn.tooltip = $.fn.bootstrapTooltip
       delete $.fn.bootstrapTooltip
+      $('.tooltip').remove()
     }
   })
 
-  test('should provide no conflict', function () {
-    strictEqual($.fn.tooltip, undefined, 'tooltip was set back to undefined (org value)')
+  QUnit.test('should provide no conflict', function (assert) {
+    assert.expect(1)
+    assert.strictEqual($.fn.tooltip, undefined, 'tooltip was set back to undefined (org value)')
   })
 
-  test('should return jquery collection containing the element', function () {
+  QUnit.test('should return jquery collection containing the element', function (assert) {
+    assert.expect(2)
     var $el = $('<div/>')
     var $tooltip = $el.bootstrapTooltip()
-    ok($tooltip instanceof $, 'returns jquery collection')
-    strictEqual($tooltip[0], $el[0], 'collection contains element')
+    assert.ok($tooltip instanceof $, 'returns jquery collection')
+    assert.strictEqual($tooltip[0], $el[0], 'collection contains element')
   })
 
-  test('should expose default settings', function () {
-    ok($.fn.bootstrapTooltip.Constructor.Defaults, 'defaults is defined')
+  QUnit.test('should expose default settings', function (assert) {
+    assert.expect(1)
+    assert.ok($.fn.bootstrapTooltip.Constructor.Default, 'defaults is defined')
   })
 
-  test('should empty title attribute', function () {
+  QUnit.test('should empty title attribute', function (assert) {
+    assert.expect(1)
     var $trigger = $('<a href="#" rel="tooltip" title="Another tooltip"/>').bootstrapTooltip()
-    strictEqual($trigger.attr('title'), '', 'title attribute was emptied')
+    assert.strictEqual($trigger.attr('title'), '', 'title attribute was emptied')
   })
 
-  test('should add data attribute for referencing original title', function () {
+  QUnit.test('should add data attribute for referencing original title', function (assert) {
+    assert.expect(1)
     var $trigger = $('<a href="#" rel="tooltip" title="Another tooltip"/>').bootstrapTooltip()
-    strictEqual($trigger.attr('data-original-title'), 'Another tooltip', 'original title preserved in data attribute')
+    assert.strictEqual($trigger.attr('data-original-title'), 'Another tooltip', 'original title preserved in data attribute')
   })
 
-  test('should add aria-describedby to the trigger on show', function () {
-    var $trigger = $('<a href="#" rel="tooltip" title="Another tooltip">Tooltip trigger</a>')
+  QUnit.test('should add aria-describedby to the trigger on show', function (assert) {
+    assert.expect(3)
+    var $trigger = $('<a href="#" rel="tooltip" title="Another tooltip"/>')
       .bootstrapTooltip()
       .appendTo('#qunit-fixture')
       .bootstrapTooltip('show')
 
     var id = $('.tooltip').attr('id')
 
-    strictEqual($('#' + id).length, 1, 'has a unique id')
-    strictEqual($('.tooltip').attr('aria-describedby'), $trigger.attr('id'), 'tooltip id and aria-describedby on trigger match')
-    ok($trigger[0].hasAttribute('aria-describedby'), 'trigger has aria-describedby')
+    assert.strictEqual($('#' + id).length, 1, 'has a unique id')
+    assert.strictEqual($('.tooltip').attr('aria-describedby'), $trigger.attr('id'), 'tooltip id and aria-describedby on trigger match')
+    assert.ok($trigger[0].hasAttribute('aria-describedby'), 'trigger has aria-describedby')
   })
 
-  test('should remove aria-describedby from trigger on hide', function () {
-    var $trigger = $('<a href="#" rel="tooltip" title="Another tooltip">Tooltip trigger</a>')
+  QUnit.test('should remove aria-describedby from trigger on hide', function (assert) {
+    assert.expect(2)
+    var $trigger = $('<a href="#" rel="tooltip" title="Another tooltip"/>')
       .bootstrapTooltip()
       .appendTo('#qunit-fixture')
 
     $trigger.bootstrapTooltip('show')
-    ok($trigger[0].hasAttribute('aria-describedby'), 'trigger has aria-describedby')
+    assert.ok($trigger[0].hasAttribute('aria-describedby'), 'trigger has aria-describedby')
 
     $trigger.bootstrapTooltip('hide')
-    ok(!$trigger[0].hasAttribute('aria-describedby'), 'trigger does not have aria-describedby')
+    assert.ok(!$trigger[0].hasAttribute('aria-describedby'), 'trigger does not have aria-describedby')
   })
 
-  test('should assign a unique id tooltip element', function () {
-    $('<a href="#" rel="tooltip" title="Another tooltip">Tooltip trigger</a>')
+  QUnit.test('should assign a unique id tooltip element', function (assert) {
+    assert.expect(2)
+    $('<a href="#" rel="tooltip" title="Another tooltip"/>')
       .appendTo('#qunit-fixture')
       .bootstrapTooltip('show')
 
     var id = $('.tooltip').attr('id')
 
-    strictEqual($('#' + id).length, 1, 'tooltip has unique id')
-    strictEqual(id.indexOf('tooltip'), 0, 'tooltip id has prefix')
+    assert.strictEqual($('#' + id).length, 1, 'tooltip has unique id')
+    assert.strictEqual(id.indexOf('tooltip'), 0, 'tooltip id has prefix')
   })
 
-  test('should place tooltips relative to placement option', function () {
-    var $tooltip = $('<a href="#" rel="tooltip" title="Another tooltip">Tooltip trigger</a>')
+  QUnit.test('should place tooltips relative to placement option', function (assert) {
+    assert.expect(2)
+    var $tooltip = $('<a href="#" rel="tooltip" title="Another tooltip"/>')
       .appendTo('#qunit-fixture')
       .bootstrapTooltip({ placement: 'bottom' })
 
     $tooltip.bootstrapTooltip('show')
-    ok($('.tooltip').is('.fade.tooltip-bottom.in'), 'has correct classes applied')
+
+    assert
+      .ok($('.tooltip')
+      .is('.fade.bs-tether-element-attached-top.bs-tether-element-attached-center.in'), 'has correct classes applied')
 
     $tooltip.bootstrapTooltip('hide')
-    equal($('.tooltip').length, 0, 'tooltip removed')
+
+    assert.strictEqual($tooltip.data('bs.tooltip').tip.parentNode, null, 'tooltip removed')
   })
 
-  test('should allow html entities', function () {
-    var $tooltip = $('<a href="#" rel="tooltip" title="&lt;b&gt;@fat&lt;/b&gt;">Tooltip trigger</a>')
+  QUnit.test('should allow html entities', function (assert) {
+    assert.expect(2)
+    var $tooltip = $('<a href="#" rel="tooltip" title="&lt;b&gt;@fat&lt;/b&gt;"/>')
       .appendTo('#qunit-fixture')
       .bootstrapTooltip({ html: true })
 
     $tooltip.bootstrapTooltip('show')
-    notEqual($('.tooltip b').length, 0, 'b tag was inserted')
+    assert.notEqual($('.tooltip b').length, 0, 'b tag was inserted')
 
     $tooltip.bootstrapTooltip('hide')
-    equal($('.tooltip').length, 0, 'tooltip removed')
+    assert.strictEqual($tooltip.data('bs.tooltip').tip.parentNode, null, 'tooltip removed')
   })
 
-  test('should respect custom classes', function () {
-    var $tooltip = $('<a href="#" rel="tooltip" title="Another tooltip">Tooltip trigger</a>')
+  QUnit.test('should respect custom classes', function (assert) {
+    assert.expect(2)
+    var $tooltip = $('<a href="#" rel="tooltip" title="Another tooltip"/>')
       .appendTo('#qunit-fixture')
       .bootstrapTooltip({ template: '<div class="tooltip some-class"><div class="tooltip-arrow"/><div class="tooltip-inner"/></div>' })
 
     $tooltip.bootstrapTooltip('show')
-    ok($('.tooltip').hasClass('some-class'), 'custom class is present')
+    assert.ok($('.tooltip').hasClass('some-class'), 'custom class is present')
 
     $tooltip.bootstrapTooltip('hide')
-    equal($('.tooltip').length, 0, 'tooltip removed')
+    assert.strictEqual($tooltip.data('bs.tooltip').tip.parentNode, null, 'tooltip removed')
   })
 
-  test('should fire show event', function (assert) {
+  QUnit.test('should fire show event', function (assert) {
+    assert.expect(1)
     var done = assert.async()
 
-    $('<div title="tooltip title">Tooltip trigger</div>')
-      .appendTo('#qunit-fixture')
+    $('<div title="tooltip title"/>')
       .on('show.bs.tooltip', function () {
-        ok(true, 'show event fired')
+        assert.ok(true, 'show event fired')
         done()
       })
       .bootstrapTooltip('show')
   })
 
-  test('should fire shown event', function (assert) {
+  QUnit.test('should fire inserted event', function (assert) {
+    assert.expect(2)
     var done = assert.async()
 
-    $('<div title="tooltip title">Tooltip trigger</div>')
+    $('<div title="tooltip title"/>')
       .appendTo('#qunit-fixture')
-      .on('shown.bs.tooltip', function () {
-        ok(true, 'shown was called')
+      .on('inserted.bs.tooltip', function () {
+        assert.notEqual($('.tooltip').length, 0, 'tooltip was inserted')
+        assert.ok(true, 'inserted event fired')
         done()
       })
       .bootstrapTooltip('show')
   })
 
-  test('should not fire shown event when show was prevented', function (assert) {
+  QUnit.test('should fire shown event', function (assert) {
+    assert.expect(1)
     var done = assert.async()
 
-    $('<div title="tooltip title">Tooltip trigger</div>')
+    $('<div title="tooltip title"></div>')
       .appendTo('#qunit-fixture')
+      .on('shown.bs.tooltip', function () {
+        assert.ok(true, 'shown was called')
+        done()
+      })
+      .bootstrapTooltip('show')
+  })
+
+  QUnit.test('should not fire shown event when show was prevented', function (assert) {
+    assert.expect(1)
+    var done = assert.async()
+
+    $('<div title="tooltip title"/>')
       .on('show.bs.tooltip', function (e) {
         e.preventDefault()
-        ok(true, 'show event fired')
+        assert.ok(true, 'show event fired')
         done()
       })
       .on('shown.bs.tooltip', function () {
-        ok(false, 'shown event fired')
+        assert.ok(false, 'shown event fired')
       })
       .bootstrapTooltip('show')
   })
 
-  test('should fire hide event', function (assert) {
+  QUnit.test('should fire hide event', function (assert) {
+    assert.expect(1)
     var done = assert.async()
 
-    $('<div title="tooltip title">Tooltip trigger</div>')
+    $('<div title="tooltip title"/>')
       .appendTo('#qunit-fixture')
       .on('shown.bs.tooltip', function () {
         $(this).bootstrapTooltip('hide')
       })
       .on('hide.bs.tooltip', function () {
-        ok(true, 'hide event fired')
+        assert.ok(true, 'hide event fired')
         done()
       })
       .bootstrapTooltip('show')
   })
 
-  test('should fire hidden event', function (assert) {
+  QUnit.test('should fire hidden event', function (assert) {
+    assert.expect(1)
     var done = assert.async()
 
-    $('<div title="tooltip title">Tooltip trigger</div>')
+    $('<div title="tooltip title"/>')
       .appendTo('#qunit-fixture')
       .on('shown.bs.tooltip', function () {
         $(this).bootstrapTooltip('hide')
       })
       .on('hidden.bs.tooltip', function () {
-        ok(true, 'hidden event fired')
+        assert.ok(true, 'hidden event fired')
         done()
       })
       .bootstrapTooltip('show')
   })
 
-  test('should not fire hidden event when hide was prevented', function (assert) {
+  QUnit.test('should not fire hidden event when hide was prevented', function (assert) {
+    assert.expect(1)
     var done = assert.async()
 
-    $('<div title="tooltip title">Tooltip trigger</div>')
+    $('<div title="tooltip title"/>')
       .appendTo('#qunit-fixture')
       .on('shown.bs.tooltip', function () {
         $(this).bootstrapTooltip('hide')
       })
       .on('hide.bs.tooltip', function (e) {
         e.preventDefault()
-        ok(true, 'hide event fired')
+        assert.ok(true, 'hide event fired')
         done()
       })
       .on('hidden.bs.tooltip', function () {
-        ok(false, 'hidden event fired')
+        assert.ok(false, 'hidden event fired')
       })
       .bootstrapTooltip('show')
   })
 
-  test('should destroy tooltip', function () {
-    var $tooltip = $('<div>Tooltip trigger</div>')
-      .appendTo('#qunit-fixture')
+  QUnit.test('should destroy tooltip', function (assert) {
+    assert.expect(7)
+    var $tooltip = $('<div/>')
       .bootstrapTooltip()
       .on('click.foo', function () {})
 
-    ok($tooltip.data('bs.tooltip'), 'tooltip has data')
-    ok($._data($tooltip[0], 'events').mouseover && $._data($tooltip[0], 'events').mouseout, 'tooltip has hover events')
-    equal($._data($tooltip[0], 'events').click[0].namespace, 'foo', 'tooltip has extra click.foo event')
+    assert.ok($tooltip.data('bs.tooltip'), 'tooltip has data')
+    assert.ok($._data($tooltip[0], 'events').mouseover && $._data($tooltip[0], 'events').mouseout, 'tooltip has hover events')
+    assert.strictEqual($._data($tooltip[0], 'events').click[0].namespace, 'foo', 'tooltip has extra click.foo event')
 
     $tooltip.bootstrapTooltip('show')
-    $tooltip.bootstrapTooltip('destroy')
+    $tooltip.bootstrapTooltip('dispose')
 
-    ok(!$tooltip.hasClass('in'), 'tooltip is hidden')
-    ok(!$._data($tooltip[0], 'bs.tooltip'), 'tooltip does not have data')
-    equal($._data($tooltip[0], 'events').click[0].namespace, 'foo', 'tooltip still has click.foo')
-    ok(!$._data($tooltip[0], 'events').mouseover && !$._data($tooltip[0], 'events').mouseout, 'tooltip does not have hover events')
+    assert.ok(!$tooltip.hasClass('in'), 'tooltip is hidden')
+    assert.ok(!$._data($tooltip[0], 'bs.tooltip'), 'tooltip does not have data')
+    assert.strictEqual($._data($tooltip[0], 'events').click[0].namespace, 'foo', 'tooltip still has click.foo')
+    assert.ok(!$._data($tooltip[0], 'events').mouseover && !$._data($tooltip[0], 'events').mouseout, 'tooltip does not have hover events')
   })
 
-  test('should show tooltip with delegate selector on click', function () {
-    var $div = $('<div><a href="#" rel="tooltip" title="Another tooltip">Tooltip trigger</a></div>')
-      .appendTo('#qunit-fixture')
-      .bootstrapTooltip({
-        selector: 'a[rel="tooltip"]',
-        trigger: 'click'
-      })
+  // QUnit.test('should show tooltip with delegate selector on click', function (assert) {
+  //   assert.expect(2)
+  //   var $div = $('<div><a href="#" rel="tooltip" title="Another tooltip"/></div>')
+  //     .appendTo('#qunit-fixture')
+  //     .bootstrapTooltip({
+  //       selector: 'a[rel="tooltip"]',
+  //       trigger: 'click'
+  //     })
 
-    $div.find('a').click()
-    ok($('.tooltip').is('.fade.in'), 'tooltip is faded in')
+  //   $div.find('a').trigger('click')
+  //   assert.ok($('.tooltip').is('.fade.in'), 'tooltip is faded in')
 
-    $div.find('a').click()
-    equal($('.tooltip').length, 0, 'tooltip was removed from dom')
-  })
+  //   $div.find('a').trigger('click')
+  //   assert.strictEqual($div.data('bs.tooltip').tip.parentNode, null, 'tooltip removed')
+  // })
 
-  test('should show tooltip when toggle is called', function () {
-    $('<a href="#" rel="tooltip" title="tooltip on toggle">Tooltip trigger</a>')
+  QUnit.test('should show tooltip when toggle is called', function (assert) {
+    assert.expect(1)
+    $('<a href="#" rel="tooltip" title="tooltip on toggle"/>')
       .appendTo('#qunit-fixture')
       .bootstrapTooltip({ trigger: 'manual' })
       .bootstrapTooltip('toggle')
 
-    ok($('.tooltip').is('.fade.in'), 'tooltip is faded in')
+    assert.ok($('.tooltip').is('.fade.in'), 'tooltip is faded in')
   })
 
-  test('should hide previously shown tooltip when toggle is called on tooltip', function () {
+  QUnit.test('should hide previously shown tooltip when toggle is called on tooltip', function (assert) {
+    assert.expect(1)
     $('<a href="#" rel="tooltip" title="tooltip on toggle">@ResentedHook</a>')
       .appendTo('#qunit-fixture')
       .bootstrapTooltip({ trigger: 'manual' })
       .bootstrapTooltip('show')
 
     $('.tooltip').bootstrapTooltip('toggle')
-    ok($('.tooltip').not('.fade.in'), 'tooltip was faded out')
+    assert.ok($('.tooltip').not('.fade.in'), 'tooltip was faded out')
   })
 
-  test('should place tooltips inside body when container is body', function () {
-    var $tooltip = $('<a href="#" rel="tooltip" title="Another tooltip">Tooltip trigger</a>')
+  QUnit.test('should place tooltips inside body when container is body', function (assert) {
+    assert.expect(3)
+    var $tooltip = $('<a href="#" rel="tooltip" title="Another tooltip"/>')
       .appendTo('#qunit-fixture')
       .bootstrapTooltip({ container: 'body' })
       .bootstrapTooltip('show')
 
-    notEqual($('body > .tooltip').length, 0, 'tooltip is direct descendant of body')
-    equal($('#qunit-fixture > .tooltip').length, 0, 'tooltip is not in parent')
+    assert.notEqual($('body > .tooltip').length, 0, 'tooltip is direct descendant of body')
+    assert.strictEqual($('#qunit-fixture > .tooltip').length, 0, 'tooltip is not in parent')
 
     $tooltip.bootstrapTooltip('hide')
-    equal($('body > .tooltip').length, 0, 'tooltip was removed from dom')
+    assert.strictEqual($('body > .tooltip').length, 0, 'tooltip was removed from dom')
   })
 
-  test('should add position class before positioning so that position-specific styles are taken into account', function () {
+  QUnit.test('should add position class before positioning so that position-specific styles are taken into account', function (assert) {
+    assert.expect(1)
     var styles = '<style>'
-        + '.tooltip.tooltip-right { white-space: nowrap; }'
-        + '.tooltip.tooltip-right .tooltip-inner { max-width: none; }'
-        + '</style>'
+      + '.tooltip.right { white-space: nowrap; }'
+      + '.tooltip.right .tooltip-inner { max-width: none; }'
+      + '</style>'
     var $styles = $(styles).appendTo('head')
 
     var $container = $('<div/>').appendTo('#qunit-fixture')
-    var $target = $('<a href="#" rel="tooltip" title="very very very very very very very very long tooltip in one line">m</a>')
+    var $target = $('<a href="#" rel="tooltip" title="very very very very very very very very long tooltip in one line"/>')
       .appendTo($container)
       .bootstrapTooltip({
-        placement: 'right',
-        viewport: null
+        placement: 'right'
       })
       .bootstrapTooltip('show')
-    var $tooltip = $container.find('.tooltip')
+
+    var $tooltip = $($target.data('bs.tooltip').tip)
 
     // this is some dumb hack shit because sub pixels in firefox
     var top = Math.round($target.offset().top + ($target[0].offsetHeight / 2) - ($tooltip[0].offsetHeight / 2))
     var top2 = Math.round($tooltip.offset().top)
     var topDiff = top - top2
-    ok(topDiff <= 1 && topDiff >= -1)
+    assert.ok(topDiff <= 1 && topDiff >= -1)
     $target.bootstrapTooltip('hide')
 
     $container.remove()
     $styles.remove()
   })
 
-  test('should use title attribute for tooltip text', function () {
-    var $tooltip = $('<a href="#" rel="tooltip" title="Simple tooltip">Tooltip trigger</a>')
+  QUnit.test('should use title attribute for tooltip text', function (assert) {
+    assert.expect(2)
+    var $tooltip = $('<a href="#" rel="tooltip" title="Simple tooltip"/>')
       .appendTo('#qunit-fixture')
       .bootstrapTooltip()
 
     $tooltip.bootstrapTooltip('show')
-    equal($('.tooltip').children('.tooltip-inner').text(), 'Simple tooltip', 'title from title attribute is set')
+    assert.strictEqual($('.tooltip').children('.tooltip-inner').text(), 'Simple tooltip', 'title from title attribute is set')
 
     $tooltip.bootstrapTooltip('hide')
-    equal($('.tooltip').length, 0, 'tooltip removed from dom')
+    assert.strictEqual($('.tooltip').length, 0, 'tooltip removed from dom')
   })
 
-  test('should prefer title attribute over title option', function () {
-    var $tooltip = $('<a href="#" rel="tooltip" title="Simple tooltip">Tooltip trigger</a>')
+  QUnit.test('should prefer title attribute over title option', function (assert) {
+    assert.expect(2)
+    var $tooltip = $('<a href="#" rel="tooltip" title="Simple tooltip"/>')
       .appendTo('#qunit-fixture')
       .bootstrapTooltip({
         title: 'This is a tooltip with some content'
       })
 
     $tooltip.bootstrapTooltip('show')
-    equal($('.tooltip').children('.tooltip-inner').text(), 'Simple tooltip', 'title is set from title attribute while preferred over title option')
+    assert.strictEqual($('.tooltip').children('.tooltip-inner').text(), 'Simple tooltip', 'title is set from title attribute while preferred over title option')
 
     $tooltip.bootstrapTooltip('hide')
-    equal($('.tooltip').length, 0, 'tooltip removed from dom')
+    assert.strictEqual($('.tooltip').length, 0, 'tooltip removed from dom')
   })
 
-  test('should use title option', function () {
-    var $tooltip = $('<a href="#" rel="tooltip">Tooltip trigger</a>')
+  QUnit.test('should use title option', function (assert) {
+    assert.expect(2)
+    var $tooltip = $('<a href="#" rel="tooltip"/>')
       .appendTo('#qunit-fixture')
       .bootstrapTooltip({
         title: 'This is a tooltip with some content'
       })
 
     $tooltip.bootstrapTooltip('show')
-    equal($('.tooltip').children('.tooltip-inner').text(), 'This is a tooltip with some content', 'title from title option is set')
+    assert.strictEqual($('.tooltip').children('.tooltip-inner').text(), 'This is a tooltip with some content', 'title from title option is set')
 
     $tooltip.bootstrapTooltip('hide')
-    equal($('.tooltip').length, 0, 'tooltip removed from dom')
-  })
-
-  test('should be placed dynamically with the dynamic placement option', function () {
-    var $style = $('<style> a[rel="tooltip"] { display: inline-block; position: absolute; } </style>')
-    var $container = $('<div/>')
-      .css({
-        position: 'absolute',
-        overflow: 'hidden',
-        width: 600,
-        height: 400,
-        top: 0,
-        left: 0
-      })
-      .appendTo(document.body)
-
-    var $topTooltip = $('<div style="left: 0; top: 0;" rel="tooltip" title="Top tooltip">Top Dynamic Tooltip</div>')
-      .appendTo($container)
-      .bootstrapTooltip({ placement: 'auto' })
-
-    $topTooltip.bootstrapTooltip('show')
-    ok($('.tooltip').is('.tooltip-bottom'), 'top positioned tooltip is dynamically positioned to bottom')
-
-    $topTooltip.bootstrapTooltip('hide')
-    equal($('.tooltip').length, 0, 'top positioned tooltip removed from dom')
-
-    var $rightTooltip = $('<div style="right: 0;" rel="tooltip" title="Right tooltip">Right Dynamic Tooltip</div>')
-      .appendTo($container)
-      .bootstrapTooltip({ placement: 'right auto' })
-
-    $rightTooltip.bootstrapTooltip('show')
-    ok($('.tooltip').is('.tooltip-left'), 'right positioned tooltip is dynamically positioned left')
-
-    $rightTooltip.bootstrapTooltip('hide')
-    equal($('.tooltip').length, 0, 'right positioned tooltip removed from dom')
-
-    var $leftTooltip = $('<div style="left: 0;" rel="tooltip" title="Left tooltip">Left Dynamic Tooltip</div>')
-      .appendTo($container)
-      .bootstrapTooltip({ placement: 'auto left' })
-
-    $leftTooltip.bootstrapTooltip('show')
-    ok($('.tooltip').is('.tooltip-right'), 'left positioned tooltip is dynamically positioned right')
-
-    $leftTooltip.bootstrapTooltip('hide')
-    equal($('.tooltip').length, 0, 'left positioned tooltip removed from dom')
-
-    $container.remove()
-    $style.remove()
-  })
-
-  test('should position tip on top if viewport has enough space and placement is "auto top"', function () {
-    var styles = '<style>'
-        + 'body { padding-top: 100px; }'
-        + '#section { height: 300px; border: 1px solid red; padding-top: 50px }'
-        + 'div[rel="tooltip"] { width: 150px; border: 1px solid blue; }'
-        + '</style>'
-    var $styles = $(styles).appendTo('head')
-
-    var $container = $('<div id="section"/>').appendTo('#qunit-fixture')
-    var $target = $('<div rel="tooltip" title="tip"/>')
-      .appendTo($container)
-      .bootstrapTooltip({
-        placement: 'auto top',
-        viewport: '#section'
-      })
-
-    $target.bootstrapTooltip('show')
-    ok($('.tooltip').is('.tooltip-top'), 'top positioned tooltip is dynamically positioned to top')
-
-    $target.bootstrapTooltip('hide')
-    equal($('.tooltip').length, 0, 'tooltip removed from dom')
-
-    $styles.remove()
-  })
-
-  test('should position tip on bottom if the tip\'s dimension exceeds the viewport area and placement is "auto top"', function () {
-    var styles = '<style>'
-        + 'body { padding-top: 100px; }'
-        + '#section { height: 300px; border: 1px solid red; }'
-        + 'div[rel="tooltip"] { width: 150px; border: 1px solid blue; }'
-        + '</style>'
-    var $styles = $(styles).appendTo('head')
-
-    var $container = $('<div id="section"/>').appendTo('#qunit-fixture')
-    var $target = $('<div rel="tooltip" title="tip"/>')
-      .appendTo($container)
-      .bootstrapTooltip({
-        placement: 'auto top',
-        viewport: '#section'
-      })
-
-    $target.bootstrapTooltip('show')
-    ok($('.tooltip').is('.tooltip-bottom'), 'top positioned tooltip is dynamically positioned to bottom')
-
-    $target.bootstrapTooltip('hide')
-    equal($('.tooltip').length, 0, 'tooltip removed from dom')
-
-    $styles.remove()
-  })
-
-  test('should display the tip on top whenever scrollable viewport has enough room if the given placement is "auto top"', function () {
-    var styles = '<style>'
-        + '#scrollable-div { height: 200px; overflow: auto; }'
-        + '.tooltip-item { margin: 200px 0 400px; width: 150px; }'
-        + '</style>'
-    var $styles = $(styles).appendTo('head')
-
-    var $container = $('<div id="scrollable-div"/>').appendTo('#qunit-fixture')
-    var $target = $('<div rel="tooltip" title="tip" class="tooltip-item">Tooltip Item</div>')
-      .appendTo($container)
-      .bootstrapTooltip({
-        placement: 'top auto',
-        viewport: '#scrollable-div'
-      })
-
-    $('#scrollable-div').scrollTop(100)
-
-    $target.bootstrapTooltip('show')
-    ok($('.tooltip').is('.fade.tooltip-top.in'), 'has correct classes applied')
-
-    $target.bootstrapTooltip('hide')
-    equal($('.tooltip').length, 0, 'tooltip removed from dom')
-
-    $styles.remove()
+    assert.strictEqual($('.tooltip').length, 0, 'tooltip removed from dom')
   })
 
-  test('should display the tip on bottom whenever scrollable viewport doesn\'t have enough room if the given placement is "auto top"', function () {
-    var styles = '<style>'
-        + '#scrollable-div { height: 200px; overflow: auto; }'
-        + '.tooltip-item { padding: 200px 0 400px; width: 150px; }'
-        + '</style>'
-    var $styles = $(styles).appendTo('head')
-
-    var $container = $('<div id="scrollable-div"/>').appendTo('#qunit-fixture')
-    var $target = $('<div rel="tooltip" title="tip" class="tooltip-item">Tooltip Item</div>')
-      .appendTo($container)
-      .bootstrapTooltip({
-        placement: 'top auto',
-        viewport: '#scrollable-div'
-      })
-
-    $('#scrollable-div').scrollTop(200)
-
-    $target.bootstrapTooltip('show')
-    ok($('.tooltip').is('.fade.tooltip-bottom.in'), 'has correct classes applied')
-
-    $target.bootstrapTooltip('hide')
-    equal($('.tooltip').length, 0, 'tooltip removed from dom')
-
-    $styles.remove()
-  })
-
-  test('should display the tip on bottom whenever scrollable viewport has enough room if the given placement is "auto bottom"', function () {
-    var styles = '<style>'
-        + '#scrollable-div { height: 200px; overflow: auto; }'
-        + '.spacer { height: 400px; }'
-        + '.spacer:first-child { height: 200px; }'
-        + '.tooltip-item { width: 150px; }'
-        + '</style>'
-    var $styles = $(styles).appendTo('head')
-
-    var $container = $('<div id="scrollable-div"/>').appendTo('#qunit-fixture')
-    var $target = $('<div rel="tooltip" title="tip" class="tooltip-item">Tooltip Item</div>')
-      .appendTo($container)
-      .before('<div class="spacer"/>')
-      .after('<div class="spacer"/>')
-      .bootstrapTooltip({
-        placement: 'bottom auto',
-        viewport: '#scrollable-div'
-      })
-
-    $('#scrollable-div').scrollTop(200)
-
-    $target.bootstrapTooltip('show')
-    ok($('.tooltip').is('.fade.tooltip-bottom.in'), 'has correct classes applied')
-
-    $target.bootstrapTooltip('hide')
-    equal($('.tooltip').length, 0, 'tooltip removed from dom')
-
-    $styles.remove()
-  })
-
-  test('should display the tip on top whenever scrollable viewport doesn\'t have enough room if the given placement is "auto bottom"', function () {
-    var styles = '<style>'
-        + '#scrollable-div { height: 200px; overflow: auto; }'
-        + '.tooltip-item { margin-top: 400px; width: 150px; }'
-        + '</style>'
-    var $styles = $(styles).appendTo('head')
-
-    var $container = $('<div id="scrollable-div"/>').appendTo('#qunit-fixture')
-    var $target = $('<div rel="tooltip" title="tip" class="tooltip-item">Tooltip Item</div>')
-      .appendTo($container)
-      .bootstrapTooltip({
-        placement: 'bottom auto',
-        viewport: '#scrollable-div'
-      })
-
-    $('#scrollable-div').scrollTop(400)
-
-    $target.bootstrapTooltip('show')
-    ok($('.tooltip').is('.fade.tooltip-top.in'), 'has correct classes applied')
-
-    $target.bootstrapTooltip('hide')
-    equal($('.tooltip').length, 0, 'tooltip removed from dom')
-
-    $styles.remove()
-  })
-
-  test('should adjust the tip\'s top position when up against the top of the viewport', function () {
-    var styles = '<style>'
-        + '.tooltip .tooltip-inner { width: 200px; height: 200px; max-width: none; }'
-        + 'a[rel="tooltip"] { position: fixed; }'
-        + '</style>'
-    var $styles = $(styles).appendTo('head')
-
-    var $container = $('<div/>').appendTo('#qunit-fixture')
-    var $target = $('<a href="#" rel="tooltip" title="tip" style="top: 0px; left: 0px;">m</a>')
-      .appendTo($container)
-      .bootstrapTooltip({
-        placement: 'right',
-        viewport: {
-          selector: 'body',
-          padding: 12
-        }
-      })
-
-    $target.bootstrapTooltip('show')
-    equal(Math.round($container.find('.tooltip').offset().top), 12)
-
-    $target.bootstrapTooltip('hide')
-    equal($('.tooltip').length, 0, 'tooltip removed from dom')
-
-    $styles.remove()
-  })
-
-  test('should adjust the tip\'s top position when up against the bottom of the viewport', function () {
-    var styles = '<style>'
-        + '.tooltip .tooltip-inner { width: 200px; height: 200px; max-width: none; }'
-        + 'a[rel="tooltip"] { position: fixed; }'
-        + '</style>'
-    var $styles = $(styles).appendTo('head')
-
-    var $container = $('<div/>').appendTo('#qunit-fixture')
-    var $target = $('<a href="#" rel="tooltip" title="tip" style="bottom: 0px; left: 0px;">m</a>')
-      .appendTo($container)
-      .bootstrapTooltip({
-        placement: 'right',
-        viewport: {
-          selector: 'body',
-          padding: 12
-        }
-      })
-
-    $target.bootstrapTooltip('show')
-    var $tooltip = $container.find('.tooltip')
-    strictEqual(Math.round($tooltip.offset().top), Math.round($(window).height() - 12 - $tooltip[0].offsetHeight))
-
-    $target.bootstrapTooltip('hide')
-    equal($('.tooltip').length, 0, 'tooltip removed from dom')
-
-    $container.remove()
-    $styles.remove()
-  })
-
-  test('should adjust the tip\'s left position when up against the left of the viewport', function () {
-    var styles = '<style>'
-        + '.tooltip .tooltip-inner { width: 200px; height: 200px; max-width: none; }'
-        + 'a[rel="tooltip"] { position: fixed; }'
-        + '</style>'
-    var $styles = $(styles).appendTo('head')
-
-    var $container = $('<div/>').appendTo('#qunit-fixture')
-    var $target = $('<a href="#" rel="tooltip" title="tip" style="top: 0px; left: 0px;">m</a>')
-      .appendTo($container)
-      .bootstrapTooltip({
-        placement: 'bottom',
-        viewport: {
-          selector: 'body',
-          padding: 12
-        }
-      })
-
-    $target.bootstrapTooltip('show')
-    strictEqual(Math.round($container.find('.tooltip').offset().left), 12)
-
-    $target.bootstrapTooltip('hide')
-    equal($('.tooltip').length, 0, 'tooltip removed from dom')
-
-    $container.remove()
-    $styles.remove()
-  })
-
-  test('should adjust the tip\'s left position when up against the right of the viewport', function () {
-    var styles = '<style>'
-        + '.tooltip .tooltip-inner { width: 200px; height: 200px; max-width: none; }'
-        + 'a[rel="tooltip"] { position: fixed; }'
-        + '</style>'
-    var $styles = $(styles).appendTo('head')
-
-    var $container = $('<div/>').appendTo('body')
-    var $target = $('<a href="#" rel="tooltip" title="tip" style="top: 0px; right: 0px;">m</a>')
-      .appendTo($container)
-      .bootstrapTooltip({
-        placement: 'bottom',
-        viewport: {
-          selector: 'body',
-          padding: 12
-        }
-      })
-
-    $target.bootstrapTooltip('show')
-    var $tooltip = $container.find('.tooltip')
-    strictEqual(Math.round($tooltip.offset().left), Math.round($(window).width() - 12 - $tooltip[0].offsetWidth))
-
-    $target.bootstrapTooltip('hide')
-    equal($('.tooltip').length, 0, 'tooltip removed from dom')
-
-    $container.remove()
-    $styles.remove()
-  })
-
-  test('should adjust the tip when up against the right of an arbitrary viewport', function () {
-    var styles = '<style>'
-        + '.tooltip, .tooltip .tooltip-inner { width: 200px; height: 200px; max-width: none; }'
-        + '.container-viewport { position: absolute; top: 50px; left: 60px; width: 300px; height: 300px; }'
-        + 'a[rel="tooltip"] { position: fixed; }'
-        + '</style>'
-    var $styles = $(styles).appendTo('head')
-
-    var $container = $('<div class="container-viewport"/>').appendTo(document.body)
-    var $target = $('<a href="#" rel="tooltip" title="tip" style="top: 50px; left: 350px;">m</a>')
-      .appendTo($container)
-      .bootstrapTooltip({
-        placement: 'bottom',
-        viewport: '.container-viewport'
-      })
-
-    $target.bootstrapTooltip('show')
-    var $tooltip = $container.find('.tooltip')
-    strictEqual(Math.round($tooltip.offset().left), Math.round(60 + $container.width() - $tooltip[0].offsetWidth))
-
-    $target.bootstrapTooltip('hide')
-    equal($('.tooltip').length, 0, 'tooltip removed from dom')
-
-    $container.remove()
-    $styles.remove()
-  })
-
-  test('should not error when trying to show an auto-placed tooltip that has been removed from the dom', function () {
+  QUnit.test('should not error when trying to show an top-placed tooltip that has been removed from the dom', function (assert) {
+    assert.expect(1)
     var passed = true
-    var $tooltip = $('<a href="#" rel="tooltip" title="Another tooltip">Tooltip trigger</a>')
+    var $tooltip = $('<a href="#" rel="tooltip" title="Another tooltip"/>')
       .appendTo('#qunit-fixture')
       .one('show.bs.tooltip', function () {
         $(this).remove()
       })
-      .bootstrapTooltip({ placement: 'auto' })
+      .bootstrapTooltip({ placement: 'top' })
 
     try {
       $tooltip.bootstrapTooltip('show')
@@ -699,10 +398,11 @@ $(function () {
       console.log(err)
     }
 
-    ok(passed, '.tooltip(\'show\') should not throw an error if element no longer is in dom')
+    assert.ok(passed, '.tooltip(\'show\') should not throw an error if element no longer is in dom')
   })
 
-  test('should place tooltip on top of element', function (assert) {
+  QUnit.test('should place tooltip on top of element', function (assert) {
+    assert.expect(1)
     var done = assert.async()
 
     var containerHTML = '<div>'
@@ -731,102 +431,74 @@ $(function () {
       })
       .bootstrapTooltip('show')
 
-    var $tooltip = $container.find('.tooltip')
+    var $tooltip = $($trigger.data('bs.tooltip').tip)
 
     setTimeout(function () {
-      ok(Math.round($tooltip.offset().top + $tooltip.outerHeight()) <= Math.round($trigger.offset().top))
+      assert.ok(Math.round($tooltip.offset().top + $tooltip.outerHeight()) <= Math.round($trigger.offset().top))
       done()
     }, 0)
   })
 
-  test('should place tooltip inside viewport', function (assert) {
+  QUnit.test('should show tooltip if leave event hasn\'t occurred before delay expires', function (assert) {
+    assert.expect(2)
     var done = assert.async()
 
-    var $container = $('<div/>')
-      .css({
-        position: 'absolute',
-        width: 200,
-        height: 200,
-        bottom: 0,
-        left: 0
-      })
-      .appendTo('#qunit-fixture')
-
-    $('<a href="#" title="Very very very very very very very very long tooltip">Hover me</a>')
-      .css({
-        position: 'absolute',
-        top: 0,
-        left: 0
-      })
-      .appendTo($container)
-      .bootstrapTooltip({
-        placement: 'top'
-      })
-      .bootstrapTooltip('show')
-
-    setTimeout(function () {
-      ok($('.tooltip').offset().left >= 0)
-      done()
-    }, 0)
-  })
-
-  test('should show tooltip if leave event hasn\'t occurred before delay expires', function (assert) {
-    var done = assert.async()
-
-    var $tooltip = $('<a href="#" rel="tooltip" title="Another tooltip">Tooltip trigger</a>')
+    var $tooltip = $('<a href="#" rel="tooltip" title="Another tooltip"/>')
       .appendTo('#qunit-fixture')
       .bootstrapTooltip({ delay: 150 })
 
     setTimeout(function () {
-      ok(!$('.tooltip').is('.fade.in'), '100ms: tooltip is not faded in')
+      assert.ok(!$('.tooltip').is('.fade.in'), '100ms: tooltip is not faded in')
     }, 100)
 
     setTimeout(function () {
-      ok($('.tooltip').is('.fade.in'), '200ms: tooltip is faded in')
+      assert.ok($('.tooltip').is('.fade.in'), '200ms: tooltip is faded in')
       done()
     }, 200)
 
     $tooltip.trigger('mouseenter')
   })
 
-  test('should not show tooltip if leave event occurs before delay expires', function (assert) {
+  QUnit.test('should not show tooltip if leave event occurs before delay expires', function (assert) {
+    assert.expect(2)
     var done = assert.async()
 
-    var $tooltip = $('<a href="#" rel="tooltip" title="Another tooltip">Tooltip trigger</a>')
+    var $tooltip = $('<a href="#" rel="tooltip" title="Another tooltip"/>')
       .appendTo('#qunit-fixture')
       .bootstrapTooltip({ delay: 150 })
 
     setTimeout(function () {
-      ok(!$('.tooltip').is('.fade.in'), '100ms: tooltip not faded in')
+      assert.ok(!$('.tooltip').is('.fade.in'), '100ms: tooltip not faded in')
       $tooltip.trigger('mouseout')
     }, 100)
 
     setTimeout(function () {
-      ok(!$('.tooltip').is('.fade.in'), '200ms: tooltip not faded in')
+      assert.ok(!$('.tooltip').is('.fade.in'), '200ms: tooltip not faded in')
       done()
     }, 200)
 
     $tooltip.trigger('mouseenter')
   })
 
-  test('should not hide tooltip if leave event occurs and enter event occurs within the hide delay', function (assert) {
+  QUnit.test('should not hide tooltip if leave event occurs and enter event occurs within the hide delay', function (assert) {
+    assert.expect(3)
     var done = assert.async()
 
-    var $tooltip = $('<a href="#" rel="tooltip" title="Another tooltip">Tooltip trigger</a>')
+    var $tooltip = $('<a href="#" rel="tooltip" title="Another tooltip"/>')
       .appendTo('#qunit-fixture')
       .bootstrapTooltip({ delay: { show: 0, hide: 150 }})
 
     setTimeout(function () {
-      ok($('.tooltip').is('.fade.in'), '1ms: tooltip faded in')
+      assert.ok($('.tooltip').is('.fade.in'), '1ms: tooltip faded in')
       $tooltip.trigger('mouseout')
 
       setTimeout(function () {
-        ok($('.tooltip').is('.fade.in'), '100ms: tooltip still faded in')
+        assert.ok($('.tooltip').is('.fade.in'), '100ms: tooltip still faded in')
         $tooltip.trigger('mouseenter')
       }, 100)
 
       setTimeout(function () {
-        ok($('.tooltip').is('.fade.in'), '200ms: tooltip still faded in')
+        assert.ok($('.tooltip').is('.fade.in'), '200ms: tooltip still faded in')
         done()
       }, 200)
     }, 0)
@@ -834,65 +506,68 @@ $(function () {
     $tooltip.trigger('mouseenter')
   })
 
-  test('should not show tooltip if leave event occurs before delay expires', function (assert) {
+  QUnit.test('should not show tooltip if leave event occurs before delay expires', function (assert) {
+    assert.expect(2)
     var done = assert.async()
 
-    var $tooltip = $('<a href="#" rel="tooltip" title="Another tooltip">Tooltip trigger</a>')
+    var $tooltip = $('<a href="#" rel="tooltip" title="Another tooltip"/>')
       .appendTo('#qunit-fixture')
       .bootstrapTooltip({ delay: 150 })
 
     setTimeout(function () {
-      ok(!$('.tooltip').is('.fade.in'), '100ms: tooltip not faded in')
+      assert.ok(!$('.tooltip').is('.fade.in'), '100ms: tooltip not faded in')
       $tooltip.trigger('mouseout')
     }, 100)
 
     setTimeout(function () {
-      ok(!$('.tooltip').is('.fade.in'), '200ms: tooltip not faded in')
+      assert.ok(!$('.tooltip').is('.fade.in'), '200ms: tooltip not faded in')
       done()
     }, 200)
 
     $tooltip.trigger('mouseenter')
   })
 
-  test('should not show tooltip if leave event occurs before delay expires, even if hide delay is 0', function (assert) {
+  QUnit.test('should not show tooltip if leave event occurs before delay expires, even if hide delay is 0', function (assert) {
+    assert.expect(2)
     var done = assert.async()
 
-    var $tooltip = $('<a href="#" rel="tooltip" title="Another tooltip">Tooltip trigger</a>')
+    var $tooltip = $('<a href="#" rel="tooltip" title="Another tooltip"/>')
       .appendTo('#qunit-fixture')
       .bootstrapTooltip({ delay: { show: 150, hide: 0 }})
 
     setTimeout(function () {
-      ok(!$('.tooltip').is('.fade.in'), '100ms: tooltip not faded in')
+      assert.ok(!$('.tooltip').is('.fade.in'), '100ms: tooltip not faded in')
       $tooltip.trigger('mouseout')
     }, 100)
 
     setTimeout(function () {
-      ok(!$('.tooltip').is('.fade.in'), '250ms: tooltip not faded in')
+      assert.ok(!$('.tooltip').is('.fade.in'), '250ms: tooltip not faded in')
       done()
     }, 250)
 
     $tooltip.trigger('mouseenter')
   })
 
-  test('should wait 200ms before hiding the tooltip', function (assert) {
+  QUnit.test('should wait 200ms before hiding the tooltip', function (assert) {
+    assert.expect(3)
     var done = assert.async()
 
-    var $tooltip = $('<a href="#" rel="tooltip" title="Another tooltip">Tooltip trigger</a>')
+    var $tooltip = $('<a href="#" rel="tooltip" title="Another tooltip"/>')
       .appendTo('#qunit-fixture')
       .bootstrapTooltip({ delay: { show: 0, hide: 150 }})
 
     setTimeout(function () {
-      ok($('.tooltip').is('.fade.in'), '1ms: tooltip faded in')
+      assert.ok($($tooltip.data('bs.tooltip').tip).is('.fade.in'), '1ms: tooltip faded in')
 
       $tooltip.trigger('mouseout')
 
       setTimeout(function () {
-        ok($('.tooltip').is('.fade.in'), '100ms: tooltip still faded in')
+        assert.ok($($tooltip.data('bs.tooltip').tip).is('.fade.in'), '100ms: tooltip still faded in')
       }, 100)
 
       setTimeout(function () {
-        ok(!$('.tooltip').is('.in'), '200ms: tooltip removed')
-        start()
+        assert.ok(!$($tooltip.data('bs.tooltip').tip).is('.in'), '200ms: tooltip removed')
+        done()
       }, 200)
 
     }, 0)
@@ -900,12 +575,13 @@ $(function () {
     $tooltip.trigger('mouseenter')
   })
 
-  test('should correctly position tooltips on SVG elements', function (assert) {
+  QUnit.test('should correctly position tooltips on SVG elements', function (assert) {
     if (!window.SVGElement) {
       // Skip IE8 since it doesn't support SVG
-      expect(0)
+      assert.expect(0)
       return
     }
+    assert.expect(2)
 
     var done = assert.async()
 
@@ -928,60 +604,20 @@ $(function () {
       .on('shown.bs.tooltip', function () {
         var offset = $('.tooltip').offset()
         $styles.remove()
-        ok(Math.abs(offset.left - 88) <= 1, 'tooltip has correct horizontal location')
+        assert.ok(Math.abs(offset.left - 88) <= 1, 'tooltip has correct horizontal location')
         $circle.bootstrapTooltip('hide')
-        equal($('.tooltip').length, 0, 'tooltip removed from dom')
+        assert.strictEqual($('.tooltip').length, 0, 'tooltip removed from dom')
         done()
       })
-      .bootstrapTooltip({ container: 'body', placement: 'top', trigger: 'manual' })
+      .bootstrapTooltip({ placement: 'top', trigger: 'manual' })
 
     $circle.bootstrapTooltip('show')
   })
 
-  test('should correctly determine auto placement based on container rather than parent', function (assert) {
-    var done = assert.async()
-
-    var styles = '<style>'
-        + '.tooltip, .tooltip *, .tooltip *:before, .tooltip *:after { box-sizing: border-box; }'
-        + '.tooltip { position: absolute; display: block; font-size: 12px; line-height: 1.4; }'
-        + '.tooltip .tooltip-inner { max-width: 200px; padding: 3px 8px; font-family: Helvetica; text-align: center; }'
-        + '#trigger-parent {'
-        + '  position: fixed;'
-        + '  top: 100px;'
-        + '  right: 17px;'
-        + '}'
-        + '</style>'
-    var $styles = $(styles).appendTo('head')
-
-    $('#qunit-fixture').append('<span id="trigger-parent"><a id="tt-trigger" title="If a_larger_text is written here, it won\'t fit using older broken version of BS">HOVER OVER ME</a></span>')
-    var $trigger = $('#tt-trigger')
-
-    $trigger
-      .on('shown.bs.tooltip', function () {
-        var $tip = $('.tooltip-inner')
-        var tipXrightEdge = $tip.offset().left + $tip.width()
-        var triggerXleftEdge = $trigger.offset().left
-        ok(tipXrightEdge < triggerXleftEdge, 'tooltip with auto left placement, when near the right edge of the viewport, gets left placement')
-        $trigger.bootstrapTooltip('hide')
-      })
-      .on('hidden.bs.tooltip', function () {
-        $styles.remove()
-        $(this).remove()
-        equal($('.tooltip').length, 0, 'tooltip removed from dom')
-        done()
-      })
-      .bootstrapTooltip({
-        container: 'body',
-        placement: 'auto left',
-        trigger: 'manual'
-      })
-
-    $trigger.bootstrapTooltip('show')
-  })
-
-  test('should not reload the tooltip on subsequent mouseenter events', function () {
+  QUnit.test('should not reload the tooltip on subsequent mouseenter events', function (assert) {
+    assert.expect(1)
     var titleHtml = function () {
-      var uid = 'fatTooltip'
+      var uid = Util.getUID('tooltip')
       return '<p id="tt-content">' + uid + '</p><p>' + uid + '</p><p>' + uid + '</p>'
     }
 
@@ -1002,12 +638,14 @@ $(function () {
     var currentUid = $('#tt-content').text()
 
     $('#tt-content').trigger('mouseenter')
-    equal(currentUid, $('#tt-content').text())
+    assert.strictEqual(currentUid, $('#tt-content').text())
   })
 
-  test('should not reload the tooltip if the mouse leaves and re-enters before hiding', function () {
+  QUnit.test('should not reload the tooltip if the mouse leaves and re-enters before hiding', function (assert) {
+    assert.expect(4)
+
     var titleHtml = function () {
-      var uid = 'fatTooltip'
+      var uid = Util.getUID('tooltip')
       return '<p id="tt-content">' + uid + '</p><p>' + uid + '</p><p>' + uid + '</p>'
     }
 
@@ -1019,7 +657,6 @@ $(function () {
       animation: false,
       trigger: 'hover',
       delay: { show: 0, hide: 500 },
-      container: $tooltip,
       title: titleHtml
     })
 
@@ -1030,56 +667,23 @@ $(function () {
     var currentUid = $('#tt-content').text()
 
     $('#tt-outer').trigger('mouseleave')
-    equal(currentUid, $('#tt-content').text())
-
-    debugger
-
-    ok(obj.getHoverState() == 'out', 'the tooltip hoverState should be set to "out"')
-
-    $('#tt-content').trigger('mouseenter')
-    ok(obj.getHoverState() == 'in', 'the tooltip hoverState should be set to "in"')
+    assert.strictEqual(currentUid, $('#tt-content').text())
 
-    equal(currentUid, $('#tt-content').text())
-  })
+    assert.ok(obj._hoverState == 'out', 'the tooltip hoverState should be set to "out"')
 
-  test('should position arrow correctly when tooltip is moved to not appear offscreen', function (assert) {
-    var done = assert.async()
-
-    var styles = '<style>'
-        + '.tooltip, .tooltip *, .tooltip *:before, .tooltip *:after { box-sizing: border-box; }'
-        + '.tooltip { position: absolute; }'
-        + '.tooltip-arrow { position: absolute; width: 0; height: 0; }'
-        + '.tooltip .tooltip-inner { max-width: 200px; padding: 3px 8px; }'
-        + '</style>'
-    var $styles = $(styles).appendTo('head')
+    $('#tt-outer').trigger('mouseenter')
+    assert.ok(obj._hoverState == 'in', 'the tooltip hoverState should be set to "in"')
 
-    $('<a href="#" title="tooltip title" style="position: absolute; bottom: 0; right: 0;">Foobar</a>')
-      .appendTo('body')
-      .on('shown.bs.tooltip', function () {
-        var arrowStyles = $('.tooltip').find('.tooltip-arrow').attr('style')
-        ok(/left/i.test(arrowStyles) && !/top/i.test(arrowStyles), 'arrow positioned correctly')
-        $(this).bootstrapTooltip('hide')
-      })
-      .on('hidden.bs.tooltip', function () {
-        $styles.remove()
-        $(this).remove()
-        equal($('.tooltip').length, 0, 'tooltip removed from dom')
-        done()
-      })
-      .bootstrapTooltip({
-        container: 'body',
-        placement: 'top',
-        trigger: 'manual'
-      })
-      .bootstrapTooltip('show')
+    assert.strictEqual(currentUid, $('#tt-content').text())
   })
 
-  test('should correctly position tooltips on transformed elements', function (assert) {
+  QUnit.test('should correctly position tooltips on transformed elements', function (assert) {
     var styleProps = document.documentElement.style
     if (!('transform' in styleProps) && !('webkitTransform' in styleProps) && !('msTransform' in styleProps)) {
-      expect(0)
+      assert.expect(0)
       return
     }
+    assert.expect(2)
 
     var done = assert.async()
 
@@ -1092,35 +696,72 @@ $(function () {
         + '</style>'
     var $styles = $(styles).appendTo('head')
 
-    var $element = $('<div id="target" title="1"></div>').appendTo('#qunit-fixture')
+    var $element = $('<div id="target" title="1"/>').appendTo('#qunit-fixture')
 
     $element
       .on('shown.bs.tooltip', function () {
         var offset = $('.tooltip').offset()
         $styles.remove()
-        ok(Math.abs(offset.left - 88) <= 1, 'tooltip has correct horizontal location')
-        ok(Math.abs(offset.top - 126) <= 1, 'tooltip has correct vertical location')
+        assert.ok(Math.abs(offset.left - 88) <= 1, 'tooltip has correct horizontal location')
+        assert.ok(Math.abs(offset.top - 126) <= 1, 'tooltip has correct vertical location')
         $element.bootstrapTooltip('hide')
         done()
       })
       .bootstrapTooltip({
-        container: 'body',
-        placement: 'top',
         trigger: 'manual'
       })
 
     $element.bootstrapTooltip('show')
   })
 
-  QUnit.test('should throw an error when trying to show a tooltip on a hidden element', function (assert) {
+  QUnit.test('should do nothing when an attempt is made to hide an uninitialized tooltip', function (assert) {
     assert.expect(1)
-    var $target = $('<a href="#" rel="tooltip" title="Another tooltip" style="display: none;">I am hidden</a>').appendTo('#qunit-fixture')
 
-    assert.throws(function () {
-      $target.bootstrapTooltip('show')
-    }, new Error('Can\'t show a tooltip/popover on a hidden element'))
+    var $tooltip = $('<span data-toggle="tooltip" title="some tip">some text</span>')
+      .appendTo('#qunit-fixture')
+      .on('hidden.bs.tooltip shown.bs.tooltip', function () {
+        assert.ok(false, 'should not fire any tooltip events')
+      })
+      .bootstrapTooltip('hide')
+    assert.strictEqual($tooltip.data('bs.tooltip'), undefined, 'should not initialize the tooltip')
+  })
+
+  QUnit.test('should not remove tooltip if multiple triggers are set and one is still active', function (assert) {
+    assert.expect(41)
+    var $el = $('<button>Trigger</button>')
+      .appendTo('#qunit-fixture')
+      .bootstrapTooltip({ trigger: 'click hover focus', animation: false })
+    var tooltip = $el.data('bs.tooltip')
+    var $tooltip = $(tooltip.getTipElement())
 
-    $target.remove()
+    function showingTooltip() { return $tooltip.hasClass('in') || tooltip._hoverState == 'in' }
+
+    var tests = [
+        ['mouseenter', 'mouseleave'],
+
+        ['focusin', 'focusout'],
+
+        ['click', 'click'],
+
+        ['mouseenter', 'focusin', 'focusout', 'mouseleave'],
+        ['mouseenter', 'focusin', 'mouseleave', 'focusout'],
+
+        ['focusin', 'mouseenter', 'mouseleave', 'focusout'],
+        ['focusin', 'mouseenter', 'focusout', 'mouseleave'],
+
+        ['click', 'focusin', 'mouseenter', 'focusout', 'mouseleave', 'click'],
+        ['mouseenter', 'click', 'focusin', 'focusout', 'mouseleave', 'click'],
+        ['mouseenter', 'focusin', 'click', 'click', 'mouseleave', 'focusout']
+    ]
+
+    assert.ok(!showingTooltip())
+
+    $.each(tests, function (idx, triggers) {
+      for (var i = 0, len = triggers.length; i < len; i++) {
+        $el.trigger(triggers[i]);
+        assert.equal(i < (len - 1), showingTooltip())
+      }
+    })
   })
 
 })
diff --git a/js/tests/vendor/tether.min.js b/js/tests/vendor/tether.min.js
new file mode 100644
index 000000000..882e9e8c8
--- /dev/null
+++ b/js/tests/vendor/tether.min.js
@@ -0,0 +1,2 @@
+/*! tether 0.7.1 */
+!function(t,e){"function"==typeof define&&define.amd?define(e):"object"==typeof exports?module.exports=e(require,exports,module):t.Tether=e()}(this,function(t,e,o){return function(){var t,e,o,i,n,s,l,r,h,a,f,p,u,d,g,c,m,b,v,y={}.hasOwnProperty,w=[].indexOf||function(t){for(var e=0,o=this.length;o>e;e++)if(e in this&&this[e]===t)return e;return-1},C=[].slice;null==this.Tether&&(this.Tether={modules:[]}),p=function(t){var e,o,i,n,s;if(o=getComputedStyle(t).position,"fixed"===o)return t;for(i=void 0,e=t;e=e.parentNode;){try{n=getComputedStyle(e)}catch(l){}if(null==n)return e;if(/(auto|scroll)/.test(n.overflow+n.overflowY+n.overflowX)&&("absolute"!==o||"relative"===(s=n.position)||"absolute"===s||"fixed"===s))return e}return document.body},m=function(){var t;return t=0,function(){return t++}}(),v={},a=function(t){var e,i,s,l,r;if(s=t._tetherZeroElement,null==s&&(s=t.createElement("div"),s.setAttribute("data-tether-id",m()),n(s.style,{top:0,left:0,position:"absolute"}),t.body.appendChild(s),t._tetherZeroElement=s),e=s.getAttribute("data-tether-id"),null==v[e]){v[e]={},r=s.getBoundingClientRect();for(i in r)l=r[i],v[e][i]=l;o(function(){return v[e]=void 0})}return v[e]},d=null,l=function(t){var e,o,i,n,s,l,r;t===document?(o=document,t=document.documentElement):o=t.ownerDocument,i=o.documentElement,e={},r=t.getBoundingClientRect();for(n in r)l=r[n],e[n]=l;return s=a(o),e.top-=s.top,e.left-=s.left,null==e.width&&(e.width=document.body.scrollWidth-e.left-e.right),null==e.height&&(e.height=document.body.scrollHeight-e.top-e.bottom),e.top=e.top-i.clientTop,e.left=e.left-i.clientLeft,e.right=o.body.clientWidth-e.width-e.left,e.bottom=o.body.clientHeight-e.height-e.top,e},h=function(t){return t.offsetParent||document.documentElement},f=function(){var t,e,o,i,s;return t=document.createElement("div"),t.style.width="100%",t.style.height="200px",e=document.createElement("div"),n(e.style,{position:"absolute",top:0,left:0,pointerEvents:"none",visibility:"hidden",width:"200px",height:"150px",overflow:"hidden"}),e.appendChild(t),document.body.appendChild(e),i=t.offsetWidth,e.style.overflow="scroll",s=t.offsetWidth,i===s&&(s=e.clientWidth),document.body.removeChild(e),o=i-s,{width:o,height:o}},n=function(t){var e,o,i,n,s,l,r;for(null==t&&(t={}),e=[],Array.prototype.push.apply(e,arguments),r=e.slice(1),s=0,l=r.length;l>s;s++)if(i=r[s])for(o in i)y.call(i,o)&&(n=i[o],t[o]=n);return t},g=function(t,e){var o,i,n,s,l,h;if(null!=t.classList){for(l=e.split(" "),h=[],n=0,s=l.length;s>n;n++)i=l[n],i.trim()&&h.push(t.classList.remove(i));return h}return o=r(t).replace(new RegExp("(^| )"+e.split(" ").join("|")+"( |$)","gi")," "),c(t,o)},e=function(t,e){var o,i,n,s,l;if(null!=t.classList){for(s=e.split(" "),l=[],i=0,n=s.length;n>i;i++)o=s[i],o.trim()&&l.push(t.classList.add(o));return l}return g(t,e),o=r(t)+(" "+e),c(t,o)},u=function(t,e){return null!=t.classList?t.classList.contains(e):new RegExp("(^| )"+e+"( |$)","gi").test(r(t))},r=function(t){return t.className instanceof SVGAnimatedString?t.className.baseVal:t.className},c=function(t,e){return t.setAttribute("class",e)},b=function(t,o,i){var n,s,l,r,h,a;for(s=0,r=i.length;r>s;s++)n=i[s],w.call(o,n)<0&&u(t,n)&&g(t,n);for(a=[],l=0,h=o.length;h>l;l++)n=o[l],a.push(u(t,n)?void 0:e(t,n));return a},i=[],o=function(t){return i.push(t)},s=function(){var t,e;for(e=[];t=i.pop();)e.push(t());return e},t=function(){function t(){}return t.prototype.on=function(t,e,o,i){var n;return null==i&&(i=!1),null==this.bindings&&(this.bindings={}),null==(n=this.bindings)[t]&&(n[t]=[]),this.bindings[t].push({handler:e,ctx:o,once:i})},t.prototype.once=function(t,e,o){return this.on(t,e,o,!0)},t.prototype.off=function(t,e){var o,i,n;if(null!=(null!=(i=this.bindings)?i[t]:void 0)){if(null==e)return delete this.bindings[t];for(o=0,n=[];o<this.bindings[t].length;)n.push(this.bindings[t][o].handler===e?this.bindings[t].splice(o,1):o++);return n}},t.prototype.trigger=function(){var t,e,o,i,n,s,l,r,h;if(o=arguments[0],t=2<=arguments.length?C.call(arguments,1):[],null!=(l=this.bindings)?l[o]:void 0){for(n=0,h=[];n<this.bindings[o].length;)r=this.bindings[o][n],i=r.handler,e=r.ctx,s=r.once,i.apply(null!=e?e:this,t),h.push(s?this.bindings[o].splice(n,1):n++);return h}},t}(),this.Tether.Utils={getScrollParent:p,getBounds:l,getOffsetParent:h,extend:n,addClass:e,removeClass:g,hasClass:u,updateClasses:b,defer:o,flush:s,uniqueId:m,Evented:t,getScrollBarSize:f}}.call(this),function(){var t,e,o,i,n,s,l,r,h,a,f,p,u,d,g,c,m,b,v,y,w,C,O,T,x,A,E,S,W,M=[].slice,P=function(t,e){return function(){return t.apply(e,arguments)}};if(null==this.Tether)throw new Error("You must include the utils.js file before tether.js");i=this.Tether,W=i.Utils,c=W.getScrollParent,m=W.getSize,d=W.getOuterSize,p=W.getBounds,u=W.getOffsetParent,a=W.extend,n=W.addClass,O=W.removeClass,A=W.updateClasses,h=W.defer,f=W.flush,g=W.getScrollBarSize,E=function(t,e,o){return null==o&&(o=1),t+o>=e&&e>=t-o},x=function(){var t,e,o,i,n;for(t=document.createElement("div"),n=["transform","webkitTransform","OTransform","MozTransform","msTransform"],o=0,i=n.length;i>o;o++)if(e=n[o],void 0!==t.style[e])return e}(),T=[],C=function(){var t,e,o;for(e=0,o=T.length;o>e;e++)t=T[e],t.position(!1);return f()},b=function(){var t;return null!=(t="undefined"!=typeof performance&&null!==performance&&"function"==typeof performance.now?performance.now():void 0)?t:+new Date},function(){var t,e,o,i,n,s,l,r,h;for(e=null,o=null,i=null,n=function(){if(null!=o&&o>16)return o=Math.min(o-16,250),void(i=setTimeout(n,250));if(!(null!=e&&b()-e<10))return null!=i&&(clearTimeout(i),i=null),e=b(),C(),o=b()-e},r=["resize","scroll","touchmove"],h=[],s=0,l=r.length;l>s;s++)t=r[s],h.push(window.addEventListener(t,n));return h}(),t={center:"center",left:"right",right:"left"},e={middle:"middle",top:"bottom",bottom:"top"},o={top:0,left:0,middle:"50%",center:"50%",bottom:"100%",right:"100%"},r=function(o,i){var n,s;return n=o.left,s=o.top,"auto"===n&&(n=t[i.left]),"auto"===s&&(s=e[i.top]),{left:n,top:s}},l=function(t){var e,i;return{left:null!=(e=o[t.left])?e:t.left,top:null!=(i=o[t.top])?i:t.top}},s=function(){var t,e,o,i,n,s,l;for(e=1<=arguments.length?M.call(arguments,0):[],o={top:0,left:0},n=0,s=e.length;s>n;n++)l=e[n],i=l.top,t=l.left,"string"==typeof i&&(i=parseFloat(i,10)),"string"==typeof t&&(t=parseFloat(t,10)),o.top+=i,o.left+=t;return o},v=function(t,e){return"string"==typeof t.left&&-1!==t.left.indexOf("%")&&(t.left=parseFloat(t.left,10)/100*e.width),"string"==typeof t.top&&-1!==t.top.indexOf("%")&&(t.top=parseFloat(t.top,10)/100*e.height),t},y=w=function(t){var e,o,i;return i=t.split(" "),o=i[0],e=i[1],{top:o,left:e}},S=function(){function t(t){this.position=P(this.position,this);var e,o,n,s,l;for(T.push(this),this.history=[],this.setOptions(t,!1),s=i.modules,o=0,n=s.length;n>o;o++)e=s[o],null!=(l=e.initialize)&&l.call(this);this.position()}return t.modules=[],t.prototype.getClass=function(t){var e,o;return(null!=(e=this.options.classes)?e[t]:void 0)?this.options.classes[t]:(null!=(o=this.options.classes)?o[t]:void 0)!==!1?this.options.classPrefix?""+this.options.classPrefix+"-"+t:t:""},t.prototype.setOptions=function(t,e){var o,i,s,l,r,h;for(this.options=t,null==e&&(e=!0),o={offset:"0 0",targetOffset:"0 0",targetAttachment:"auto auto",classPrefix:"tether"},this.options=a(o,this.options),r=this.options,this.element=r.element,this.target=r.target,this.targetModifier=r.targetModifier,"viewport"===this.target?(this.target=document.body,this.targetModifier="visible"):"scroll-handle"===this.target&&(this.target=document.body,this.targetModifier="scroll-handle"),h=["element","target"],s=0,l=h.length;l>s;s++){if(i=h[s],null==this[i])throw new Error("Tether Error: Both element and target must be defined");null!=this[i].jquery?this[i]=this[i][0]:"string"==typeof this[i]&&(this[i]=document.querySelector(this[i]))}if(n(this.element,this.getClass("element")),this.options.addTargetClasses!==!1&&n(this.target,this.getClass("target")),!this.options.attachment)throw new Error("Tether Error: You must provide an attachment");return this.targetAttachment=y(this.options.targetAttachment),this.attachment=y(this.options.attachment),this.offset=w(this.options.offset),this.targetOffset=w(this.options.targetOffset),null!=this.scrollParent&&this.disable(),"scroll-handle"===this.targetModifier?this.scrollParent=this.target:this.scrollParent=c(this.target),this.options.enabled!==!1?this.enable(e):void 0},t.prototype.getTargetBounds=function(){var t,e,o,i,n,s,l,r,h;if(null==this.targetModifier)return p(this.target);switch(this.targetModifier){case"visible":return this.target===document.body?{top:pageYOffset,left:pageXOffset,height:innerHeight,width:innerWidth}:(t=p(this.target),n={height:t.height,width:t.width,top:t.top,left:t.left},n.height=Math.min(n.height,t.height-(pageYOffset-t.top)),n.height=Math.min(n.height,t.height-(t.top+t.height-(pageYOffset+innerHeight))),n.height=Math.min(innerHeight,n.height),n.height-=2,n.width=Math.min(n.width,t.width-(pageXOffset-t.left)),n.width=Math.min(n.width,t.width-(t.left+t.width-(pageXOffset+innerWidth))),n.width=Math.min(innerWidth,n.width),n.width-=2,n.top<pageYOffset&&(n.top=pageYOffset),n.left<pageXOffset&&(n.left=pageXOffset),n);case"scroll-handle":return h=this.target,h===document.body?(h=document.documentElement,t={left:pageXOffset,top:pageYOffset,height:innerHeight,width:innerWidth}):t=p(h),r=getComputedStyle(h),o=h.scrollWidth>h.clientWidth||"scroll"===[r.overflow,r.overflowX]||this.target!==document.body,s=0,o&&(s=15),i=t.height-parseFloat(r.borderTopWidth)-parseFloat(r.borderBottomWidth)-s,n={width:15,height:.975*i*(i/h.scrollHeight),left:t.left+t.width-parseFloat(r.borderLeftWidth)-15},e=0,408>i&&this.target===document.body&&(e=-11e-5*Math.pow(i,2)-.00727*i+22.58),this.target!==document.body&&(n.height=Math.max(n.height,24)),l=this.target.scrollTop/(h.scrollHeight-i),n.top=l*(i-n.height-e)+t.top+parseFloat(r.borderTopWidth),this.target===document.body&&(n.height=Math.max(n.height,24)),n}},t.prototype.clearCache=function(){return this._cache={}},t.prototype.cache=function(t,e){return null==this._cache&&(this._cache={}),null==this._cache[t]&&(this._cache[t]=e.call(this)),this._cache[t]},t.prototype.enable=function(t){return null==t&&(t=!0),this.options.addTargetClasses!==!1&&n(this.target,this.getClass("enabled")),n(this.element,this.getClass("enabled")),this.enabled=!0,this.scrollParent!==document&&this.scrollParent.addEventListener("scroll",this.position),t?this.position():void 0},t.prototype.disable=function(){return O(this.target,this.getClass("enabled")),O(this.element,this.getClass("enabled")),this.enabled=!1,null!=this.scrollParent?this.scrollParent.removeEventListener("scroll",this.position):void 0},t.prototype.destroy=function(){var t,e,o,i,n;for(this.disable(),n=[],t=o=0,i=T.length;i>o;t=++o){if(e=T[t],e===this){T.splice(t,1);break}n.push(void 0)}return n},t.prototype.updateAttachClasses=function(t,e){var o,i,n,s,l,r,a,f,p,u=this;for(null==t&&(t=this.attachment),null==e&&(e=this.targetAttachment),s=["left","top","bottom","right","middle","center"],(null!=(p=this._addAttachClasses)?p.length:void 0)&&this._addAttachClasses.splice(0,this._addAttachClasses.length),o=null!=this._addAttachClasses?this._addAttachClasses:this._addAttachClasses=[],t.top&&o.push(""+this.getClass("element-attached")+"-"+t.top),t.left&&o.push(""+this.getClass("element-attached")+"-"+t.left),e.top&&o.push(""+this.getClass("target-attached")+"-"+e.top),e.left&&o.push(""+this.getClass("target-attached")+"-"+e.left),i=[],l=0,a=s.length;a>l;l++)n=s[l],i.push(""+this.getClass("element-attached")+"-"+n);for(r=0,f=s.length;f>r;r++)n=s[r],i.push(""+this.getClass("target-attached")+"-"+n);return h(function(){return null!=u._addAttachClasses?(A(u.element,u._addAttachClasses,i),u.options.addTargetClasses!==!1&&A(u.target,u._addAttachClasses,i),u._addAttachClasses=void 0):void 0})},t.prototype.position=function(t){var e,o,n,h,a,d,c,m,b,y,w,C,O,T,x,A,E,S,W,M,P,z,B,_,F,L,Y,H,X,N,j,R,U,q,k,D=this;if(null==t&&(t=!0),this.enabled){for(this.clearCache(),M=r(this.targetAttachment,this.attachment),this.updateAttachClasses(this.attachment,M),e=this.cache("element-bounds",function(){return p(D.element)}),F=e.width,n=e.height,0===F&&0===n&&null!=this.lastSize?(N=this.lastSize,F=N.width,n=N.height):this.lastSize={width:F,height:n},B=z=this.cache("target-bounds",function(){return D.getTargetBounds()}),b=v(l(this.attachment),{width:F,height:n}),P=v(l(M),B),a=v(this.offset,{width:F,height:n}),d=v(this.targetOffset,B),b=s(b,a),P=s(P,d),h=z.left+P.left-b.left,_=z.top+P.top-b.top,j=i.modules,L=0,H=j.length;H>L;L++){if(c=j[L],x=c.position.call(this,{left:h,top:_,targetAttachment:M,targetPos:z,attachment:this.attachment,elementPos:e,offset:b,targetOffset:P,manualOffset:a,manualTargetOffset:d,scrollbarSize:S}),x===!1)return!1;null!=x&&"object"==typeof x&&(_=x.top,h=x.left)}if(m={page:{top:_,left:h},viewport:{top:_-pageYOffset,bottom:pageYOffset-_-n+innerHeight,left:h-pageXOffset,right:pageXOffset-h-F+innerWidth}},document.body.scrollWidth>window.innerWidth&&(S=this.cache("scrollbar-size",g),m.viewport.bottom-=S.height),document.body.scrollHeight>window.innerHeight&&(S=this.cache("scrollbar-size",g),m.viewport.right-=S.width),(""!==(R=document.body.style.position)&&"static"!==R||""!==(U=document.body.parentElement.style.position)&&"static"!==U)&&(m.page.bottom=document.body.scrollHeight-_-n,m.page.right=document.body.scrollWidth-h-F),(null!=(q=this.options.optimizations)?q.moveElement:void 0)!==!1&&null==this.targetModifier){for(w=this.cache("target-offsetparent",function(){return u(D.target)}),T=this.cache("target-offsetparent-bounds",function(){return p(w)}),O=getComputedStyle(w),o=getComputedStyle(this.element),C=T,y={},k=["Top","Left","Bottom","Right"],Y=0,X=k.length;X>Y;Y++)W=k[Y],y[W.toLowerCase()]=parseFloat(O["border"+W+"Width"]);T.right=document.body.scrollWidth-T.left-C.width+y.right,T.bottom=document.body.scrollHeight-T.top-C.height+y.bottom,m.page.top>=T.top+y.top&&m.page.bottom>=T.bottom&&m.page.left>=T.left+y.left&&m.page.right>=T.right&&(E=w.scrollTop,A=w.scrollLeft,m.offset={top:m.page.top-T.top+E-y.top,left:m.page.left-T.left+A-y.left})}return this.move(m),this.history.unshift(m),this.history.length>3&&this.history.pop(),t&&f(),!0}},t.prototype.move=function(t){var e,o,i,n,s,l,r,f,p,d,g,c,m,b,v,y,w,C=this;if(null!=this.element.parentNode){f={};for(d in t){f[d]={};for(n in t[d]){for(i=!1,y=this.history,b=0,v=y.length;v>b;b++)if(r=y[b],!E(null!=(w=r[d])?w[n]:void 0,t[d][n])){i=!0;break}i||(f[d][n]=!0)}}e={top:"",left:"",right:"",bottom:""},p=function(t,o){var i,n,s;return(null!=(s=C.options.optimizations)?s.gpu:void 0)===!1?(t.top?e.top=""+o.top+"px":e.bottom=""+o.bottom+"px",t.left?e.left=""+o.left+"px":e.right=""+o.right+"px"):(t.top?(e.top=0,n=o.top):(e.bottom=0,n=-o.bottom),t.left?(e.left=0,i=o.left):(e.right=0,i=-o.right),e[x]="translateX("+Math.round(i)+"px) translateY("+Math.round(n)+"px)","msTransform"!==x?e[x]+=" translateZ(0)":void 0)},s=!1,(f.page.top||f.page.bottom)&&(f.page.left||f.page.right)?(e.position="absolute",p(f.page,t.page)):(f.viewport.top||f.viewport.bottom)&&(f.viewport.left||f.viewport.right)?(e.position="fixed",p(f.viewport,t.viewport)):null!=f.offset&&f.offset.top&&f.offset.left?(e.position="absolute",l=this.cache("target-offsetparent",function(){return u(C.target)}),u(this.element)!==l&&h(function(){return C.element.parentNode.removeChild(C.element),l.appendChild(C.element)}),p(f.offset,t.offset),s=!0):(e.position="absolute",p({top:!0,left:!0},t.page)),s||"BODY"===this.element.parentNode.tagName||(this.element.parentNode.removeChild(this.element),document.body.appendChild(this.element)),m={},c=!1;for(n in e)g=e[n],o=this.element.style[n],""===o||""===g||"top"!==n&&"left"!==n&&"bottom"!==n&&"right"!==n||(o=parseFloat(o),g=parseFloat(g)),o!==g&&(c=!0,m[n]=e[n]);return c?h(function(){return a(C.element.style,m)}):void 0}},t}(),i.position=C,this.Tether=a(S,i)}.call(this),function(){var t,e,o,i,n,s,l,r,h,a,f=[].indexOf||function(t){for(var e=0,o=this.length;o>e;e++)if(e in this&&this[e]===t)return e;return-1};a=this.Tether.Utils,l=a.getOuterSize,s=a.getBounds,r=a.getSize,i=a.extend,h=a.updateClasses,o=a.defer,e={left:"right",right:"left",top:"bottom",bottom:"top",middle:"middle"},t=["left","top","right","bottom"],n=function(e,o){var i,n,l,r,h,a,f;if("scrollParent"===o?o=e.scrollParent:"window"===o&&(o=[pageXOffset,pageYOffset,innerWidth+pageXOffset,innerHeight+pageYOffset]),o===document&&(o=o.documentElement),null!=o.nodeType)for(n=r=s(o),h=getComputedStyle(o),o=[n.left,n.top,r.width+n.left,r.height+n.top],i=a=0,f=t.length;f>a;i=++a)l=t[i],l=l[0].toUpperCase()+l.substr(1),"Top"===l||"Left"===l?o[i]+=parseFloat(h["border"+l+"Width"]):o[i]-=parseFloat(h["border"+l+"Width"]);return o},this.Tether.modules.push({position:function(e){var l,r,a,p,u,d,g,c,m,b,v,y,w,C,O,T,x,A,E,S,W,M,P,z,B,_,F,L,Y,H,X,N,j,R,U,q,k,D,Z,V,$,G,I,J,K,Q,tt,et=this;if(_=e.top,v=e.left,W=e.targetAttachment,!this.options.constraints)return!0;for(A=function(e){var o,i,n,s;for(et.removeClass(e),s=[],i=0,n=t.length;n>i;i++)o=t[i],s.push(et.removeClass(""+e+"-"+o));return s},V=this.cache("element-bounds",function(){return s(et.element)}),b=V.height,F=V.width,0===F&&0===b&&null!=this.lastSize&&($=this.lastSize,F=$.width,b=$.height),P=this.cache("target-bounds",function(){return et.getTargetBounds()}),M=P.height,z=P.width,S={},m={},r=[this.getClass("pinned"),this.getClass("out-of-bounds")],G=this.options.constraints,L=0,N=G.length;N>L;L++)c=G[L],c.outOfBoundsClass&&r.push(c.outOfBoundsClass),c.pinnedClass&&r.push(c.pinnedClass);for(Y=0,j=r.length;j>Y;Y++)for(g=r[Y],I=["left","top","right","bottom"],H=0,R=I.length;R>H;H++)E=I[H],r.push(""+g+"-"+E);for(l=[],S=i({},W),m=i({},this.attachment),J=this.options.constraints,X=0,U=J.length;U>X;X++){if(c=J[X],B=c.to,a=c.attachment,O=c.pin,null==a&&(a=""),f.call(a," ")>=0?(K=a.split(" "),d=K[0],u=K[1]):u=d=a,p=n(this,B),("target"===d||"both"===d)&&(_<p[1]&&"top"===S.top&&(_+=M,S.top="bottom"),_+b>p[3]&&"bottom"===S.top&&(_-=M,S.top="top")),"together"===d&&(_<p[1]&&"top"===S.top&&("bottom"===m.top?(_+=M,S.top="bottom",_+=b,m.top="top"):"top"===m.top&&(_+=M,S.top="bottom",_-=b,m.top="bottom")),_+b>p[3]&&"bottom"===S.top&&("top"===m.top?(_-=M,S.top="top",_-=b,m.top="bottom"):"bottom"===m.top&&(_-=M,S.top="top",_+=b,m.top="top")),"middle"===S.top&&(_+b>p[3]&&"top"===m.top?(_-=b,m.top="bottom"):_<p[1]&&"bottom"===m.top&&(_+=b,m.top="top"))),("target"===u||"both"===u)&&(v<p[0]&&"left"===S.left&&(v+=z,S.left="right"),v+F>p[2]&&"right"===S.left&&(v-=z,S.left="left")),"together"===u&&(v<p[0]&&"left"===S.left?"right"===m.left?(v+=z,S.left="right",v+=F,m.left="left"):"left"===m.left&&(v+=z,S.left="right",v-=F,m.left="right"):v+F>p[2]&&"right"===S.left?"left"===m.left?(v-=z,S.left="left",v-=F,m.left="right"):"right"===m.left&&(v-=z,S.left="left",v+=F,m.left="left"):"center"===S.left&&(v+F>p[2]&&"left"===m.left?(v-=F,m.left="right"):v<p[0]&&"right"===m.left&&(v+=F,m.left="left"))),("element"===d||"both"===d)&&(_<p[1]&&"bottom"===m.top&&(_+=b,m.top="top"),_+b>p[3]&&"top"===m.top&&(_-=b,m.top="bottom")),("element"===u||"both"===u)&&(v<p[0]&&"right"===m.left&&(v+=F,m.left="left"),v+F>p[2]&&"left"===m.left&&(v-=F,m.left="right")),"string"==typeof O?O=function(){var t,e,o,i;for(o=O.split(","),i=[],e=0,t=o.length;t>e;e++)C=o[e],i.push(C.trim());return i}():O===!0&&(O=["top","left","right","bottom"]),O||(O=[]),T=[],y=[],_<p[1]&&(f.call(O,"top")>=0?(_=p[1],T.push("top")):y.push("top")),_+b>p[3]&&(f.call(O,"bottom")>=0?(_=p[3]-b,T.push("bottom")):y.push("bottom")),v<p[0]&&(f.call(O,"left")>=0?(v=p[0],T.push("left")):y.push("left")),v+F>p[2]&&(f.call(O,"right")>=0?(v=p[2]-F,T.push("right")):y.push("right")),T.length)for(x=null!=(Q=this.options.pinnedClass)?Q:this.getClass("pinned"),l.push(x),D=0,q=T.length;q>D;D++)E=T[D],l.push(""+x+"-"+E);if(y.length)for(w=null!=(tt=this.options.outOfBoundsClass)?tt:this.getClass("out-of-bounds"),l.push(w),Z=0,k=y.length;k>Z;Z++)E=y[Z],l.push(""+w+"-"+E);(f.call(T,"left")>=0||f.call(T,"right")>=0)&&(m.left=S.left=!1),(f.call(T,"top")>=0||f.call(T,"bottom")>=0)&&(m.top=S.top=!1),(S.top!==W.top||S.left!==W.left||m.top!==this.attachment.top||m.left!==this.attachment.left)&&this.updateAttachClasses(m,S)}return o(function(){return et.options.addTargetClasses!==!1&&h(et.target,l,r),h(et.element,l,r)}),{top:_,left:v}}})}.call(this),function(){var t,e,o,i;i=this.Tether.Utils,e=i.getBounds,o=i.updateClasses,t=i.defer,this.Tether.modules.push({position:function(i){var n,s,l,r,h,a,f,p,u,d,g,c,m,b,v,y,w,C,O,T,x,A,E,S,W,M=this;if(g=i.top,a=i.left,x=this.cache("element-bounds",function(){return e(M.element)}),h=x.height,c=x.width,d=this.getTargetBounds(),r=g+h,f=a+c,n=[],g<=d.bottom&&r>=d.top)for(A=["left","right"],m=0,w=A.length;w>m;m++)p=A[m],((E=d[p])===a||E===f)&&n.push(p);if(a<=d.right&&f>=d.left)for(S=["top","bottom"],b=0,C=S.length;C>b;b++)p=S[b],((W=d[p])===g||W===r)&&n.push(p);for(l=[],s=[],u=["left","top","right","bottom"],l.push(this.getClass("abutted")),v=0,O=u.length;O>v;v++)p=u[v],l.push(""+this.getClass("abutted")+"-"+p);for(n.length&&s.push(this.getClass("abutted")),y=0,T=n.length;T>y;y++)p=n[y],s.push(""+this.getClass("abutted")+"-"+p);return t(function(){return M.options.addTargetClasses!==!1&&o(M.target,s,l),o(M.element,s,l)}),!0}})}.call(this),function(){this.Tether.modules.push({position:function(t){var e,o,i,n,s,l,r;return l=t.top,e=t.left,this.options.shift?(o=function(t){return"function"==typeof t?t.call(this,{top:l,left:e}):t},i=o(this.options.shift),"string"==typeof i?(i=i.split(" "),i[1]||(i[1]=i[0]),s=i[0],n=i[1],s=parseFloat(s,10),n=parseFloat(n,10)):(r=[i.top,i.left],s=r[0],n=r[1]),l+=s,e+=n,{top:l,left:e}):void 0}})}.call(this),this.Tether});
+\ No newline at end of file
diff --git a/js/tests/visual/alert.html b/js/tests/visual/alert.html
index 978f9ac20..9e6a939e9 100644
--- a/js/tests/visual/alert.html
+++ b/js/tests/visual/alert.html
@@ -6,6 +6,13 @@
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <title>Alert</title>
   <link rel="stylesheet" href="../../../dist/css/bootstrap.min.css">
+
+  <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
+  <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+  <!--[if lt IE 9]>
+    <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
+    <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+  <![endif]-->
 </head>
 <body>
 
@@ -34,8 +41,8 @@
 
 <!-- JavaScript Includes -->
 <script src="../vendor/jquery.min.js"></script>
-<script src="../../util.js"></script>
-<script src="../../alert.js"></script>
+<script src="../../dist/util.js"></script>
+<script src="../../dist/alert.js"></script>
 
 </body>
 </html>
diff --git a/js/tests/visual/button.html b/js/tests/visual/button.html
index c3be92141..a6eed7e05 100644
--- a/js/tests/visual/button.html
+++ b/js/tests/visual/button.html
@@ -6,6 +6,13 @@
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <title>Button</title>
   <link rel="stylesheet" href="../../../dist/css/bootstrap.min.css">
+
+  <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
+  <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+  <!--[if lt IE 9]>
+    <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
+    <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+  <![endif]-->
 </head>
 <body>
 
@@ -45,8 +52,8 @@
 
 <!-- JavaScript Includes -->
 <script src="../vendor/jquery.min.js"></script>
-<script src="../../util.js"></script>
-<script src="../../button.js"></script>
+<script src="../../dist/util.js"></script>
+<script src="../../dist/button.js"></script>
 
 <!-- JavaScript Test -->
 <script>
diff --git a/js/tests/visual/carousel.html b/js/tests/visual/carousel.html
index 45424a5d1..47dacaa6a 100644
--- a/js/tests/visual/carousel.html
+++ b/js/tests/visual/carousel.html
@@ -6,6 +6,13 @@
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <title>Carousel</title>
   <link rel="stylesheet" href="../../../dist/css/bootstrap.min.css">
+
+  <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
+  <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+  <!--[if lt IE 9]>
+    <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
+    <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+  <![endif]-->
 </head>
 <body>
 
@@ -44,8 +51,8 @@
 
 <!-- JavaScript Includes -->
 <script src="../vendor/jquery.min.js"></script>
-<script src="../../util.js"></script>
-<script src="../../carousel.js"></script>
+<script src="../../dist/util.js"></script>
+<script src="../../dist/carousel.js"></script>
 
 </body>
 </html>
diff --git a/js/tests/visual/collapse.html b/js/tests/visual/collapse.html
index 42ac0aaa2..2ccc787ec 100644
--- a/js/tests/visual/collapse.html
+++ b/js/tests/visual/collapse.html
@@ -6,6 +6,13 @@
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <title>Collapse</title>
   <link rel="stylesheet" href="../../../dist/css/bootstrap.min.css">
+
+  <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
+  <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+  <!--[if lt IE 9]>
+    <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
+    <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+  <![endif]-->
 </head>
 <body>
 
@@ -64,8 +71,8 @@
 
 <!-- JavaScript Includes -->
 <script src="../vendor/jquery.min.js"></script>
-<script src="../../util.js"></script>
-<script src="../../collapse.js"></script>
+<script src="../../dist/util.js"></script>
+<script src="../../dist/collapse.js"></script>
 
 </body>
 </html>
diff --git a/js/tests/visual/dropdown.html b/js/tests/visual/dropdown.html
index 6cf18df8e..a51267de8 100644
--- a/js/tests/visual/dropdown.html
+++ b/js/tests/visual/dropdown.html
@@ -6,6 +6,13 @@
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <title>Dropdown</title>
   <link rel="stylesheet" href="../../../dist/css/bootstrap.min.css">
+
+  <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
+  <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+  <!--[if lt IE 9]>
+    <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
+    <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+  <![endif]-->
 </head>
 <body>
 
@@ -15,21 +22,15 @@
     <h1>Dropdown <small>Bootstrap Visual Test</small></h1>
   </div>
 
-  <nav id="navbar-example" class="navbar navbar-default navbar-static" role="navigation">
+  <nav id="navbar-example" class="navbar navbar-default navbar-static-top" role="navigation">
     <div class="container-fluid">
-      <div class="navbar-header">
-        <button class="navbar-toggle collapsed" type="button" data-toggle="collapse" data-target=".bs-example-js-navbar-collapse">
-          <span class="sr-only">Toggle navigation</span>
-          <span class="icon-bar"></span>
-          <span class="icon-bar"></span>
-          <span class="icon-bar"></span>
-        </button>
-        <a class="navbar-brand" href="#">Project Name</a>
-      </div>
-      <div class="collapse navbar-collapse bs-example-js-navbar-collapse">
-        <ul class="nav navbar-nav">
-          <li class="dropdown">
-            <a id="drop1" href="#" role="button" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a>
+      <button class="navbar-toggler hidden-sm-up" type="button" data-toggle="collapse" data-target="#exCollapsingNavbar2">
+        &#9776;
+      </button>
+      <div class="collapse navbar-toggleable-xs" id="exCollapsingNavbar2">
+        <ul class="nav navbar-nav pull-left">
+          <li class="dropdown nav-item">
+            <a id="drop1" href="#" role="button" class="dropdown-toggle nav-link" data-toggle="dropdown">Dropdown <b class="caret"></b></a>
             <ul class="dropdown-menu" role="menu" aria-labelledby="drop1">
               <li role="presentation"><a role="menuitem" tabindex="-1" href="https://twitter.com/fat">Action</a></li>
               <li role="presentation"><a role="menuitem" tabindex="-1" href="https://twitter.com/fat">Another action</a></li>
@@ -38,8 +39,8 @@
               <li role="presentation"><a role="menuitem" tabindex="-1" href="https://twitter.com/fat">Separated link</a></li>
             </ul>
           </li>
-          <li class="dropdown">
-            <a href="#" id="drop2" role="button" class="dropdown-toggle" data-toggle="dropdown">Dropdown 2 <b class="caret"></b></a>
+          <li class="dropdown nav-item">
+            <a href="#" id="drop2" role="button" class="dropdown-toggle nav-link" data-toggle="dropdown">Dropdown 2 <b class="caret"></b></a>
             <ul class="dropdown-menu" role="menu" aria-labelledby="drop2">
               <li role="presentation"><a role="menuitem" tabindex="-1" href="https://twitter.com/fat">Action</a></li>
               <li role="presentation"><a role="menuitem" tabindex="-1" href="https://twitter.com/fat">Another action</a></li>
@@ -49,9 +50,9 @@
             </ul>
           </li>
         </ul>
-        <ul class="nav navbar-nav navbar-right">
-          <li id="fat-menu" class="dropdown">
-            <a href="#" id="drop3" role="button" class="dropdown-toggle" data-toggle="dropdown">Dropdown 3 <b class="caret"></b></a>
+        <ul class="nav navbar-nav pull-right">
+          <li id="fat-menu" class="dropdown nav-item">
+            <a href="#" id="drop3" role="button" class="dropdown-toggle nav-link" data-toggle="dropdown">Dropdown 3 <b class="caret"></b></a>
             <ul class="dropdown-menu" role="menu" aria-labelledby="drop3">
               <li role="presentation"><a role="menuitem" tabindex="-1" href="https://twitter.com/fat">Action</a></li>
               <li role="presentation"><a role="menuitem" tabindex="-1" href="https://twitter.com/fat">Another action</a></li>
@@ -66,9 +67,9 @@
   </nav>
 
   <ul class="nav nav-pills">
-    <li class="active"><a href="#">Regular link</a></li>
-    <li class="dropdown">
-      <a id="drop4" role="button" data-toggle="dropdown" href="#">Dropdown <b class="caret"></b></a>
+    <li class="active nav-item"><a href="#" class="nav-link">Regular link</a></li>
+    <li class="dropdown nav-item">
+      <a id="drop4" class="nav-link" role="button" data-toggle="dropdown" href="#">Dropdown <b class="caret"></b></a>
       <ul id="menu1" class="dropdown-menu" role="menu" aria-labelledby="drop4">
         <li role="presentation"><a role="menuitem" tabindex="-1" href="https://twitter.com/fat">Action</a></li>
         <li role="presentation"><a role="menuitem" tabindex="-1" href="https://twitter.com/fat">Another action</a></li>
@@ -77,8 +78,8 @@
         <li role="presentation"><a role="menuitem" tabindex="-1" href="https://twitter.com/fat">Separated link</a></li>
       </ul>
     </li>
-    <li class="dropdown">
-      <a id="drop5" role="button" data-toggle="dropdown" href="#">Dropdown 2 <b class="caret"></b></a>
+    <li class="dropdown nav-item">
+      <a id="drop5" class="nav-link" role="button" data-toggle="dropdown" href="#">Dropdown 2 <b class="caret"></b></a>
       <ul id="menu2" class="dropdown-menu" role="menu" aria-labelledby="drop5">
         <li role="presentation"><a role="menuitem" tabindex="-1" href="https://twitter.com/fat">Action</a></li>
         <li role="presentation"><a role="menuitem" tabindex="-1" href="https://twitter.com/fat">Another action</a></li>
@@ -93,9 +94,9 @@
 
 <!-- JavaScript Includes -->
 <script src="../vendor/jquery.min.js"></script>
-<script src="../../util.js"></script>
-<script src="../../dropdown.js"></script>
-<script src="../../collapse.js"></script>
+<script src="../../dist/util.js"></script>
+<script src="../../dist/dropdown.js"></script>
+<script src="../../dist/collapse.js"></script>
 
 </body>
 </html>
diff --git a/js/tests/visual/modal.html b/js/tests/visual/modal.html
index 0d6e50ea2..ab61a3b16 100644
--- a/js/tests/visual/modal.html
+++ b/js/tests/visual/modal.html
@@ -6,16 +6,55 @@
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <title>Modal</title>
   <link rel="stylesheet" href="../../../dist/css/bootstrap.min.css">
+
+  <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
+  <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+  <!--[if lt IE 9]>
+    <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
+    <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+  <![endif]-->
+
+  <style>
+    #tall {
+      height: 1500px;
+      width: 100px;
+      background-color: black;
+      color: white;
+    }
+  </style>
 </head>
 <body>
 
+<nav class="navbar navbar-default navbar-static-top">
+  <div class="container-fluid">
+    <div class="navbar-header">
+      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
+        <span class="sr-only">Toggle navigation</span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+      </button>
+      <a class="navbar-brand" href="#">navbar-static-top</a>
+    </div>
+    <div id="navbar" class="navbar-collapse collapse">
+      <ul class="nav navbar-nav">
+        <li><a href="#about">About</a></li>
+        <li><a href="#contact">Contact</a></li>
+      </ul>
+      <ul class="nav navbar-nav navbar-right">
+        <li><a href="#">This should not jump to the left when the modal is shown.</a></li>
+      </ul>
+    </div><!--/.nav-collapse -->
+  </div>
+</nav>
+
 <div class="container">
 
   <div class="page-header">
     <h1>Modal <small>Bootstrap Visual Test</small></h1>
   </div>
 
-  <div id="myModal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+  <div id="myModal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
     <div class="modal-dialog">
       <div class="modal-content">
 
@@ -28,10 +67,43 @@
           <p>Duis mollis, est non commodo luctus, nisi erat porttitor ligula.</p>
 
           <h4>Popover in a modal</h4>
-          <p>This <a href="#" role="button" class="btn btn-default js-popover" title="" data-content="And here's some amazing content. It's very engaging. right?" data-original-title="A Title">button</a> should trigger a popover on click.</p>
+          <p>This <a href="#" role="button" class="btn btn-default js-popover" title="A Title" data-content="And here's some amazing content. It's very engaging. right?" data-placement="left">button</a> should trigger a popover on click.</p>
 
           <h4>Tooltips in a modal</h4>
-          <p><a href="#" class="js-tooltip" title="" data-original-title="Tooltip">This link</a> and <a href="#" class="js-tooltip" title="" data-original-title="Tooltip">that link</a> should have tooltips on hover.</p>
+          <p><a href="#" class="js-tooltip" title="Tooltip">This link</a> and <a href="#" class="js-tooltip" title="Tooltip">that link</a> should have tooltips on hover.</p>
+
+          <div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true">
+            <div class="panel panel-default">
+              <div class="panel-heading" role="tab" id="headingOne">
+                <h4 class="panel-title">
+                  <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseOne" aria-expanded="true" aria-controls="collapseOne">
+                    Collapsible Group Item #1
+                  </a>
+                </h4>
+              </div>
+              <div id="collapseOne" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="headingOne">
+                <div class="panel-body">
+                  Lorem ipsum
+                </div>
+              </div>
+            </div>
+            <div class="panel panel-default">
+              <div class="panel-heading" role="tab" id="headingTwo">
+                <h4 class="panel-title">
+                  <a class="collapsed" role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseTwo" aria-expanded="false" aria-controls="collapseTwo">
+                    Collapsible Group Item #2
+                  </a>
+                </h4>
+              </div>
+              <div id="collapseTwo" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingTwo">
+                <div class="panel-body">
+                  Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS.
+                  Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS.
+                  Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS.
+                </div>
+              </div>
+            </div>
+          </div>
 
           <hr>
 
@@ -59,20 +131,33 @@
     Launch demo modal
   </button>
 
+  <button id="tall-toggle" class="btn btn-default">Toggle tall &lt;body&gt; content</button>
+  <br><br>
+  <div id="tall" style="display: none;">
+    Tall body content to force the page to have a scrollbar.
+  </div>
+
 </div>
 
 <!-- JavaScript Includes -->
 <script src="../vendor/jquery.min.js"></script>
-<script src="../../util.js"></script>
-<script src="../../modal.js"></script>
+
+<script src="../../dist/util.js"></script>
+<script src="../../dist/modal.js"></script>
+<script src="../../dist/collapse.js"></script>
+
+<!-- <script src="../../transition.js"></script>
 <script src="../../tooltip.js"></script>
-<script src="../../popover.js"></script>
+<script src="../../popover.js"></script> -->
 
 <!-- JavaScript Test -->
 <script>
 $(function () {
-  $('.js-popover').popover()
-  $('.js-tooltip').tooltip()
+  // $('.js-popover').popover()
+  // $('.js-tooltip').tooltip()
+  // $('#tall-toggle').click(function () {
+  //   $('#tall').toggle()
+  // })
 })
 </script>
 
diff --git a/js/tests/visual/popover.html b/js/tests/visual/popover.html
index 7446a6741..ac6557256 100644
--- a/js/tests/visual/popover.html
+++ b/js/tests/visual/popover.html
@@ -5,7 +5,14 @@
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <title>Popover</title>
-  <link rel="stylesheet" href="../../../dist/css/bootstrap.min.css">
+  <link rel="stylesheet" href="../../../dist/css/bootstrap.css">
+
+  <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
+  <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+  <!--[if lt IE 9]>
+    <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
+    <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+  <![endif]-->
 </head>
 <body>
 
@@ -32,9 +39,11 @@
 
 <!-- JavaScript Includes -->
 <script src="../vendor/jquery.min.js"></script>
-<script src="../../util.js"></script>
-<script src="../../tooltip.js"></script>
-<script src="../../popover.js"></script>
+<script src="../vendor/tether.min.js"></script>
+<script src="../../dist/util.js"></script>
+<script src="../../dist/tooltip.js"></script>
+<script src="../../dist/popover.js"></script>
+
 
 <!-- JavaScript Test -->
 <script>
diff --git a/js/tests/visual/scrollspy.html b/js/tests/visual/scrollspy.html
index 13bc4383c..9958f90c0 100644
--- a/js/tests/visual/scrollspy.html
+++ b/js/tests/visual/scrollspy.html
@@ -10,6 +10,13 @@
   <style>
     body { padding-top: 70px; }
   </style>
+
+  <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
+  <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+  <!--[if lt IE 9]>
+    <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
+    <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+  <![endif]-->
 </head>
 <body data-spy="scroll" data-target=".navbar" data-offset="70">
 
@@ -17,21 +24,12 @@
 
   <nav class="navbar navbar-default navbar-fixed-top" role="navigation">
     <div class="container-fluid">
-      <div class="navbar-header">
-        <button class="navbar-toggle collapsed" type="button" data-toggle="collapse" data-target=".js-navbar-scrollspy">
-          <span class="sr-only">Toggle navigation</span>
-          <span class="icon-bar"></span>
-          <span class="icon-bar"></span>
-          <span class="icon-bar"></span>
-        </button>
-        <a class="navbar-brand" href="#">Project Name</a>
-      </div>
-      <div class="collapse navbar-collapse js-navbar-scrollspy">
+      <div class="js-navbar-scrollspy">
         <ul class="nav navbar-nav">
-          <li class=""><a href="#fat">@fat</a></li>
-          <li class=""><a href="#mdo">@mdo</a></li>
-          <li class="dropdown">
-            <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a>
+          <li class="nav-item active"><a class="nav-link" href="#fat">@fat</a></li>
+          <li class="nav-item"><a class="nav-link" href="#mdo">@mdo</a></li>
+          <li class="dropdown nav-item">
+            <a href="#" class="dropdown-toggle nav-link" data-toggle="dropdown">Dropdown <b class="caret"></b></a>
             <ul class="dropdown-menu" role="menu">
               <li class=""><a href="#one" tabindex="-1">one</a></li>
               <li><a href="#two" tabindex="-1">two</a></li>
@@ -93,10 +91,10 @@
 
 <!-- JavaScript Includes -->
 <script src="../vendor/jquery.min.js"></script>
-<script src="../../util.js"></script>
-<script src="../../scrollspy.js"></script>
-<script src="../../dropdown.js"></script>
-<script src="../../collapse.js"></script>
+<script src="../../dist/util.js"></script>
+<script src="../../dist/scrollspy.js"></script>
+<script src="../../dist/dropdown.js"></script>
+<script src="../../dist/collapse.js"></script>
 
 </body>
 </html>
diff --git a/js/tests/visual/tab.html b/js/tests/visual/tab.html
index 2480ce08c..ff6685fed 100644
--- a/js/tests/visual/tab.html
+++ b/js/tests/visual/tab.html
@@ -16,6 +16,13 @@
       margin-bottom: 15px;
     }
   </style>
+
+  <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
+  <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+  <!--[if lt IE 9]>
+    <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
+    <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+  <![endif]-->
 </head>
 <body>
 
@@ -28,10 +35,10 @@
   <h4>Tabs without fade</h4>
 
   <ul id="myTab" class="nav nav-tabs">
-    <li class="active"><a href="#home" data-toggle="tab">Home</a></li>
-    <li><a href="#profile" data-toggle="tab">Profile</a></li>
-    <li class="dropdown">
-      <a href="#" id="myTabDrop1" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a>
+    <li class="active nav-item"><a href="#home" class="nav-link" data-toggle="tab">Home</a></li>
+    <li class="nav-item"><a href="#profile" data-toggle="tab" class="nav-link">Profile</a></li>
+    <li class="dropdown nav-item">
+      <a href="#" id="myTabDrop1" class="dropdown-toggle nav-link" data-toggle="dropdown">Dropdown <b class="caret"></b></a>
       <ul class="dropdown-menu" role="menu" aria-labelledby="myTabDrop1">
         <li><a href="#dropdown1" tabindex="-1" data-toggle="tab">@fat</a></li>
         <li><a href="#dropdown2" tabindex="-1" data-toggle="tab">@mdo</a></li>
@@ -60,10 +67,10 @@
   <h4>Tabs with fade</h4>
 
   <ul id="myTab1" class="nav nav-tabs">
-    <li class="active"><a href="#home1" data-toggle="tab">Home</a></li>
-    <li><a href="#profile1" data-toggle="tab">Profile</a></li>
-    <li class="dropdown">
-      <a href="#" id="myTabDrop2" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a>
+    <li class="active nav-item"><a class="nav-link" href="#home1" data-toggle="tab">Home</a></li>
+    <li class="nav-item"><a class="nav-link" href="#profile1" data-toggle="tab">Profile</a></li>
+    <li class="dropdown nav-item">
+      <a href="#" id="myTabDrop2" class="dropdown-toggle nav-link" data-toggle="dropdown">Dropdown <b class="caret"></b></a>
       <ul class="dropdown-menu" role="menu" aria-labelledby="myTabDrop2">
         <li><a href="#dropdown1-1" tabindex="-1" data-toggle="tab">@fat</a></li>
         <li><a href="#dropdown1-2" tabindex="-1" data-toggle="tab">@mdo</a></li>
@@ -92,10 +99,10 @@
   <h4>Tabs without fade (no initially active pane)</h4>
 
   <ul id="myTab2" class="nav nav-tabs">
-    <li><a href="#home2" data-toggle="tab">Home</a></li>
-    <li><a href="#profile2" data-toggle="tab">Profile</a></li>
-    <li class="dropdown">
-      <a href="#" id="myTabDrop3" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a>
+    <li class="nav-item"><a class="nav-link" href="#home2" data-toggle="tab">Home</a></li>
+    <li class="nav-item"><a class="nav-link" href="#profile2" data-toggle="tab">Profile</a></li>
+    <li class="dropdown nav-item">
+      <a href="#" id="myTabDrop3" class="dropdown-toggle nav-link" data-toggle="dropdown">Dropdown <b class="caret"></b></a>
       <ul class="dropdown-menu" role="menu" aria-labelledby="myTabDrop3">
         <li><a href="#dropdown2-1" tabindex="-1" data-toggle="tab">@fat</a></li>
         <li><a href="#dropdown2-2" tabindex="-1" data-toggle="tab">@mdo</a></li>
@@ -124,10 +131,10 @@
   <h4>Tabs with fade (no initially active pane)</h4>
 
   <ul id="myTab3" class="nav nav-tabs">
-    <li><a href="#home3" data-toggle="tab">Home</a></li>
-    <li><a href="#profile3" data-toggle="tab">Profile</a></li>
-    <li class="dropdown">
-      <a href="#" id="myTabDrop4" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a>
+    <li class="nav-item"><a class="nav-link" href="#home3" data-toggle="tab">Home</a></li>
+    <li class="nav-item"><a class="nav-link" href="#profile3" data-toggle="tab">Profile</a></li>
+    <li class="dropdown nav-item">
+      <a href="#" id="myTabDrop4" class="dropdown-toggle nav-link" data-toggle="dropdown">Dropdown <b class="caret"></b></a>
       <ul class="dropdown-menu" role="menu" aria-labelledby="myTabDrop4">
         <li><a href="#dropdown3-1" tabindex="-1" data-toggle="tab">@fat</a></li>
         <li><a href="#dropdown3-2" tabindex="-1" data-toggle="tab">@mdo</a></li>
@@ -157,9 +164,9 @@
 
 <!-- JavaScript Includes -->
 <script src="../vendor/jquery.min.js"></script>
-<script src="../../util.js"></script>
-<script src="../../tab.js"></script>
-<script src="../../dropdown.js"></script>
+<script src="../../dist/util.js"></script>
+<script src="../../dist/tab.js"></script>
+<script src="../../dist/dropdown.js"></script>
 
 </body>
 </html>
diff --git a/js/tests/visual/tooltip.html b/js/tests/visual/tooltip.html
index c61b088d0..1946dff97 100644
--- a/js/tests/visual/tooltip.html
+++ b/js/tests/visual/tooltip.html
@@ -5,7 +5,14 @@
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <title>Tooltip</title>
-  <link rel="stylesheet" href="../../../dist/css/bootstrap.min.css">
+  <link rel="stylesheet" href="../../../dist/css/bootstrap.css">
+
+  <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
+  <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+  <!--[if lt IE 9]>
+    <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
+    <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+  <![endif]-->
 </head>
 <body>
 
@@ -15,7 +22,7 @@
     <h1>Tooltip <small>Bootstrap Visual Test</small></h1>
   </div>
 
-  <p class="muted" style="margin-bottom: 0;">Tight pants next level keffiyeh <a href="#" data-toggle="tooltip" title="" data-original-title="Default tooltip">you probably</a> haven't heard of them. Photo booth beard raw denim letterpress vegan messenger bag stumptown. Farm-to-table seitan, mcsweeney's fixie sustainable quinoa 8-bit american apparel <a href="#" data-toggle="tooltip" title="" data-original-title="Another tooltip">have a</a> terry richardson vinyl chambray. Beard stumptown, cardigans banh mi lomo thundercats. Tofu biodiesel williamsburg marfa, four loko mcsweeney's cleanse vegan chambray. A really ironic artisan <a href="#" data-toggle="tooltip" title="" data-original-title="Another one here too">whatever keytar</a>, scenester farm-to-table banksy Austin <a href="#" data-toggle="tooltip" title="" data-original-title="The last tip!">twitter handle</a> freegan cred raw denim single-origin coffee viral.
+  <p class="muted" style="margin-bottom: 0;">Tight pants next level keffiyeh <a href="#" data-toggle="tooltip" title="Default tooltip">you probably</a> haven't heard of them. Photo booth beard raw denim letterpress vegan messenger bag stumptown. Farm-to-table seitan, mcsweeney's fixie sustainable quinoa 8-bit american apparel <a href="#" data-toggle="tooltip" title="Another tooltip">have a</a> terry richardson vinyl chambray. Beard stumptown, cardigans banh mi lomo thundercats. Tofu biodiesel williamsburg marfa, four loko mcsweeney's cleanse vegan chambray. A really ironic artisan <a href="#" data-toggle="tooltip" title="Another one here too">whatever keytar</a>, scenester farm-to-table banksy Austin <a href="#" data-toggle="tooltip" title="The last tip!">twitter handle</a> freegan cred raw denim single-origin coffee viral.
   </p>
   <hr>
   <p>
@@ -29,8 +36,9 @@
 
 <!-- JavaScript Includes -->
 <script src="../vendor/jquery.min.js"></script>
-<script src="../../util.js"></script>
-<script src="../../tooltip.js"></script>
+<script src="../vendor/tether.min.js"></script>
+<script src="../../dist/util.js"></script>
+<script src="../../dist/tooltip.js"></script>
 
 <!-- JavaScript Test -->
 <script>
author	Mark Otto <[email protected]>	2015-05-27 15:49:55 -0700
committer	Mark Otto <[email protected]>	2015-05-27 15:49:55 -0700
commit	663576a7ae77fb3f6143ce59ea16511cdaf8e9c3 (patch)
tree	4c205f99d57e85308abc01ee431b6008bdf8c641 /js/tests
parent	bd971c49b0883452af2e1278a8628eaf351504a1 (diff)
parent	3fe894ba3620c7e5d2e040f83948488d1911aedc (diff)
download	bootstrap-663576a7ae77fb3f6143ce59ea16511cdaf8e9c3.tar.xz bootstrap-663576a7ae77fb3f6143ce59ea16511cdaf8e9c3.zip