From 6ec7c72e5b5152afb676c43ea57a51fb625f9ba2 Mon Sep 17 00:00:00 2001
From: Paul McLanahan <paul@mclanahan.net>
Date: Fri, 9 Nov 2012 11:48:21 -0500
Subject: Fix issue with double move event firing in typeahead.

Fix test to catch issue.
Fix #5806.
---
 js/tests/unit/bootstrap-typeahead.js | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

(limited to 'js/tests')

diff --git a/js/tests/unit/bootstrap-typeahead.js b/js/tests/unit/bootstrap-typeahead.js
index 16bdb9194..b796a33b3 100644
--- a/js/tests/unit/bootstrap-typeahead.js
+++ b/js/tests/unit/bootstrap-typeahead.js
@@ -137,10 +137,19 @@ $(function () {
         equals(typeahead.$menu.find('.active').length, 1, 'one item is active')
         ok(typeahead.$menu.find('li').first().hasClass('active'), "first item is active")
 
+        // simulate entire key pressing event
         $input.trigger({
           type: 'keydown'
         , keyCode: 40
         })
+        .trigger({
+          type: 'keypress'
+        , keyCode: 40
+        })
+        .trigger({
+          type: 'keyup'
+        , keyCode: 40
+        })
 
         ok(typeahead.$menu.find('li').first().next().hasClass('active'), "second item is active")
 
@@ -149,6 +158,14 @@ $(function () {
           type: 'keydown'
         , keyCode: 38
         })
+        .trigger({
+          type: 'keypress'
+        , keyCode: 38
+        })
+        .trigger({
+          type: 'keyup'
+        , keyCode: 38
+        })
 
         ok(typeahead.$menu.find('li').first().hasClass('active'), "first item is active")
 
@@ -196,4 +213,4 @@ $(function () {
 
         typeahead.$menu.remove()
       })
-})
\ No newline at end of file
+})
-- 
cgit v1.2.3


From a7eb9c294a575b5471ddec45ae75e1d09f7ace4c Mon Sep 17 00:00:00 2001
From: fat <jacobthornton@gmail.com>
Date: Fri, 7 Dec 2012 17:06:01 -0500
Subject: add noConflict functionality to all bootstrap plugins

---
 js/tests/unit/bootstrap-affix.js     |  6 ++++++
 js/tests/unit/bootstrap-alert.js     |  6 ++++++
 js/tests/unit/bootstrap-button.js    |  6 ++++++
 js/tests/unit/bootstrap-carousel.js  |  6 ++++++
 js/tests/unit/bootstrap-collapse.js  |  6 ++++++
 js/tests/unit/bootstrap-dropdown.js  | 10 ++++++++--
 js/tests/unit/bootstrap-modal.js     |  6 ++++++
 js/tests/unit/bootstrap-popover.js   | 12 +++++++++---
 js/tests/unit/bootstrap-scrollspy.js |  6 ++++++
 js/tests/unit/bootstrap-tab.js       |  6 ++++++
 js/tests/unit/bootstrap-tooltip.js   |  6 ++++++
 js/tests/unit/bootstrap-typeahead.js |  6 ++++++
 12 files changed, 77 insertions(+), 5 deletions(-)

(limited to 'js/tests')

diff --git a/js/tests/unit/bootstrap-affix.js b/js/tests/unit/bootstrap-affix.js
index bc25df991..c97887890 100644
--- a/js/tests/unit/bootstrap-affix.js
+++ b/js/tests/unit/bootstrap-affix.js
@@ -2,6 +2,12 @@ $(function () {
 
     module("bootstrap-affix")
 
+      test("should provide no conflict", function () {
+        var affix = $.fn.affix.noConflict()
+        ok(!$.fn.affix, 'affix was set back to undefined (org value)')
+        $.fn.affix = affix
+      })
+
       test("should be defined on jquery object", function () {
         ok($(document.body).affix, 'affix method is defined')
       })
diff --git a/js/tests/unit/bootstrap-alert.js b/js/tests/unit/bootstrap-alert.js
index 7f24e0e6b..9a6b514c4 100644
--- a/js/tests/unit/bootstrap-alert.js
+++ b/js/tests/unit/bootstrap-alert.js
@@ -2,6 +2,12 @@ $(function () {
 
     module("bootstrap-alerts")
 
+      test("should provide no conflict", function () {
+        var alert = $.fn.alert.noConflict()
+        ok(!$.fn.alert, 'alert was set back to undefined (org value)')
+        $.fn.alert = alert
+      })
+
       test("should be defined on jquery object", function () {
         ok($(document.body).alert, 'alert method is defined')
       })
diff --git a/js/tests/unit/bootstrap-button.js b/js/tests/unit/bootstrap-button.js
index b5d083499..e23ff9e30 100644
--- a/js/tests/unit/bootstrap-button.js
+++ b/js/tests/unit/bootstrap-button.js
@@ -2,6 +2,12 @@ $(function () {
 
     module("bootstrap-buttons")
 
+      test("should provide no conflict", function () {
+        var button = $.fn.button.noConflict()
+        ok(!$.fn.button, 'button was set back to undefined (org value)')
+        $.fn.button = button
+      })
+
       test("should be defined on jquery object", function () {
         ok($(document.body).button, 'button method is defined')
       })
diff --git a/js/tests/unit/bootstrap-carousel.js b/js/tests/unit/bootstrap-carousel.js
index 8bd1b62ba..13b8f721f 100644
--- a/js/tests/unit/bootstrap-carousel.js
+++ b/js/tests/unit/bootstrap-carousel.js
@@ -2,6 +2,12 @@ $(function () {
 
     module("bootstrap-carousel")
 
+      test("should provide no conflict", function () {
+        var carousel = $.fn.carousel.noConflict()
+        ok(!$.fn.carousel, 'carousel was set back to undefined (org value)')
+        $.fn.carousel = carousel
+      })
+
       test("should be defined on jquery object", function () {
         ok($(document.body).carousel, 'carousel method is defined')
       })
diff --git a/js/tests/unit/bootstrap-collapse.js b/js/tests/unit/bootstrap-collapse.js
index 6cc7ac7a4..4c5916ecd 100644
--- a/js/tests/unit/bootstrap-collapse.js
+++ b/js/tests/unit/bootstrap-collapse.js
@@ -2,6 +2,12 @@ $(function () {
 
     module("bootstrap-collapse")
 
+      test("should provide no conflict", function () {
+        var collapse = $.fn.collapse.noConflict()
+        ok(!$.fn.collapse, 'collapse was set back to undefined (org value)')
+        $.fn.collapse = collapse
+      })
+
       test("should be defined on jquery object", function () {
         ok($(document.body).collapse, 'collapse method is defined')
       })
diff --git a/js/tests/unit/bootstrap-dropdown.js b/js/tests/unit/bootstrap-dropdown.js
index 3788209ec..2f0d2d29e 100644
--- a/js/tests/unit/bootstrap-dropdown.js
+++ b/js/tests/unit/bootstrap-dropdown.js
@@ -2,6 +2,12 @@ $(function () {
 
     module("bootstrap-dropdowns")
 
+      test("should provide no conflict", function () {
+        var dropdown = $.fn.dropdown.noConflict()
+        ok(!$.fn.dropdown, 'dropdown was set back to undefined (org value)')
+        $.fn.dropdown = dropdown
+      })
+
       test("should be defined on jquery object", function () {
         ok($(document.body).dropdown, 'dropdown method is defined')
       })
@@ -104,7 +110,7 @@ $(function () {
       })
 
       test("should remove open class if body clicked, with multiple drop downs", function () {
-          var dropdownHTML = 
+          var dropdownHTML =
             '<ul class="nav">'
             + '    <li><a href="#menu1">Menu 1</a></li>'
             + '    <li class="dropdown" id="testmenu">'
@@ -126,7 +132,7 @@ $(function () {
           , last = dropdowns.last()
 
         ok(dropdowns.length == 2, "Should be two dropdowns")
-          
+
         first.click()
         ok(first.parents('.open').length == 1, 'open class added on click')
         ok($('#qunit-fixture .open').length == 1, 'only one object is open')
diff --git a/js/tests/unit/bootstrap-modal.js b/js/tests/unit/bootstrap-modal.js
index 0851f64a7..98aa990a6 100644
--- a/js/tests/unit/bootstrap-modal.js
+++ b/js/tests/unit/bootstrap-modal.js
@@ -2,6 +2,12 @@ $(function () {
 
     module("bootstrap-modal")
 
+      test("should provide no conflict", function () {
+        var modal = $.fn.modal.noConflict()
+        ok(!$.fn.modal, 'modal was set back to undefined (org value)')
+        $.fn.modal = modal
+      })
+
       test("should be defined on jquery object", function () {
         var div = $("<div id='modal-test'></div>")
         ok(div.modal, 'modal method is defined')
diff --git a/js/tests/unit/bootstrap-popover.js b/js/tests/unit/bootstrap-popover.js
index 6a5f0bdcf..20234e147 100644
--- a/js/tests/unit/bootstrap-popover.js
+++ b/js/tests/unit/bootstrap-popover.js
@@ -2,6 +2,12 @@ $(function () {
 
     module("bootstrap-popover")
 
+      test("should provide no conflict", function () {
+        var popover = $.fn.popover.noConflict()
+        ok(!$.fn.popover, 'popover was set back to undefined (org value)')
+        $.fn.popover = popover
+      })
+
       test("should be defined on jquery object", function () {
         var div = $('<div></div>')
         ok(div.popover, 'popover method is defined')
@@ -70,7 +76,7 @@ $(function () {
         ok(!$('.popover').length, 'popover was removed')
         $('#qunit-fixture').empty()
       })
-    
+
       test("should respect custom classes", function() {
         $.support.transition = false
         var popover = $('<a href="#">@fat</a>')
@@ -80,7 +86,7 @@ $(function () {
           , content: 'Test'
           , template: '<div class="popover foobar"><div class="arrow"></div><div class="inner"><h3 class="title"></h3><div class="content"><p></p></div></div></div>'
           })
-        
+
         popover.popover('show')
 
         ok($('.popover').length, 'popover was inserted')
@@ -103,5 +109,5 @@ $(function () {
         ok($._data(popover[0],'events').click[0].namespace == 'foo', 'popover still has click.foo')
         ok(!$._data(popover[0], 'events').mouseover && !$._data(popover[0], 'events').mouseout, 'popover does not have any events')
       })
-      
+
 })
\ No newline at end of file
diff --git a/js/tests/unit/bootstrap-scrollspy.js b/js/tests/unit/bootstrap-scrollspy.js
index bee46a925..32bfa7134 100644
--- a/js/tests/unit/bootstrap-scrollspy.js
+++ b/js/tests/unit/bootstrap-scrollspy.js
@@ -2,6 +2,12 @@ $(function () {
 
     module("bootstrap-scrollspy")
 
+      test("should provide no conflict", function () {
+        var scrollspy = $.fn.scrollspy.noConflict()
+        ok(!$.fn.scrollspy, 'scrollspy was set back to undefined (org value)')
+        $.fn.scrollspy = scrollspy
+      })
+
       test("should be defined on jquery object", function () {
         ok($(document.body).scrollspy, 'scrollspy method is defined')
       })
diff --git a/js/tests/unit/bootstrap-tab.js b/js/tests/unit/bootstrap-tab.js
index 40f9a7406..ba5910d5e 100644
--- a/js/tests/unit/bootstrap-tab.js
+++ b/js/tests/unit/bootstrap-tab.js
@@ -2,6 +2,12 @@ $(function () {
 
     module("bootstrap-tabs")
 
+      test("should provide no conflict", function () {
+        var tab = $.fn.tab.noConflict()
+        ok(!$.fn.tab, 'tab was set back to undefined (org value)')
+        $.fn.tab = tab
+      })
+
       test("should be defined on jquery object", function () {
         ok($(document.body).tab, 'tabs method is defined')
       })
diff --git a/js/tests/unit/bootstrap-tooltip.js b/js/tests/unit/bootstrap-tooltip.js
index bbdf3ce80..ba5134743 100644
--- a/js/tests/unit/bootstrap-tooltip.js
+++ b/js/tests/unit/bootstrap-tooltip.js
@@ -2,6 +2,12 @@ $(function () {
 
     module("bootstrap-tooltip")
 
+      test("should provide no conflict", function () {
+        var tooltip = $.fn.tooltip.noConflict()
+        ok(!$.fn.tooltip, 'tooltip was set back to undefined (org value)')
+        $.fn.tooltip = tooltip
+      })
+
       test("should be defined on jquery object", function () {
         var div = $("<div></div>")
         ok(div.tooltip, 'popover method is defined')
diff --git a/js/tests/unit/bootstrap-typeahead.js b/js/tests/unit/bootstrap-typeahead.js
index 16bdb9194..0f7aed27d 100644
--- a/js/tests/unit/bootstrap-typeahead.js
+++ b/js/tests/unit/bootstrap-typeahead.js
@@ -2,6 +2,12 @@ $(function () {
 
     module("bootstrap-typeahead")
 
+      test("should provide no conflict", function () {
+        var typeahead = $.fn.typeahead.noConflict()
+        ok(!$.fn.typeahead, 'typeahead was set back to undefined (org value)')
+        $.fn.typeahead = typeahead
+      })
+
       test("should be defined on jquery object", function () {
         ok($(document.body).typeahead, 'alert method is defined')
       })
-- 
cgit v1.2.3


From 820a3b27b6cfd320584be5a8e1652c7dff9771e4 Mon Sep 17 00:00:00 2001
From: fat <jacobthornton@gmail.com>
Date: Fri, 7 Dec 2012 19:16:48 -0500
Subject: get tests passing for typeahead :P

---
 js/tests/unit/bootstrap-typeahead.js | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

(limited to 'js/tests')

diff --git a/js/tests/unit/bootstrap-typeahead.js b/js/tests/unit/bootstrap-typeahead.js
index 0cf26b315..4bdbce970 100644
--- a/js/tests/unit/bootstrap-typeahead.js
+++ b/js/tests/unit/bootstrap-typeahead.js
@@ -38,7 +38,9 @@ $(function () {
       })
 
       test("should show menu when query entered", function () {
-        var $input = $('<input />').typeahead({
+        var $input = $('<input />')
+            .appendTo('body')
+            .typeahead({
               source: ['aa', 'ab', 'ac']
             })
           , typeahead = $input.data('typeahead')
@@ -50,6 +52,7 @@ $(function () {
         equals(typeahead.$menu.find('li').length, 3, 'has 3 items in menu')
         equals(typeahead.$menu.find('.active').length, 1, 'one item is active')
 
+        $input.remove()
         typeahead.$menu.remove()
       })
 
@@ -58,7 +61,7 @@ $(function () {
               source: function () {
                 return ['aa', 'ab', 'ac']
               }
-            })
+            }).appendTo('body')
           , typeahead = $input.data('typeahead')
 
         $input.val('a')
@@ -68,6 +71,7 @@ $(function () {
         equals(typeahead.$menu.find('li').length, 3, 'has 3 items in menu')
         equals(typeahead.$menu.find('.active').length, 1, 'one item is active')
 
+        $input.remove()
         typeahead.$menu.remove()
       })
 
@@ -76,7 +80,7 @@ $(function () {
               source: function (query, process) {
                 process(['aa', 'ab', 'ac'])
               }
-            })
+            }).appendTo('body')
           , typeahead = $input.data('typeahead')
 
         $input.val('a')
@@ -86,13 +90,14 @@ $(function () {
         equals(typeahead.$menu.find('li').length, 3, 'has 3 items in menu')
         equals(typeahead.$menu.find('.active').length, 1, 'one item is active')
 
+        $input.remove()
         typeahead.$menu.remove()
       })
 
       test("should not explode when regex chars are entered", function () {
         var $input = $('<input />').typeahead({
               source: ['aa', 'ab', 'ac', 'mdo*', 'fat+']
-            })
+            }).appendTo('body')
           , typeahead = $input.data('typeahead')
 
         $input.val('+')
@@ -102,6 +107,7 @@ $(function () {
         equals(typeahead.$menu.find('li').length, 1, 'has 1 item in menu')
         equals(typeahead.$menu.find('.active').length, 1, 'one item is active')
 
+        $input.remove()
         typeahead.$menu.remove()
       })
 
@@ -109,7 +115,7 @@ $(function () {
         stop()
         var $input = $('<input />').typeahead({
               source: ['aa', 'ab', 'ac']
-            })
+            }).appendTo('body')
           , typeahead = $input.data('typeahead')
 
         $input.val('a')
@@ -126,13 +132,14 @@ $(function () {
           start()
         }, 200)
 
+        $input.remove()
         typeahead.$menu.remove()
       })
 
       test("should set next item when down arrow is pressed", function () {
         var $input = $('<input />').typeahead({
               source: ['aa', 'ab', 'ac']
-            })
+            }).appendTo('body')
           , typeahead = $input.data('typeahead')
 
         $input.val('a')
@@ -159,7 +166,6 @@ $(function () {
 
         ok(typeahead.$menu.find('li').first().next().hasClass('active'), "second item is active")
 
-
         $input.trigger({
           type: 'keydown'
         , keyCode: 38
@@ -175,6 +181,7 @@ $(function () {
 
         ok(typeahead.$menu.find('li').first().hasClass('active'), "first item is active")
 
+        $input.remove()
         typeahead.$menu.remove()
       })
 
@@ -182,7 +189,7 @@ $(function () {
       test("should set input value to selected item", function () {
         var $input = $('<input />').typeahead({
               source: ['aa', 'ab', 'ac']
-            })
+            }).appendTo('body')
           , typeahead = $input.data('typeahead')
           , changed = false
 
@@ -197,6 +204,7 @@ $(function () {
         ok(!typeahead.$menu.is(':visible'), 'the menu was hidden')
         ok(changed, 'a change event was fired')
 
+        $input.remove()
         typeahead.$menu.remove()
       })
 
@@ -204,7 +212,7 @@ $(function () {
         var $input = $('<input />').typeahead({
               source: ['aaaa', 'aaab', 'aaac'],
               minLength: 3
-            })
+            }).appendTo('body')
           , typeahead = $input.data('typeahead')
 
         $input.val('aa')
@@ -217,6 +225,7 @@ $(function () {
 
         equals(typeahead.$menu.find('li').length, 3, 'has 3 items in menu')
 
+        $input.remove()
         typeahead.$menu.remove()
       })
 })
-- 
cgit v1.2.3