From 55b01ab1def6e9ec634456c08e66a6b1c41936a6 Mon Sep 17 00:00:00 2001 From: Felix Nagel Date: Sun, 11 Dec 2016 17:53:17 +0100 Subject: [PATCH] Date tests: Update to QUnit 2.x, shift to use no globals --- tests/unit/date/core.js | 113 ++++++++++++++++++++-------------------- 1 file changed, 57 insertions(+), 56 deletions(-) diff --git a/tests/unit/date/core.js b/tests/unit/date/core.js index c4d604a3a..fc4dcd975 100644 --- a/tests/unit/date/core.js +++ b/tests/unit/date/core.js @@ -1,75 +1,76 @@ define( [ + "qunit", "jquery", "./helper", "ui/date" -], function( $, testHelper ) { +], function( QUnit, $, testHelper ) { -module( "date: core" ); +QUnit.module( "date: core" ); var attributes = testHelper.getAttributes( "en" ); -test( "Instantiation", function() { - expect( 2 ); - ok( new $.ui.date( null, attributes ) instanceof $.ui.date, "constructor function" ); - ok( $.ui.date( null, attributes ) instanceof $.ui.date, "instantiation without new" ); +QUnit.test( "Instantiation", function( assert ) { + assert.expect( 2 ); + assert.ok( new $.ui.date( null, attributes ) instanceof $.ui.date, "constructor function" ); + assert.ok( $.ui.date( null, attributes ) instanceof $.ui.date, "instantiation without new" ); } ); -test( "Check Sets and Gets", 4, function() { - var date = $.ui.date( null, attributes ); - equal( date.setDay( 15 ).day(), 15, "Set day and retrieve" ); - equal( date.setFullDate( 2012, 9, 15 ).year(), 2012, "Set full date and retrieve year" ); - equal( date.month(), 9, "Set full date and retrieve month" ); - equal( date.day(), 15, "Set full date and retrieve day" ); +QUnit.test( "Check Sets and Gets", 4, function( assert ) { +var date = $.ui.date( null, attributes ); + assert.equal( date.setDay( 15 ).day(), 15, "Set day and retrieve" ); + assert.equal( date.setFullDate( 2012, 9, 15 ).year(), 2012, "Set full date and retrieve year" ); + assert.equal( date.month(), 9, "Set full date and retrieve month" ); + assert.equal( date.day(), 15, "Set full date and retrieve day" ); // TODO Add setTime test } ); -test( "Date Adjustments - Normal Use Cases", 10, function() { +QUnit.test( "Date Adjustments - Normal Use Cases", 10, function( assert ) { var date = $.ui.date( null, attributes ); // Use October 15, 2012 date.setFullDate( 2012, 9, 15 ); - equal( date.adjust( "D", 1 ).day(), 16, "Add 1 day" ); - equal( date.adjust( "D", -1 ).day(), 15, "Subtract 1 day" ); - equal( date.adjust( "M", 1 ).month(), 10, "Add 1 month" ); - equal( date.adjust( "M", -1 ).month(), 9, "Subtract 1 month" ); - equal( date.adjust( "Y", 1 ).year(), 2013, "Add 1 year" ); - equal( date.adjust( "Y", -1 ).year(), 2012, "Subtract 1 year" ); + assert.equal( date.adjust( "D", 1 ).day(), 16, "Add 1 day" ); + assert.equal( date.adjust( "D", -1 ).day(), 15, "Subtract 1 day" ); + assert.equal( date.adjust( "M", 1 ).month(), 10, "Add 1 month" ); + assert.equal( date.adjust( "M", -1 ).month(), 9, "Subtract 1 month" ); + assert.equal( date.adjust( "Y", 1 ).year(), 2013, "Add 1 year" ); + assert.equal( date.adjust( "Y", -1 ).year(), 2012, "Subtract 1 year" ); // Check changing one value impact another. Ex: Day impacts month // Use April 30th 2012 date.setFullDate( 2012, 3, 30 ); - equal( date.adjust( "D", 1 ).month(), 4, "Add 1 day to change month from April to May" ); - equal( date.adjust( "D", -1 ).month(), 3, "Subtract 1 day to change month from May to April" ); + assert.equal( date.adjust( "D", 1 ).month(), 4, "Add 1 day to change month from April to May" ); + assert.equal( date.adjust( "D", -1 ).month(), 3, "Subtract 1 day to change month from May to April" ); // Use December 31st 2012 date.setFullDate( 2012, 11, 31 ); - equal( date.adjust( "D", 1 ).year(), 2013, "Add 1 day to change year from 2012 to 2013" ); - equal( date.adjust( "D", -1 ).year(), 2012, + assert.equal( date.adjust( "D", 1 ).year(), 2013, "Add 1 day to change year from 2012 to 2013" ); + assert.equal( date.adjust( "D", -1 ).year(), 2012, "Subtract 1 day to change month from 2013 to 2012" ); } ); -test( "Date Adjustments - Month Overflow Edge Cases", 2, function() { +QUnit.test( "Date Adjustments - Month Overflow Edge Cases", 2, function( assert ) { var date = $.ui.date( null, attributes ); // Use May 31 2012 date.setFullDate( 2012, 4, 31 ); - equal( date.adjust( "M", 1 ).day(), 30, + assert.equal( date.adjust( "M", 1 ).day(), 30, "Add 1 month from May to June sets days to 30, last day in June (prevent Overflow)" ); - equal( date.adjust( "M", -1 ).day(), 30, + assert.equal( date.adjust( "M", -1 ).day(), 30, "Subtract 1 month from June to May sets days to 30 in May" ); } ); -test( "Date Adjustments - Leap Year Edge Cases", 1, function() { +QUnit.test( "Date Adjustments - Leap Year Edge Cases", 1, function( assert ) { var date = $.ui.date( null, attributes ); // Use February 29 2012 a Leap year date.setFullDate( 2012, 1, 29 ); - equal( date.adjust( "Y", 1 ).day(), 28, + assert.equal( date.adjust( "Y", 1 ).day(), 28, "Feb 29 2012, add a year to convert to Feb 28, 2013" ); } ); -test( "List days of Week", 2, function() { +QUnit.test( "List days of Week", 2, function( assert ) { var date = $.ui.date( null, attributes ), offset0 = [ { "fullname": "Sunday", "shortname": "Su" }, @@ -90,34 +91,34 @@ test( "List days of Week", 2, function() { { "fullname": "Sonntag", "shortname": "So." } ]; - deepEqual( date.weekdays(), offset0, "Get weekdays with start of day on 0 (English)" ); + assert.deepEqual( date.weekdays(), offset0, "Get weekdays with start of day on 0 (English)" ); date = $.ui.date( null, testHelper.getAttributes( "de" ) ); - deepEqual( date.weekdays(), offset1, "Get weekdays with start of day on 1 (Germany)" ); + assert.deepEqual( date.weekdays(), offset1, "Get weekdays with start of day on 1 (Germany)" ); } ); -test( "Days in Month", 3, function() { +QUnit.test( "Days in Month", 3, function( assert ) { var date = $.ui.date( null, attributes ); date.setFullDate( 2012, 1, 1 ); - equal( date.daysInMonth(), 29, "Leap Year implicit check for 29 days" ); - equal( date.daysInMonth( 2012, 1 ), 29, "Leap Year explicit check for 29 days" ); - equal( date.daysInMonth( 2011, 3 ), 30, "April has 30 days" ); + assert.equal( date.daysInMonth(), 29, "Leap Year implicit check for 29 days" ); + assert.equal( date.daysInMonth( 2012, 1 ), 29, "Leap Year explicit check for 29 days" ); + assert.equal( date.daysInMonth( 2011, 3 ), 30, "April has 30 days" ); } ); -test( "Month Name", 2, function() { +QUnit.test( "Month Name", 2, function( assert ) { var date = $.ui.date( null, attributes ); - equal( date.setFullDate( 2012, 3, 1 ).monthName(), "April", "Month name return April (English)" ); + assert.equal( date.setFullDate( 2012, 3, 1 ).monthName(), "April", "Month name return April (English)" ); date = $.ui.date( null, testHelper.getAttributes( "de" ) ); - equal( date.setFullDate( 2012, 2, 1 ).monthName(), "März", "Month name return March (German)" ); + assert.equal( date.setFullDate( 2012, 2, 1 ).monthName(), "März", "Month name return March (German)" ); } ); -test( "Clone", 2, function() { +QUnit.test( "Clone", 2, function( assert ) { var date = $.ui.date( null, attributes ), date2 = date.clone(); - ok( date2, "Created cloned object" ); - notEqual( date.adjust( "Y", 1 ).year(), date2.year(), "Object manipulated independently" ); + assert.ok( date2, "Created cloned object" ); + assert.notEqual( date.adjust( "Y", 1 ).year(), date2.year(), "Object manipulated independently" ); } ); -test( "Days", 1, function() { +QUnit.test( "Days", 1, function( assert ) { // TODO Needs work var date = $.ui.date( null, attributes ); @@ -141,34 +142,34 @@ test( "Days", 1, function() { day.title = "A good day!"; } }; - ok( date.days(), "Date days() returns" ); + assert.ok( date.days(), "Date days() returns" ); } ); -test( "Months", 5, function() { +QUnit.test( "Months", 5, function( assert ) { var date = $.ui.date( new Date( 2015, 11 - 1, 15 ), attributes ), currentMonth = date.months( 1 )[ 0 ], nextMonth = date.months( 1 )[ 1 ]; - ok( currentMonth.first, "Current month marked as first" ); - ok( !nextMonth.first, "Next month not marked as first" ); - ok( nextMonth.last, "Next month marked as last" ); + assert.ok( currentMonth.first, "Current month marked as first" ); + assert.ok( !nextMonth.first, "Next month not marked as first" ); + assert.ok( nextMonth.last, "Next month marked as last" ); - equal( currentMonth.month(), 10, "Current month index is November" ); - equal( nextMonth.month(), 11, "Next month index is December" ); + assert.equal( currentMonth.month(), 10, "Current month index is November" ); + assert.equal( nextMonth.month(), 11, "Next month index is December" ); } ); -test( "Equal", 4, function() { +QUnit.test( "Equal", 4, function( assert ) { var date = $.ui.date( null, attributes ); date.setFullDate( 2012, 9, 16 ); - ok( date.equal( new Date( 2012, 9, 16 ) ), "Does date equal provide date" ); - ok( !date.equal( new Date( 2011, 9, 16 ) ), "Does date year not equal provide date" ); - ok( !date.equal( new Date( 2012, 8, 16 ) ), "Does date month not equal provide date" ); - ok( !date.equal( new Date( 2012, 9, 15 ) ), "Does date day not equal provide date" ); + assert.ok( date.equal( new Date( 2012, 9, 16 ) ), "Does date equal provide date" ); + assert.ok( !date.equal( new Date( 2011, 9, 16 ) ), "Does date year not equal provide date" ); + assert.ok( !date.equal( new Date( 2012, 8, 16 ) ), "Does date month not equal provide date" ); + assert.ok( !date.equal( new Date( 2012, 9, 15 ) ), "Does date day not equal provide date" ); } ); -test( "Date", 1, function() { +QUnit.test( "Date", 1, function( assert ) { var date = $.ui.date( null, attributes ); - ok( date.date() instanceof Date, "Date returned" ); + assert.ok( date.date() instanceof Date, "Date returned" ); } ); } ); -- 2.39.5