Merge tag 'v1.7' into fiksgatami-dev

1 files changed, 15 insertions, 13 deletions

diff --git a/t/app/model/problem.t b/t/app/model/problem.t
index ad82a62a5..82569d72a 100644
--- a/t/app/model/problem.t
+++ b/t/app/model/problem.t
@@ -457,7 +457,8 @@ foreach my $test ( {
         email_count   => 1,
         to            => qr'Gloucestershire County Council" <2226@example',
         dear          => qr'Dear Gloucestershire County Council,',
-        body          => $body_ids{2226}  . '|' . $body_ids{2649},
+        body          => $body_ids{2226},
+        body_missing  => $body_ids{2649},
         missing       => qr'problem might be the responsibility of Fife.*Council'ms,
     }, {
         %common,
@@ -524,14 +525,15 @@ foreach my $test ( {
             {
                 whensent => undef
             }
-        )->update( { whensent => \'ms_current_timestamp()' } );
+        )->update( { whensent => \'current_timestamp' } );
 
         $problem->discard_changes;
         $problem->update( {
             bodies_str => $test->{ body },
+            bodies_missing => $test->{ body_missing },
             state => 'confirmed',
-            confirmed => \'ms_current_timestamp()',
-            whensent => $test->{ unset_whendef } ? undef : \'ms_current_timestamp()',
+            confirmed => \'current_timestamp',
+            whensent => $test->{ unset_whendef } ? undef : \'current_timestamp',
             category => $test->{ category } || 'potholes',
             name => $test->{ name },
             cobrand => $test->{ cobrand } || 'fixmystreet',
@@ -598,13 +600,13 @@ subtest 'check can set mutiple emails as a single contact' => sub {
         {
             whensent => undef
         }
-    )->update( { whensent => \'ms_current_timestamp()' } );
+    )->update( { whensent => \'current_timestamp' } );
 
     $problem->discard_changes;
     $problem->update( {
         bodies_str => $contact->{ body_id },
         state => 'confirmed',
-        confirmed => \'ms_current_timestamp()',
+        confirmed => \'current_timestamp',
         whensent => undef,
         category => 'trees',
         name => 'Test User',
@@ -632,13 +634,13 @@ subtest 'check can turn on report sent email alerts' => sub {
         {
             whensent => undef
         }
-    )->update( { whensent => \'ms_current_timestamp()' } );
+    )->update( { whensent => \'current_timestamp' } );
 
     $problem->discard_changes;
     $problem->update( {
         bodies_str => $body_ids{2651},
         state => 'confirmed',
-        confirmed => \'ms_current_timestamp()',
+        confirmed => \'current_timestamp',
         whensent => undef,
         category => 'potholes',
         name => 'Test User',
@@ -677,14 +679,14 @@ subtest 'check iOS app store test reports not sent' => sub {
         {
             whensent => undef
         }
-    )->update( { whensent => \'ms_current_timestamp()' } );
+    )->update( { whensent => \'current_timestamp' } );
 
     $problem->discard_changes;
     $problem->update( {
         bodies_str => $body_ids{2651},
         title => 'App store test',
         state => 'confirmed',
-        confirmed => \'ms_current_timestamp()',
+        confirmed => \'current_timestamp',
         whensent => undef,
         category => 'potholes',
         send_fail_count => 0,
@@ -706,14 +708,14 @@ subtest 'check reports from abuser not sent' => sub {
         {
             whensent => undef
         }
-    )->update( { whensent => \'ms_current_timestamp()' } );
+    )->update( { whensent => \'current_timestamp' } );
 
     $problem->discard_changes;
     $problem->update( {
         bodies_str => $body_ids{2651},
         title => 'Report',
         state => 'confirmed',
-        confirmed => \'ms_current_timestamp()',
+        confirmed => \'current_timestamp',
         whensent => undef,
         category => 'potholes',
         send_fail_count => 0,
@@ -728,7 +730,7 @@ subtest 'check reports from abuser not sent' => sub {
 
     $problem->update( {
         state => 'confirmed',
-        confirmed => \'ms_current_timestamp()',
+        confirmed => \'current_timestamp',
         whensent => undef,
     } );