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/button.js | 106 ++++++++++++++++++++++++------------------------
 1 file changed, 53 insertions(+), 53 deletions(-)

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

diff --git a/js/tests/unit/button.js b/js/tests/unit/button.js
index cb51d40b9..4324d0b57 100644
--- a/js/tests/unit/button.js
+++ b/js/tests/unit/button.js
@@ -3,8 +3,8 @@ $(function () {
 
   module('button plugin')
 
-  test('should be defined on jquery object', function () {
-    ok($(document.body).button, 'button method is defined')
+  test('should be defined on jquery object', function (assert) {
+    assert.ok($(document.body).button, 'button method is defined')
   })
 
   module('button', {
@@ -18,46 +18,46 @@ $(function () {
     }
   })
 
-  test('should provide no conflict', function () {
-    strictEqual($.fn.button, undefined, 'button was set back to undefined (org value)')
+  test('should provide no conflict', function (assert) {
+    assert.strictEqual($.fn.button, undefined, 'button 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 $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 return set state to loading', function (assert) {
     var $btn = $('<button class="btn" data-loading-text="fat">mdo</button>')
-    equal($btn.html(), 'mdo', 'btn text equals mdo')
+    assert.equal($btn.html(), 'mdo', 'btn text equals mdo')
     $btn.bootstrapButton('loading')
     var done = assert.async()
     setTimeout(function () {
-      equal($btn.html(), 'fat', 'btn text equals fat')
-      ok($btn[0].hasAttribute('disabled'), 'btn is disabled')
-      ok($btn.hasClass('disabled'), 'btn has disabled class')
+      assert.equal($btn.html(), 'fat', 'btn text equals fat')
+      assert.ok($btn[0].hasAttribute('disabled'), 'btn is disabled')
+      assert.ok($btn.hasClass('disabled'), 'btn has disabled class')
       done()
     }, 0)
   })
 
   test('should return reset state', function (assert) {
     var $btn = $('<button class="btn" data-loading-text="fat">mdo</button>')
-    equal($btn.html(), 'mdo', 'btn text equals mdo')
+    assert.equal($btn.html(), 'mdo', 'btn text equals mdo')
     $btn.bootstrapButton('loading')
     var doneOne = assert.async()
     setTimeout(function () {
-      equal($btn.html(), 'fat', 'btn text equals fat')
-      ok($btn[0].hasAttribute('disabled'), 'btn is disabled')
-      ok($btn.hasClass('disabled'), 'btn has disabled class')
+      assert.equal($btn.html(), 'fat', 'btn text equals fat')
+      assert.ok($btn[0].hasAttribute('disabled'), 'btn is disabled')
+      assert.ok($btn.hasClass('disabled'), 'btn has disabled class')
       doneOne()
       var doneTwo = assert.async()
       $btn.bootstrapButton('reset')
       setTimeout(function () {
-        equal($btn.html(), 'mdo', 'btn text equals mdo')
-        ok(!$btn[0].hasAttribute('disabled'), 'btn is not disabled')
-        ok(!$btn.hasClass('disabled'), 'btn does not have disabled class')
+        assert.equal($btn.html(), 'mdo', 'btn text equals mdo')
+        assert.ok(!$btn[0].hasAttribute('disabled'), 'btn is not disabled')
+        assert.ok(!$btn.hasClass('disabled'), 'btn does not have disabled class')
         doneTwo()
       }, 0)
     }, 0)
@@ -65,74 +65,74 @@ $(function () {
 
   test('should work with an empty string as reset state', function (assert) {
     var $btn = $('<button class="btn" data-loading-text="fat"/>')
-    equal($btn.html(), '', 'btn text equals ""')
+    assert.equal($btn.html(), '', 'btn text equals ""')
     $btn.bootstrapButton('loading')
     var doneOne = assert.async()
     setTimeout(function () {
-      equal($btn.html(), 'fat', 'btn text equals fat')
-      ok($btn[0].hasAttribute('disabled'), 'btn is disabled')
-      ok($btn.hasClass('disabled'), 'btn has disabled class')
+      assert.equal($btn.html(), 'fat', 'btn text equals fat')
+      assert.ok($btn[0].hasAttribute('disabled'), 'btn is disabled')
+      assert.ok($btn.hasClass('disabled'), 'btn has disabled class')
       doneOne()
       var doneTwo = assert.async()
       $btn.bootstrapButton('reset')
       setTimeout(function () {
-        equal($btn.html(), '', 'btn text equals ""')
-        ok(!$btn[0].hasAttribute('disabled'), 'btn is not disabled')
-        ok(!$btn.hasClass('disabled'), 'btn does not have disabled class')
+        assert.equal($btn.html(), '', 'btn text equals ""')
+        assert.ok(!$btn[0].hasAttribute('disabled'), 'btn is not disabled')
+        assert.ok(!$btn.hasClass('disabled'), 'btn does not have disabled class')
         doneTwo()
       }, 0)
     }, 0)
   })
 
-  test('should toggle active', function () {
+  test('should toggle active', function (assert) {
     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 () {
+  test('should toggle active when btn children are clicked', function (assert) {
     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')
+    assert.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 has class active')
   })
 
-  test('should toggle aria-pressed', function () {
+  test('should toggle aria-pressed', function (assert) {
     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.equal($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.equal($btn.attr('aria-pressed'), 'true', 'btn aria-pressed state is true')
   })
 
-  test('should toggle aria-pressed when btn children are clicked', function () {
+  test('should toggle aria-pressed when btn children are clicked', function (assert) {
     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')
+    assert.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.equal($btn.attr('aria-pressed'), 'true', 'btn aria-pressed state is true')
   })
 
-  test('should toggle active when btn children are clicked within btn-group', function () {
+  test('should toggle active when btn children are clicked within btn-group', function (assert) {
     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')
+    assert.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 has class active')
   })
 
-  test('should check for closest matching toggle', function () {
+  test('should check for closest matching toggle', function (assert) {
     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'
@@ -149,21 +149,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')
+    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').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 does not have active class')
+    assert.ok(!$btn1.find('input').prop('checked'), 'btn1 is 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')
+    assert.ok(!$btn1.hasClass('active'), 'btn1 does not have active class')
+    assert.ok(!$btn1.find('input').prop('checked'), 'btn1 is checked')
+    assert.ok($btn2.hasClass('active'), 'btn2 has active class')
+    assert.ok($btn2.find('input').prop('checked'), 'btn2 is checked')
   })
 
 })
-- 
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/button.js | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

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

diff --git a/js/tests/unit/button.js b/js/tests/unit/button.js
index 4324d0b57..0d708d10d 100644
--- a/js/tests/unit/button.js
+++ b/js/tests/unit/button.js
@@ -1,13 +1,13 @@
 $(function () {
   'use strict';
 
-  module('button plugin')
+  QUnit.module('button plugin')
 
-  test('should be defined on jquery object', function (assert) {
+  QUnit.test('should be defined on jquery object', function (assert) {
     assert.ok($(document.body).button, 'button method is defined')
   })
 
-  module('button', {
+  QUnit.module('button', {
     setup: 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()
@@ -18,18 +18,18 @@ $(function () {
     }
   })
 
-  test('should provide no conflict', function (assert) {
+  QUnit.test('should provide no conflict', function (assert) {
     assert.strictEqual($.fn.button, undefined, 'button 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 $button = $el.bootstrapButton()
     assert.ok($button instanceof $, 'returns jquery collection')
     assert.strictEqual($button[0], $el[0], 'collection contains element')
   })
 
-  test('should return set state to loading', function (assert) {
+  QUnit.test('should return set state to loading', function (assert) {
     var $btn = $('<button class="btn" data-loading-text="fat">mdo</button>')
     assert.equal($btn.html(), 'mdo', 'btn text equals mdo')
     $btn.bootstrapButton('loading')
@@ -42,7 +42,7 @@ $(function () {
     }, 0)
   })
 
-  test('should return reset state', function (assert) {
+  QUnit.test('should return reset state', function (assert) {
     var $btn = $('<button class="btn" data-loading-text="fat">mdo</button>')
     assert.equal($btn.html(), 'mdo', 'btn text equals mdo')
     $btn.bootstrapButton('loading')
@@ -63,7 +63,7 @@ $(function () {
     }, 0)
   })
 
-  test('should work with an empty string as reset state', function (assert) {
+  QUnit.test('should work with an empty string as reset state', function (assert) {
     var $btn = $('<button class="btn" data-loading-text="fat"/>')
     assert.equal($btn.html(), '', 'btn text equals ""')
     $btn.bootstrapButton('loading')
@@ -84,14 +84,14 @@ $(function () {
     }, 0)
   })
 
-  test('should toggle active', function (assert) {
+  QUnit.test('should toggle active', function (assert) {
     var $btn = $('<button class="btn" data-toggle="button">mdo</button>')
     assert.ok(!$btn.hasClass('active'), 'btn does not have active class')
     $btn.bootstrapButton('toggle')
     assert.ok($btn.hasClass('active'), 'btn has class active')
   })
 
-  test('should toggle active when btn children are clicked', function (assert) {
+  QUnit.test('should toggle active when btn children are clicked', function (assert) {
     var $btn = $('<button class="btn" data-toggle="button">mdo</button>')
     var $inner = $('<i/>')
     $btn
@@ -102,14 +102,14 @@ $(function () {
     assert.ok($btn.hasClass('active'), 'btn has class active')
   })
 
-  test('should toggle aria-pressed', function (assert) {
+  QUnit.test('should toggle aria-pressed', function (assert) {
     var $btn = $('<button class="btn" data-toggle="button" aria-pressed="false">redux</button>')
     assert.equal($btn.attr('aria-pressed'), 'false', 'btn aria-pressed state is false')
     $btn.bootstrapButton('toggle')
     assert.equal($btn.attr('aria-pressed'), 'true', 'btn aria-pressed state is true')
   })
 
-  test('should toggle aria-pressed when btn children are clicked', function (assert) {
+  QUnit.test('should toggle aria-pressed when btn children are clicked', function (assert) {
     var $btn = $('<button class="btn" data-toggle="button" aria-pressed="false">redux</button>')
     var $inner = $('<i/>')
     $btn
@@ -120,7 +120,7 @@ $(function () {
     assert.equal($btn.attr('aria-pressed'), 'true', 'btn aria-pressed state is true')
   })
 
-  test('should toggle active when btn children are clicked within btn-group', function (assert) {
+  QUnit.test('should toggle active when btn children are clicked within btn-group', function (assert) {
     var $btngroup = $('<div class="btn-group" data-toggle="buttons"/>')
     var $btn = $('<button class="btn">fat</button>')
     var $inner = $('<i/>')
@@ -132,7 +132,7 @@ $(function () {
     assert.ok($btn.hasClass('active'), 'btn has class active')
   })
 
-  test('should check for closest matching toggle', function (assert) {
+  QUnit.test('should check for closest matching toggle', function (assert) {
     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'
-- 
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/button.js | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

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

diff --git a/js/tests/unit/button.js b/js/tests/unit/button.js
index 0d708d10d..d173916a0 100644
--- a/js/tests/unit/button.js
+++ b/js/tests/unit/button.js
@@ -31,11 +31,11 @@ $(function () {
 
   QUnit.test('should return set state to loading', function (assert) {
     var $btn = $('<button class="btn" data-loading-text="fat">mdo</button>')
-    assert.equal($btn.html(), 'mdo', 'btn text equals mdo')
+    assert.strictEqual($btn.html(), 'mdo', 'btn text equals mdo')
     $btn.bootstrapButton('loading')
     var done = assert.async()
     setTimeout(function () {
-      assert.equal($btn.html(), 'fat', 'btn text equals fat')
+      assert.strictEqual($btn.html(), 'fat', 'btn text equals fat')
       assert.ok($btn[0].hasAttribute('disabled'), 'btn is disabled')
       assert.ok($btn.hasClass('disabled'), 'btn has disabled class')
       done()
@@ -44,18 +44,18 @@ $(function () {
 
   QUnit.test('should return reset state', function (assert) {
     var $btn = $('<button class="btn" data-loading-text="fat">mdo</button>')
-    assert.equal($btn.html(), 'mdo', 'btn text equals mdo')
+    assert.strictEqual($btn.html(), 'mdo', 'btn text equals mdo')
     $btn.bootstrapButton('loading')
     var doneOne = assert.async()
     setTimeout(function () {
-      assert.equal($btn.html(), 'fat', 'btn text equals fat')
+      assert.strictEqual($btn.html(), 'fat', 'btn text equals fat')
       assert.ok($btn[0].hasAttribute('disabled'), 'btn is disabled')
       assert.ok($btn.hasClass('disabled'), 'btn has disabled class')
       doneOne()
       var doneTwo = assert.async()
       $btn.bootstrapButton('reset')
       setTimeout(function () {
-        assert.equal($btn.html(), 'mdo', 'btn text equals mdo')
+        assert.strictEqual($btn.html(), 'mdo', 'btn text equals mdo')
         assert.ok(!$btn[0].hasAttribute('disabled'), 'btn is not disabled')
         assert.ok(!$btn.hasClass('disabled'), 'btn does not have disabled class')
         doneTwo()
@@ -65,18 +65,18 @@ $(function () {
 
   QUnit.test('should work with an empty string as reset state', function (assert) {
     var $btn = $('<button class="btn" data-loading-text="fat"/>')
-    assert.equal($btn.html(), '', 'btn text equals ""')
+    assert.strictEqual($btn.html(), '', 'btn text equals ""')
     $btn.bootstrapButton('loading')
     var doneOne = assert.async()
     setTimeout(function () {
-      assert.equal($btn.html(), 'fat', 'btn text equals fat')
+      assert.strictEqual($btn.html(), 'fat', 'btn text equals fat')
       assert.ok($btn[0].hasAttribute('disabled'), 'btn is disabled')
       assert.ok($btn.hasClass('disabled'), 'btn has disabled class')
       doneOne()
       var doneTwo = assert.async()
       $btn.bootstrapButton('reset')
       setTimeout(function () {
-        assert.equal($btn.html(), '', 'btn text equals ""')
+        assert.strictEqual($btn.html(), '', 'btn text equals ""')
         assert.ok(!$btn[0].hasAttribute('disabled'), 'btn is not disabled')
         assert.ok(!$btn.hasClass('disabled'), 'btn does not have disabled class')
         doneTwo()
@@ -104,9 +104,9 @@ $(function () {
 
   QUnit.test('should toggle aria-pressed', function (assert) {
     var $btn = $('<button class="btn" data-toggle="button" aria-pressed="false">redux</button>')
-    assert.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')
-    assert.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')
   })
 
   QUnit.test('should toggle aria-pressed when btn children are clicked', function (assert) {
@@ -115,9 +115,9 @@ $(function () {
     $btn
       .append($inner)
       .appendTo('#qunit-fixture')
-    assert.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')
     $inner.click()
-    assert.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')
   })
 
   QUnit.test('should toggle active when btn children are clicked within btn-group', function (assert) {
-- 
cgit v1.2.3