diff options
| author | Matthew Somerville <matthew@mysociety.org> | 2015-03-16 16:24:34 +0000 |
|---|---|---|
| committer | Matthew Somerville <matthew@mysociety.org> | 2015-03-16 19:10:16 +0000 |
| commit | 72e7c2ac4b6a644ee2bb002915122648d97c56e0 (patch) | |
| tree | 6cc0ff6e8386d0aa53ac6bcfcdca8f4ae1dfa2ac /t | |
| parent | d0a16157fbd10f8bdf1a07c77331504c61bf7f5d (diff) | |
[fixmystreet.com] Remove special NI code.
This is now handled by normal bodies in the admin. In order to remove
references in send_reports, tidy up (unused) EmptyHomes code a bit.
Diffstat (limited to 't')
| -rw-r--r-- | t/app/model/problem.t | 19 | ||||
| -rw-r--r-- | t/open311/endpoint/warwick.t | 1 |
2 files changed, 13 insertions, 7 deletions
diff --git a/t/app/model/problem.t b/t/app/model/problem.t index f88dc09b8..c57f8af3b 100644 --- a/t/app/model/problem.t +++ b/t/app/model/problem.t @@ -380,10 +380,15 @@ for my $body ( { area_id => 14279, name => 'Ballymoney Borough Council' }, { area_id => 2636, name => 'Isle of Wight Council' }, { area_id => 2649, name => 'Fife Council' }, + { area_id => 14279, name => 'TransportNI (Western)' }, ) { my $aid = $body->{area_id}; my $body = $mech->create_body_ok($aid, $body->{name}); - $body_ids{$aid} = $body->id; + if ($body_ids{$aid}) { + $body_ids{$aid} = [ $body_ids{$aid}, $body->id ]; + } else { + $body_ids{$aid} = $body->id; + } push @bodies, $body; } @@ -409,11 +414,11 @@ for my $contact ( { category => 'potholes', email => 'highways@example.com', }, { - body_id => $body_ids{14279}, # Ballymoney + body_id => $body_ids{14279}[1], # TransportNI category => 'Street lighting', email => 'roads.western@drdni.example.org', }, { - body_id => $body_ids{14279}, # Ballymoney + body_id => $body_ids{14279}[0], # Ballymoney category => 'Graffiti', email => 'highways@example.com', }, { @@ -488,7 +493,7 @@ foreach my $test ( { email_count => 1, dear => qr'Dear Ballymoney Borough Council', to => qr'Ballymoney Borough Council', - body => $body_ids{14279}, + body => $body_ids{14279}[0], category => 'Graffiti', longitude => -9.5, }, { @@ -496,9 +501,9 @@ foreach my $test ( { desc => 'directs NI correctly, 2', unset_whendef => 1, email_count => 1, - dear => qr'Dear Roads Service \(Western\)', - to => qr'Roads Service \(Western\)" <roads', - body => $body_ids{14279}, + dear => qr'Dear TransportNI \(Western\)', + to => qr'TransportNI \(Western\)" <roads', + body => $body_ids{14279}[1], category => 'Street lighting', longitude => -9.5, }, { diff --git a/t/open311/endpoint/warwick.t b/t/open311/endpoint/warwick.t index e144b745a..b51c601f3 100644 --- a/t/open311/endpoint/warwick.t +++ b/t/open311/endpoint/warwick.t @@ -212,6 +212,7 @@ subtest "End to end" => sub { FixMyStreet::override_config { ALLOWED_COBRANDS => [ 'fixmystreet' ], SEND_REPORTS_ON_STAGING => 1, + MAPIT_URL => 'http://mapit.mysociety.org/', }, sub { ## we can't (yet) just do following due to ## https://github.com/mysociety/fixmystreet/issues/893 |