diff options
| -rw-r--r-- | t/app/controller/questionnaire.t | 11 | ||||
| -rw-r--r-- | t/app/controller/report_updates.t | 24 |
2 files changed, 18 insertions, 17 deletions
diff --git a/t/app/controller/questionnaire.t b/t/app/controller/questionnaire.t index af3b373ac..a013569ee 100644 --- a/t/app/controller/questionnaire.t +++ b/t/app/controller/questionnaire.t @@ -1,6 +1,7 @@ use strict; use warnings; use Test::More; +use DateTime; use FixMyStreet::TestMech; use FixMyStreet::App::Controller::Questionnaire; @@ -15,7 +16,10 @@ my $user = ->find_or_create( { email => 'test@example.com', name => 'Test User' } ); ok $user, "created test user"; -my $report_time = '2011-03-01 12:00:00'; +my $dt = DateTime->now()->subtract( weeks => 5 ); +my $report_time = $dt->ymd . ' ' . $dt->hms; +my $sent = $dt->add( minutes => 5 ); +my $sent_time = $sent->ymd . ' ' . $sent->hms; my $report = FixMyStreet::App->model('DB::Problem')->find_or_create( { @@ -31,7 +35,7 @@ my $report = FixMyStreet::App->model('DB::Problem')->find_or_create( state => 'confirmed', confirmed => $report_time, lastupdate => $report_time, - whensent => '2011-03-01 12:05:00', + whensent => $sent_time, lang => 'en-gb', service => '', cobrand => 'default', @@ -334,10 +338,11 @@ $mech->get_ok("/Q/" . $token); $mech->content_contains( 'should have reported what they have done' ); # Test already answered the ever reported question, so not shown again +$dt = $dt->add( weeks => 4 ); my $questionnaire2 = FixMyStreet::App->model('DB::Questionnaire')->find_or_create( { problem_id => $report->id, - whensent => '2011-03-28 12:00:00', + whensent => $dt->ymd . ' ' . $dt->hms, ever_reported => 1, } ); diff --git a/t/app/controller/report_updates.t b/t/app/controller/report_updates.t index b8b91eb6b..4469d4003 100644 --- a/t/app/controller/report_updates.t +++ b/t/app/controller/report_updates.t @@ -418,7 +418,7 @@ subtest 'check non authority user cannot change set state' => sub { id => $report_id, name => $user->name, may_show_name => 1, - add_alert => 0, + add_alert => undef, photo => '', update => 'this is a forbidden update', state => 'fixed - council', @@ -441,19 +441,15 @@ for my $state ( qw/unconfirmed hidden partial/ ) { $user->update; $mech->get_ok("/report/$report_id"); - $mech->submit_form_ok( { - form_number => 2, - fields => { + $mech->post_ok( "/report/update", { submit_update => 1, id => $report_id, name => $user->name, - rznvy => $user->email, may_show_name => 1, - add_alert => 0, + add_alert => undef, photo => '', update => 'this is a forbidden update', state => $state, - }, }, 'submitted with state', ); @@ -473,7 +469,7 @@ for my $test ( fields => { name => $user->name, may_show_name => 1, - add_alert => 0, + add_alert => undef, photo => '', update => 'Set state to investigating', state => 'investigating', @@ -485,7 +481,7 @@ for my $test ( fields => { name => $user->name, may_show_name => 1, - add_alert => 0, + add_alert => undef, photo => '', update => 'Set state to planned', state => 'planned', @@ -497,7 +493,7 @@ for my $test ( fields => { name => $user->name, may_show_name => 1, - add_alert => 0, + add_alert => undef, photo => '', update => 'Set state to in progress', state => 'in progress', @@ -509,7 +505,7 @@ for my $test ( fields => { name => $user->name, may_show_name => 1, - add_alert => 0, + add_alert => undef, photo => '', update => 'Set state to closed', state => 'closed', @@ -521,7 +517,7 @@ for my $test ( fields => { name => $user->name, may_show_name => 1, - add_alert => 0, + add_alert => undef, photo => '', update => 'Set state to fixed', state => 'fixed', @@ -533,7 +529,7 @@ for my $test ( fields => { name => $user->name, may_show_name => 1, - add_alert => 0, + add_alert => undef, photo => '', update => 'Set state to confirmed', state => 'confirmed', @@ -545,7 +541,7 @@ for my $test ( fields => { name => $user->name, may_show_name => 1, - add_alert => 0, + add_alert => undef, photo => '', update => 'Set state to fixed', state => 'fixed', |