Merge remote branch 'origin/master' into packaging

4 files changed, 21 insertions, 21 deletions

diff --git a/t/app/controller/alert_new.t b/t/app/controller/alert_new.t
index 950666d2d..5ea73625a 100644
--- a/t/app/controller/alert_new.t
+++ b/t/app/controller/alert_new.t
@@ -452,7 +452,7 @@ subtest "Test normal alert signups and that alerts are sent" => sub {
         $count++ if $_->body =~ /The following updates have been left on this problem:/;
         $count++ if $_->body =~ /The following new problems have been reported to City of\s*Edinburgh Council:/;
         $count++ if $_->body =~ /The following nearby problems have been added:/;
-        $count++ if $_->body =~ / - Testing, EH1 1BB/;
+        $count++ if $_->body =~ / -\s+Testing, EH1 1BB/;
     }
     is $count, 5, 'Five emails with the right things in them';
 
diff --git a/t/app/controller/contact.t b/t/app/controller/contact.t
index 86b845eb3..970241d12 100644
--- a/t/app/controller/contact.t
+++ b/t/app/controller/contact.t
@@ -21,7 +21,7 @@ for my $test (
         postcode  => 'EH99 1SP',
         confirmed => '2011-05-04 10:44:28.145168',
         anonymous => 0,
-        meta      => 'Reported by A User at 10:44, Wednesday  4 May 2011',
+        meta      => 'Reported by A User at 10:44, Wed  4 May 2011',
         main      => 1,
     },
     {
@@ -32,7 +32,7 @@ for my $test (
         postcode  => 'EH99 1SP',
         confirmed => '2011-05-03 13:24:28.145168',
         anonymous => 1,
-        meta      => 'Reported anonymously at 13:24, Tuesday  3 May 2011',
+        meta      => 'Reported anonymously at 13:24, Tue  3 May 2011',
     },
     {
         name      => 'A User',
@@ -42,7 +42,7 @@ for my $test (
         postcode  => 'EH99 1SP',
         confirmed => '2011-05-03 13:24:28.145168',
         anonymous => 1,
-        meta      => 'Reported anonymously at 13:24, Tuesday  3 May 2011',
+        meta      => 'Reported anonymously at 13:24, Tue  3 May 2011',
         update    => {
             name  => 'Different User',
             email => 'commenter@example.com',
diff --git a/t/app/controller/report_display.t b/t/app/controller/report_display.t
index c7455a99b..548580fe1 100644
--- a/t/app/controller/report_display.t
+++ b/t/app/controller/report_display.t
@@ -103,7 +103,7 @@ subtest "test a good report" => sub {
     is $mech->uri->path, "/report/$report_id", "at /report/$report_id";
     is $mech->extract_problem_title, 'Test 2', 'problem title';
     is $mech->extract_problem_meta,
-      'Reported by Test User at 15:47, Saturday 16 April 2011',
+      'Reported by Test User at 15:47, Sat 16 April 2011',
       'correct problem meta information';
     $mech->content_contains('Test 2 Detail');
 
@@ -124,55 +124,55 @@ foreach my $meta (
         anonymous => 'f',
         category  => 'Other',
         service   => '',
-        meta      => 'Reported by Test User at 15:47, Saturday 16 April 2011'
+        meta      => 'Reported by Test User at 15:47, Sat 16 April 2011'
     },
     {
         anonymous => 'f',
         category  => 'Roads',
         service   => '',
         meta =>
-'Reported in the Roads category by Test User at 15:47, Saturday 16 April 2011'
+'Reported in the Roads category by Test User at 15:47, Sat 16 April 2011'
     },
     {
         anonymous => 'f',
         category  => '',
         service   => 'Transport service',
         meta =>
-'Reported by Transport service by Test User at 15:47, Saturday 16 April 2011'
+'Reported by Transport service by Test User at 15:47, Sat 16 April 2011'
     },
     {
         anonymous => 'f',
         category  => 'Roads',
         service   => 'Transport service',
         meta =>
-'Reported by Transport service in the Roads category by Test User at 15:47, Saturday 16 April 2011'
+'Reported by Transport service in the Roads category by Test User at 15:47, Sat 16 April 2011'
     },
     {
         anonymous => 't',
         category  => 'Other',
         service   => '',
-        meta      => 'Reported anonymously at 15:47, Saturday 16 April 2011'
+        meta      => 'Reported anonymously at 15:47, Sat 16 April 2011'
     },
     {
         anonymous => 't',
         category  => 'Roads',
         service   => '',
         meta =>
-'Reported in the Roads category anonymously at 15:47, Saturday 16 April 2011'
+'Reported in the Roads category anonymously at 15:47, Sat 16 April 2011'
     },
     {
         anonymous => 't',
         category  => '',
         service   => 'Transport service',
         meta =>
-'Reported by Transport service anonymously at 15:47, Saturday 16 April 2011'
+'Reported by Transport service anonymously at 15:47, Sat 16 April 2011'
     },
     {
         anonymous => 't',
         category  => 'Roads',
         service   => 'Transport service',
         meta =>
-'Reported by Transport service in the Roads category anonymously at 15:47, Saturday 16 April 2011'
+'Reported by Transport service in the Roads category anonymously at 15:47, Sat 16 April 2011'
     },
   )
 {
diff --git a/t/app/controller/report_updates.t b/t/app/controller/report_updates.t
index 5719b13e3..39cb5d6d8 100644
--- a/t/app/controller/report_updates.t
+++ b/t/app/controller/report_updates.t
@@ -81,7 +81,7 @@ for my $test (
         anonymous  => 'f',
         mark_fixed => 'false',
         mark_open  => 'false',
-        meta       => 'Posted by Other User at 15:47, Saturday 16 April 2011',
+        meta       => 'Posted by Other User at 15:47, Sat 16 April 2011',
     },
     {
         description => 'blank user, anon is false',
@@ -89,7 +89,7 @@ for my $test (
         anonymous  => 'f',
         mark_fixed => 'false',
         mark_open  => 'false',
-        meta       => 'Posted anonymously at 15:47, Saturday 16 April 2011',
+        meta       => 'Posted anonymously at 15:47, Sat 16 April 2011',
     },
     {
         description => 'named user, anon is true',
@@ -97,7 +97,7 @@ for my $test (
         anonymous  => 't',
         mark_fixed => 'false',
         mark_open  => 'false',
-        meta       => 'Posted anonymously at 15:47, Saturday 16 April 2011',
+        meta       => 'Posted anonymously at 15:47, Sat 16 April 2011',
     },
     {
         description => 'named user, anon is true, fixed',
@@ -106,7 +106,7 @@ for my $test (
         mark_fixed => 'true',
         mark_open  => 'false',
         meta =>
-'Posted anonymously at 15:47, Saturday 16 April 2011, marked as fixed',
+'Posted anonymously at 15:47, Sat 16 April 2011, marked as fixed',
     },
     {
         description => 'named user, anon is true, reopened',
@@ -114,7 +114,7 @@ for my $test (
         anonymous  => 't',
         mark_fixed => 'false',
         mark_open  => 'true',
-        meta => 'Posted anonymously at 15:47, Saturday 16 April 2011, reopened',
+        meta => 'Posted anonymously at 15:47, Sat 16 April 2011, reopened',
     }
   )
 {
@@ -185,9 +185,9 @@ subtest "several updates shown in correct order" => sub {
 
     my $meta = $mech->extract_update_metas;
     is scalar @$meta, 3, 'number of updates';
-    is $meta->[0], 'Posted by Other User at 12:23, Thursday 10 March 2011', 'first update';
-    is $meta->[1], 'Posted by Main User at 12:23, Thursday 10 March 2011', 'second update';
-    is $meta->[2], 'Posted anonymously at 08:12, Tuesday 15 March 2011, marked as fixed', 'third update';
+    is $meta->[0], 'Posted by Other User at 12:23, Thu 10 March 2011', 'first update';
+    is $meta->[1], 'Posted by Main User at 12:23, Thu 10 March 2011', 'second update';
+    is $meta->[2], 'Posted anonymously at 08:12, Tue 15 March 2011, marked as fixed', 'third update';
 };
 
 for my $test (