chrono-node 1.4.7 → 1.4.9

package/test/en/en_time_from_now.test.js

@@ -1,5 +1,5 @@
 import * as chrono from '../../src/chrono';
-import { testSingleCase, testUnexpectedResult } from '../test_util';
+import { testSingleCase } from '../test_util';
 
 test("Test - Single Expression", function () {
     testSingleCase(chrono, '5 days from now, we did something', new Date(2012, 7, 10), (result) => {
@@ -11,7 +11,9 @@ test("Test - Single Expression", function () {
         expect(result.index).toBe(0);
         expect(result.text).toBe('5 days from now');
 
-        expect(result.start).toBeDate(new Date(2012, 8 - 1, 15, 12));
+        var resultDate = result.start.date();
+        var expectDate = new Date(2012, 8 - 1, 15, 12);
+        expect(expectDate.getTime()).toBe(resultDate.getTime())
     });
 
     testSingleCase(chrono, '10 days from now, we did something', new Date(2012, 7, 10), (result) => {
@@ -23,7 +25,9 @@ test("Test - Single Expression", function () {
         expect(result.index).toBe(0);
         expect(result.text).toBe('10 days from now');
 
-        expect(result.start).toBeDate(new Date(2012, 8 - 1, 20, 12));
+        var resultDate = result.start.date();
+        var expectDate = new Date(2012, 8 - 1, 20, 12);
+        expect(expectDate.getTime()).toBe(resultDate.getTime())
     });
 
     testSingleCase(chrono, '15 minute from now', new Date(2012, 7, 10, 12, 14), (result) => {
@@ -32,7 +36,9 @@ test("Test - Single Expression", function () {
         expect(result.start.get('hour')).toBe(12);
         expect(result.start.get('minute')).toBe(29);
 
-        expect(result.start).toBeDate(new Date(2012, 7, 10, 12, 29));
+        var resultDate = result.start.date();
+        var expectDate = new Date(2012, 7, 10, 12, 29);
+        expect(expectDate.getTime()).toBe(resultDate.getTime())
     });
 
     testSingleCase(chrono, '15 minutes earlier', new Date(2012, 7, 10, 12, 14), (result) => {
@@ -41,7 +47,9 @@ test("Test - Single Expression", function () {
         expect(result.start.get('hour')).toBe(11);
         expect(result.start.get('minute')).toBe(59);
 
-        expect(result.start).toBeDate(new Date(2012, 7, 10, 11, 59));
+        var resultDate = result.start.date();
+        var expectDate = new Date(2012, 7, 10, 11, 59);
+        expect(expectDate.getTime()).toBe(resultDate.getTime())
     });
 
     testSingleCase(chrono, '15 minute out', new Date(2012, 7, 10, 12, 14), (result) => {
@@ -50,7 +58,9 @@ test("Test - Single Expression", function () {
         expect(result.start.get('hour')).toBe(12);
         expect(result.start.get('minute')).toBe(29);
 
-        expect(result.start).toBeDate(new Date(2012, 7, 10, 12, 29));
+        var resultDate = result.start.date();
+        var expectDate = new Date(2012, 7, 10, 12, 29);
+        expect(expectDate.getTime()).toBe(resultDate.getTime())
     });
 
     testSingleCase(chrono, '   12 hours from now', new Date(2012, 7, 10, 12, 14), (result) => {
@@ -60,7 +70,9 @@ test("Test - Single Expression", function () {
         expect(result.start.get('hour')).toBe(0);
         expect(result.start.get('minute')).toBe(14);
 
-        expect(result.start).toBeDate(new Date(2012, 7, 11, 0, 14));
+        var resultDate = result.start.date();
+        var expectDate = new Date(2012, 7, 11, 0, 14);
+        expect(expectDate.getTime()).toBe(resultDate.getTime())
     });
 
     testSingleCase(chrono, '   12 hrs from now', new Date(2012, 7, 10, 12, 14), (result) => {
@@ -77,7 +89,9 @@ test("Test - Single Expression", function () {
         expect(result.start.get('hour')).toBe(12);
         expect(result.start.get('minute')).toBe(44);
 
-        expect(result.start).toBeDate(new Date(2012, 7, 10, 12, 44));
+        var resultDate = result.start.date();
+        var expectDate = new Date(2012, 7, 10, 12, 44);
+        expect(expectDate.getTime()).toBe(resultDate.getTime())
     });
 
     testSingleCase(chrono, '12 hours from now I did something', new Date(2012, 7, 10, 12, 14), (result) => {
@@ -87,7 +101,9 @@ test("Test - Single Expression", function () {
         expect(result.start.get('hour')).toBe(0);
         expect(result.start.get('minute')).toBe(14);
 
-        expect(result.start).toBeDate(new Date(2012, 7, 11, 0, 14));
+        var resultDate = result.start.date();
+        var expectDate = new Date(2012, 7, 11, 0, 14);
+        expect(expectDate.getTime()).toBe(resultDate.getTime())
     });
 
     testSingleCase(chrono, '12 seconds from now I did something', new Date(2012, 7, 10, 12, 14), (result) => {
@@ -97,7 +113,9 @@ test("Test - Single Expression", function () {
         expect(result.start.get('minute')).toBe(14);
         expect(result.start.get('second')).toBe(12);
 
-        expect(result.start).toBeDate(new Date(2012, 7, 10, 12, 14, 12));
+        var resultDate = result.start.date();
+        var expectDate = new Date(2012, 7, 10, 12, 14, 12);
+        expect(expectDate.getTime()).toBe(resultDate.getTime())
     });
 
     testSingleCase(chrono, 'three seconds from now I did something', new Date(2012, 7, 10, 12, 14), (result) => {
@@ -107,7 +125,9 @@ test("Test - Single Expression", function () {
         expect(result.start.get('minute')).toBe(14);
         expect(result.start.get('second')).toBe(3);
 
-        expect(result.start).toBeDate(new Date(2012, 7, 10, 12, 14, 3));
+        var resultDate = result.start.date();
+        var expectDate = new Date(2012, 7, 10, 12, 14, 3);
+        expect(expectDate.getTime()).toBe(resultDate.getTime())
     });
 
     testSingleCase(chrono, '5 Days from now, we did something', new Date(2012, 7, 10), (result) => {
@@ -119,7 +139,9 @@ test("Test - Single Expression", function () {
         expect(result.index).toBe(0);
         expect(result.text).toBe('5 Days from now');
 
-        expect(result.start).toBeDate(new Date(2012, 8 - 1, 15, 12));
+        var resultDate = result.start.date();
+        var expectDate = new Date(2012, 8 - 1, 15, 12);
+        expect(expectDate.getTime()).toBe(resultDate.getTime())
     });
 
 
@@ -129,7 +151,9 @@ test("Test - Single Expression", function () {
         expect(result.start.get('hour')).toBe(12);
         expect(result.start.get('minute')).toBe(44);
 
-        expect(result.start).toBeDate(new Date(2012, 7, 10, 12, 44));
+        var resultDate = result.start.date();
+        var expectDate = new Date(2012, 7, 10, 12, 44);
+        expect(expectDate.getTime()).toBe(resultDate.getTime())
     });
 
     testSingleCase(chrono, 'A days from now, we did something', new Date(2012, 7, 10), (result) => {
@@ -141,7 +165,9 @@ test("Test - Single Expression", function () {
         expect(result.index).toBe(0);
         expect(result.text).toBe('A days from now');
 
-        expect(result.start).toBeDate(new Date(2012, 8 - 1, 11, 12));
+        var resultDate = result.start.date();
+        var expectDate = new Date(2012, 8 - 1, 11, 12);
+        expect(expectDate.getTime()).toBe(resultDate.getTime())
     });
 
     testSingleCase(chrono, 'a min out', new Date(2012, 7, 10, 12, 14), (result) => {
@@ -150,7 +176,9 @@ test("Test - Single Expression", function () {
         expect(result.start.get('hour')).toBe(12);
         expect(result.start.get('minute')).toBe(15);
 
-        expect(result.start).toBeDate(new Date(2012, 7, 10, 12, 15));
+        var resultDate = result.start.date();
+        var expectDate = new Date(2012, 7, 10, 12, 15);
+        expect(expectDate.getTime()).toBe(resultDate.getTime())
     });
 
     testSingleCase(chrono, 'in 1 hour', new Date(2012, 7, 10, 12, 14), (result) => {
@@ -159,7 +187,9 @@ test("Test - Single Expression", function () {
         expect(result.start.get('hour')).toBe(13);
         expect(result.start.get('minute')).toBe(14);
 
-        expect(result.start).toBeDate(new Date(2012, 7, 10, 13, 14));
+        var resultDate = result.start.date();
+        var expectDate = new Date(2012, 7, 10, 13, 14);
+        expect(expectDate.getTime()).toBe(resultDate.getTime())
     });
 
     testSingleCase(chrono, 'in 1.5 hours', new Date(2012, 7, 10, 12, 40), (result) => {
@@ -168,7 +198,9 @@ test("Test - Single Expression", function () {
         expect(result.start.get('hour')).toBe(14);
         expect(result.start.get('minute')).toBe(10);
 
-        expect(result.start).toBeDate(new Date(2012, 7, 10, 14, 10));
+        var resultDate = result.start.date();
+        var expectDate = new Date(2012, 7, 10, 14, 10);
+        expect(expectDate.getTime()).toBe(resultDate.getTime())
     });
 });
 
@@ -183,7 +215,9 @@ test("Test - Single Expression (Casual)", function () {
         expect(result.index).toBe(0);
         expect(result.text).toBe('5 months from now');
 
-        expect(result.start).toBeDate(new Date(2013, 1 - 1, 10, 12));
+        var resultDate = result.start.date();
+        var expectDate = new Date(2013, 1 - 1, 10, 12);
+        expect(expectDate.getTime()).toBe(resultDate.getTime())
     });
 
     testSingleCase(chrono, '5 years from now, we did something', new Date(2012, 8 - 1, 10), (result) => {
@@ -195,7 +229,9 @@ test("Test - Single Expression (Casual)", function () {
         expect(result.index).toBe(0);
         expect(result.text).toBe('5 years from now');
 
-        expect(result.start).toBeDate(new Date(2017, 8 - 1, 10, 12));
+        var resultDate = result.start.date();
+        var expectDate = new Date(2017, 8 - 1, 10, 12);
+        expect(expectDate.getTime()).toBe(resultDate.getTime())
     });
 
 
@@ -208,7 +244,9 @@ test("Test - Single Expression (Casual)", function () {
         expect(result.index).toBe(0);
         expect(result.text).toBe('a week from now');
 
-        expect(result.start).toBeDate(new Date(2012, 8 - 1, 10, 12));
+        var resultDate = result.start.date();
+        var expectDate = new Date(2012, 8 - 1, 10, 12);
+        expect(expectDate.getTime()).toBe(resultDate.getTime())
     });
 
     testSingleCase(chrono, 'a few days from now, we did something', new Date(2012, 8 - 1, 3), (result) => {
@@ -220,15 +258,23 @@ test("Test - Single Expression (Casual)", function () {
         expect(result.index).toBe(0);
         expect(result.text).toBe('a few days from now');
 
-        expect(result.start).toBeDate(new Date(2012, 8 - 1, 6, 12));
+        var resultDate = result.start.date();
+        var expectDate = new Date(2012, 8 - 1, 6, 12);
+        expect(expectDate.getTime()).toBe(resultDate.getTime())
     });
 });
 
 test("Test - Single Expression (Strict)", function () {
 
-    testUnexpectedResult(chrono.strict, '15 min from now', new Date(2012, 7, 10, 12, 14));
+    var text = "15 min from now";
+    var results = chrono.strict.parse(text, new Date(2012, 7, 10, 12, 14));
+    expect(results.length).toBe(0);
 
-    testSingleCase(chrono.strict, '15 minutes from now', new Date(2012, 7, 10, 12, 14));
+    var text = "15 minutes from now";
+    var results = chrono.strict.parse(text, new Date(2012, 7, 10, 12, 14));
+    expect(results.length).toBe(1);
 
-    testUnexpectedResult(chrono.strict, 'a week from now, we did something', new Date(2012, 8 - 1, 3))
+    var text = "a week from now, we did something";
+    var results = chrono.strict.parse(text, new Date(2012, 8 - 1, 3));
+    expect(results.length).toBe(0)
 });

package/test/en/en_time_later.test.js

@@ -1,5 +1,5 @@
 import * as chrono from '../../src/chrono';
-import { testSingleCase, testUnexpectedResult } from '../test_util';
+import { testSingleCase } from '../test_util';
 
 test("Test - Single Expression", function() {
 
@@ -15,7 +15,9 @@ test("Test - Single Expression", function() {
         expect(result.start.isCertain('day')).toBe(true);
         expect(result.start.isCertain('month')).toBe(true);
 
-        expect(result.start).toBeDate(new Date(2012, 8-1, 12, 12));
+        var resultDate = result.start.date();
+        var expectDate = new Date(2012, 8-1, 12, 12);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
     });
 
     testSingleCase(chrono, '5 minutes later', new Date(2012, 7, 10, 10, 0), (result) => {
@@ -32,7 +34,9 @@ test("Test - Single Expression", function() {
         expect(result.start.isCertain('hour')).toBe(true);
         expect(result.start.isCertain('minute')).toBe(true);
 
-        expect(result.start).toBeDate(new Date(2012, 8-1, 10, 10, 5));
+        var resultDate = result.start.date();
+        var expectDate = new Date(2012, 8-1, 10, 10, 5);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
     });
 
     testSingleCase(chrono, '3 week later', new Date(2012, 7-1, 10, 10, 0), (result) => {
@@ -44,7 +48,9 @@ test("Test - Single Expression", function() {
         expect(result.index).toBe(0);
         expect(result.text).toBe('3 week later');
 
-        expect(result.start).toBeDate(new Date(2012, 7-1, 31, 12));
+        var resultDate = result.start.date();
+        var expectDate = new Date(2012, 7-1, 31, 12);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
     });
 });
 
@@ -53,7 +59,9 @@ test("Test - Single Expression (Strict)", function() {
     var results = chrono.strict.parse(text, new Date(2012,7,10,12,14));
     expect(results[0]).toBe(undefined);
 
-    testUnexpectedResult(chrono.strict, 'a week ago, we did something', new Date(2012, 8-1, 3))
+    var text = "a week ago, we did something";
+    var results = chrono.strict.parse(text, new Date(2012, 8-1, 3));
+    expect(results.length).toBe(0)
 
     testSingleCase(chrono, 'in 25 minutes', new Date(2012, 7, 10, 12, 40), (result) => {
         expect(result.index).toBe(0);
@@ -61,6 +69,8 @@ test("Test - Single Expression (Strict)", function() {
         expect(result.start.get('hour')).toBe(13);
         expect(result.start.get('minute')).toBe(5);
 
-        expect(result.start).toBeDate(new Date(2012, 7, 10, 13, 5));
+        var resultDate = result.start.date();
+        var expectDate = new Date(2012, 7, 10, 13, 5);
+        expect(expectDate.getTime()).toBe(resultDate.getTime())
     });
 });

package/test/en/en_weekday.test.js

@@ -19,7 +19,9 @@ test("Test - Single Expression", function () {
         expect(result.start.isCertain('year')).toBe(false);
         expect(result.start.isCertain('weekday')).toBe(true);
 
-        expect(result.start).toBeDate(new Date(2012, 7, 6, 12));
+        var resultDate = result.start.date();
+        var expectDate = new Date(2012, 7, 6, 12);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
     });
 
     testSingleCase(chrono.casual, 'Monday (forward dates only)', new Date(2012, 7, 9), {forwardDate: true}, (result) => {
@@ -38,7 +40,9 @@ test("Test - Single Expression", function () {
         expect(result.start.isCertain('year')).toBe(false);
         expect(result.start.isCertain('weekday')).toBe(true);
 
-        expect(result.start).toBeDate(new Date(2012, 7, 13, 12));
+        var resultDate = result.start.date();
+        var expectDate = new Date(2012, 7, 13, 12);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
     });
 
     testSingleCase(chrono.casual, 'Thursday', new Date(2012, 7, 9), (result) => {
@@ -51,7 +55,9 @@ test("Test - Single Expression", function () {
         expect(result.start.get('day')).toBe(9);
         expect(result.start.get('weekday')).toBe(4);
 
-        expect(result.start).toBeDate(new Date(2012, 7, 9, 12));
+        var resultDate = result.start.date();
+        var expectDate = new Date(2012, 7, 9, 12);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
     });
 
     testSingleCase(chrono.casual, 'Sunday', new Date(2012, 7, 9), (result) => {
@@ -64,7 +70,9 @@ test("Test - Single Expression", function () {
         expect(result.start.get('day')).toBe(12);
         expect(result.start.get('weekday')).toBe(0);
 
-        expect(result.start).toBeDate(new Date(2012, 7, 12, 12));
+        var resultDate = result.start.date();
+        var expectDate = new Date(2012, 7, 12, 12);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
     });
 
 
@@ -78,7 +86,9 @@ test("Test - Single Expression", function () {
         expect(result.start.get('day')).toBe(3);
         expect(result.start.get('weekday')).toBe(5);
 
-        expect(result.start).toBeDate(new Date(2012, 7, 3, 12));
+        var resultDate = result.start.date();
+        var expectDate = new Date(2012, 7, 3, 12);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
     });
 
     testSingleCase(chrono.casual, 'The Deadline is past Friday...', new Date(2012, 7, 9), (result) => {
@@ -91,7 +101,9 @@ test("Test - Single Expression", function () {
         expect(result.start.get('day')).toBe(3);
         expect(result.start.get('weekday')).toBe(5);
 
-        expect(result.start).toBeDate(new Date(2012, 7, 3, 12));
+        var resultDate = result.start.date();
+        var expectDate = new Date(2012, 7, 3, 12);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
     });
 
 
@@ -105,7 +117,9 @@ test("Test - Single Expression", function () {
         expect(result.start.get('day')).toBe(24);
         expect(result.start.get('weekday')).toBe(5);
 
-        expect(result.start).toBeDate(new Date(2015, 3, 24, 12));
+        var resultDate = result.start.date();
+        var expectDate = new Date(2015, 3, 24, 12);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
     });
 
 
@@ -119,7 +133,9 @@ test("Test - Single Expression", function () {
         expect(result.start.get('day')).toBe(21);
         expect(result.start.get('weekday')).toBe(2);
 
-        expect(result.start).toBeDate(new Date(2015, 3, 21, 12));
+        var resultDate = result.start.date();
+        var expectDate = new Date(2015, 3, 21, 12);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
     });
 });
 
@@ -135,7 +151,9 @@ test("Test - Weekday With Casual Time", function () {
         expect(result.start.get('weekday')).toBe(2);
         expect(result.start.get('hour')).toBe(6);
 
-        expect(result.start).toBeDate(new Date(2015, 3, 21, 6));
+        var resultDate = result.start.date();
+        var expectDate = new Date(2015, 3, 21, 6);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
     });
 });
 
@@ -157,7 +175,9 @@ test("Test - Weekday Overlap", function () {
         expect(result.start.isCertain('year')).toBe(true);
         expect(result.start.isCertain('weekday')).toBe(true);
 
-        expect(result.start).toBeDate(new Date(2014, 12 - 1, 7, 12));
+        var resultDate = result.start.date();
+        var expectDate = new Date(2014, 12 - 1, 7, 12);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
     });
 
 
@@ -177,7 +197,9 @@ test("Test - Weekday Overlap", function () {
         expect(result.start.isCertain('year')).toBe(true);
         expect(result.start.isCertain('weekday')).toBe(true);
 
-        expect(result.start).toBeDate(new Date(2014, 12 - 1, 7, 12));
+        var resultDate = result.start.date();
+        var expectDate = new Date(2014, 12 - 1, 7, 12);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
     });
 });
 
@@ -199,7 +221,9 @@ test('Test - forward dates only option', function () {
         expect(result.start.isCertain('year')).toBe(false);
         expect(result.start.isCertain('weekday')).toBe(true);
 
-        expect(result.start).toBeDate(new Date(2016, 8-1, 5, 12));
+        var resultDate = result.start.date();
+        var expectDate = new Date(2016, 8-1, 5, 12);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
 
 
         expect(result.end).not.toBeNull();
@@ -213,6 +237,8 @@ test('Test - forward dates only option', function () {
         expect(result.end.isCertain('year')).toBe(false);
         expect(result.end.isCertain('weekday')).toBe(true);
 
-        expect(result.end).toBeDate(new Date(2016, 8-1, 8, 12));
+        var resultDate = result.end.date();
+        var expectDate = new Date(2016, 8-1, 8, 12);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
     });
 });