diff options
| author | Struan Donald <struan@exo.org.uk> | 2011-07-26 16:57:08 +0100 |
|---|---|---|
| committer | Struan Donald <struan@exo.org.uk> | 2011-07-26 16:57:08 +0100 |
| commit | 54066cd1387643dd6c6cb3040c520bee66881fd7 (patch) | |
| tree | eda84b3f347220ed12de3aa690116148287891bd /t/app/controller/admin.t | |
| parent | 8146bad18eeaab658871dd28eb38199a5d068395 (diff) | |
| parent | 198fcef62892fe0b2fbb3ea8a080fca87843445e (diff) | |
Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreet into new_statuses
Conflicts:
perllib/FixMyStreet/App/Controller/Admin.pm
perllib/FixMyStreet/App/Controller/JSON.pm
perllib/FixMyStreet/Map/Tilma/Original.pm
web/css/core.css
Diffstat (limited to 't/app/controller/admin.t')
| -rw-r--r-- | t/app/controller/admin.t | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/t/app/controller/admin.t b/t/app/controller/admin.t index dcf45e983..25b79dc44 100644 --- a/t/app/controller/admin.t +++ b/t/app/controller/admin.t @@ -108,9 +108,9 @@ subtest 'check summary counts' => sub { $mech->get_ok('/admin'); $mech->title_like(qr/Summary/); - $mech->content_contains( "0</strong> live problems" ); - $mech->content_contains( "0 confirmed alerts" ); - $mech->content_contains( "0 questionnaires sent" ); + my ($num_live) = $mech->content =~ /(\d+)<\/strong> live problems/; + my ($num_alerts) = $mech->content =~ /(\d+) confirmed alerts/; + my ($num_qs) = $mech->content =~ /(\d+) questionnaires sent/; $report->council(2489); $report->cobrand('barnet'); @@ -121,9 +121,9 @@ subtest 'check summary counts' => sub { $mech->get_ok('/admin'); - $mech->content_contains( "1</strong> live problems" ); - $mech->content_contains( "1 confirmed alerts" ); - $mech->content_contains( "1 questionnaires sent" ); + $mech->content_contains( ($num_live+1) . "</strong> live problems" ); + $mech->content_contains( ($num_alerts+1) . " confirmed alerts" ); + $mech->content_contains( ($num_qs+1) . " questionnaires sent" ); $report->council(2504); $report->cobrand(''); |