diff options
Diffstat (limited to 't')
| -rw-r--r-- | t/app/controller/dashboard.t | 22 | ||||
| -rw-r--r-- | t/app/controller/report_updates.t | 12 | ||||
| -rw-r--r-- | t/app/model/problem.t | 28 | ||||
| -rw-r--r-- | t/open311/getservicerequestupdates.t | 12 |
4 files changed, 39 insertions, 35 deletions
diff --git a/t/app/controller/dashboard.t b/t/app/controller/dashboard.t index 47d10ff5c..ffdc5e5b3 100644 --- a/t/app/controller/dashboard.t +++ b/t/app/controller/dashboard.t @@ -78,7 +78,7 @@ my $categories = scraper { process "tr[id=fixed_user] > td", 'user[]' => 'TEXT', process "tr[id=total_fixed] > td", 'total_fixed[]' => 'TEXT', process "tr[id=in_progress] > td", 'in_progress[]' => 'TEXT', - process "tr[id=planned] > td", 'planned[]' => 'TEXT', + process "tr[id=action_scheduled] > td", 'action_scheduled[]' => 'TEXT', process "tr[id=investigating] > td", 'investigating[]' => 'TEXT', process "tr[id=marked] > td", 'marked[]' => 'TEXT', process "tr[id=avg_marked] > td", 'avg_marked[]' => 'TEXT', @@ -212,10 +212,10 @@ foreach my $test ( } }, { - desc => 'marked as planned today', + desc => 'marked as action scheduled today', confirm_dt => DateTime->now->subtract( days => 1 ), mark_dt => DateTime->now, - state => 'planned', + state => 'action scheduled', counts => { totals => $is_monday ? [ 0,5,5,5] : [5,5,5,5], user => [1,1,1,1], @@ -224,15 +224,15 @@ foreach my $test ( avg_marked => [1,1,1,1], investigating => [1,1,1,1], in_progress => [1,1,1,1], - planned => [1,1,1,1], + action_scheduled => [1,1,1,1], marked => [3,3,3,3] } }, { - desc => 'marked as planned today, confirmed a week ago', + desc => 'marked as action scheduled today, confirmed a week ago', confirm_dt => DateTime->now->subtract( days => 8 ), mark_dt => DateTime->now, - state => 'planned', + state => 'action scheduled', counts => { totals => $is_monday ? [0,5,6,6] : [5,5,6,6], user => [1,1,1,1], @@ -241,7 +241,7 @@ foreach my $test ( avg_marked => [3,3,3,3], investigating => [1,1,1,1], in_progress => [1,1,1,1], - planned => [2,2,2,2], + action_scheduled => [2,2,2,2], marked => [4,4,4,4] } }, @@ -259,7 +259,7 @@ foreach my $test ( avg_marked => [3,3,3,3], investigating => [1,1,1,1], in_progress => [1,1,1,1], - planned => [2,2,2,2], + action_scheduled => [2,2,2,2], marked => [4,4,4,4] } }, @@ -277,7 +277,7 @@ foreach my $test ( avg_marked => [3,3,3,3], investigating => [1,1,1,1], in_progress => [1,1,1,1], - planned => [2,2,2,2], + action_scheduled => [2,2,2,2], marked => [4,4,4,4] } }, @@ -295,7 +295,7 @@ foreach my $test ( avg_marked => [3,3,3,3], investigating => [1,1,1,1], in_progress => [1,1,1,1], - planned => [2,2,2,2], + action_scheduled => [2,2,2,2], marked => [4,4,4,4] } }, @@ -313,7 +313,7 @@ foreach my $test ( avg_marked => [2,2,2,2], investigating => [1,1,1,1], in_progress => [1,1,1,1], - planned => [2,2,2,2], + action_scheduled => [2,2,2,2], closed => [1,1,1,1], marked => [5,5,5,5] } diff --git a/t/app/controller/report_updates.t b/t/app/controller/report_updates.t index 4a2aea7ef..4c8a01cf1 100644 --- a/t/app/controller/report_updates.t +++ b/t/app/controller/report_updates.t @@ -477,18 +477,6 @@ for my $test ( state => 'investigating', }, { - desc => 'from authority user marks report as planned', - fields => { - name => $user->name, - may_show_name => 1, - add_alert => undef, - photo => '', - update => 'Set state to planned', - state => 'planned', - }, - state => 'planned', - }, - { desc => 'from authority user marks report as in progress', fields => { name => $user->name, diff --git a/t/app/model/problem.t b/t/app/model/problem.t index 8aabce4f7..c3913b79e 100644 --- a/t/app/model/problem.t +++ b/t/app/model/problem.t @@ -302,6 +302,13 @@ for my $test ( is_closed => 0, }, { + state => 'action scheduled', + is_visible => 1, + is_fixed => 0, + is_open => 1, + is_closed => 0, + }, + { state => 'in progress', is_visible => 1, is_fixed => 0, @@ -309,6 +316,27 @@ for my $test ( is_closed => 0, }, { + state => 'duplicate', + is_visible => 1, + is_fixed => 0, + is_open => 0, + is_closed => 1, + }, + { + state => 'not responsible', + is_visible => 1, + is_fixed => 0, + is_open => 0, + is_closed => 1, + }, + { + state => 'unable to fix', + is_visible => 1, + is_fixed => 0, + is_open => 0, + is_closed => 1, + }, + { state => 'fixed', is_visible => 1, is_fixed => 1, diff --git a/t/open311/getservicerequestupdates.t b/t/open311/getservicerequestupdates.t index 9f67633aa..c7d12391a 100644 --- a/t/open311/getservicerequestupdates.t +++ b/t/open311/getservicerequestupdates.t @@ -117,18 +117,6 @@ for my $test ( end_state => 'confirmed', }, { - desc => 'planned status changed problem status', - updated_datetime => sprintf( '<updated_datetime>%s</updated_datetime>', $dt ), - description => 'This is a note', - external_id => 638344, - start_state => 'confirmed', - comment_status => 'PLANNED', - mark_fixed=> 0, - mark_open => 0, - problem_state => 'planned', - end_state => 'planned', - }, - { desc => 'investigating status changes problem status', updated_datetime => sprintf( '<updated_datetime>%s</updated_datetime>', $dt ), description => 'This is a note', |