]> git.ipfire.org Git - thirdparty/moment.git/commitdiff
projects / thirdparty / moment.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c3e79c7)
Make tests involving hours-only off-set pass when non-whole hour offsets
authorDavid Simons <12e.david@gmail.com>
Sun, 6 Dec 2015 12:55:20 +0000 (19:55 +0700)
committerIskren Chernev <iskren.chernev@gmail.com>
Wed, 9 Dec 2015 08:34:38 +0000 (00:34 -0800)
src/test/moment/create.js patch | blob | blame | history

diff --git a/src/test/moment/create.js b/src/test/moment/create.js
index cdfb5320e5087d8a8b32c9c0f09aaecf3c996604..4f2bbc63c972b8eb686ae93fc1f45a6f6f337aaf 100644 (file)
--- a/src/test/moment/create.js
+++ b/src/test/moment/create.js
@@ -426,8 +426,13 @@ test('parsing iso', function (assert) {
     tz = (offset >= 0) ?
         '+' + pad(hourOffset) + ':' + pad(minOffset) :
         '-' + pad(-hourOffset) + ':' + pad(-minOffset),
+    tz_hour = tz.slice(0, 4) + "00",
     tz2 = tz.replace(':', ''),
     tz3 = tz2.slice(0, 3),
+    //Tz3 removes minutes digit so will break the tests when parsed if they all use the same minutes digit
+    minutesForTz3 = pad((4 + minOffset) % 60),
+    minute = pad(4 + minOffset),
+
     formats = [
         ['2011-10',                       '2011-10-01T00:00:00.000' + tz],
         ['2011-10-08',                    '2011-10-08T00:00:00.000' + tz],
@@ -438,8 +443,8 @@ test('parsing iso', function (assert) {
         ['2011-10-08T18:04:20' + tz,      '2011-10-08T18:04:20.000' + tz],
         ['2011-10-08T18:04' + tz2,        '2011-10-08T18:04:00.000' + tz],
         ['2011-10-08T18:04:20' + tz2,     '2011-10-08T18:04:20.000' + tz],
-        ['2011-10-08T18:04' + tz3,        '2011-10-08T18:04:00.000' + tz],
-        ['2011-10-08T18:04:20' + tz3,     '2011-10-08T18:04:20.000' + tz],
+        ['2011-10-08T18:04' + tz3,        '2011-10-08T18:' + minutesForTz3 + ':00.000' + tz],
+        ['2011-10-08T18:04:20' + tz3,     '2011-10-08T18:' + minutesForTz3 + ':20.000' + tz],
         ['2011-10-08T18:04:20.1' + tz2,   '2011-10-08T18:04:20.100' + tz],
         ['2011-10-08T18:04:20.11' + tz2,  '2011-10-08T18:04:20.110' + tz],
         ['2011-10-08T18:04:20.111' + tz2, '2011-10-08T18:04:20.111' + tz],
@@ -450,8 +455,8 @@ test('parsing iso', function (assert) {
         ['2011-10-08 18:04:20' + tz,      '2011-10-08T18:04:20.000' + tz],
         ['2011-10-08 18:04' + tz2,        '2011-10-08T18:04:00.000' + tz],
         ['2011-10-08 18:04:20' + tz2,     '2011-10-08T18:04:20.000' + tz],
-        ['2011-10-08 18:04' + tz3,        '2011-10-08T18:04:00.000' + tz],
-        ['2011-10-08 18:04:20' + tz3,     '2011-10-08T18:04:20.000' + tz],
+        ['2011-10-08 18:04' + tz3,        '2011-10-08T18:' + minutesForTz3 + ':00.000' + tz],
+        ['2011-10-08 18:04:20' + tz3,     '2011-10-08T18:' + minutesForTz3 + ':20.000' + tz],
         ['2011-10-08 18:04:20.1' + tz2,   '2011-10-08T18:04:20.100' + tz],
         ['2011-10-08 18:04:20.11' + tz2,  '2011-10-08T18:04:20.110' + tz],
         ['2011-10-08 18:04:20.111' + tz2, '2011-10-08T18:04:20.111' + tz],
@@ -464,8 +469,8 @@ test('parsing iso', function (assert) {
         ['2011-W40-6T18:04:20' + tz,      '2011-10-08T18:04:20.000' + tz],
         ['2011-W40-6T18:04' + tz2,        '2011-10-08T18:04:00.000' + tz],
         ['2011-W40-6T18:04:20' + tz2,     '2011-10-08T18:04:20.000' + tz],
-        ['2011-W40-6T18:04' + tz3,        '2011-10-08T18:04:00.000' + tz],
-        ['2011-W40-6T18:04:20' + tz3,     '2011-10-08T18:04:20.000' + tz],
+        ['2011-W40-6T18:04' + tz3,        '2011-10-08T18:' + minutesForTz3 + ':00.000' + tz],
+        ['2011-W40-6T18:04:20' + tz3,     '2011-10-08T18:' + minutesForTz3 + ':20.000' + tz],
         ['2011-W40-6T18:04:20.1' + tz2,   '2011-10-08T18:04:20.100' + tz],
         ['2011-W40-6T18:04:20.11' + tz2,  '2011-10-08T18:04:20.110' + tz],
         ['2011-W40-6T18:04:20.111' + tz2, '2011-10-08T18:04:20.111' + tz],
@@ -476,8 +481,8 @@ test('parsing iso', function (assert) {
         ['2011-W40-6 18:04:20' + tz,      '2011-10-08T18:04:20.000' + tz],
         ['2011-W40-6 18:04' + tz2,        '2011-10-08T18:04:00.000' + tz],
         ['2011-W40-6 18:04:20' + tz2,     '2011-10-08T18:04:20.000' + tz],
-        ['2011-W40-6 18:04' + tz3,        '2011-10-08T18:04:00.000' + tz],
-        ['2011-W40-6 18:04:20' + tz3,     '2011-10-08T18:04:20.000' + tz],
+        ['2011-W40-6 18:04' + tz3,        '2011-10-08T18:' + minutesForTz3 + ':00.000' + tz],
+        ['2011-W40-6 18:04:20' + tz3,     '2011-10-08T18:' + minutesForTz3 + ':20.000' + tz],
         ['2011-W40-6 18:04:20.1' + tz2,   '2011-10-08T18:04:20.100' + tz],
         ['2011-W40-6 18:04:20.11' + tz2,  '2011-10-08T18:04:20.110' + tz],
         ['2011-W40-6 18:04:20.111' + tz2, '2011-10-08T18:04:20.111' + tz],
@@ -489,8 +494,8 @@ test('parsing iso', function (assert) {
         ['2011-281T18:04:20' + tz,        '2011-10-08T18:04:20.000' + tz],
         ['2011-281T18:04' + tz2,          '2011-10-08T18:04:00.000' + tz],
         ['2011-281T18:04:20' + tz2,       '2011-10-08T18:04:20.000' + tz],
-        ['2011-281T18:04' + tz3,          '2011-10-08T18:04:00.000' + tz],
-        ['2011-281T18:04:20' + tz3,       '2011-10-08T18:04:20.000' + tz],
+        ['2011-281T18:04' + tz3,          '2011-10-08T18:' + minutesForTz3 + ':00.000' + tz],
+        ['2011-281T18:04:20' + tz3,       '2011-10-08T18:' + minutesForTz3 + ':20.000' + tz],
         ['2011-281T18:04:20.1' + tz2,     '2011-10-08T18:04:20.100' + tz],
         ['2011-281T18:04:20.11' + tz2,    '2011-10-08T18:04:20.110' + tz],
         ['2011-281T18:04:20.111' + tz2,   '2011-10-08T18:04:20.111' + tz],
@@ -501,8 +506,8 @@ test('parsing iso', function (assert) {
         ['2011-281 18:04:20' + tz,        '2011-10-08T18:04:20.000' + tz],
         ['2011-281 18:04' + tz2,          '2011-10-08T18:04:00.000' + tz],
         ['2011-281 18:04:20' + tz2,       '2011-10-08T18:04:20.000' + tz],
-        ['2011-281 18:04' + tz3,          '2011-10-08T18:04:00.000' + tz],
-        ['2011-281 18:04:20' + tz3,       '2011-10-08T18:04:20.000' + tz],
+        ['2011-281 18:04' + tz3,          '2011-10-08T18:' + minutesForTz3 + ':00.000' + tz],
+        ['2011-281 18:04:20' + tz3,       '2011-10-08T18:' + minutesForTz3 + ':20.000' + tz],
         ['2011-281 18:04:20.1' + tz2,     '2011-10-08T18:04:20.100' + tz],
         ['2011-281 18:04:20.11' + tz2,    '2011-10-08T18:04:20.110' + tz],
         ['2011-281 18:04:20.111' + tz2,   '2011-10-08T18:04:20.111' + tz],
@@ -513,8 +518,8 @@ test('parsing iso', function (assert) {
         ['20111008T180420' + tz,          '2011-10-08T18:04:20.000' + tz],
         ['20111008T1804' + tz2,           '2011-10-08T18:04:00.000' + tz],
         ['20111008T180420' + tz2,         '2011-10-08T18:04:20.000' + tz],
-        ['20111008T1804' + tz3,           '2011-10-08T18:04:00.000' + tz],
-        ['20111008T180420' + tz3,         '2011-10-08T18:04:20.000' + tz],
+        ['20111008T1804' + tz3,           '2011-10-08T18:' + minutesForTz3 + ':00.000' + tz],
+        ['20111008T180420' + tz3,         '2011-10-08T18:' + minutesForTz3 + ':20.000' + tz],
         ['20111008T180420,1' + tz2,       '2011-10-08T18:04:20.100' + tz],
         ['20111008T180420,11' + tz2,      '2011-10-08T18:04:20.110' + tz],
         ['20111008T180420,111' + tz2,     '2011-10-08T18:04:20.111' + tz],
@@ -525,8 +530,8 @@ test('parsing iso', function (assert) {
         ['20111008 180420' + tz,          '2011-10-08T18:04:20.000' + tz],
         ['20111008 1804' + tz2,           '2011-10-08T18:04:00.000' + tz],
         ['20111008 180420' + tz2,         '2011-10-08T18:04:20.000' + tz],
-        ['20111008 1804' + tz3,           '2011-10-08T18:04:00.000' + tz],
-        ['20111008 180420' + tz3,         '2011-10-08T18:04:20.000' + tz],
+        ['20111008 1804' + tz3,           '2011-10-08T18:' + minutesForTz3 + ':00.000' + tz],
+        ['20111008 180420' + tz3,         '2011-10-08T18:' + minutesForTz3 + ':20.000' + tz],
         ['20111008 180420,1' + tz2,       '2011-10-08T18:04:20.100' + tz],
         ['20111008 180420,11' + tz2,      '2011-10-08T18:04:20.110' + tz],
         ['20111008 180420,111' + tz2,     '2011-10-08T18:04:20.111' + tz],
@@ -540,8 +545,8 @@ test('parsing iso', function (assert) {
         ['2011W406T180420' + tz,          '2011-10-08T18:04:20.000' + tz],
         ['2011W406T1804' + tz2,           '2011-10-08T18:04:00.000' + tz],
         ['2011W406T180420' + tz2,         '2011-10-08T18:04:20.000' + tz],
-        ['2011W406T1804' + tz3,           '2011-10-08T18:04:00.000' + tz],
-        ['2011W406T180420' + tz3,         '2011-10-08T18:04:20.000' + tz],
+        ['2011W406T1804' + tz3,           '2011-10-08T18:' + minutesForTz3 + ':00.000' + tz],
+        ['2011W406T180420' + tz3,         '2011-10-08T18:' + minutesForTz3 + ':20.000' + tz],
         ['2011W406T180420,1' + tz2,       '2011-10-08T18:04:20.100' + tz],
         ['2011W406T180420,11' + tz2,      '2011-10-08T18:04:20.110' + tz],
         ['2011W406T180420,111' + tz2,     '2011-10-08T18:04:20.111' + tz],
@@ -551,8 +556,8 @@ test('parsing iso', function (assert) {
         ['2011W406 1804' + tz,            '2011-10-08T18:04:00.000' + tz],
         ['2011W406 180420' + tz,          '2011-10-08T18:04:20.000' + tz],
         ['2011W406 180420' + tz2,         '2011-10-08T18:04:20.000' + tz],
-        ['2011W406 1804' + tz3,           '2011-10-08T18:04:00.000' + tz],
-        ['2011W406 180420' + tz3,         '2011-10-08T18:04:20.000' + tz],
+        ['2011W406 1804' + tz3,           '2011-10-08T18:' + minutesForTz3 + ':00.000' + tz],
+        ['2011W406 180420' + tz3,         '2011-10-08T18:' + minutesForTz3 + ':20.000' + tz],
         ['2011W406 180420,1' + tz2,       '2011-10-08T18:04:20.100' + tz],
         ['2011W406 180420,11' + tz2,      '2011-10-08T18:04:20.110' + tz],
         ['2011W406 180420,111' + tz2,     '2011-10-08T18:04:20.111' + tz],
@@ -564,8 +569,8 @@ test('parsing iso', function (assert) {
         ['2011281T180420' + tz,           '2011-10-08T18:04:20.000' + tz],
         ['2011281T1804' + tz2,            '2011-10-08T18:04:00.000' + tz],
         ['2011281T180420' + tz2,          '2011-10-08T18:04:20.000' + tz],
-        ['2011281T1804' + tz3,            '2011-10-08T18:04:00.000' + tz],
-        ['2011281T180420' + tz3,          '2011-10-08T18:04:20.000' + tz],
+        ['2011281T1804' + tz3,            '2011-10-08T18:' + minutesForTz3 + ':00.000' + tz],
+        ['2011281T180420' + tz3,          '2011-10-08T18:' + minutesForTz3 + ':20.000' + tz],
         ['2011281T180420,1' + tz2,        '2011-10-08T18:04:20.100' + tz],
         ['2011281T180420,11' + tz2,       '2011-10-08T18:04:20.110' + tz],
         ['2011281T180420,111' + tz2,      '2011-10-08T18:04:20.111' + tz],
@@ -576,8 +581,8 @@ test('parsing iso', function (assert) {
         ['2011281 180420' + tz,           '2011-10-08T18:04:20.000' + tz],
         ['2011281 1804' + tz2,            '2011-10-08T18:04:00.000' + tz],
         ['2011281 180420' + tz2,          '2011-10-08T18:04:20.000' + tz],
-        ['2011281 1804' + tz3,            '2011-10-08T18:04:00.000' + tz],
-        ['2011281 180420' + tz3,          '2011-10-08T18:04:20.000' + tz],
+        ['2011281 1804' + tz3,            '2011-10-08T18:' + minutesForTz3 + ':00.000' + tz],
+        ['2011281 180420' + tz3,          '2011-10-08T18:' + minutesForTz3 + ':20.000' + tz],
         ['2011281 180420,1' + tz2,        '2011-10-08T18:04:20.100' + tz],
         ['2011281 180420,11' + tz2,       '2011-10-08T18:04:20.110' + tz],
         ['2011281 180420,111' + tz2,      '2011-10-08T18:04:20.111' + tz]
Mirror of https://github.com/moment/moment.git