Merge branch 'master' into zurich-mandatory-telephone-number

7 files changed, 42 insertions, 16 deletions

diff --git a/perllib/FixMyStreet/App/Controller/JSON.pm b/perllib/FixMyStreet/App/Controller/JSON.pm
index 1a7c1915b..17507a84b 100644
--- a/perllib/FixMyStreet/App/Controller/JSON.pm
+++ b/perllib/FixMyStreet/App/Controller/JSON.pm
@@ -8,6 +8,7 @@ use JSON;
 use DateTime;
 use DateTime::Format::ISO8601;
 use List::MoreUtils 'uniq';
+use FixMyStreet::App;
 
 =head1 NAME
 
@@ -80,11 +81,13 @@ sub problems : Local {
         $date_col = 'lastupdate';
     }
 
+    my $dt_parser = FixMyStreet::App->model('DB')->schema->storage->datetime_parser;
+
     my $one_day = DateTime::Duration->new( days => 1 );
     my $query = {
         $date_col => {
-            '>=' => $start_dt,
-            '<=' => $end_dt + $one_day,
+            '>=' => $dt_parser->format_datetime($start_dt),
+            '<=' => $dt_parser->format_datetime($end_dt + $one_day),
         },
         state => [ @state ],
     };
diff --git a/t/app/controller/alert_new.t b/t/app/controller/alert_new.t
index 43d90c0ba..23240c3b9 100644
--- a/t/app/controller/alert_new.t
+++ b/t/app/controller/alert_new.t
@@ -3,6 +3,7 @@ use warnings;
 use Test::More;
 
 use FixMyStreet::TestMech;
+use FixMyStreet::App;
 
 my $mech = FixMyStreet::TestMech->new;
 
@@ -362,6 +363,8 @@ subtest "Test normal alert signups and that alerts are sent" => sub {
 
     my $dt = DateTime->now()->add( days => 2);
 
+    my $dt_parser = FixMyStreet::App->model('DB')->schema->storage->datetime_parser;
+
     my $report_time = '2011-03-01 12:00:00';
     my $report = FixMyStreet::App->model('DB::Problem')->find_or_create( {
         postcode           => 'EH1 1BB',
@@ -374,9 +377,9 @@ subtest "Test normal alert signups and that alerts are sent" => sub {
         name               => $user1->name,
         anonymous          => 0,
         state              => 'fixed - user',
-        confirmed          => $dt,
-        lastupdate         => $dt,
-        whensent           => $dt->clone->add( minutes => 5 ),
+        confirmed          => $dt_parser->format_datetime($dt),
+        lastupdate         => $dt_parser->format_datetime($dt),
+        whensent           => $dt_parser->format_datetime($dt->clone->add( minutes => 5 )),
         lang               => 'en-gb',
         service            => '',
         cobrand            => 'default',
@@ -514,6 +517,8 @@ for my $test (
         my $alert_user1 = FixMyStreet::App->model('DB::Alert')->create( $alert_params );
         ok $alert_user1, "alert created";
 
+        my $dt_parser = FixMyStreet::App->model('DB')->schema->storage->datetime_parser;
+
         my $report = FixMyStreet::App->model('DB::Problem')->find_or_create( {
             postcode           => 'EH1 1BB',
             bodies_str         => '2651',
@@ -525,9 +530,9 @@ for my $test (
             name               => $user2->name,
             anonymous          => 0,
             state              => 'confirmed',
-            confirmed          => $r_dt,
-            lastupdate         => $r_dt,
-            whensent           => $r_dt->clone->add( minutes => 5 ),
+            confirmed          => $dt_parser->format_datetime($r_dt),
+            lastupdate         => $dt_parser->format_datetime($r_dt),
+            whensent           => $dt_parser->format_datetime($r_dt->clone->add( minutes => 5 )),
             lang               => 'en-gb',
             service            => '',
             cobrand            => 'default',
@@ -573,6 +578,8 @@ subtest 'check new updates alerts for non public reports only go to report owner
     my $dt = DateTime->now->add( minutes => -30 );
     my $r_dt = $dt->clone->add( minutes => 20 );
 
+    my $dt_parser = FixMyStreet::App->model('DB')->schema->storage->datetime_parser;
+
     my $report = FixMyStreet::App->model('DB::Problem')->find_or_create( {
         postcode           => 'EH1 1BB',
         bodies_str         => '2651',
@@ -584,9 +591,9 @@ subtest 'check new updates alerts for non public reports only go to report owner
         name               => $user2->name,
         anonymous          => 0,
         state              => 'confirmed',
-        confirmed          => $r_dt,
-        lastupdate         => $r_dt,
-        whensent           => $r_dt->clone->add( minutes => 5 ),
+        confirmed          => $dt_parser->format_datetime($r_dt),
+        lastupdate         => $dt_parser->format_datetime($r_dt),
+        whensent           => $dt_parser->format_datetime($r_dt->clone->add( minutes => 5 )),
         lang               => 'en-gb',
         service            => '',
         cobrand            => 'default',
diff --git a/t/app/controller/report_import.t b/t/app/controller/report_import.t
index eb686b44e..e25764c4b 100644
--- a/t/app/controller/report_import.t
+++ b/t/app/controller/report_import.t
@@ -3,6 +3,7 @@ use warnings;
 use Test::More;
 
 use FixMyStreet::TestMech;
+use FixMyStreet::App;
 use Web::Scraper;
 use Path::Class;
 
@@ -12,6 +13,10 @@ $mech->get_ok('/import');
 my $sample_file = file(__FILE__)->parent->file("sample.jpg")->stringify;
 ok -e $sample_file, "sample file $sample_file exists";
 
+# disable info logs for this test run
+FixMyStreet::App->log->disable('info');
+END { FixMyStreet::App->log->enable('info'); }
+
 # submit an empty report to import - check we get all errors
 subtest "Test creating bad partial entries" => sub {
 
diff --git a/t/app/controller/report_new.t b/t/app/controller/report_new.t
index 8e129a41c..d1f246e95 100644
--- a/t/app/controller/report_new.t
+++ b/t/app/controller/report_new.t
@@ -5,9 +5,14 @@ use Test::More;
 use utf8;
 
 use FixMyStreet::TestMech;
+use FixMyStreet::App;
 use Web::Scraper;
 use Path::Class;
 
+# disable info logs for this test run
+FixMyStreet::App->log->disable('info');
+END { FixMyStreet::App->log->enable('info'); }
+
 my $mech = FixMyStreet::TestMech->new;
 $mech->get_ok('/report/new');
 
diff --git a/t/app/controller/report_new_open311.t b/t/app/controller/report_new_open311.t
index 22d2d1f97..ed26d58d5 100644
--- a/t/app/controller/report_new_open311.t
+++ b/t/app/controller/report_new_open311.t
@@ -3,8 +3,13 @@ use warnings;
 use Test::More;
 
 use FixMyStreet::TestMech;
+use FixMyStreet::App;
 use Web::Scraper;
 
+# disable info logs for this test run
+FixMyStreet::App->log->disable('info');
+END { FixMyStreet::App->log->enable('info'); }
+
 my $mech = FixMyStreet::TestMech->new;
 
 my $body = $mech->create_body_ok(2651, 'City of Edinburgh Council');
diff --git a/t/app/controller/rss.t b/t/app/controller/rss.t
index f04a17151..ec6a01b50 100644
--- a/t/app/controller/rss.t
+++ b/t/app/controller/rss.t
@@ -3,6 +3,7 @@ use warnings;
 use Test::More;
 
 use FixMyStreet::TestMech;
+use FixMyStreet::App;
 
 my $mech = FixMyStreet::TestMech->new;
 
@@ -15,6 +16,8 @@ my $dt = DateTime->new(
 my $user1 = FixMyStreet::App->model('DB::User')
   ->find_or_create( { email => 'reporter-rss@example.com', name => 'Reporter User' } );
 
+my $dt_parser = FixMyStreet::App->model('DB')->schema->storage->datetime_parser;
+
 my $report = FixMyStreet::App->model('DB::Problem')->find_or_create( {
     postcode           => 'eh1 1BB',
     bodies_str         => '2651',
@@ -26,9 +29,9 @@ my $report = FixMyStreet::App->model('DB::Problem')->find_or_create( {
     name               => $user1->name,
     anonymous          => 0,
     state              => 'confirmed',
-    confirmed          => $dt,
-    lastupdate         => $dt,
-    whensent           => $dt->clone->add( minutes => 5 ),
+    confirmed          => $dt_parser->format_datetime($dt),
+    lastupdate         => $dt_parser->format_datetime($dt),
+    whensent           => $dt_parser->format_datetime($dt->clone->add( minutes => 5 )),
     lang               => 'en-gb',
     service            => '',
     cobrand            => 'default',
diff --git a/t/app/model/questionnaire.t b/t/app/model/questionnaire.t
index 86af51c42..be5b433c1 100644
--- a/t/app/model/questionnaire.t
+++ b/t/app/model/questionnaire.t
@@ -32,8 +32,6 @@ my $problem = FixMyStreet::App->model('DB::Problem')->create(
     }
 );
 
-diag $problem->id;
-
 my $mech = FixMyStreet::TestMech->new;
 
 for my $test (