Make tests compatible with cldr-engine v1.13

Author: phensley

__tests__/context.test.ts

@@ -160,7 +160,7 @@ test('too many pops', () => {
   const ctx = new Context({ a: 1 });
   ctx.pushSection(['a']);
   ctx.pop();
-  expect(() => ctx.pop()).toThrowError(Error);
+  expect(() => ctx.pop()).toThrow(Error);
 });
 
 test('resolve missing', () => {

__tests__/parser.test.ts

@@ -30,7 +30,7 @@ const parser = (str: string) => {
 
 test('initialization failures', () => {
   const matcher = undefined as unknown as Matcher;
-  expect(() => new Parser('hello', {} as Sink, matcher)).toThrowError();
+  expect(() => new Parser('hello', {} as Sink, matcher)).toThrow();
 });
 
 test('degenerate cases', () => {

__tests__/plugins/formatters.i18n.test.ts

@@ -135,15 +135,15 @@ test('datetime', () => {
   expect(formatDatetime(DE, d, ZONE_NY, args)).toEqual('12. März 2018');
 
   args = ['date:full', 'time:full'];
-  expect(formatDatetime(EN, d, ZONE_NY, args)).toEqual('Monday, March 12, 2018 at 1:48:54 PM Eastern Daylight Time');
+  expect(formatDatetime(EN, d, ZONE_NY, args)).toEqual('Monday, March 12, 2018 at 1:48:54 PM Eastern Daylight Time');
   expect(formatDatetime(DE, d, ZONE_NY, args)).toEqual(
     'Montag, 12. März 2018 um 13:48:54 Nordamerikanische Ostküsten-Sommerzeit',
   );
 
   args = ['time:medium'];
-  expect(formatDatetime(EN, d, ZONE_LON, args)).toEqual('5:48:54 PM');
-  expect(formatDatetime(EN, d, ZONE_NY, args)).toEqual('1:48:54 PM');
-  expect(formatDatetime(EN, d, ZONE_LA, args)).toEqual('10:48:54 AM');
+  expect(formatDatetime(EN, d, ZONE_LON, args)).toEqual('5:48:54 PM');
+  expect(formatDatetime(EN, d, ZONE_NY, args)).toEqual('1:48:54 PM');
+  expect(formatDatetime(EN, d, ZONE_LA, args)).toEqual('10:48:54 AM');
 
   // Mixed date/time and skeleton
   args = ['date:medium', 'time:Bh'];
@@ -188,9 +188,9 @@ test('datetime-interval', () => {
   // March 12, 2018 5:48:54 PM UTC
   const start = 1520876934000;
   const args: string[] = [];
-  expect(formatInterval(EN, start, start + 2000, ZONE_NY, args)).toEqual('1:48:54 PM');
-  expect(formatInterval(EN, start, start + 12000, ZONE_NY, args)).toEqual('1:48 – 1:49 PM');
-  expect(formatInterval(EN, start, start + ONE_DAY_MS, ZONE_NY, args)).toEqual('Mar 12 – 13, 2018');
+  expect(formatInterval(EN, start, start + 2000, ZONE_NY, args)).toEqual('1:48 PM');
+  expect(formatInterval(EN, start, start + 12000, ZONE_NY, args)).toEqual('1:48 – 1:49 PM');
+  expect(formatInterval(EN, start, start + ONE_DAY_MS, ZONE_NY, args)).toEqual('Mar 12 – 13, 2018');
 
   // Undefined cldr produces empty output
   expect(formatInterval(undefined, start, start + 2000, ZONE_NY, args)).toEqual('');
@@ -229,15 +229,15 @@ test('message', () => {
 
   ctx = { website: { timeZone: 'America/Los_Angeles' }, epoch: 1582648395000 };
   args = ['epoch'];
-  expect(formatMessage(EN, 'date {0 datetime time:full}', args, ctx)).toEqual('date 8:33:15 AM Pacific Standard Time');
+  expect(formatMessage(EN, 'date {0 datetime time:full}', args, ctx)).toEqual('date 8:33:15 AM Pacific Standard Time');
 
   ctx = { n: '123456.789' };
   args = ['n'];
   expect(formatMessage(EN, 'num {0 decimal maximumFractionDigits:1}', args, ctx)).toEqual('num 123,456.8');
 
   ctx = { s: 1582648395000, e: 1583748395000 };
   args = ['s', 'e'];
-  expect(formatMessage(EN, 'inv {0;1 datetime-interval}', args, ctx)).toEqual('inv Feb 25 – Mar 9, 2020');
+  expect(formatMessage(EN, 'inv {0;1 datetime-interval}', args, ctx)).toEqual('inv Feb 25 – Mar 9, 2020');
 
   // Undefined cldr produces empty output
   expect(formatMessage(undefined, '{0}', args, ctx)).toEqual('');
@@ -269,7 +269,7 @@ test('relative time', () => {
   e = start.add({ millis: -100 }).unixEpoch();
   expect(formatRelativeTime(EN, base, variables(e), ['numericOnly:true'])).toEqual('0 seconds ago');
 
-  e = start.add({ year: -1.6 }).unixEpoch();
+  e = start.add({ year: -2 }).unixEpoch();
   expect(formatRelativeTime(EN, base, variables(e), args)).toEqual('2 years ago');
   expect(formatRelativeTime(DE, base, variables(e), args)).toEqual('Vor 2 Jahren');
   expect(formatRelativeTime(ES, base, variables(e), args)).toEqual('Hace 2 años');
@@ -284,11 +284,16 @@ test('relative time', () => {
   expect(formatRelativeTime(EN, undefined, variables(base, e), args)).toEqual('6 months ago');
 
   e = start.add({ day: -27 }).unixEpoch();
-  expect(formatRelativeTime(EN, base, variables(e), args)).toEqual('4 weeks ago');
-  expect(formatRelativeTime(DE, base, variables(e), args)).toEqual('Vor 4 Wochen');
-  expect(formatRelativeTime(ES, base, variables(e), args)).toEqual('Hace 4 semanas');
-
-  expect(formatRelativeTime(EN, undefined, variables(base, e), args)).toEqual('4 weeks ago');
+  const weekargs = [...args, 'allowWeeks:true'];
+  expect(formatRelativeTime(EN, base, variables(e), weekargs)).toEqual('4 weeks ago');
+  expect(formatRelativeTime(DE, base, variables(e), weekargs)).toEqual('Vor 4 Wochen');
+  expect(formatRelativeTime(ES, base, variables(e), weekargs)).toEqual('Hace 4 semanas');
+  expect(formatRelativeTime(EN, undefined, variables(base, e), weekargs)).toEqual('4 weeks ago');
+
+  expect(formatRelativeTime(EN, base, variables(e), args)).toEqual('27 days ago');
+  expect(formatRelativeTime(DE, base, variables(e), args)).toEqual('Vor 27 Tagen');
+  expect(formatRelativeTime(ES, base, variables(e), args)).toEqual('Hace 27 días');
+  expect(formatRelativeTime(EN, undefined, variables(base, e), args)).toEqual('27 days ago');
 
   e = start.add({ hour: -27 }).unixEpoch();
   expect(formatRelativeTime(EN, base, variables(e), args)).toEqual('Yesterday');

__tests__/plugins/messages.test.ts

@@ -37,7 +37,7 @@ test('message formats', () => {
 
   expect(f['datetime-interval']([], [])).toEqual('');
   expect(f['datetime-interval'](undefined as any, [])).toEqual('');
-  expect(f['datetime-interval']([date1, date2], [])).toEqual('Mar 3 – Apr 3, 2021');
+  expect(f['datetime-interval']([date1, date2], [])).toEqual('Mar 3 – Apr 3, 2021');
 });
 
 test('custom converter', () => {

__tests__/plugins/resources/f-datetime-1.html

@@ -22,16 +22,16 @@
 
 :OUTPUT
 February 24, 2020
-2/24/20, 2:04 PM
-Feb 24, 2020, 2:04:40 PM
-February 24, 2020 at 2:04:40 PM EST
-Monday, February 24, 2020 at 2:04:40 PM Eastern Standard Time
+2/24/20, 2:04 PM
+Feb 24, 2020, 2:04:40 PM
+February 24, 2020 at 2:04:40 PM EST
+Monday, February 24, 2020 at 2:04:40 PM Eastern Standard Time
 
-2/24/20, 2:04:40 PM
-Monday, February 24, 2020 at 2:04 PM
+2/24/20, 2:04:40 PM
+Monday, February 24, 2020 at 2:04 PM
 
 Mon, Feb 24, 2020
 Monday, February 24, 2020
 2 in the afternoon
-2/24/2020, 2:04 PM
-Feb 24, 2020 at 2:04 PM
+2/24/2020, 2:04 PM
+Feb 24, 2020 at 2:04 PM

__tests__/plugins/resources/f-datetime-interval-1.html

@@ -14,9 +14,9 @@
 {s,e3|datetime-interval yMMM}
 
 :OUTPUT
-2:04 – 7:38 PM
-Feb 24 – Jun 19, 2020
-Feb 24, 2020 – Aug 21, 2023
+2:04 – 7:38 PM
+Feb 24 – Jun 19, 2020
+Feb 24, 2020 – Aug 21, 2023
 
-Feb 2020 – Aug 2023
+Feb 2020 – Aug 2023
 

__tests__/plugins/resources/f-message-6.html

@@ -12,5 +12,5 @@
 
 :OUTPUT
 February 25, 2020
-Tuesday, February 25, 2020 at 12:51:50 PM Pacific Standard Time
-2/25/20, 12:51:50 PM Pacific Standard Time
+Tuesday, February 25, 2020 at 12:51:50 PM Pacific Standard Time
+2/25/20, 12:51:50 PM Pacific Standard Time

__tests__/plugins/resources/f-message-7.html

@@ -9,6 +9,6 @@
 {msg|message s e}
 
 :OUTPUT
-Feb 25 – Mar 9, 2020
-Tuesday, February 25 – Monday, March 9, 2020
-Tue, 2/25 – Mon, 3/9
+Feb 25 – Mar 9, 2020
+Tuesday, February 25 – Monday, March 9, 2020
+Tue, 3:51 PM – Mon, 10:25 AM

__tests__/plugins/resources/f-relative-time-1.html

@@ -18,13 +18,16 @@
 
 :TEMPLATE
 {.repeated section dates}
-{start, end|relative-time}{.end}
+{start, end|relative-time}
+{start, end|relative-time allowWeeks:true}{.end}
 {.repeated section timestamps}
 {@|relative-time context:begin-sentence}{.end}
 
 :OUTPUT
+in 12 days
 in 2 weeks
 in 2 hours
+in 2 hours
 
 In 2 hours
 11 hours ago

src/plugins/options.ts

@@ -336,6 +336,9 @@ const relativetimeOption = (arg: string, val: string, options: RelativeTimeForma
     case 'numericOnly':
       options.numericOnly = val === 'true';
       break;
+    case 'allowWeeks':
+      options.allowWeeks = val === 'true';
+      break;
     case 'alwaysNow':
       options.alwaysNow = val === 'true';
       break;