From ab4d28751806f727025bac1ff6c20eb1bcced87f Mon Sep 17 00:00:00 2001 From: Tymoteusz Makowski Date: Tue, 11 Jul 2023 22:49:59 +0200 Subject: [PATCH 1/2] test: add cases for superfluous days --- test/relative-time.js | 60 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/test/relative-time.js b/test/relative-time.js index 1f20571..8ff1057 100644 --- a/test/relative-time.js +++ b/test/relative-time.js @@ -1760,6 +1760,66 @@ suite('relative-time', function () { tense: 'past', expected: '2 days ago', }, + + // Whole years shouldn't have extra days + { + reference: '2023-01-01T09:00:00.000Z', + datetime: '2022-01-01T10:00:00.000Z', + format: 'duration', + tense: 'past', + expected: '1 year ago', + }, + { + reference: '2023-01-01T00:00:00.000Z', + datetime: '2021-01-01T00:00:00.000Z', + format: 'duration', + tense: 'past', + expected: '2 years ago', + }, + { + reference: '2023-01-01T00:00:00.000Z', + datetime: '2003-01-01T00:00:00.000Z', + format: 'duration', + tense: 'past', + expected: '20 years ago', + }, + { + reference: '2023-02-01T00:00:00.000Z', + datetime: '2022-02-01T00:00:00.000Z', + format: 'duration', + tense: 'past', + expected: '1 year ago', + }, + { + reference: '2023-03-01T00:00:00.000Z', + datetime: '2022-03-01T00:00:00.000Z', + format: 'duration', + tense: 'past', + expected: '1 year ago', + }, + { + reference: '2023-04-01T00:00:00.000Z', + datetime: '2022-04-01T00:00:00.000Z', + format: 'duration', + tense: 'past', + expected: '1 year ago', + }, + + // Whole months shouldn't have extra days + { + reference: '2023-07-01T00:00:00.000Z', + datetime: '2023-05-01T00:00:00.000Z', + format: 'duration', + tense: 'past', + expected: '2 months ago', + }, + { + reference: '2023-06-01T00:00:00.000Z', + datetime: '2023-04-01T00:00:00.000Z', + format: 'duration', + tense: 'past', + expected: '2 months ago', + }, ]) for (const { From 84dde5bb890aa447fc90adf69ef621b13aa2e5ae Mon Sep 17 00:00:00 2001 From: Tymoteusz Makowski Date: Tue, 11 Jul 2023 22:57:20 +0200 Subject: [PATCH 2/2] test: remove trailing 'ago' --- test/relative-time.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/test/relative-time.js b/test/relative-time.js index 8ff1057..8fc29ce 100644 --- a/test/relative-time.js +++ b/test/relative-time.js @@ -1767,42 +1767,42 @@ suite('relative-time', function () { datetime: '2022-01-01T10:00:00.000Z', format: 'duration', tense: 'past', - expected: '1 year ago', + expected: '1 year', }, { reference: '2023-01-01T00:00:00.000Z', datetime: '2021-01-01T00:00:00.000Z', format: 'duration', tense: 'past', - expected: '2 years ago', + expected: '2 years', }, { reference: '2023-01-01T00:00:00.000Z', datetime: '2003-01-01T00:00:00.000Z', format: 'duration', tense: 'past', - expected: '20 years ago', + expected: '20 years', }, { reference: '2023-02-01T00:00:00.000Z', datetime: '2022-02-01T00:00:00.000Z', format: 'duration', tense: 'past', - expected: '1 year ago', + expected: '1 year', }, { reference: '2023-03-01T00:00:00.000Z', datetime: '2022-03-01T00:00:00.000Z', format: 'duration', tense: 'past', - expected: '1 year ago', + expected: '1 year', }, { reference: '2023-04-01T00:00:00.000Z', datetime: '2022-04-01T00:00:00.000Z', format: 'duration', tense: 'past', - expected: '1 year ago', + expected: '1 year', }, // Whole months shouldn't have extra days @@ -1811,14 +1811,14 @@ suite('relative-time', function () { datetime: '2023-05-01T00:00:00.000Z', format: 'duration', tense: 'past', - expected: '2 months ago', + expected: '2 months', }, { reference: '2023-06-01T00:00:00.000Z', datetime: '2023-04-01T00:00:00.000Z', format: 'duration', tense: 'past', - expected: '2 months ago', + expected: '2 months', }, ])