Merge pull request #15893 from twbs/qunit-modern

Modernize QUnit usage by avoiding usage of global functions

1 files changed, 39 insertions, 39 deletions

diff --git a/js/tests/unit/tab.js b/js/tests/unit/tab.js
index 1228ae3fa..215178cc8 100644
--- a/js/tests/unit/tab.js
+++ b/js/tests/unit/tab.js
@@ -1,13 +1,13 @@
 $(function () {
   'use strict';
 
-  module('tabs plugin')
+  QUnit.module('tabs plugin')
 
-  test('should be defined on jquery object', function () {
-    ok($(document.body).tab, 'tabs method is defined')
+  QUnit.test('should be defined on jquery object', function (assert) {
+    assert.ok($(document.body).tab, 'tabs method is defined')
   })
 
-  module('tabs', {
+  QUnit.module('tabs', {
     setup: function () {
       // Run all tests in noConflict mode -- it's the only way to ensure that the plugin works in noConflict mode
       $.fn.bootstrapTab = $.fn.tab.noConflict()
@@ -18,18 +18,18 @@ $(function () {
     }
   })
 
-  test('should provide no conflict', function () {
-    strictEqual($.fn.tab, undefined, 'tab was set back to undefined (org value)')
+  QUnit.test('should provide no conflict', function (assert) {
+    assert.strictEqual($.fn.tab, undefined, 'tab 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) {
     var $el = $('<div/>')
     var $tab = $el.bootstrapTab()
-    ok($tab instanceof $, 'returns jquery collection')
-    strictEqual($tab[0], $el[0], 'collection contains element')
+    assert.ok($tab instanceof $, 'returns jquery collection')
+    assert.strictEqual($tab[0], $el[0], 'collection contains element')
   })
 
-  test('should activate element by tab id', function () {
+  QUnit.test('should activate element by tab id', function (assert) {
     var tabsHTML = '<ul class="tabs">'
         + '<li><a href="#home">Home</a></li>'
         + '<li><a href="#profile">Profile</a></li>'
@@ -38,13 +38,13 @@ $(function () {
     $('<ul><li id="home"/><li id="profile"/></ul>').appendTo('#qunit-fixture')
 
     $(tabsHTML).find('li:last a').bootstrapTab('show')
-    equal($('#qunit-fixture').find('.active').attr('id'), 'profile')
+    assert.strictEqual($('#qunit-fixture').find('.active').attr('id'), 'profile')
 
     $(tabsHTML).find('li:first a').bootstrapTab('show')
-    equal($('#qunit-fixture').find('.active').attr('id'), 'home')
+    assert.strictEqual($('#qunit-fixture').find('.active').attr('id'), 'home')
   })
 
-  test('should activate element by tab id', function () {
+  QUnit.test('should activate element by tab id', function (assert) {
     var pillsHTML = '<ul class="pills">'
         + '<li><a href="#home">Home</a></li>'
         + '<li><a href="#profile">Profile</a></li>'
@@ -53,28 +53,28 @@ $(function () {
     $('<ul><li id="home"/><li id="profile"/></ul>').appendTo('#qunit-fixture')
 
     $(pillsHTML).find('li:last a').bootstrapTab('show')
-    equal($('#qunit-fixture').find('.active').attr('id'), 'profile')
+    assert.strictEqual($('#qunit-fixture').find('.active').attr('id'), 'profile')
 
     $(pillsHTML).find('li:first a').bootstrapTab('show')
-    equal($('#qunit-fixture').find('.active').attr('id'), 'home')
+    assert.strictEqual($('#qunit-fixture').find('.active').attr('id'), 'home')
   })
 
-  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="tab"/>')
       .on('show.bs.tab', function (e) {
         e.preventDefault()
-        ok(true, 'show event fired')
+        assert.ok(true, 'show event fired')
         done()
       })
       .on('shown.bs.tab', function () {
-        ok(false, 'shown event fired')
+        assert.ok(false, 'shown event fired')
       })
       .bootstrapTab('show')
   })
 
-  test('show and shown events should reference correct relatedTarget', function (assert) {
+  QUnit.test('show and shown events should reference correct relatedTarget', function (assert) {
     var done = assert.async()
 
     var dropHTML = '<ul class="drop">'
@@ -92,16 +92,16 @@ $(function () {
       .end()
       .find('ul > li:last a')
         .on('show.bs.tab', function (e) {
-          equal(e.relatedTarget.hash, '#1-1', 'references correct element as relatedTarget')
+          assert.strictEqual(e.relatedTarget.hash, '#1-1', 'references correct element as relatedTarget')
         })
         .on('shown.bs.tab', function (e) {
-          equal(e.relatedTarget.hash, '#1-1', 'references correct element as relatedTarget')
+          assert.strictEqual(e.relatedTarget.hash, '#1-1', 'references correct element as relatedTarget')
           done()
         })
         .bootstrapTab('show')
   })
 
-  test('should fire hide and hidden events', function (assert) {
+  QUnit.test('should fire hide and hidden events', function (assert) {
     var done = assert.async()
 
     var tabsHTML = '<ul class="tabs">'
@@ -112,7 +112,7 @@ $(function () {
     $(tabsHTML)
       .find('li:first a')
         .on('hide.bs.tab', function () {
-          ok(true, 'hide event fired')
+          assert.ok(true, 'hide event fired')
         })
         .bootstrapTab('show')
       .end()
@@ -122,7 +122,7 @@ $(function () {
     $(tabsHTML)
       .find('li:first a')
         .on('hidden.bs.tab', function () {
-          ok(true, 'hidden event fired')
+          assert.ok(true, 'hidden event fired')
           done()
         })
         .bootstrapTab('show')
@@ -131,7 +131,7 @@ $(function () {
         .bootstrapTab('show')
   })
 
-  test('should not fire hidden when hide is prevented', function (assert) {
+  QUnit.test('should not fire hidden when hide is prevented', function (assert) {
     var done = assert.async()
 
     var tabsHTML = '<ul class="tabs">'
@@ -143,11 +143,11 @@ $(function () {
       .find('li:first a')
         .on('hide.bs.tab', function (e) {
           e.preventDefault()
-          ok(true, 'hide event fired')
+          assert.ok(true, 'hide event fired')
           done()
         })
         .on('hidden.bs.tab', function () {
-          ok(false, 'hidden event fired')
+          assert.ok(false, 'hidden event fired')
         })
         .bootstrapTab('show')
       .end()
@@ -155,7 +155,7 @@ $(function () {
         .bootstrapTab('show')
   })
 
-  test('hide and hidden events contain correct relatedTarget', function (assert) {
+  QUnit.test('hide and hidden events contain correct relatedTarget', function (assert) {
     var done = assert.async()
 
     var tabsHTML = '<ul class="tabs">'
@@ -166,10 +166,10 @@ $(function () {
     $(tabsHTML)
       .find('li:first a')
         .on('hide.bs.tab', function (e) {
-          equal(e.relatedTarget.hash, '#profile', 'references correct element as relatedTarget')
+          assert.strictEqual(e.relatedTarget.hash, '#profile', 'references correct element as relatedTarget')
         })
         .on('hidden.bs.tab', function (e) {
-          equal(e.relatedTarget.hash, '#profile', 'references correct element as relatedTarget')
+          assert.strictEqual(e.relatedTarget.hash, '#profile', 'references correct element as relatedTarget')
           done()
         })
         .bootstrapTab('show')
@@ -178,7 +178,7 @@ $(function () {
         .bootstrapTab('show')
   })
 
-  test('selected tab should have aria-expanded', function () {
+  QUnit.test('selected tab should have aria-expanded', function (assert) {
     var tabsHTML = '<ul class="nav nav-tabs">'
         + '<li class="active"><a href="#home" toggle="tab" aria-expanded="true">Home</a></li>'
         + '<li><a href="#profile" toggle="tab" aria-expanded="false">Profile</a></li>'
@@ -186,20 +186,20 @@ $(function () {
     var $tabs = $(tabsHTML).appendTo('#qunit-fixture')
 
     $tabs.find('li:first a').bootstrapTab('show')
-    equal($tabs.find('.active a').attr('aria-expanded'), 'true', 'shown tab has aria-expanded = true')
-    equal($tabs.find('li:not(.active) a').attr('aria-expanded'), 'false', 'hidden tab has aria-expanded = false')
+    assert.strictEqual($tabs.find('.active a').attr('aria-expanded'), 'true', 'shown tab has aria-expanded = true')
+    assert.strictEqual($tabs.find('li:not(.active) a').attr('aria-expanded'), 'false', 'hidden tab has aria-expanded = false')
 
     $tabs.find('li:last a').click()
-    equal($tabs.find('.active a').attr('aria-expanded'), 'true', 'after click, shown tab has aria-expanded = true')
-    equal($tabs.find('li:not(.active) a').attr('aria-expanded'), 'false', 'after click, hidden tab has aria-expanded = false')
+    assert.strictEqual($tabs.find('.active a').attr('aria-expanded'), 'true', 'after click, shown tab has aria-expanded = true')
+    assert.strictEqual($tabs.find('li:not(.active) a').attr('aria-expanded'), 'false', 'after click, hidden tab has aria-expanded = false')
 
     $tabs.find('li:first a').bootstrapTab('show')
-    equal($tabs.find('.active a').attr('aria-expanded'), 'true', 'shown tab has aria-expanded = true')
-    equal($tabs.find('li:not(.active) a').attr('aria-expanded'), 'false', 'hidden tab has aria-expanded = false')
+    assert.strictEqual($tabs.find('.active a').attr('aria-expanded'), 'true', 'shown tab has aria-expanded = true')
+    assert.strictEqual($tabs.find('li:not(.active) a').attr('aria-expanded'), 'false', 'hidden tab has aria-expanded = false')
 
     $tabs.find('li:first a').click()
-    equal($tabs.find('.active a').attr('aria-expanded'), 'true', 'after second show event, shown tab still has aria-expanded = true')
-    equal($tabs.find('li:not(.active) a').attr('aria-expanded'), 'false', 'after second show event, hidden tab has aria-expanded = false')
+    assert.strictEqual($tabs.find('.active a').attr('aria-expanded'), 'true', 'after second show event, shown tab still has aria-expanded = true')
+    assert.strictEqual($tabs.find('li:not(.active) a').attr('aria-expanded'), 'false', 'after second show event, hidden tab has aria-expanded = false')
   })
 
 })