--- a/web/test/jstests/test_utils.js Wed May 13 18:39:29 2015 +0200
+++ b/web/test/jstests/test_utils.js Wed May 20 16:33:01 2015 +0200
@@ -3,55 +3,55 @@
module("datetime");
test("test full datetime", function() {
- equals(cw.utils.toISOTimestamp(new Date(1986, 3, 18, 10, 30, 0, 0)),
+ equal(cw.utils.toISOTimestamp(new Date(1986, 3, 18, 10, 30, 0, 0)),
'1986-04-18 10:30:00');
});
test("test only date", function() {
- equals(cw.utils.toISOTimestamp(new Date(1986, 3, 18)), '1986-04-18 00:00:00');
+ equal(cw.utils.toISOTimestamp(new Date(1986, 3, 18)), '1986-04-18 00:00:00');
});
test("test null", function() {
- equals(cw.utils.toISOTimestamp(null), null);
+ equal(cw.utils.toISOTimestamp(null), null);
});
module("parsing");
test("test basic number parsing", function() {
var d = strptime('2008/08/08', '%Y/%m/%d');
- same(datetuple(d), [2008, 8, 8, 0, 0]);
+ deepEqual(datetuple(d), [2008, 8, 8, 0, 0]);
d = strptime('2008/8/8', '%Y/%m/%d');
- same(datetuple(d), [2008, 8, 8, 0, 0]);
+ deepEqual(datetuple(d), [2008, 8, 8, 0, 0]);
d = strptime('8/8/8', '%Y/%m/%d');
- same(datetuple(d), [8, 8, 8, 0, 0]);
+ deepEqual(datetuple(d), [8, 8, 8, 0, 0]);
d = strptime('0/8/8', '%Y/%m/%d');
- same(datetuple(d), [0, 8, 8, 0, 0]);
+ deepEqual(datetuple(d), [0, 8, 8, 0, 0]);
d = strptime('-10/8/8', '%Y/%m/%d');
- same(datetuple(d), [-10, 8, 8, 0, 0]);
+ deepEqual(datetuple(d), [-10, 8, 8, 0, 0]);
d = strptime('-35000', '%Y');
- same(datetuple(d), [-35000, 1, 1, 0, 0]);
+ deepEqual(datetuple(d), [-35000, 1, 1, 0, 0]);
});
test("test custom format parsing", function() {
var d = strptime('2008-08-08', '%Y-%m-%d');
- same(datetuple(d), [2008, 8, 8, 0, 0]);
+ deepEqual(datetuple(d), [2008, 8, 8, 0, 0]);
d = strptime('2008 - ! 08: 08', '%Y - ! %m: %d');
- same(datetuple(d), [2008, 8, 8, 0, 0]);
+ deepEqual(datetuple(d), [2008, 8, 8, 0, 0]);
d = strptime('2008-08-08 12:14', '%Y-%m-%d %H:%M');
- same(datetuple(d), [2008, 8, 8, 12, 14]);
+ deepEqual(datetuple(d), [2008, 8, 8, 12, 14]);
d = strptime('2008-08-08 1:14', '%Y-%m-%d %H:%M');
- same(datetuple(d), [2008, 8, 8, 1, 14]);
+ deepEqual(datetuple(d), [2008, 8, 8, 1, 14]);
d = strptime('2008-08-08 01:14', '%Y-%m-%d %H:%M');
- same(datetuple(d), [2008, 8, 8, 1, 14]);
+ deepEqual(datetuple(d), [2008, 8, 8, 1, 14]);
});
module("sliceList");
test("test slicelist", function() {
var list = ['a', 'b', 'c', 'd', 'e', 'f'];
- same(cw.utils.sliceList(list, 2), ['c', 'd', 'e', 'f']);
- same(cw.utils.sliceList(list, 2, -2), ['c', 'd']);
- same(cw.utils.sliceList(list, -3), ['d', 'e', 'f']);
- same(cw.utils.sliceList(list, 0, -2), ['a', 'b', 'c', 'd']);
- same(cw.utils.sliceList(list), list);
+ 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);
});
module("formContents", {
@@ -83,7 +83,7 @@
'value="one" />');
$('#test-form').append('<input name="unchecked-choice" type="radio" ' +
'value="two"/>');
- same(cw.utils.formContents($('#test-form')[0]), [
+ deepEqual(cw.utils.formContents($('#test-form')[0]), [
['input-text', 'mytextarea', 'choice', 'check', 'theselect'],
['toto', 'Hello World!', 'no', 'no', 'foo']
]);