aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStruan Donald <struan@exo.org.uk>2012-10-02 17:45:34 +0100
committerStruan Donald <struan@exo.org.uk>2012-10-02 18:59:08 +0100
commit844a16a3c51d69e99ba322a055673364a2a9290d (patch)
tree2f3dc19c7944d471f9d5f5cb3d7fd45884faab1a
parentf342b7933e94202935f91f3122e8dfbde75fe54b (diff)
update tests with new statuses
-rw-r--r--t/app/controller/questionnaire.t16
-rw-r--r--t/app/controller/report_display.t34
-rw-r--r--t/app/controller/report_updates.t5
-rw-r--r--t/app/model/questionnaire.t16
-rw-r--r--t/map/tilma/original.t16
5 files changed, 85 insertions, 2 deletions
diff --git a/t/app/controller/questionnaire.t b/t/app/controller/questionnaire.t
index 3475307fb..872a1733c 100644
--- a/t/app/controller/questionnaire.t
+++ b/t/app/controller/questionnaire.t
@@ -307,6 +307,10 @@ for my $test (
fixed => 0
},
{
+ state => 'action scheduled',
+ fixed => 0
+ },
+ {
state => 'in progress',
fixed => 0
},
@@ -315,6 +319,18 @@ for my $test (
fixed => 0
},
{
+ state => 'duplicate',
+ fixed => 0
+ },
+ {
+ state => 'not responsible',
+ fixed => 0
+ },
+ {
+ state => 'unable to fix',
+ fixed => 0
+ },
+ {
state => 'closed',
fixed => 0
},
diff --git a/t/app/controller/report_display.t b/t/app/controller/report_display.t
index 6c2733e36..c10f13547 100644
--- a/t/app/controller/report_display.t
+++ b/t/app/controller/report_display.t
@@ -252,6 +252,30 @@ for my $test (
fixed => 1
},
{
+ description => 'duplicate report',
+ date => DateTime->now,
+ state => 'duplicate',
+ banner_id => 'closed',
+ banner_text => 'closed',
+ fixed => 0
+ },
+ {
+ description => 'not responsible report',
+ date => DateTime->now,
+ state => 'not responsible',
+ banner_id => 'closed',
+ banner_text => 'closed',
+ fixed => 0
+ },
+ {
+ description => 'unable to fix report',
+ date => DateTime->now,
+ state => 'unable to fix',
+ banner_id => 'closed',
+ banner_text => 'closed',
+ fixed => 0
+ },
+ {
description => 'closed report',
date => DateTime->now,
state => 'closed',
@@ -268,6 +292,14 @@ for my $test (
fixed => 0
},
{
+ description => 'action scheduled eport',
+ date => DateTime->now,
+ state => 'action scheduled',
+ banner_id => 'progress',
+ banner_text => 'progress',
+ fixed => 0
+ },
+ {
description => 'planned report',
date => DateTime->now,
state => 'planned',
@@ -276,7 +308,7 @@ for my $test (
fixed => 0
},
{
- description => 'in progressreport',
+ description => 'in progress report',
date => DateTime->now,
state => 'in progress',
banner_id => 'progress',
diff --git a/t/app/controller/report_updates.t b/t/app/controller/report_updates.t
index 4c8a01cf1..e4cec5f9f 100644
--- a/t/app/controller/report_updates.t
+++ b/t/app/controller/report_updates.t
@@ -547,6 +547,7 @@ for my $test (
state => 'not responsible',
},
state => 'not responsible',
+ meta => "not the council's responsibility"
},
{
desc => 'from authority user marks report as duplicate',
@@ -559,6 +560,7 @@ for my $test (
state => 'duplicate',
},
state => 'duplicate',
+ meta => 'duplicate report',
},
{
desc => 'from authority user marks report sent to two councils as fixed',
@@ -601,7 +603,8 @@ for my $test (
is $update->problem_state, $test->{state}, 'problem state set';
my $update_meta = $mech->extract_update_metas;
- like $update_meta->[0], qr/marked as $test->{fields}->{state}$/, 'update meta includes state change';
+ my $meta_state = $test->{meta} || $test->{fields}->{state};
+ like $update_meta->[0], qr/marked as $meta_state$/, 'update meta includes state change';
like $update_meta->[0], qr{Test User \(Westminster City Council\)}, 'update meta includes council name';
$mech->content_contains( 'Test User (<strong>Westminster City Council</strong>)', 'council name in bold');
diff --git a/t/app/model/questionnaire.t b/t/app/model/questionnaire.t
index 60b52043a..86af51c42 100644
--- a/t/app/model/questionnaire.t
+++ b/t/app/model/questionnaire.t
@@ -62,6 +62,10 @@ for my $test (
send_email => 1,
},
{
+ state => 'action scheduled',
+ send_email => 1,
+ },
+ {
state => 'in progress',
send_email => 1,
},
@@ -78,6 +82,18 @@ for my $test (
send_email => 1,
},
{
+ state => 'duplicate',
+ send_email => 1,
+ },
+ {
+ state => 'unable to fix',
+ send_email => 1,
+ },
+ {
+ state => 'not responsible',
+ send_email => 1,
+ },
+ {
state => 'closed',
send_email => 1,
},
diff --git a/t/map/tilma/original.t b/t/map/tilma/original.t
index 04c4d578c..7f68df308 100644
--- a/t/map/tilma/original.t
+++ b/t/map/tilma/original.t
@@ -71,10 +71,26 @@ for my $test (
colour => 'yellow',
},
{
+ state => 'duplicate',
+ colour => 'yellow',
+ },
+ {
+ state => 'unable to fix',
+ colour => 'yellow',
+ },
+ {
+ state => 'not responsible',
+ colour => 'yellow',
+ },
+ {
state => 'investigating',
colour => 'yellow',
},
{
+ state => 'action scheduled',
+ colour => 'yellow',
+ },
+ {
state => 'planned',
colour => 'yellow',
},