Calendar tests: Use assert.expect instead of global expect

diff --git a/tests/unit/calendar/core.js b/tests/unit/calendar/core.js
index 5cc78c42375a9f2999804ea4fd5028e6aba631e6..97f8a43b713cd171ed3f94b068fbc2286b924f76 100644 (file)
--- a/tests/unit/calendar/core.js
+++ b/tests/unit/calendar/core.js
@@ -14,8 +14,8 @@ module( "calendar: core", {
        }
 } );
 
-test( "base structure", function() {
-       expect( 28 );
+test( "base structure", function( assert ) {
+       assert.expect( 28 );
 
        var that = this,
                buttons, header, title, table, thead, week, child, buttonpane;
@@ -90,8 +90,8 @@ test( "base structure", function() {
        step1();
 } );
 
-test( "Localization", function() {
-       expect( 10 );
+test( "Localization", function( assert ) {
+       assert.expect( 10 );
 
        var that = this,
                date = new Date( 2014, 0, 1 ),
@@ -142,7 +142,7 @@ test( "Localization", function() {
 } );
 
 asyncTest( "keyboard handling", function( assert ) {
-       expect( 10 );
+       assert.expect( 10 );
 
        var that = this;
 
@@ -313,7 +313,7 @@ asyncTest( "keyboard handling", function( assert ) {
 } );
 
 asyncTest( "mouse", function( assert ) {
-       expect( 6 );
+       assert.expect( 6 );
 
        var that = this,
                date = new Date();

diff --git a/tests/unit/calendar/events.js b/tests/unit/calendar/events.js
index fef9d6bf5e5f6d4ff8aa5b40e71644b9dda0b52b..87df2d8e041f2e819e7e6a471f323bcd3e8a27f8 100644 (file)
--- a/tests/unit/calendar/events.js
+++ b/tests/unit/calendar/events.js
@@ -10,8 +10,8 @@ module( "calendar: events", {
        }
 } );
 
-test( "change", function() {
-       expect( 6 );
+test( "change", function( assert ) {
+       assert.expect( 6 );
 
        var shouldFire, eventType;
 
@@ -46,8 +46,8 @@ test( "change", function() {
        this.element.find( "tbody button" ).first().simulate( eventType );
 } );
 
-asyncTest( "select", function() {
-       expect( 6 );
+asyncTest( "select", function( assert ) {
+       assert.expect( 6 );
 
        var that = this,
                message, eventType;

diff --git a/tests/unit/calendar/methods.js b/tests/unit/calendar/methods.js
index 77c2c8ce504891ae15ec7e0ab0217e819cdedea9..c66f146b9f20157d6e94cd5fee20507c0e672a3a 100644 (file)
--- a/tests/unit/calendar/methods.js
+++ b/tests/unit/calendar/methods.js
@@ -14,7 +14,7 @@ module( "calendar: methods", {
 } );
 
 test( "destroy", function( assert ) {
-       expect( 1 );
+       assert.expect( 1 );
 
        var div = $( "<div>" ).appendTo( "#qunit-fixture" );
 
@@ -23,8 +23,8 @@ test( "destroy", function( assert ) {
        } );
 } );
 
-test( "enable / disable", function() {
-       expect( 8 );
+test( "enable / disable", function( assert ) {
+       assert.expect( 8 );
 
        this.element.calendar( "disable" );
        ok( this.element.calendar( "option", "disabled" ), "disabled option is set" );
@@ -39,14 +39,14 @@ test( "enable / disable", function() {
        equal( this.element.attr( "aria-disabled" ), "false", "no longer has ARIA disabled" );
 } );
 
-test( "widget", function() {
-       expect( 1 );
+test( "widget", function( assert ) {
+       assert.expect( 1 );
 
        strictEqual( this.widget[ 0 ],  this.element[ 0 ] );
 } );
 
-test( "value", function() {
-       expect( 3 );
+test( "value", function( assert ) {
+       assert.expect( 3 );
 
        this.element.calendar( "value", "1/1/14" );
        ok( this.element.find( "button[data-timestamp]:first" )
@@ -60,7 +60,7 @@ test( "value", function() {
 } );
 
 test( "valueAsDate", function( assert ) {
-       expect( 11 );
+       assert.expect( 11 );
 
        var minDate, maxDate, dateAndTimeToSet, dateAndTimeClone,
                date1 = new Date( 2008, 6 - 1, 4 ),

diff --git a/tests/unit/calendar/options.js b/tests/unit/calendar/options.js
index 9fb49b362a4ea8325dffaf8a0fbbe90e22cf3f9e..3cce60ac702220bfc843c0dd455e0e04acd10b02 100644 (file)
--- a/tests/unit/calendar/options.js
+++ b/tests/unit/calendar/options.js
@@ -13,8 +13,8 @@ module( "calendar: options", {
        }
 } );
 
-test( "buttons", function() {
-       expect( 21 );
+test( "buttons", function( assert ) {
+       assert.expect( 21 );
 
        var button, i, newButtons,
                that = this,
@@ -86,8 +86,8 @@ test( "buttons", function() {
        equal( this.element.hasClass( "ui-calendar-buttons" ), false, "calendar element removes class about having buttons" );
 } );
 
-test( "buttons - advanced", function() {
-       expect( 7 );
+test( "buttons - advanced", function( assert ) {
+       assert.expect( 7 );
 
        var that = this,
                buttons;
@@ -115,8 +115,8 @@ test( "buttons - advanced", function() {
        buttons.click();
 } );
 
-test( "dateFormat", function() {
-       expect( 2 );
+test( "dateFormat", function( assert ) {
+       assert.expect( 2 );
 
        this.element.calendar( "value", "1/1/14" );
 
@@ -127,8 +127,8 @@ test( "dateFormat", function() {
        equal( this.element.calendar( "value" ), "Wednesday, January 1, 2014", "updated formatting" );
 } );
 
-test( "eachDay", function() {
-       expect( 5 );
+test( "eachDay", function( assert ) {
+       assert.expect( 5 );
 
        var timestamp,
                firstCell = this.widget.find( "td[id]:first" );
@@ -187,7 +187,7 @@ test( "showWeek", function() {
 } );
 
 test( "min / max", function( assert ) {
-       expect( 17 );
+       assert.expect( 17 );
 
        // With existing date
        var prevButton = this.widget.find( ".ui-calendar-prev" ),
@@ -264,8 +264,8 @@ test( "min / max", function( assert ) {
        ok( !prevButton.hasClass( "ui-state-disabled" ), "Other year below min: Prev button enabled after click" );
 } );
 
-test( "numberOfMonths", function() {
-       expect( 6 );
+test( "numberOfMonths", function( assert ) {
+       assert.expect( 6 );
 
        var date = new Date( 2015, 8 - 1, 1 );
 
@@ -311,7 +311,7 @@ test( "numberOfMonths", function() {
 } );
 
 test( "value", function( assert ) {
-       expect( 4 );
+       assert.expect( 4 );
 
        var date = new Date( 2016, 5 - 1, 23 );
 

diff --git a/tests/unit/datepicker/core.js b/tests/unit/datepicker/core.js
index 46f2a1989aef3ec836497ea9974a62f55b651c1c..88e327b8b283e993e6b8707a86961630c5cd3dd1 100644 (file)
--- a/tests/unit/datepicker/core.js
+++ b/tests/unit/datepicker/core.js
@@ -13,8 +13,8 @@ module( "datepicker: core", {
        }
 } );
 
-test( "input's value determines starting date", function() {
-       expect( 3 );
+test( "input's value determines starting date", function( assert ) {
+       assert.expect( 3 );
 
        this.element = $( "<input>" ).appendTo( "#qunit-fixture" );
        this.element.val( "1/1/14" ).datepicker();
@@ -27,8 +27,8 @@ test( "input's value determines starting date", function() {
        equal( this.widget.find( ".ui-state-active" ).html(), "1", "correct day highlighted" );
 } );
 
-asyncTest( "base structure", function() {
-       expect( 5 );
+asyncTest( "base structure", function( assert ) {
+       assert.expect( 5 );
 
        var that = this;
 
@@ -46,8 +46,8 @@ asyncTest( "base structure", function() {
        }, 50 );
 } );
 
-asyncTest( "Keyboard handling: focus", function() {
-       expect( 2 );
+asyncTest( "Keyboard handling: focus", function( assert ) {
+       assert.expect( 2 );
 
        var that = this;
 
@@ -60,8 +60,8 @@ asyncTest( "Keyboard handling: focus", function() {
        }, 100 );
 } );
 
-asyncTest( "Keyboard handling: keystroke up", function() {
-       expect( 2 );
+asyncTest( "Keyboard handling: keystroke up", function( assert ) {
+       assert.expect( 2 );
 
        var that = this;
 
@@ -75,7 +75,7 @@ asyncTest( "Keyboard handling: keystroke up", function() {
 } );
 
 test( "Keyboard handling: input", function( assert ) {
-       expect( 6 );
+       assert.expect( 6 );
 
        var that = this,
                instance = that.element.datepicker( "instance" );
@@ -125,7 +125,7 @@ test( "ARIA", function() {
 } );
 
 asyncTest( "mouse", function( assert ) {
-       expect( 4 );
+       assert.expect( 4 );
 
        var that = this;
 

diff --git a/tests/unit/datepicker/events.js b/tests/unit/datepicker/events.js
index 394a94d68d37d16a1d640fe48292518f6d81a42a..cf10020843ba612952e3b07b5ccd566198b991b0 100644 (file)
--- a/tests/unit/datepicker/events.js
+++ b/tests/unit/datepicker/events.js
@@ -13,8 +13,8 @@ module( "datepicker: events", {
        }
 } );
 
-test( "beforeOpen", function() {
-       expect( 3 );
+test( "beforeOpen", function( assert ) {
+       assert.expect( 3 );
 
        var that = this;
 
@@ -42,8 +42,8 @@ test( "beforeOpen", function() {
                .datepicker( "open" );
 } );
 
-test( "change", function() {
-       expect( 4 );
+test( "change", function( assert ) {
+       assert.expect( 4 );
 
        var shouldFire;
 
@@ -71,8 +71,8 @@ test( "change", function() {
        this.widget.find( "tbody button" ).eq( 2 ).simulate( "mousedown" );
 } );
 
-test( "close", function() {
-       expect( 4 );
+test( "close", function( assert ) {
+       assert.expect( 4 );
 
        var shouldFire;
 
@@ -103,8 +103,8 @@ test( "close", function() {
        this.widget.find( "tbody tr:first button:first" ).simulate( "mousedown" );
 } );
 
-test( "open", function() {
-       expect( 2 );
+test( "open", function( assert ) {
+       assert.expect( 2 );
 
        var that = this;
 
@@ -118,8 +118,8 @@ test( "open", function() {
        this.element.datepicker( "open" );
 } );
 
-asyncTest( "select", function() {
-       expect( 4 );
+asyncTest( "select", function( assert ) {
+       assert.expect( 4 );
 
        var message = "",
                that = this;

diff --git a/tests/unit/datepicker/methods.js b/tests/unit/datepicker/methods.js
index 3ce1468610c8149e364e3fd85dba7ecd20395247..2e9b94dadf7eaac9c8e027368fbced716dc7f0e9 100644 (file)
--- a/tests/unit/datepicker/methods.js
+++ b/tests/unit/datepicker/methods.js
@@ -14,7 +14,7 @@ module( "datepicker: methods", {
 } );
 
 test( "destroy", function( assert ) {
-       expect( 3 );
+       assert.expect( 3 );
 
        var input = $( "<input>" ).appendTo( "#qunit-fixture" );
 
@@ -26,8 +26,8 @@ test( "destroy", function( assert ) {
        } );
 } );
 
-test( "enable / disable", function() {
-       expect( 10 );
+test( "enable / disable", function( assert ) {
+       assert.expect( 10 );
 
        this.element.datepicker( "disable" );
        ok( this.element.datepicker( "option", "disabled" ), "disabled option is set" );
@@ -44,15 +44,15 @@ test( "enable / disable", function() {
        equal( this.element.attr( "disabled" ), undefined, "input no longer disabled" );
 } );
 
-test( "widget", function() {
-       expect( 1 );
+test( "widget", function( assert ) {
+       assert.expect( 1 );
 
        deepEqual( $( "body > .ui-front" )[ 0 ],  this.widget[ 0 ] );
        this.widget.remove();
 } );
 
-test( "open / close", function() {
-       expect( 7 );
+test( "open / close", function( assert ) {
+       assert.expect( 7 );
 
        ok( this.widget.is( ":hidden" ), "calendar hidden on init" );
 
@@ -67,8 +67,8 @@ test( "open / close", function() {
        equal( this.widget.attr( "aria-expanded" ), "false", "close: calendar aria-expanded" );
 } );
 
-test( "value", function() {
-       expect( 4 );
+test( "value", function( assert ) {
+       assert.expect( 4 );
 
        this.element.datepicker( "value", "1/1/14" );
        equal( this.element.val(), "1/1/14", "input's value set" );
@@ -85,7 +85,7 @@ test( "value", function() {
 } );
 
 test( "valueAsDate", function( assert ) {
-       expect( 5 );
+       assert.expect( 5 );
 
        strictEqual( this.element.datepicker( "valueAsDate" ), null, "Default" );
 
@@ -101,8 +101,8 @@ test( "valueAsDate", function( assert ) {
        equal( this.element.datepicker( "valueAsDate" ), null, "Invalid dates return null" );
 } );
 
-test( "isValid", function() {
-       expect( 2 );
+test( "isValid", function( assert ) {
+       assert.expect( 2 );
 
        this.element.val( "1/1/14" );
        ok( this.element.datepicker( "isValid" ) );

diff --git a/tests/unit/datepicker/options.js b/tests/unit/datepicker/options.js
index e5b142acc5a9d37ad057d7d968cc7f681b249d0a..b6e0cb13eae951bbc648781864eefe2c7ef316e5 100644 (file)
--- a/tests/unit/datepicker/options.js
+++ b/tests/unit/datepicker/options.js
@@ -13,8 +13,8 @@ module( "datepicker: options", {
        }
 } );
 
-test( "appendTo", function() {
-       expect( 6 );
+test( "appendTo", function( assert ) {
+       assert.expect( 6 );
 
        var container = this.widget.parent()[ 0 ],
                detached = $( "<div>" );
@@ -49,7 +49,7 @@ test( "appendTo", function() {
 } );
 
 test( "min / max", function( assert ) {
-       expect( 10 );
+       assert.expect( 10 );
 
        var min, max;
 
@@ -87,8 +87,8 @@ test( "min / max", function( assert ) {
 
 } );
 
-test( "Pass-through options", function() {
-       expect( 11 );
+test( "Pass-through options", function( assert ) {
+       assert.expect( 11 );
 
        var options = {
                        buttons: { "Test": $.noop },
@@ -124,7 +124,7 @@ test( "Pass-through options", function() {
 } );
 
 asyncTest( "position", function( assert ) {
-       expect( 3 );
+       assert.expect( 3 );
 
        var input = $( "<input>" ).datepicker().appendTo( "body" ).css( {
                        position: "absolute",
@@ -152,8 +152,8 @@ asyncTest( "position", function( assert ) {
        } );
 } );
 
-test( "Stop datepicker from appearing with beforeOpen event handler - nothing", function() {
-       expect( 1 );
+test( "Stop datepicker from appearing with beforeOpen event handler - nothing", function( assert ) {
+       assert.expect( 1 );
 
        this.element.datepicker( {
                beforeOpen: function() {}
@@ -163,8 +163,8 @@ test( "Stop datepicker from appearing with beforeOpen event handler - nothing",
        ok( this.element.datepicker( "widget" ).is( ":visible" ), "beforeOpen returns nothing" );
 } );
 
-test( "Stop datepicker from appearing with beforeOpen event handler - true", function() {
-       expect( 1 );
+test( "Stop datepicker from appearing with beforeOpen event handler - true", function( assert ) {
+       assert.expect( 1 );
 
        this.element.datepicker( {
                beforeOpen: function() {
@@ -175,8 +175,8 @@ test( "Stop datepicker from appearing with beforeOpen event handler - true", fun
        ok( this.element.datepicker( "widget" ).is( ":visible" ), "beforeOpen returns true" );
 } );
 
-test( "Stop datepicker from appearing with beforeOpen event handler - false", function() {
-       expect( 1 );
+test( "Stop datepicker from appearing with beforeOpen event handler - false", function( assert ) {
+       assert.expect( 1 );
 
        this.element.datepicker( {
                beforeOpen: function() {