diff options
| author | Struan Donald <struan@exo.org.uk> | 2012-08-22 10:57:10 +0100 |
|---|---|---|
| committer | Struan Donald <struan@exo.org.uk> | 2012-08-22 10:57:10 +0100 |
| commit | 2e0a4e8ec45579e4e5c9cf8aa123d5ab215b9703 (patch) | |
| tree | c13e3c59b686e01460dc7960547f7e9c53c288bd /t/cobrand | |
| parent | b99c5ff97b29a27eeba52ed24385ac30388e875c (diff) | |
| parent | 88a7d38dffa3dabdf0f85573b254cea9c8ab232b (diff) | |
Merge remote-tracking branch 'origin/master' into fmb-read-only
Conflicts:
.gitignore
bin/make_css
conf/general.yml-example
perllib/FixMyStreet/App/Controller/Council.pm
perllib/FixMyStreet/App/Controller/Report/New.pm
perllib/FixMyStreet/Cobrand/Default.pm
templates/web/default/around/around_index.html
templates/web/default/index.html
templates/web/emptyhomes/index.html
templates/web/fixmystreet/around/around_index.html
templates/web/fixmystreet/index.html
web/fixmystreet_app_cgi.cgi
web/fixmystreet_app_fastcgi.cgi
Diffstat (limited to 't/cobrand')
| -rw-r--r-- | t/cobrand/closest.t | 28 |
1 files changed, 17 insertions, 11 deletions
diff --git a/t/cobrand/closest.t b/t/cobrand/closest.t index c7ba10cc4..02c979756 100644 --- a/t/cobrand/closest.t +++ b/t/cobrand/closest.t @@ -10,7 +10,7 @@ use_ok 'FixMyStreet::Cobrand'; mySociety::Locale::gettext_domain( 'FixMyStreet' ); -my $c = FixMyStreet::Cobrand::Default->new(); +my $c = FixMyStreet::Cobrand::UK->new(); my $user = FixMyStreet::App->model('DB::User') @@ -58,21 +58,27 @@ ok !$report->geocode, 'no gecode entry for report'; my $near = $c->find_closest( $report->latitude, $report->longitude, $report ); -ok $report->geocode, 'geocode entry added to report'; -ok $report->geocode->{resourceSets}, 'geocode entry looks like right sort of thing'; +SKIP: { + if (!FixMyStreet->config('BING_MAPS_API_KEY')) { + skip 'No Bing Maps key', 0; + } -like $near, qr/Constitution Hill/i, 'nearest street looks right'; -like $near, qr/Nearest postcode .*: SW1A 1AA/i, 'nearest postcode looks right'; + ok $report->geocode, 'geocode entry added to report'; + ok $report->geocode->{resourceSets}, 'geocode entry looks like right sort of thing'; -$near = $c->find_closest_address_for_rss( $report->latitude, $report->longitude, $report ); + like $near, qr/Constitution Hill/i, 'nearest street looks right'; + like $near, qr/Nearest postcode .*: SW1A 1AA/i, 'nearest postcode looks right'; -like $near, qr/Constitution Hill/i, 'nearest street for RSS looks right'; -unlike $near, qr/Nearest postcode/i, 'no nearest postcode in RSS text'; + $near = $c->find_closest_address_for_rss( $report->latitude, $report->longitude, $report ); -$report->geocode( undef ); -$near = $c->find_closest_address_for_rss( $report->latitude, $report->longitude, $report ); + like $near, qr/Constitution Hill/i, 'nearest street for RSS looks right'; + unlike $near, qr/Nearest postcode/i, 'no nearest postcode in RSS text'; + + $report->geocode( undef ); + $near = $c->find_closest_address_for_rss( $report->latitude, $report->longitude, $report ); -ok !$near, 'no closest address for RSS if not cached'; + ok !$near, 'no closest address for RSS if not cached'; +} # all done done_testing(); |