Make sure all MapIt tests can run offline.

1 files changed, 27 insertions, 28 deletions

diff --git a/t/app/controller/report_new.t b/t/app/controller/report_new.t
index c4dd30e47..fd3108438 100644
--- a/t/app/controller/report_new.t
+++ b/t/app/controller/report_new.t
@@ -25,7 +25,7 @@ subtest "test that bare requests to /report/new get redirected" => sub {
     is_deeply { $mech->uri->query_form }, {}, "query empty";
 
     FixMyStreet::override_config {
-        MAPIT_URL => 'http://mapit.mysociety.org/',
+        MAPIT_URL => 'http://mapit.uk/',
     }, sub {
         $mech->get_ok('/report/new?pc=SW1A%201AA');
     };
@@ -476,7 +476,7 @@ foreach my $test (
         # submit initial pc form
         FixMyStreet::override_config {
             ALLOWED_COBRANDS => [ { fixmystreet => '.' } ],
-            MAPIT_URL => 'http://mapit.mysociety.org/',
+            MAPIT_URL => 'http://mapit.uk/',
         }, sub {
             $mech->submit_form_ok( { with_fields => { pc => $test->{pc} } },
                 "submit location" );
@@ -549,7 +549,7 @@ foreach my $test (
     $mech->get_ok('/around');
     FixMyStreet::override_config {
         ALLOWED_COBRANDS => [ { fixmystreet => '.' } ],
-        MAPIT_URL => 'http://mapit.mysociety.org/',
+        MAPIT_URL => 'http://mapit.uk/',
     }, sub {
         $mech->submit_form_ok( { with_fields => { pc => 'EH1 1BB', } },
             "submit location" );
@@ -665,7 +665,7 @@ subtest "test password errors for a user who is signing in as they report" => su
     $mech->get_ok('/around');
     FixMyStreet::override_config {
         ALLOWED_COBRANDS => [ { fixmystreet => '.' } ],
-        MAPIT_URL => 'http://mapit.mysociety.org/',
+        MAPIT_URL => 'http://mapit.uk/',
     }, sub {
         $mech->submit_form_ok( { with_fields => { pc => 'EH1 1BB', } },
             "submit location" );
@@ -717,7 +717,7 @@ subtest "test report creation for a user who is signing in as they report" => su
     $mech->get_ok('/around');
     FixMyStreet::override_config {
         ALLOWED_COBRANDS => [ { fixmystreet => '.' } ],
-        MAPIT_URL => 'http://mapit.mysociety.org/',
+        MAPIT_URL => 'http://mapit.uk/',
     }, sub {
         $mech->submit_form_ok( { with_fields => { pc => 'EH1 1BB', } },
             "submit location" );
@@ -813,7 +813,7 @@ foreach my $test (
         $mech->get_ok('/around');
         FixMyStreet::override_config {
             ALLOWED_COBRANDS => [ { fixmystreet => '.' } ],
-            MAPIT_URL => 'http://mapit.mysociety.org/',
+            MAPIT_URL => 'http://mapit.uk/',
         }, sub {
             $mech->submit_form_ok( { with_fields => { pc => 'GL50 2PR', } },
                 "submit location" );
@@ -912,7 +912,7 @@ subtest "test report creation for a category that is non public" => sub {
     $mech->get_ok('/around');
     FixMyStreet::override_config {
         ALLOWED_COBRANDS => [ { fixmystreet => '.' } ],
-        MAPIT_URL => 'http://mapit.mysociety.org/',
+        MAPIT_URL => 'http://mapit.uk/',
     }, sub {
         $mech->submit_form_ok( { with_fields => { pc => 'EH1 1BB', } },
             "submit location" );
@@ -974,7 +974,7 @@ $contact2->update;
 my $extra_details;
 FixMyStreet::override_config {
     ALLOWED_COBRANDS => [ { fixmystreet => '.' } ],
-    MAPIT_URL => 'http://mapit.mysociety.org/',
+    MAPIT_URL => 'http://mapit.uk/',
 }, sub {
     $extra_details = $mech->get_ok_json( '/report/new/ajax?latitude=' . $saved_lat . '&longitude=' . $saved_lon );
 };
@@ -983,7 +983,7 @@ ok !$extra_details->{titles_list}, 'Non Bromley does not send back list of title
 
 FixMyStreet::override_config {
     ALLOWED_COBRANDS => [ { fixmystreet => '.' } ],
-    MAPIT_URL => 'http://mapit.mysociety.org/',
+    MAPIT_URL => 'http://mapit.uk/',
 }, sub {
     $extra_details = $mech->get_ok_json( '/report/new/ajax?latitude=51.4021&longitude=0.01578');
 };
@@ -1003,7 +1003,7 @@ subtest "check that a lat/lon off coast leads to /around" => sub {
     my $off_coast_longitude = -0.646929;
 
     FixMyStreet::override_config {
-        MAPIT_URL => 'http://mapit.mysociety.org/',
+        MAPIT_URL => 'http://mapit.uk/',
     }, sub {
         $mech->get_ok(    #
             "/report/new"
@@ -1025,7 +1025,7 @@ for my $test (
     {
         desc  => 'user title not set if not bromley problem',
         host  => 'www.fixmystreet.com',
-        postcode => 'EH99 1SP',
+        postcode => 'EH1 1BB',
         fms_extra_title => '',
         extra => [],
         user_title => undef,
@@ -1076,7 +1076,7 @@ for my $test (
     subtest $test->{desc} => sub {
         my $override = {
             ALLOWED_COBRANDS => [ $test->{host} =~ /bromley/ ? 'bromley' : 'fixmystreet' ],
-            MAPIT_URL => 'http://mapit.mysociety.org/',
+            MAPIT_URL => 'http://mapit.uk/',
         };
 
         $mech->host( $test->{host} );
@@ -1193,9 +1193,9 @@ subtest 'user title not reset if no user title in submission' => sub {
         $mech->get_ok('/');
         FixMyStreet::override_config {
             ALLOWED_COBRANDS => [ { fixmystreet => '.' } ],
-            MAPIT_URL => 'http://mapit.mysociety.org/',
+            MAPIT_URL => 'http://mapit.uk/',
         }, sub {
-            $mech->submit_form_ok( { with_fields => { pc => 'EH99 1SP', } },
+            $mech->submit_form_ok( { with_fields => { pc => 'EH1 1BB', } },
                 "submit location" );
             $mech->follow_link_ok(
                 { text_regex => qr/skip this step/i, },
@@ -1258,7 +1258,7 @@ subtest "test Hart" => sub {
             FixMyStreet::override_config {
                 ALLOWED_COBRANDS => [ 'hart', 'fixmystreet' ],
                 BASE_URL => 'http://www.fixmystreet.com',
-                MAPIT_URL => 'http://mapit.mysociety.org/',
+                MAPIT_URL => 'http://mapit.uk/',
             }, sub {
                 $mech->get_ok('/around');
                 $mech->content_contains( "Hart Council" );
@@ -1434,7 +1434,7 @@ subtest "test SeeSomething" => sub {
             $mech->get_ok( '/around' );
             FixMyStreet::override_config {
                 ALLOWED_COBRANDS => [ 'seesomething' ],
-                MAPIT_URL => 'http://mapit.mysociety.org/',
+                MAPIT_URL => 'http://mapit.uk/',
             }, sub {
                 $mech->submit_form_ok(
                     {
@@ -1481,15 +1481,15 @@ subtest "test SeeSomething" => sub {
 subtest "categories from deleted bodies shouldn't be visible for new reports" => sub {
     FixMyStreet::override_config {
         ALLOWED_COBRANDS => [ { fixmystreet => '.' } ],
-        MAPIT_URL => 'http://mapit.mysociety.org/',
+        MAPIT_URL => 'http://mapit.uk/',
     }, sub {
-        $mech->get_ok('/report/new/ajax?latitude=51.89&longitude=-2.09'); # Cheltenham
+        $mech->get_ok('/report/new/ajax?latitude=51.896268&longitude=-2.093063'); # Cheltenham
         ok $mech->content_contains( $contact3->category );
 
         # Delete the body which the contact belongs to.
         $contact3->body->update( { deleted => 1 } );
 
-        $mech->get_ok('/report/new/ajax?latitude=51.89&longitude=-2.09'); # Cheltenham
+        $mech->get_ok('/report/new/ajax?latitude=51.896268&longitude=-2.093063'); # Cheltenham
         ok $mech->content_lacks( $contact3->category );
 
         $contact3->body->update( { deleted => 0 } );
@@ -1499,12 +1499,12 @@ subtest "categories from deleted bodies shouldn't be visible for new reports" =>
 subtest "unresponsive body handling works" => sub {
     FixMyStreet::override_config {
         ALLOWED_COBRANDS => [ { fixmystreet => '.' } ],
-        MAPIT_URL => 'http://mapit.mysociety.org/',
+        MAPIT_URL => 'http://mapit.uk/',
     }, sub {
         # Test body-level send method
         my $old_send = $contact1->body->send_method;
         $contact1->body->update( { send_method => 'Refused' } );
-        $mech->get_ok('/report/new/ajax?latitude=55.9&longitude=-3.2'); # Edinburgh
+        $mech->get_ok('/report/new/ajax?latitude=55.952055&longitude=-3.189579'); # Edinburgh
         my $body_id = $contact1->body->id;
         ok $mech->content_like( qr{Edinburgh.*accept reports.*/unresponsive\?body=$body_id} );
 
@@ -1553,8 +1553,8 @@ subtest "unresponsive body handling works" => sub {
             phone               => '07903 123 456',
             category            => 'Trees',
             service             => 'iOS',
-            lat                 => 55.9,
-            lon                 => -3.2,
+            lat                 => 55.952055,
+            lon                 => -3.189579,
             pc                  => '',
             used_map            => '1',
             submit_register     => '1',
@@ -1580,7 +1580,7 @@ subtest "unresponsive body handling works" => sub {
         # And test per-category refusing
         my $old_email = $contact3->email;
         $contact3->update( { email => 'REFUSED' } );
-        $mech->get_ok('/report/new/category_extras?category=Trees&latitude=51.89&longitude=-2.09');
+        $mech->get_ok('/report/new/category_extras?category=Trees&latitude=51.896268&longitude=-2.093063');
         ok $mech->content_like( qr/Cheltenham.*Trees.*unresponsive.*category=Trees/ );
 
         $mech->get_ok('/around');
@@ -1614,7 +1614,6 @@ subtest "unresponsive body handling works" => sub {
 subtest "unresponsive body page works" => sub {
     FixMyStreet::override_config {
         ALLOWED_COBRANDS => [ { fixmystreet => '.' } ],
-        MAPIT_URL => 'http://mapit.mysociety.org/',
     }, sub {
         my $old_send = $contact1->body->send_method;
         my $body_id = $contact1->body->id;
@@ -1641,7 +1640,7 @@ subtest "extra google analytics code displayed on logged in problem creation" =>
     FixMyStreet::override_config {
         ALLOWED_COBRANDS => [ { fixmystreet => '.' } ],
         BASE_URL => 'https://www.fixmystreet.com',
-        MAPIT_URL => 'http://mapit.mysociety.org/',
+        MAPIT_URL => 'http://mapit.uk/',
     }, sub {
         # check that the user does not exist
         my $test_email = 'test-2@example.com';
@@ -1670,7 +1669,7 @@ subtest "extra google analytics code displayed on logged in problem creation" =>
         $mech->submit_form_ok(
             {
                 with_fields => {
-                    title         => "Test Report at café", 
+                    title         => "Test Report at café",
                     detail        => 'Test report details.',
                     photo1        => '',
                     name          => 'Joe Bloggs',
@@ -1697,7 +1696,7 @@ subtest "extra google analytics code displayed on email confirmation problem cre
     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;
         $mech->clear_emails_ok;