diff options
| -rw-r--r-- | t/app/controller/report_updates.t | 8 | ||||
| -rw-r--r-- | t/open311/getservicerequestupdates.t | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/t/app/controller/report_updates.t b/t/app/controller/report_updates.t index aa34b1a2c..c99a54743 100644 --- a/t/app/controller/report_updates.t +++ b/t/app/controller/report_updates.t @@ -639,7 +639,7 @@ subtest 'check meta correct for comments marked confirmed but not marked open' = user => $user, problem_id => $report->id, text => 'update text', - confirmed => DateTime->now, + confirmed => DateTime->now( time_zone => 'local' ), problem_state => 'confirmed', anonymous => 0, mark_open => 0, @@ -751,7 +751,7 @@ subtest "check comment with no status change has not status in meta" => sub { unlike $update_meta->[1], qr/marked as/, 'second update meta does not include state change'; like $update_meta->[2], qr/marked as investigating/, 'third update meta says investigating'; - my $dt = DateTime->now->add( seconds => 1 ); + my $dt = DateTime->now( time_zone => "local" )->add( seconds => 1 ); $comment = FixMyStreet::App->model('DB::Comment')->find_or_create( { problem_id => $report_id, @@ -789,7 +789,7 @@ subtest 'check meta correct for second comment marking as reopened' => sub { user => $user, problem_id => $report->id, text => 'update text', - confirmed => DateTime->now, + confirmed => DateTime->now( time_zone => 'local'), problem_state => 'fixed - user', anonymous => 0, mark_open => 0, @@ -807,7 +807,7 @@ subtest 'check meta correct for second comment marking as reopened' => sub { user => $user, problem_id => $report->id, text => 'update text', - confirmed => DateTime->now + DateTime::Duration->new( minutes => 1 ), + confirmed => DateTime->now( time_zone => 'local' ) + DateTime::Duration->new( minutes => 1 ), problem_state => 'confirmed', anonymous => 0, mark_open => 0, diff --git a/t/open311/getservicerequestupdates.t b/t/open311/getservicerequestupdates.t index 36ed13615..e700aef38 100644 --- a/t/open311/getservicerequestupdates.t +++ b/t/open311/getservicerequestupdates.t @@ -13,6 +13,7 @@ use_ok( 'Open311' ); use_ok( 'Open311::GetServiceRequestUpdates' ); use DateTime; +use DateTime::Format::W3CDTF; use FixMyStreet::App; my $user = FixMyStreet::App->model('DB::User')->find_or_create( @@ -380,7 +381,8 @@ foreach my $test ( $dt->subtract( minutes => 10 ); my $local_requests_xml = $requests_xml; - my $updated = sprintf( '<updated_datetime>%s</updated_datetime>', $dt ); + my $updated = sprintf( '<updated_datetime>%s</updated_datetime>', DateTime::Format::W3CDTF->format_datetime( $dt ) ); + $local_requests_xml =~ s/UPDATED_DATETIME/$updated/; $local_requests_xml =~ s#<service_request_id>\d+</service_request_id>#<service_request_id>@{[$problem->external_id]}</service_request_id>#; $local_requests_xml =~ s#<service_request_id_ext>\d+</service_request_id_ext>#<service_request_id_ext>@{[$problem->id]}</service_request_id_ext>#; |