aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Somerville <matthew-github@dracos.co.uk>2017-05-25 09:07:34 +0100
committerMatthew Somerville <matthew-github@dracos.co.uk>2017-05-25 09:40:56 +0100
commit61749f6f561c18b8eef9d5b5158a7a1505ba1c4a (patch)
treec18f7c569c1978426272dd81f88a95956de0d80b
parentd7286a011c7216cdae9e8aee21895f4f74c3277b (diff)
Fix test that would not run offline.
Switch it to use our mock MapIt. Also remove other unused overrides to external services.
-rw-r--r--t/app/controller/report_new.t2
-rw-r--r--t/app/controller/reports.t1
-rw-r--r--t/app/model/problem.t3
-rw-r--r--t/cobrand/get_body_sender.t2
-rw-r--r--t/cobrand/oxfordshire.t1
5 files changed, 2 insertions, 7 deletions
diff --git a/t/app/controller/report_new.t b/t/app/controller/report_new.t
index f3bee0513..33324d210 100644
--- a/t/app/controller/report_new.t
+++ b/t/app/controller/report_new.t
@@ -1639,7 +1639,7 @@ subtest "inspectors get redirected directly to the report page" => sub {
FixMyStreet::override_config {
ALLOWED_COBRANDS => [ { fixmystreet => '.' } ],
BASE_URL => 'https://www.fixmystreet.com',
- MAPIT_URL => 'http://mapit.mysociety.org/',
+ MAPIT_URL => 'http://mapit.uk/',
}, sub {
$mech->log_out_ok;
diff --git a/t/app/controller/reports.t b/t/app/controller/reports.t
index a21d3ad65..56b4cce8c 100644
--- a/t/app/controller/reports.t
+++ b/t/app/controller/reports.t
@@ -199,7 +199,6 @@ is $stats->{'Westminster City Council'}->[1], 5, 'non public reports included in
subtest "test fiksgatami all reports page" => sub {
FixMyStreet::override_config {
ALLOWED_COBRANDS => [ 'fiksgatami' ],
- MAPIT_URL => 'http://mapit.nuug.no/',
}, sub {
$mech->create_body_ok(3, 'Oslo');
ok $mech->host("fiksgatami.no"), 'change host to fiksgatami';
diff --git a/t/app/model/problem.t b/t/app/model/problem.t
index 6b1be0a76..47f654236 100644
--- a/t/app/model/problem.t
+++ b/t/app/model/problem.t
@@ -531,7 +531,6 @@ foreach my $test ( {
my $override = {
ALLOWED_COBRANDS => [ 'fixmystreet' ],
BASE_URL => 'http://www.fixmystreet.com',
- MAPIT_URL => 'http://mapit.mysociety.org/',
};
if ( $test->{cobrand} && $test->{cobrand} =~ /hart/ ) {
$override->{ALLOWED_COBRANDS} = [ 'hart' ];
@@ -607,8 +606,6 @@ foreach my $test ( {
subtest 'check can set mutiple emails as a single contact' => sub {
my $override = {
ALLOWED_COBRANDS => [ 'fixmystreet' ],
- BASE_URL => 'http://www.fixmystreet.com',
- MAPIT_URL => 'http://mapit.mysociety.org/',
};
my $contact = {
diff --git a/t/cobrand/get_body_sender.t b/t/cobrand/get_body_sender.t
index fbdfbffa7..b71dece7e 100644
--- a/t/cobrand/get_body_sender.t
+++ b/t/cobrand/get_body_sender.t
@@ -23,7 +23,7 @@ my $body_area = $body->body_areas->find_or_create({ area_id => 1000 });
FixMyStreet::override_config {
MAPIT_TYPES => [ 'LBO' ],
- MAPIT_URL => 'http://mapit.mysociety.org/',
+ MAPIT_URL => 'http://mapit.uk/', # Not actually used as no special casing at present
}, sub {
is_deeply $c->get_body_sender( $body ), { method => 'Email', contact => undef }, 'defaults to email';
$body_area->update({ area_id => 2481 }); # Croydon LBO
diff --git a/t/cobrand/oxfordshire.t b/t/cobrand/oxfordshire.t
index 4849554ea..d5effacae 100644
--- a/t/cobrand/oxfordshire.t
+++ b/t/cobrand/oxfordshire.t
@@ -32,7 +32,6 @@ subtest 'check /ajax defaults to open reports only' => sub {
FixMyStreet::override_config {
ALLOWED_COBRANDS => [ { 'oxfordshire' => '.' } ],
- MAPIT_URL => 'http://mapit.mysociety.org/',
}, sub {
my $json = $mech->get_ok_json( '/ajax?status=all&bbox=' . $bbox );
my $pins = $json->{pins};