chrono-node 1.4.7 → 1.4.9

package/test/en/en_middle_endian.test.js

@@ -12,7 +12,9 @@ test("Test - Single Expression", function() {
         expect(result.index).toBe(29);
         expect(result.text).toBe('July 2017');
 
-        expect(result.start).toBeDate(new Date(2017, 7-1, 1, 12));
+        var resultDate = result.start.date();
+        var expectDate = new Date(2017, 7-1, 1, 12);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
     });
 
     testSingleCase(chrono, 'She is leaving in August.', new Date(2012,7,10), (result) => {
@@ -24,7 +26,9 @@ test("Test - Single Expression", function() {
         expect(result.index).toBe(18);
         expect(result.text).toBe('August');
 
-        expect(result.start).toBeDate(new Date(2012, 8-1, 1, 12));
+        var resultDate = result.start.date();
+        var expectDate = new Date(2012, 8-1, 1, 12);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
     });
 
     testSingleCase(chrono, 'I am arriving sometime in August, 2012, probably.', new Date(2012,7,10), (result) => {
@@ -36,7 +40,9 @@ test("Test - Single Expression", function() {
         expect(result.index).toBe(26);
         expect(result.text).toBe('August, 2012');
 
-        expect(result.start).toBeDate(new Date(2012, 8-1, 1, 12));
+        var resultDate = result.start.date();
+        var expectDate = new Date(2012, 8-1, 1, 12);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
     });
 
     testSingleCase(chrono, 'August 10, 2012', new Date(2012,7,10), (result) => {
@@ -48,7 +54,9 @@ test("Test - Single Expression", function() {
         expect(result.index).toBe(0);
         expect(result.text).toBe('August 10, 2012');
 
-        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()).toBeCloseTo(resultDate.getTime())
     });
 
     testSingleCase(chrono, 'Nov 12, 2011', new Date(2012,7,10), (result) => {
@@ -60,7 +68,9 @@ test("Test - Single Expression", function() {
         expect(result.index).toBe(0);
         expect(result.text).toBe('Nov 12, 2011');
 
-        expect(result.start).toBeDate(new Date(2011, 11-1, 12, 12));
+        var resultDate = result.start.date();
+        var expectDate = new Date(2011, 11-1, 12, 12);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
     });
 
     testSingleCase(chrono, 'The Deadline is August 10', new Date(2012,7,10), (result) => {
@@ -72,7 +82,9 @@ test("Test - Single Expression", function() {
         expect(result.index).toBe(16);
         expect(result.text).toBe('August 10');
 
-        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()).toBeCloseTo(resultDate.getTime())
     });
 
 
@@ -80,14 +92,18 @@ test("Test - Single Expression", function() {
         expect(result.index).toBe(16);
         expect(result.text).toBe('August 10 2555 BE');
 
-        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()).toBeCloseTo(resultDate.getTime())
     });
 
     testSingleCase(chrono, 'The Deadline is August 10, 345 BC', new Date(2012,7,10), (result) => {
         expect(result.index).toBe(16);
         expect(result.text).toBe('August 10, 345 BC');
 
-        expect(result.start).toBeDate(new Date(-345, 8-1, 10, 12));
+        var resultDate = result.start.date();
+        var expectDate = new Date(-345, 8-1, 10, 12);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
     });
 
     testSingleCase(chrono, 'The Deadline is August 10, 8 AD', new Date(2012,7,10), (result) => {
@@ -110,7 +126,9 @@ test("Test - Single Expression", function() {
         expect(result.start.get('day')).toBe(10);
         expect(result.start.get('weekday')).toBe(2);
 
-        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()).toBeCloseTo(resultDate.getTime())
     });
 
     testSingleCase(chrono, 'Sun, Mar. 6, 2016', new Date(2012,7,10), (result) => {
@@ -184,7 +202,9 @@ test("Test - Range expression", function() {
         expect(result.start.get('month')).toBe(8);
         expect(result.start.get('day')).toBe(10);
 
-        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()).toBeCloseTo(resultDate.getTime());
 
 
         expect(result.end).not.toBeNull();
@@ -192,7 +212,9 @@ test("Test - Range expression", function() {
         expect(result.end.get('month')).toBe(8);
         expect(result.end.get('day')).toBe(22);
 
-        expect(result.end).toBeDate(new Date(2012, 8-1, 22, 12));
+        var resultDate = result.end.date();
+        var expectDate = new Date(2012, 8-1, 22, 12);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
     });
 
 
@@ -206,7 +228,9 @@ test("Test - Range expression", function() {
         expect(result.start.get('month')).toBe(8);
         expect(result.start.get('day')).toBe(10);
 
-        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()).toBeCloseTo(resultDate.getTime());
 
 
         expect(result.end).not.toBeNull();
@@ -214,7 +238,9 @@ test("Test - Range expression", function() {
         expect(result.end.get('month')).toBe(8);
         expect(result.end.get('day')).toBe(22);
 
-        expect(result.end).toBeDate(new Date(2012, 8-1, 22, 12));
+        var resultDate = result.end.date();
+        var expectDate = new Date(2012, 8-1, 22, 12);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
     });
 
 
@@ -228,7 +254,9 @@ test("Test - Range expression", function() {
         expect(result.start.get('month')).toBe(8);
         expect(result.start.get('day')).toBe(10);
 
-        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()).toBeCloseTo(resultDate.getTime());
 
 
         expect(result.end).not.toBeNull();
@@ -236,7 +264,9 @@ test("Test - Range expression", function() {
         expect(result.end.get('month')).toBe(11);
         expect(result.end.get('day')).toBe(12);
 
-        expect(result.end).toBeDate(new Date(2012, 11-1, 12, 12));
+        var resultDate = result.end.date();
+        var expectDate = new Date(2012, 11-1, 12, 12);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
     });
 
     testSingleCase(chrono, 'Aug 10 to Nov 12', new Date(2012,7,10), (result) => {
@@ -249,7 +279,9 @@ test("Test - Range expression", function() {
         expect(result.start.get('month')).toBe(8);
         expect(result.start.get('day')).toBe(10);
 
-        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()).toBeCloseTo(resultDate.getTime());
 
 
         expect(result.end).not.toBeNull();
@@ -257,7 +289,9 @@ test("Test - Range expression", function() {
         expect(result.end.get('month')).toBe(11);
         expect(result.end.get('day')).toBe(12);
 
-        expect(result.end).toBeDate(new Date(2012, 11-1, 12, 12));
+        var resultDate = result.end.date();
+        var expectDate = new Date(2012, 11-1, 12, 12);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
     });
 
 
@@ -271,7 +305,9 @@ test("Test - Range expression", function() {
         expect(result.start.get('month')).toBe(8);
         expect(result.start.get('day')).toBe(10);
 
-        expect(result.start).toBeDate(new Date(2013, 8-1, 10, 12));
+        var resultDate = result.start.date();
+        var expectDate = new Date(2013, 8-1, 10, 12);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime());
 
 
         expect(result.end).not.toBeNull();
@@ -279,7 +315,9 @@ test("Test - Range expression", function() {
         expect(result.end.get('month')).toBe(11);
         expect(result.end.get('day')).toBe(12);
 
-        expect(result.end).toBeDate(new Date(2013, 11-1, 12, 12));
+        var resultDate = result.end.date();
+        var expectDate = new Date(2013, 11-1, 12, 12);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
     });
 
 
@@ -293,7 +331,9 @@ test("Test - Range expression", function() {
         expect(result.start.get('month')).toBe(8);
         expect(result.start.get('day')).toBe(10);
 
-        expect(result.start).toBeDate(new Date(2011, 8-1, 10, 12));
+        var resultDate = result.start.date();
+        var expectDate = new Date(2011, 8-1, 10, 12);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime());
 
 
         expect(result.end).not.toBeNull();
@@ -301,7 +341,9 @@ test("Test - Range expression", function() {
         expect(result.end.get('month')).toBe(11);
         expect(result.end.get('day')).toBe(12);
 
-        expect(result.end).toBeDate(new Date(2011, 11-1, 12, 12));
+        var resultDate = result.end.date();
+        var expectDate = new Date(2011, 11-1, 12, 12);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
     });
 });
 

package/test/en/en_month.test.js

@@ -106,7 +106,9 @@ test("Test - Month slash expression", function() {
         expect(result.index).toBe(0);
         expect(result.text).toBe('9/2012');
 
-        expect(result.start).toBeDate(new Date(2012, 9-1, 1, 12));
+        var resultDate = result.start.date();
+        var expectDate = new Date(2012, 9-1, 1, 12);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
     });
 
     testSingleCase(chrono, '09/2012', new Date(2012,7,10), (result) => {
@@ -117,7 +119,9 @@ test("Test - Month slash expression", function() {
         expect(result.index).toBe(0);
         expect(result.text).toBe('09/2012');
 
-        expect(result.start).toBeDate(new Date(2012, 9-1, 1, 12));
+        var resultDate = result.start.date();
+        var expectDate = new Date(2012, 9-1, 1, 12);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
     });
 
 });

package/test/en/en_option_forward.test.js

@@ -1,146 +1,154 @@
-import * as chrono from '../../src/chrono';
-import { testSingleCase } from '../test_util';
-
+var chrono = require('../../src/chrono');
 
 test("Test - Year Guessing", function() {
 
     // Parsing "January" on February (2016-02-15)
-    testSingleCase(chrono.casual, 'January 1st', new Date(2016, 2-1, 15),
-        (result) => {
-
-            expect(result.start.get('year')).toBe(2016);
-            expect(result.start.get('month')).toBe(1);
-            expect(result.start.get('day')).toBe(1);
-        });
-
-    testSingleCase(chrono.casual, 'January 1st', new Date(2016, 2-1, 15),
-        {forwardDate: true}, (result) => {
-
-            expect(result.start.get('year')).toBe(2017);
-            expect(result.start.get('month')).toBe(1);
-            expect(result.start.get('day')).toBe(1);
-        });
+    var text = "January 1st";
+
+    var result = chrono.casual.parse(text, new Date(2016, 2-1, 15))[0];
+    
+    if (result) {
+        expect(result.start.get('year')).toBe(2016);
+        expect(result.start.get('month')).toBe(1);
+        expect(result.start.get('day')).toBe(1);
+    }
+
+    var result = chrono.casual.parse(text, new Date(2016, 2-1, 15), {forwardDate: true})[0];
+    
+    if (result) {
+        expect(result.start.get('year')).toBe(2017);
+        expect(result.start.get('month')).toBe(1);
+        expect(result.start.get('day')).toBe(1);
+    }
 });
 
 test("Test - Year Guessing (Range)", function() {
 
     // Parsing "February" on March (2016-02-15)
-    testSingleCase(chrono.casual, '22-23 Feb at 7pm', new Date(2016, 3-1, 15),
-        (result) => {
-
-            expect(result.start.get('year')).toBe(2016);
-            expect(result.start.get('month')).toBe(2);
-            expect(result.start.get('day')).toBe(22);
-            expect(result.start.get('hour')).toBe(19);
-
-            expect(result.end.get('year')).toBe(2016);
-            expect(result.end.get('month')).toBe(2);
-            expect(result.end.get('day')).toBe(23);
-            expect(result.end.get('hour')).toBe(19);
-        });
-
-
-    testSingleCase(chrono.casual, '22-23 Feb at 7pm', new Date(2016, 3-1, 15),
-        {forwardDate: true}, (result) => {
-
-            expect(result.start.get('year')).toBe(2017);
-            expect(result.start.get('month')).toBe(2);
-            expect(result.start.get('day')).toBe(22);
-            expect(result.start.get('hour')).toBe(19);
-
-            expect(result.end.get('year')).toBe(2017);
-            expect(result.end.get('month')).toBe(2);
-            expect(result.end.get('day')).toBe(23);
-            expect(result.end.get('hour')).toBe(19);
-
-        });
+    var text = "22-23 Feb at 7pm";
+
+    var result = chrono.casual.parse(text, new Date(2016, 3-1, 15))[0];
+    
+    if (result) {
+        expect(result.start.get('year')).toBe(2016);
+        expect(result.start.get('month')).toBe(2);
+        expect(result.start.get('day')).toBe(22);
+        expect(result.start.get('hour')).toBe(19);
+
+        expect(result.end.get('year')).toBe(2016);
+        expect(result.end.get('month')).toBe(2);
+        expect(result.end.get('day')).toBe(23);
+        expect(result.end.get('hour')).toBe(19);
+    }
+
+    var result = chrono.casual.parse(text, new Date(2016, 3-1, 15), {forwardDate: true})[0];
+    
+    if (result) {
+        expect(result.start.get('year')).toBe(2017);
+        expect(result.start.get('month')).toBe(2);
+        expect(result.start.get('day')).toBe(22);
+        expect(result.start.get('hour')).toBe(19);
+
+        expect(result.end.get('year')).toBe(2017);
+        expect(result.end.get('month')).toBe(2);
+        expect(result.end.get('day')).toBe(23);
+        expect(result.end.get('hour')).toBe(19);
+    }
 });
 
 test("Test - Year Guessing (Fixed)", function() {
 
     // Parsing "February" on March (2016-02-15)
-    testSingleCase(chrono.casual, '22-23 Feb 2016 at 7pm', new Date(2016, 3-1, 15),
-        {forwardDate: true}, (result) => {
-
-            expect(result.start.get('year')).toBe(2016);
-            expect(result.start.get('month')).toBe(2);
-            expect(result.start.get('day')).toBe(22);
-            expect(result.start.get('hour')).toBe(19);
-
-            expect(result.end.get('year')).toBe(2016);
-            expect(result.end.get('month')).toBe(2);
-            expect(result.end.get('day')).toBe(23);
-            expect(result.end.get('hour')).toBe(19);
-        });
+    var text = "22-23 Feb 2016 at 7pm";
+    var result = chrono.casual.parse(text, new Date(2016, 3-1, 15), {forwardDate: true})[0];
+    
+    if (result) {
+        expect(result.start.get('year')).toBe(2016);
+        expect(result.start.get('month')).toBe(2);
+        expect(result.start.get('day')).toBe(22);
+        expect(result.start.get('hour')).toBe(19);
+
+        expect(result.end.get('year')).toBe(2016);
+        expect(result.end.get('month')).toBe(2);
+        expect(result.end.get('day')).toBe(23);
+        expect(result.end.get('hour')).toBe(19);
+    }
 });
 
 test("Test - Weekday Guessing", function() {
 
     // Parsing "Monday" on Thursday (2012-08-09)
-    testSingleCase(chrono.casual, 'Monday', new Date(2012, 8-1, 9),
-        (result) => {
-            expect(result.start.get('year')).toBe(2012);
-            expect(result.start.get('month')).toBe(8);
-            expect(result.start.get('day')).toBe(6);
-        });
-
-    testSingleCase(chrono.casual, 'Monday', new Date(2012, 8-1, 9),
-        {forwardDate: true}, (result) => {
-
-            expect(result.start.get('year')).toBe(2012);
-            expect(result.start.get('month')).toBe(8);
-            expect(result.start.get('day')).toBe(13);
-        });
+    var text = "Monday";
+
+    var result = chrono.casual.parse(text, new Date(2012, 8-1, 9))[0];
+    
+    if (result) {
+        expect(result.start.get('year')).toBe(2012);
+        expect(result.start.get('month')).toBe(8);
+        expect(result.start.get('day')).toBe(6);
+    }
+
+    var result = chrono.casual.parse(text, new Date(2012, 8-1, 9), {forwardDate: true})[0];
+    
+    if (result) {
+        expect(result.start.get('year')).toBe(2012);
+        expect(result.start.get('month')).toBe(8);
+        expect(result.start.get('day')).toBe(13);
+    }
 });
 
 
 test("Test - Weekday Guessing (Range)", function() {
 
     // Parsing "Monday to Wednesday" on Thursday (2012-08-09)
-    testSingleCase(chrono.casual, 'Monday - Wednesday', new Date(2012, 8-1, 9),
-        (result) => {
-
-            expect(result.start.get('year')).toBe(2012);
-            expect(result.start.get('month')).toBe(8);
-            expect(result.start.get('day')).toBe(6);
-
-            expect(result.end.get('year')).toBe(2012);
-            expect(result.end.get('month')).toBe(8);
-            expect(result.end.get('day')).toBe(8);
-        });
-
-    testSingleCase(chrono.casual, 'Monday - Wednesday', new Date(2012, 8-1, 9),
-        {forwardDate: true}, (result) => {
-
-            expect(result.start.get('year')).toBe(2012);
-            expect(result.start.get('month')).toBe(8);
-            expect(result.start.get('day')).toBe(13);
-
-            expect(result.end.get('year')).toBe(2012);
-            expect(result.end.get('month')).toBe(8);
-            expect(result.end.get('day')).toBe(15);
-        });
+    var text = "Monday - Wednesday";
+
+    var result = chrono.casual.parse(text, new Date(2012, 8-1, 9))[0];
+    
+    if (result) {
+        expect(result.start.get('year')).toBe(2012);
+        expect(result.start.get('month')).toBe(8);
+        expect(result.start.get('day')).toBe(6);
+
+        expect(result.end.get('year')).toBe(2012);
+        expect(result.end.get('month')).toBe(8);
+        expect(result.end.get('day')).toBe(8);
+    }
+
+    var result = chrono.casual.parse(text, new Date(2012, 8-1, 9), {forwardDate: true})[0];
+    
+    if (result) {
+        expect(result.start.get('year')).toBe(2012);
+        expect(result.start.get('month')).toBe(8);
+        expect(result.start.get('day')).toBe(13);
+
+        expect(result.end.get('year')).toBe(2012);
+        expect(result.end.get('month')).toBe(8);
+        expect(result.end.get('day')).toBe(15);
+    }
 });
 
 
 test("Test - Weekday Guessing (Fixed)", function() {
 
     // Parsing "Monday" on Thursday (2012-08-09)
-    testSingleCase(chrono.casual, 'Monday last week', new Date(2012, 8-1, 9),
-        (result) => {
-
-            expect(result.start.get('year')).toBe(2012);
-            expect(result.start.get('month')).toBe(7);
-            expect(result.start.get('day')).toBe(30);
-        });
-
-    testSingleCase(chrono.casual, 'Monday last week', new Date(2012, 8-1, 9),
-        {forwardDate: true}, (result) => {
-
-            expect(result.start.get('year')).toBe(2012);
-            expect(result.start.get('month')).toBe(7);
-            expect(result.start.get('day')).toBe(30);
-        });
+    var text = "Monday last week";
+
+    var result = chrono.casual.parse(text, new Date(2012, 8-1, 9))[0];
+    
+    if (result) {
+        expect(result.start.get('year')).toBe(2012);
+        expect(result.start.get('month')).toBe(7);
+        expect(result.start.get('day')).toBe(30);
+    }
+
+    var result = chrono.casual.parse(text, new Date(2012, 8-1, 9), {forwardDate: true})[0];
+    
+    if (result) {
+        expect(result.start.get('year')).toBe(2012);
+        expect(result.start.get('month')).toBe(7);
+        expect(result.start.get('day')).toBe(30);
+    }
 });