diff --git a/js/tests/unit/alert.js b/js/tests/unit/alert.js index 755d9d1e550cac7ed05e6a5b423758cc9ab9cf7e..1de46e06fd23b03b95f56573951884721c129090 100644 --- a/js/tests/unit/alert.js +++ b/js/tests/unit/alert.js @@ -46,15 +46,15 @@ $(function () { test('should not fire closed when close is prevented', function () { $.support.transition = false - stop(); + stop() $('<div class="alert"/>') .on('close.bs.alert', function (e) { - e.preventDefault(); - ok(true); - start(); + e.preventDefault() + ok(true) + start() }) .on('closed.bs.alert', function () { - ok(false); + ok(false) }) .alert('close') }) diff --git a/js/tests/unit/carousel.js b/js/tests/unit/carousel.js index 6851e17a5edeccfcddb3b59814abf51e019340fc..6f69855c7736541fa8b5613f3d9a544832a9877e 100644 --- a/js/tests/unit/carousel.js +++ b/js/tests/unit/carousel.js @@ -21,12 +21,12 @@ $(function () { stop() $('<div class="carousel"/>') .on('slide.bs.carousel', function (e) { - e.preventDefault(); - ok(true); - start(); + e.preventDefault() + ok(true) + start() }) .on('slid.bs.carousel', function () { - ok(false); + ok(false) }) .carousel('next') }) @@ -42,14 +42,14 @@ $(function () { ok($carousel.find('.item:eq(0)').is('.active')) ok($carousel.find('.carousel-indicators li:eq(0)').is('.active')) $carousel.carousel('next') - }, 1); + }, 1) }) $carousel.one('slid.bs.carousel', function () { setTimeout(function () { ok($carousel.find('.item:eq(1)').is('.active')) ok($carousel.find('.carousel-indicators li:eq(1)').is('.active')) start() - }, 1); + }, 1) }) $carousel.carousel('next') }) @@ -72,39 +72,39 @@ $(function () { stop() $(template) .on('slide.bs.carousel', function (e) { - e.preventDefault(); - ok(e.relatedTarget); - ok($(e.relatedTarget).hasClass('item')); - start(); + e.preventDefault() + ok(e.relatedTarget) + ok($(e.relatedTarget).hasClass('item')) + start() }) .carousel('next') }) test('should set interval from data attribute', 4, function () { - var template = $('<div id="myCarousel" class="carousel slide"> <div class="carousel-inner"> <div class="item active"> <img alt=""> <div class="carousel-caption"> <h4>{{_i}}First Thumbnail label{{/i}}</h4> <p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p> </div> </div> <div class="item"> <img alt=""> <div class="carousel-caption"> <h4>{{_i}}Second Thumbnail label{{/i}}</h4> <p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p> </div> </div> <div class="item"> <img alt=""> <div class="carousel-caption"> <h4>{{_i}}Third Thumbnail label{{/i}}</h4> <p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p> </div> </div> </div> <a class="left carousel-control" href="#myCarousel" data-slide="prev">‹</a> <a class="right carousel-control" href="#myCarousel" data-slide="next">›</a> </div>'); - template.attr('data-interval', 1814); + var template = $('<div id="myCarousel" class="carousel slide"> <div class="carousel-inner"> <div class="item active"> <img alt=""> <div class="carousel-caption"> <h4>{{_i}}First Thumbnail label{{/i}}</h4> <p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p> </div> </div> <div class="item"> <img alt=""> <div class="carousel-caption"> <h4>{{_i}}Second Thumbnail label{{/i}}</h4> <p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p> </div> </div> <div class="item"> <img alt=""> <div class="carousel-caption"> <h4>{{_i}}Third Thumbnail label{{/i}}</h4> <p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p> </div> </div> </div> <a class="left carousel-control" href="#myCarousel" data-slide="prev">‹</a> <a class="right carousel-control" href="#myCarousel" data-slide="next">›</a> </div>') + template.attr('data-interval', 1814) - template.appendTo('body'); - $('[data-slide]').first().click(); - ok($('#myCarousel').data('bs.carousel').options.interval == 1814); - $('#myCarousel').remove(); + template.appendTo('body') + $('[data-slide]').first().click() + ok($('#myCarousel').data('bs.carousel').options.interval == 1814) + $('#myCarousel').remove() - template.appendTo('body').attr('data-modal', 'foobar'); - $('[data-slide]').first().click(); - ok($('#myCarousel').data('bs.carousel').options.interval == 1814, 'even if there is an data-modal attribute set'); - $('#myCarousel').remove(); + template.appendTo('body').attr('data-modal', 'foobar') + $('[data-slide]').first().click() + ok($('#myCarousel').data('bs.carousel').options.interval == 1814, 'even if there is an data-modal attribute set') + $('#myCarousel').remove() - template.appendTo('body'); - $('[data-slide]').first().click(); - $('#myCarousel').attr('data-interval', 1860); - $('[data-slide]').first().click(); - ok($('#myCarousel').data('bs.carousel').options.interval == 1814, 'attributes should be read only on intitialization'); - $('#myCarousel').remove(); + template.appendTo('body') + $('[data-slide]').first().click() + $('#myCarousel').attr('data-interval', 1860) + $('[data-slide]').first().click() + ok($('#myCarousel').data('bs.carousel').options.interval == 1814, 'attributes should be read only on intitialization') + $('#myCarousel').remove() - template.attr('data-interval', false); - template.appendTo('body'); - $('#myCarousel').carousel(1); - ok($('#myCarousel').data('bs.carousel').options.interval === false, 'data attribute has higher priority than default options'); - $('#myCarousel').remove(); + template.attr('data-interval', false) + template.appendTo('body') + $('#myCarousel').carousel(1) + ok($('#myCarousel').data('bs.carousel').options.interval === false, 'data attribute has higher priority than default options') + $('#myCarousel').remove() }) }) diff --git a/js/tests/unit/collapse.js b/js/tests/unit/collapse.js index 133e6eab72d76a30ba6505ffa7c0224879fdfcca..7948b3ab49c1d32d34d7e6e1d824b9fa478471b7 100644 --- a/js/tests/unit/collapse.js +++ b/js/tests/unit/collapse.js @@ -33,12 +33,12 @@ $(function () { stop() $('<div class="collapse"/>') .on('show.bs.collapse', function (e) { - e.preventDefault(); - ok(true); - start(); + e.preventDefault() + ok(true) + start() }) .on('shown.bs.collapse', function () { - ok(false); + ok(false) }) .collapse('show') }) diff --git a/js/tests/unit/tab.js b/js/tests/unit/tab.js index 60e46364dc8f6ad4a348fb34015f8b7aff1cbada..08f6e3cfdf06eb6f8356c7cd88e5c435d2d1d9e0 100644 --- a/js/tests/unit/tab.js +++ b/js/tests/unit/tab.js @@ -49,15 +49,15 @@ $(function () { test('should not fire closed when close is prevented', function () { $.support.transition = false - stop(); + stop() $('<div class="tab"/>') .on('show.bs.tab', function (e) { - e.preventDefault(); - ok(true); - start(); + e.preventDefault() + ok(true) + start() }) .on('shown.bs.tab', function () { - ok(false); + ok(false) }) .tab('show') })