From 0a5a8430025555ffef822345a4dc1f4474ef37b7 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Tue, 3 Jan 2017 17:14:11 +0000
Subject: Fix bad cross-year test.

Make sure the tested date is in the same year as current.
---
 t/utils.t | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 't/utils.t')

diff --git a/t/utils.t b/t/utils.t
index ac9eb1a4a..d6c56d95a 100644
--- a/t/utils.t
+++ b/t/utils.t
@@ -78,7 +78,11 @@ if ($dt->day_of_week == 7) { # Sunday
 }
 is Utils::prettify_dt($dt), $dt->strftime("%H:%M, %A");
 
-$dt = DateTime->now->subtract(days => 100);
+if ($dt->month == 1) { # January
+    $dt = DateTime->now->add(days => 30);
+} else {
+    $dt = DateTime->now->subtract(days => 30);
+}
 is Utils::prettify_dt($dt), $dt->strftime("%H:%M, %A %e %B %Y");
 is Utils::prettify_dt($dt, "date"), $dt->strftime("%A %e %B %Y");
 is Utils::prettify_dt($dt, "zurich"), $dt->strftime("%H:%M, %e. %B %Y");
-- 
cgit v1.2.3


From 0b1ab9fb1145ca32dced46b4faefe49da5c76768 Mon Sep 17 00:00:00 2001
From: pezholio <pezholio@gmail.com>
Date: Fri, 20 Jan 2017 14:46:01 +0000
Subject: Utils::prettify_duration improvements

 - Add year and month to $nearest options
 - Allow prettify_duration to choose a sensible $nearest if omitted
---
 t/utils.t | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 't/utils.t')

diff --git a/t/utils.t b/t/utils.t
index d6c56d95a..f989580c8 100644
--- a/t/utils.t
+++ b/t/utils.t
@@ -91,10 +91,18 @@ is Utils::prettify_dt($dt, 1), $dt->strftime("%H:%M, %e %b %Y");
 $dt = DateTime->now->subtract(days => 400);
 is Utils::prettify_dt($dt), $dt->strftime("%H:%M, %a %e %B %Y");
 
+is Utils::prettify_duration(12*5*7*86400+3600+60+1, 'year'), '1 year';
+is Utils::prettify_duration(25*5*7*86400+3600+60+1, 'year'), '2 years';
+is Utils::prettify_duration(5*7*86400+3600+60+1, 'month'), '1 month';
 is Utils::prettify_duration(7*86400+3600+60+1, 'week'), '1 week';
 is Utils::prettify_duration(86400+3600+60+1, 'day'), '1 day';
 is Utils::prettify_duration(86400+3600+60+1, 'hour'), '1 day, 1 hour';
 is Utils::prettify_duration(86400+3600+60+1, 'minute'), '1 day, 1 hour, 1 minute';
 is Utils::prettify_duration(20, 'minute'), 'less than a minute';
+# prettify_duration should choose a $nearest sensibly if it's not given
+is Utils::prettify_duration(12*5*7*86400+3600+60+1), '1 year';
+is Utils::prettify_duration(7*86400+3600+60+1), '1 week';
+is Utils::prettify_duration(14*86400+3600+60+1), '2 weeks';
+is Utils::prettify_duration(1800), '30 minutes';
 
 done_testing();
-- 
cgit v1.2.3