From 7c19fee3f1f3a371445981cf7e88a3af92f3b602 Mon Sep 17 00:00:00 2001
From: Chris Rebert <code@rebertia.com>
Date: Mon, 23 Feb 2015 21:55:07 -0800
Subject: JS unit tests: use modern QUnit assert object everywhere

---
 js/tests/unit/collapse.js | 74 +++++++++++++++++++++++------------------------
 1 file changed, 37 insertions(+), 37 deletions(-)

(limited to 'js/tests/unit/collapse.js')

diff --git a/js/tests/unit/collapse.js b/js/tests/unit/collapse.js
index ad59d87db..a38a3c43a 100644
--- a/js/tests/unit/collapse.js
+++ b/js/tests/unit/collapse.js
@@ -3,8 +3,8 @@ $(function () {
 
   module('collapse plugin')
 
-  test('should be defined on jquery object', function () {
-    ok($(document.body).collapse, 'collapse method is defined')
+  test('should be defined on jquery object', function (assert) {
+    assert.ok($(document.body).collapse, 'collapse method is defined')
   })
 
   module('collapse', {
@@ -18,29 +18,29 @@ $(function () {
     }
   })
 
-  test('should provide no conflict', function () {
-    strictEqual($.fn.collapse, undefined, 'collapse was set back to undefined (org value)')
+  test('should provide no conflict', function (assert) {
+    assert.strictEqual($.fn.collapse, undefined, 'collapse was set back to undefined (org value)')
   })
 
-  test('should return jquery collection containing the element', function () {
+  test('should return jquery collection containing the element', function (assert) {
     var $el = $('<div/>')
     var $collapse = $el.bootstrapCollapse()
-    ok($collapse instanceof $, 'returns jquery collection')
-    strictEqual($collapse[0], $el[0], 'collection contains element')
+    assert.ok($collapse instanceof $, 'returns jquery collection')
+    assert.strictEqual($collapse[0], $el[0], 'collection contains element')
   })
 
-  test('should show a collapsed element', function () {
+  test('should show a collapsed element', function (assert) {
     var $el = $('<div class="collapse"/>').bootstrapCollapse('show')
 
-    ok($el.hasClass('in'), 'has class "in"')
-    ok(!/height/i.test($el.attr('style')), 'has height reset')
+    assert.ok($el.hasClass('in'), 'has class "in"')
+    assert.ok(!/height/i.test($el.attr('style')), 'has height reset')
   })
 
-  test('should hide a collapsed element', function () {
+  test('should hide a collapsed element', function (assert) {
     var $el = $('<div class="collapse"/>').bootstrapCollapse('hide')
 
-    ok(!$el.hasClass('in'), 'does not have class "in"')
-    ok(/height/i.test($el.attr('style')), 'has height set')
+    assert.ok(!$el.hasClass('in'), 'does not have class "in"')
+    assert.ok(/height/i.test($el.attr('style')), 'has height set')
   })
 
   test('should not fire shown when show is prevented', function (assert) {
@@ -49,11 +49,11 @@ $(function () {
     $('<div class="collapse"/>')
       .on('show.bs.collapse', function (e) {
         e.preventDefault()
-        ok(true, 'show event fired')
+        assert.ok(true, 'show event fired')
         done()
       })
       .on('shown.bs.collapse', function () {
-        ok(false, 'shown event fired')
+        assert.ok(false, 'shown event fired')
       })
       .bootstrapCollapse('show')
   })
@@ -63,10 +63,10 @@ $(function () {
 
     $('<div class="collapse" style="height: 0px"/>')
       .on('show.bs.collapse', function () {
-        equal(this.style.height, '0px', 'height is 0px')
+        assert.equal(this.style.height, '0px', 'height is 0px')
       })
       .on('shown.bs.collapse', function () {
-        strictEqual(this.style.height, '', 'height is auto')
+        assert.strictEqual(this.style.height, '', 'height is auto')
         done()
       })
       .bootstrapCollapse('show')
@@ -80,7 +80,7 @@ $(function () {
     $('<div id="test1"/>')
       .appendTo('#qunit-fixture')
       .on('shown.bs.collapse', function () {
-        ok(!$target.hasClass('collapsed'))
+        assert.ok(!$target.hasClass('collapsed'))
         done()
       })
 
@@ -95,7 +95,7 @@ $(function () {
     $('<div id="test1" class="in"/>')
       .appendTo('#qunit-fixture')
       .on('hidden.bs.collapse', function () {
-        ok($target.hasClass('collapsed'))
+        assert.ok($target.hasClass('collapsed'))
         done()
       })
 
@@ -105,12 +105,12 @@ $(function () {
   test('should not close a collapse when initialized with "show" if already shown', function (assert) {
     var done = assert.async()
 
-    expect(0)
+    assert.expect(0)
 
     var $test = $('<div id="test1" class="in"/>')
       .appendTo('#qunit-fixture')
       .on('hide.bs.collapse', function () {
-        ok(false)
+        assert.ok(false)
       })
 
     $test.bootstrapCollapse('show')
@@ -121,12 +121,12 @@ $(function () {
   test('should open a collapse when initialized with "show" if not already shown', function (assert) {
     var done = assert.async()
 
-    expect(1)
+    assert.expect(1)
 
     var $test = $('<div id="test1" />')
       .appendTo('#qunit-fixture')
       .on('show.bs.collapse', function () {
-        ok(true)
+        assert.ok(true)
       })
 
     $test.bootstrapCollapse('show')
@@ -157,9 +157,9 @@ $(function () {
     $('<div id="body3"/>')
       .appendTo($groups.eq(2))
       .on('shown.bs.collapse', function () {
-        ok($target1.hasClass('collapsed'), 'inactive target 1 does have class "collapsed"')
-        ok($target2.hasClass('collapsed'), 'inactive target 2 does have class "collapsed"')
-        ok(!$target3.hasClass('collapsed'), 'active target 3 does not have class "collapsed"')
+        assert.ok($target1.hasClass('collapsed'), 'inactive target 1 does have class "collapsed"')
+        assert.ok($target2.hasClass('collapsed'), 'inactive target 2 does have class "collapsed"')
+        assert.ok(!$target3.hasClass('collapsed'), 'active target 3 does not have class "collapsed"')
 
         done()
       })
@@ -190,9 +190,9 @@ $(function () {
     $('<div id="body3"/>')
       .appendTo($groups.eq(2))
       .on('shown.bs.collapse', function () {
-        ok($target1.hasClass('collapsed'), 'inactive target 1 does have class "collapsed"')
-        ok($target2.hasClass('collapsed'), 'inactive target 2 does have class "collapsed"')
-        ok(!$target3.hasClass('collapsed'), 'active target 3 does not have class "collapsed"')
+        assert.ok($target1.hasClass('collapsed'), 'inactive target 1 does have class "collapsed"')
+        assert.ok($target2.hasClass('collapsed'), 'inactive target 2 does have class "collapsed"')
+        assert.ok(!$target3.hasClass('collapsed'), 'active target 3 does not have class "collapsed"')
 
         done()
       })
@@ -208,7 +208,7 @@ $(function () {
     $('<div id="test1"/>')
       .appendTo('#qunit-fixture')
       .on('shown.bs.collapse', function () {
-        equal($target.attr('aria-expanded'), 'true', 'aria-expanded on target is "true"')
+        assert.equal($target.attr('aria-expanded'), 'true', 'aria-expanded on target is "true"')
         done()
       })
 
@@ -223,7 +223,7 @@ $(function () {
     $('<div id="test1" class="in"/>')
       .appendTo('#qunit-fixture')
       .on('hidden.bs.collapse', function () {
-        equal($target.attr('aria-expanded'), 'false', 'aria-expanded on target is "false"')
+        assert.equal($target.attr('aria-expanded'), 'false', 'aria-expanded on target is "false"')
         done()
       })
 
@@ -253,9 +253,9 @@ $(function () {
     $('<div id="body3" aria-expanded="false"/>')
       .appendTo($groups.eq(2))
       .on('shown.bs.collapse', function () {
-        equal($target1.attr('aria-expanded'), 'false', 'inactive target 1 has aria-expanded="false"')
-        equal($target2.attr('aria-expanded'), 'false', 'inactive target 2 has aria-expanded="false"')
-        equal($target3.attr('aria-expanded'), 'true', 'active target 3 has aria-expanded="false"')
+        assert.equal($target1.attr('aria-expanded'), 'false', 'inactive target 1 has aria-expanded="false"')
+        assert.equal($target2.attr('aria-expanded'), 'false', 'inactive target 2 has aria-expanded="false"')
+        assert.equal($target3.attr('aria-expanded'), 'true', 'active target 3 has aria-expanded="false"')
 
         done()
       })
@@ -293,7 +293,7 @@ $(function () {
     $target1.click()
 
     setTimeout(function () {
-      ok(!showFired, 'show event didn\'t fire')
+      assert.ok(!showFired, 'show event didn\'t fire')
       done()
     }, 1)
   })
@@ -306,7 +306,7 @@ $(function () {
     $('<div id="test1" class="in"/>')
       .appendTo('#qunit-fixture')
       .on('hidden.bs.collapse', function () {
-        ok($target.hasClass('collapsed'))
+        assert.ok($target.hasClass('collapsed'))
         done()
       })
       .bootstrapCollapse('hide')
@@ -320,7 +320,7 @@ $(function () {
     $('<div id="test1"/>')
       .appendTo('#qunit-fixture')
       .on('shown.bs.collapse', function () {
-        ok(!$target.hasClass('collapsed'))
+        assert.ok(!$target.hasClass('collapsed'))
         done()
       })
       .bootstrapCollapse('show')
-- 
cgit v1.2.3


From 118b8c2695d026f1cad6cffc177d9672d9903ce9 Mon Sep 17 00:00:00 2001
From: Chris Rebert <code@rebertia.com>
Date: Mon, 23 Feb 2015 22:04:48 -0800
Subject: JS unit tests: use QUnit.module() & QUnit.test() everywhere

[skip validator]
---
 js/tests/unit/collapse.js | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

(limited to 'js/tests/unit/collapse.js')

diff --git a/js/tests/unit/collapse.js b/js/tests/unit/collapse.js
index a38a3c43a..22ae827ce 100644
--- a/js/tests/unit/collapse.js
+++ b/js/tests/unit/collapse.js
@@ -1,13 +1,13 @@
 $(function () {
   'use strict';
 
-  module('collapse plugin')
+  QUnit.module('collapse plugin')
 
-  test('should be defined on jquery object', function (assert) {
+  QUnit.test('should be defined on jquery object', function (assert) {
     assert.ok($(document.body).collapse, 'collapse method is defined')
   })
 
-  module('collapse', {
+  QUnit.module('collapse', {
     setup: function () {
       // Run all tests in noConflict mode -- it's the only way to ensure that the plugin works in noConflict mode
       $.fn.bootstrapCollapse = $.fn.collapse.noConflict()
@@ -18,32 +18,32 @@ $(function () {
     }
   })
 
-  test('should provide no conflict', function (assert) {
+  QUnit.test('should provide no conflict', function (assert) {
     assert.strictEqual($.fn.collapse, undefined, 'collapse was set back to undefined (org value)')
   })
 
-  test('should return jquery collection containing the element', function (assert) {
+  QUnit.test('should return jquery collection containing the element', function (assert) {
     var $el = $('<div/>')
     var $collapse = $el.bootstrapCollapse()
     assert.ok($collapse instanceof $, 'returns jquery collection')
     assert.strictEqual($collapse[0], $el[0], 'collection contains element')
   })
 
-  test('should show a collapsed element', function (assert) {
+  QUnit.test('should show a collapsed element', function (assert) {
     var $el = $('<div class="collapse"/>').bootstrapCollapse('show')
 
     assert.ok($el.hasClass('in'), 'has class "in"')
     assert.ok(!/height/i.test($el.attr('style')), 'has height reset')
   })
 
-  test('should hide a collapsed element', function (assert) {
+  QUnit.test('should hide a collapsed element', function (assert) {
     var $el = $('<div class="collapse"/>').bootstrapCollapse('hide')
 
     assert.ok(!$el.hasClass('in'), 'does not have class "in"')
     assert.ok(/height/i.test($el.attr('style')), 'has height set')
   })
 
-  test('should not fire shown when show is prevented', function (assert) {
+  QUnit.test('should not fire shown when show is prevented', function (assert) {
     var done = assert.async()
 
     $('<div class="collapse"/>')
@@ -58,7 +58,7 @@ $(function () {
       .bootstrapCollapse('show')
   })
 
-  test('should reset style to auto after finishing opening collapse', function (assert) {
+  QUnit.test('should reset style to auto after finishing opening collapse', function (assert) {
     var done = assert.async()
 
     $('<div class="collapse" style="height: 0px"/>')
@@ -72,7 +72,7 @@ $(function () {
       .bootstrapCollapse('show')
   })
 
-  test('should remove "collapsed" class from target when collapse is shown', function (assert) {
+  QUnit.test('should remove "collapsed" class from target when collapse is shown', function (assert) {
     var done = assert.async()
 
     var $target = $('<a data-toggle="collapse" class="collapsed" href="#test1"/>').appendTo('#qunit-fixture')
@@ -87,7 +87,7 @@ $(function () {
     $target.click()
   })
 
-  test('should add "collapsed" class to target when collapse is hidden', function (assert) {
+  QUnit.test('should add "collapsed" class to target when collapse is hidden', function (assert) {
     var done = assert.async()
 
     var $target = $('<a data-toggle="collapse" href="#test1"/>').appendTo('#qunit-fixture')
@@ -102,7 +102,7 @@ $(function () {
     $target.click()
   })
 
-  test('should not close a collapse when initialized with "show" if already shown', function (assert) {
+  QUnit.test('should not close a collapse when initialized with "show" if already shown', function (assert) {
     var done = assert.async()
 
     assert.expect(0)
@@ -118,7 +118,7 @@ $(function () {
     setTimeout(done, 0)
   })
 
-  test('should open a collapse when initialized with "show" if not already shown', function (assert) {
+  QUnit.test('should open a collapse when initialized with "show" if not already shown', function (assert) {
     var done = assert.async()
 
     assert.expect(1)
@@ -134,7 +134,7 @@ $(function () {
     setTimeout(done, 0)
   })
 
-  test('should remove "collapsed" class from active accordion target', function (assert) {
+  QUnit.test('should remove "collapsed" class from active accordion target', function (assert) {
     var done = assert.async()
 
     var accordionHTML = '<div class="panel-group" id="accordion">'
@@ -167,7 +167,7 @@ $(function () {
     $target3.click()
   })
 
-  test('should allow dots in data-parent', function (assert) {
+  QUnit.test('should allow dots in data-parent', function (assert) {
     var done = assert.async()
 
     var accordionHTML = '<div class="panel-group accordion">'
@@ -200,7 +200,7 @@ $(function () {
     $target3.click()
   })
 
-  test('should set aria-expanded="true" on target when collapse is shown', function (assert) {
+  QUnit.test('should set aria-expanded="true" on target when collapse is shown', function (assert) {
     var done = assert.async()
 
     var $target = $('<a data-toggle="collapse" class="collapsed" href="#test1" aria-expanded="false"/>').appendTo('#qunit-fixture')
@@ -215,7 +215,7 @@ $(function () {
     $target.click()
   })
 
-  test('should set aria-expanded="false" on target when collapse is hidden', function (assert) {
+  QUnit.test('should set aria-expanded="false" on target when collapse is hidden', function (assert) {
     var done = assert.async()
 
     var $target = $('<a data-toggle="collapse" href="#test1" aria-expanded="true"/>').appendTo('#qunit-fixture')
@@ -230,7 +230,7 @@ $(function () {
     $target.click()
   })
 
-  test('should change aria-expanded from active accordion target to "false" and set the newly active one to "true"', function (assert) {
+  QUnit.test('should change aria-expanded from active accordion target to "false" and set the newly active one to "true"', function (assert) {
     var done = assert.async()
 
     var accordionHTML = '<div class="panel-group" id="accordion">'
@@ -263,7 +263,7 @@ $(function () {
     $target3.click()
   })
 
-  test('should not fire show event if show is prevented because other element is still transitioning', function (assert) {
+  QUnit.test('should not fire show event if show is prevented because other element is still transitioning', function (assert) {
     var done = assert.async()
 
     var accordionHTML = '<div id="accordion">'
@@ -298,7 +298,7 @@ $(function () {
     }, 1)
   })
 
-  test('should add "collapsed" class to target when collapse is hidden via manual invocation', function (assert) {
+  QUnit.test('should add "collapsed" class to target when collapse is hidden via manual invocation', function (assert) {
     var done = assert.async()
 
     var $target = $('<a data-toggle="collapse" href="#test1"/>').appendTo('#qunit-fixture')
@@ -312,7 +312,7 @@ $(function () {
       .bootstrapCollapse('hide')
   })
 
-  test('should remove "collapsed" class from target when collapse is shown via manual invocation', function (assert) {
+  QUnit.test('should remove "collapsed" class from target when collapse is shown via manual invocation', function (assert) {
     var done = assert.async()
 
     var $target = $('<a data-toggle="collapse" class="collapsed" href="#test1"/>').appendTo('#qunit-fixture')
-- 
cgit v1.2.3


From 9c75c855c6bba0e9ef9facc7c948612cd0c2a855 Mon Sep 17 00:00:00 2001
From: Chris Rebert <code@rebertia.com>
Date: Mon, 23 Feb 2015 22:41:08 -0800
Subject: JS unit tests: equal() => strictEqual()

[skip validator]
---
 js/tests/unit/collapse.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'js/tests/unit/collapse.js')

diff --git a/js/tests/unit/collapse.js b/js/tests/unit/collapse.js
index 22ae827ce..1616fe48b 100644
--- a/js/tests/unit/collapse.js
+++ b/js/tests/unit/collapse.js
@@ -63,7 +63,7 @@ $(function () {
 
     $('<div class="collapse" style="height: 0px"/>')
       .on('show.bs.collapse', function () {
-        assert.equal(this.style.height, '0px', 'height is 0px')
+        assert.strictEqual(this.style.height, '0px', 'height is 0px')
       })
       .on('shown.bs.collapse', function () {
         assert.strictEqual(this.style.height, '', 'height is auto')
@@ -208,7 +208,7 @@ $(function () {
     $('<div id="test1"/>')
       .appendTo('#qunit-fixture')
       .on('shown.bs.collapse', function () {
-        assert.equal($target.attr('aria-expanded'), 'true', 'aria-expanded on target is "true"')
+        assert.strictEqual($target.attr('aria-expanded'), 'true', 'aria-expanded on target is "true"')
         done()
       })
 
@@ -223,7 +223,7 @@ $(function () {
     $('<div id="test1" class="in"/>')
       .appendTo('#qunit-fixture')
       .on('hidden.bs.collapse', function () {
-        assert.equal($target.attr('aria-expanded'), 'false', 'aria-expanded on target is "false"')
+        assert.strictEqual($target.attr('aria-expanded'), 'false', 'aria-expanded on target is "false"')
         done()
       })
 
@@ -253,9 +253,9 @@ $(function () {
     $('<div id="body3" aria-expanded="false"/>')
       .appendTo($groups.eq(2))
       .on('shown.bs.collapse', function () {
-        assert.equal($target1.attr('aria-expanded'), 'false', 'inactive target 1 has aria-expanded="false"')
-        assert.equal($target2.attr('aria-expanded'), 'false', 'inactive target 2 has aria-expanded="false"')
-        assert.equal($target3.attr('aria-expanded'), 'true', 'active target 3 has aria-expanded="false"')
+        assert.strictEqual($target1.attr('aria-expanded'), 'false', 'inactive target 1 has aria-expanded="false"')
+        assert.strictEqual($target2.attr('aria-expanded'), 'false', 'inactive target 2 has aria-expanded="false"')
+        assert.strictEqual($target3.attr('aria-expanded'), 'true', 'active target 3 has aria-expanded="false"')
 
         done()
       })
-- 
cgit v1.2.3