diff -r c961a301a90b -r 98ea2b865210 web/test/jstests/test_utils.js --- a/web/test/jstests/test_utils.js Wed May 20 17:04:43 2015 +0200 +++ b/web/test/jstests/test_utils.js Wed May 20 15:45:43 2015 +0200 @@ -2,56 +2,56 @@ QUnit.module("datetime"); - QUnit.test("test full datetime", function() { - equal(cw.utils.toISOTimestamp(new Date(1986, 3, 18, 10, 30, 0, 0)), + QUnit.test("test full datetime", function (assert) { + assert.equal(cw.utils.toISOTimestamp(new Date(1986, 3, 18, 10, 30, 0, 0)), '1986-04-18 10:30:00'); }); - QUnit.test("test only date", function() { - equal(cw.utils.toISOTimestamp(new Date(1986, 3, 18)), '1986-04-18 00:00:00'); + QUnit.test("test only date", function (assert) { + assert.equal(cw.utils.toISOTimestamp(new Date(1986, 3, 18)), '1986-04-18 00:00:00'); }); - QUnit.test("test null", function() { - equal(cw.utils.toISOTimestamp(null), null); + QUnit.test("test null", function (assert) { + assert.equal(cw.utils.toISOTimestamp(null), null); }); QUnit.module("parsing"); - QUnit.test("test basic number parsing", function() { + QUnit.test("test basic number parsing", function (assert) { var d = strptime('2008/08/08', '%Y/%m/%d'); - deepEqual(datetuple(d), [2008, 8, 8, 0, 0]); + assert.deepEqual(datetuple(d), [2008, 8, 8, 0, 0]); d = strptime('2008/8/8', '%Y/%m/%d'); - deepEqual(datetuple(d), [2008, 8, 8, 0, 0]); + assert.deepEqual(datetuple(d), [2008, 8, 8, 0, 0]); d = strptime('8/8/8', '%Y/%m/%d'); - deepEqual(datetuple(d), [8, 8, 8, 0, 0]); + assert.deepEqual(datetuple(d), [8, 8, 8, 0, 0]); d = strptime('0/8/8', '%Y/%m/%d'); - deepEqual(datetuple(d), [0, 8, 8, 0, 0]); + assert.deepEqual(datetuple(d), [0, 8, 8, 0, 0]); d = strptime('-10/8/8', '%Y/%m/%d'); - deepEqual(datetuple(d), [-10, 8, 8, 0, 0]); + assert.deepEqual(datetuple(d), [-10, 8, 8, 0, 0]); d = strptime('-35000', '%Y'); - deepEqual(datetuple(d), [-35000, 1, 1, 0, 0]); + assert.deepEqual(datetuple(d), [-35000, 1, 1, 0, 0]); }); - QUnit.test("test custom format parsing", function() { + QUnit.test("test custom format parsing", function (assert) { var d = strptime('2008-08-08', '%Y-%m-%d'); - deepEqual(datetuple(d), [2008, 8, 8, 0, 0]); + assert.deepEqual(datetuple(d), [2008, 8, 8, 0, 0]); d = strptime('2008 - ! 08: 08', '%Y - ! %m: %d'); - deepEqual(datetuple(d), [2008, 8, 8, 0, 0]); + assert.deepEqual(datetuple(d), [2008, 8, 8, 0, 0]); d = strptime('2008-08-08 12:14', '%Y-%m-%d %H:%M'); - deepEqual(datetuple(d), [2008, 8, 8, 12, 14]); + assert.deepEqual(datetuple(d), [2008, 8, 8, 12, 14]); d = strptime('2008-08-08 1:14', '%Y-%m-%d %H:%M'); - deepEqual(datetuple(d), [2008, 8, 8, 1, 14]); + assert.deepEqual(datetuple(d), [2008, 8, 8, 1, 14]); d = strptime('2008-08-08 01:14', '%Y-%m-%d %H:%M'); - deepEqual(datetuple(d), [2008, 8, 8, 1, 14]); + assert.deepEqual(datetuple(d), [2008, 8, 8, 1, 14]); }); QUnit.module("sliceList"); - QUnit.test("test slicelist", function() { + QUnit.test("test slicelist", function (assert) { var list = ['a', 'b', 'c', 'd', 'e', 'f']; - deepEqual(cw.utils.sliceList(list, 2), ['c', 'd', 'e', 'f']); - deepEqual(cw.utils.sliceList(list, 2, -2), ['c', 'd']); - deepEqual(cw.utils.sliceList(list, -3), ['d', 'e', 'f']); - deepEqual(cw.utils.sliceList(list, 0, -2), ['a', 'b', 'c', 'd']); - deepEqual(cw.utils.sliceList(list), list); + assert.deepEqual(cw.utils.sliceList(list, 2), ['c', 'd', 'e', 'f']); + assert.deepEqual(cw.utils.sliceList(list, 2, -2), ['c', 'd']); + assert.deepEqual(cw.utils.sliceList(list, -3), ['d', 'e', 'f']); + assert.deepEqual(cw.utils.sliceList(list, 0, -2), ['a', 'b', 'c', 'd']); + assert.deepEqual(cw.utils.sliceList(list), list); }); QUnit.module("formContents", { @@ -60,7 +60,7 @@ } }); // XXX test fckeditor - QUnit.test("test formContents", function() { + QUnit.test("test formContents", function (assert) { $('#test-form').append(''); $('#test-form').append('