diff options
Diffstat (limited to 'tests/lib')
| -rw-r--r-- | tests/lib/bootstrap.js | 15 | ||||
| -rw-r--r-- | tests/lib/qunit-assert-dateequal.js | 22 | ||||
| -rw-r--r-- | tests/lib/qunit.js | 1 |
3 files changed, 35 insertions, 3 deletions
diff --git a/tests/lib/bootstrap.js b/tests/lib/bootstrap.js index 487b3b807..ffb273837 100644 --- a/tests/lib/bootstrap.js +++ b/tests/lib/bootstrap.js @@ -4,8 +4,11 @@ var DEFAULT_JQUERY_VERSION = "1.12.4"; requirejs.config( { paths: { - "globalize": "../../../external/globalize/globalize", - "globalize/ja-JP": "../../../external/globalize/globalize.culture.ja-JP", + "cldr": "../../../external/cldrjs/cldr", + "globalize-runtime": "../../../external/globalize/globalize-runtime", + "globalize-locales": "../../../external/localization", + "globalize-old": "../../../external/globalize-old/globalize", + "globalize-old/ja-JP": "../../../external/globalize-old/globalize.culture.ja-JP", "jquery": jqueryUrl(), "jquery-migrate": migrateUrl(), "jquery-simulate": "../../../external/jquery-simulate/jquery.simulate", @@ -18,8 +21,14 @@ requirejs.config( { "testswarm": "http://swarm.jquery.org/js/inject.js?" + ( new Date() ).getTime(), "ui": "../../../ui" }, + map: { + "*": { + "globalize": "globalize-runtime" + } + }, shim: { - "globalize/ja-JP": [ "globalize" ], + "ui/date": [ "globalize-locales" ], + "globalize-old/ja-JP": [ "globalize-old" ], "jquery-simulate": [ "jquery" ], "qunit-assert-close": [ "qunit" ], "testswarm": [ "qunit" ] diff --git a/tests/lib/qunit-assert-dateequal.js b/tests/lib/qunit-assert-dateequal.js new file mode 100644 index 000000000..7a997003b --- /dev/null +++ b/tests/lib/qunit-assert-dateequal.js @@ -0,0 +1,22 @@ +/* + * Assertion for comparing Date objects by day, month and year. + */ +define( [ + "qunit" +], function( QUnit ) { + +QUnit.assert.dateEqual = function( value, expected, message ) { + + if ( !value || !expected ) { + this.push( false, value, expected, + "dateEqual failed, missing date object, message was: " + message ); + return; + } + + var newValue = new Date( value.getFullYear(), value.getMonth(), value.getDate() ), + newExpected = new Date( expected.getFullYear(), expected.getMonth(), expected.getDate() ); + + this.push( ( newValue.toString() === newExpected.toString() ), value, expected, message ); +}; + +} ); diff --git a/tests/lib/qunit.js b/tests/lib/qunit.js index c16d31154..dd4a7f690 100644 --- a/tests/lib/qunit.js +++ b/tests/lib/qunit.js @@ -4,6 +4,7 @@ define( [ "qunit-assert-classes", "qunit-assert-close", "lib/qunit-assert-domequal", + "lib/qunit-assert-dateequal", "phantom-bridge" ], function( QUnit, $ ) { |