Have a whole fake mapit (for #182) that works if MAPIT_URL is set accordingly.

Setting MAPIT_URL to .../fakemapit/ will then return one area, ID 161 and
type ZZZ, whatever co-ordinate it is given. This means the default area
type is now ZZZ, the UK specific types are moved into the UK cobrands, and
the tests updated accordingly to still function (they assume UK-ness a lot,
so probably need an ALLOWED_COBRANDS entry of "fixmystreet: 'localhost'" and
for your host's domain to show fixmystreet too).

7 files changed, 48 insertions, 43 deletions

diff --git a/t/app/controller/around.t b/t/app/controller/around.t
index ca1694b49..db03e00f4 100644
--- a/t/app/controller/around.t
+++ b/t/app/controller/around.t
@@ -72,7 +72,7 @@ foreach my $test (
         $mech->get_ok('/');
         $mech->submit_form_ok( { with_fields => { pc => $test->{pc} } },
             "good location" );
-        is_deeply $mech->form_errors, [], "no errors for pc '$test->{pc}'";
+        is_deeply $mech->page_errors, [], "no errors for pc '$test->{pc}'";
         is_deeply $mech->extract_location, $test,
           "got expected location for pc '$test->{pc}'";
     };
diff --git a/t/app/controller/auth.t b/t/app/controller/auth.t
index efc5e60e6..5c6a4ef09 100644
--- a/t/app/controller/auth.t
+++ b/t/app/controller/auth.t
@@ -33,7 +33,7 @@ for my $test (
     my ( $email, $error_message ) = @$test;
     pass "--- testing bad email '$email' gives error '$error_message'";
     $mech->get_ok('/auth');
-    is_deeply $mech->form_errors, [], 'no errors initially';
+    is_deeply $mech->page_errors, [], 'no errors initially';
     $mech->submit_form_ok(
         {
             form_name => 'general_auth',
@@ -43,7 +43,7 @@ for my $test (
         "try to create an account with email '$email'"
     );
     is $mech->uri->path, '/auth', "still on auth page";
-    is_deeply $mech->form_errors, [ $error_message ], 'no errors initially';
+    is_deeply $mech->page_errors, [ $error_message ], 'no errors initially';
 }
 
 # create a new account
diff --git a/t/app/controller/contact.t b/t/app/controller/contact.t
index 970241d12..11e0d30cf 100644
--- a/t/app/controller/contact.t
+++ b/t/app/controller/contact.t
@@ -131,8 +131,7 @@ for my $test (
             message => '',
         },
         page_errors =>
-          [ 'There were problems with your report. Please see below.', ],
-        field_errors => [
+          [ 'There were problems with your report. Please see below.',
             'Please enter your name',
             'Please enter your email',
             'Please enter a subject',
@@ -147,8 +146,7 @@ for my $test (
             message => '',
         },
         page_errors =>
-          [ 'There were problems with your report. Please see below.', ],
-        field_errors => [
+          [ 'There were problems with your report. Please see below.',
             'Please enter your name',
             'Please enter a valid email address',
             'Please enter a subject',
@@ -162,9 +160,10 @@ for my $test (
             subject => '',
             message => '',
         },
-        page_errors =>
-          [ 'There were problems with your report. Please see below.', ],
-        field_errors => [ 'Please enter a subject', 'Please write a message', ]
+        page_errors => [
+            'There were problems with your report. Please see below.',
+            'Please enter a subject', 'Please write a message',
+        ]
     },
     {
         fields => {
@@ -173,9 +172,10 @@ for my $test (
             subject => 'A subject',
             message => '',
         },
-        page_errors =>
-          [ 'There were problems with your report. Please see below.', ],
-        field_errors => [ 'Please write a message', ]
+        page_errors => [
+            'There were problems with your report. Please see below.',
+            'Please write a message',
+        ]
     },
     {
         fields => {
@@ -184,9 +184,11 @@ for my $test (
             subject => '  ',
             message => '',
         },
-        page_errors =>
-          [ 'There were problems with your report. Please see below.', ],
-        field_errors => [ 'Please enter a subject', 'Please write a message', ]
+        page_errors => [
+            'There were problems with your report. Please see below.',
+            'Please enter a subject',
+            'Please write a message',
+        ]
     },
     {
         fields => {
@@ -195,9 +197,10 @@ for my $test (
             subject => 'A subject',
             message => ' ',
         },
-        page_errors =>
-          [ 'There were problems with your report. Please see below.', ],
-        field_errors => [ 'Please write a message', ]
+        page_errors => [
+            'There were problems with your report. Please see below.',
+            'Please write a message',
+        ]
     },
     {
         url    => '/contact?id=' . $problem_main->id,
@@ -209,7 +212,6 @@ for my $test (
             id      => 'invalid',
         },
         page_errors  => [ 'Illegal ID' ],
-        field_errors => []
     },
   )
 {
@@ -217,7 +219,6 @@ for my $test (
         $mech->get_ok( $test->{url} ? $test->{url} : '/contact' );
         $mech->submit_form_ok( { with_fields => $test->{fields} } );
         is_deeply $mech->page_errors, $test->{page_errors}, 'page errors';
-        is_deeply $mech->form_errors, $test->{field_errors}, 'field_errors';
 
         # we santise this when we submit so need to remove it
         delete $test->{fields}->{id}
diff --git a/t/app/controller/report_display.t b/t/app/controller/report_display.t
index 548580fe1..6c2733e36 100644
--- a/t/app/controller/report_display.t
+++ b/t/app/controller/report_display.t
@@ -209,7 +209,7 @@ for my $test (
         ),
         state => 'confirmed',
         banner_id => 'unknown',
-        banner_text => 'This problem is old and of unknown status.',
+        banner_text => 'unknown',
         fixed => 0
     },
     {
@@ -224,7 +224,7 @@ for my $test (
         ),
         state => 'fixed',
         banner_id => 'fixed',
-        banner_text => 'This problem has been fixed.',
+        banner_text => 'fixed',
         fixed => 1
     },
     {
@@ -232,7 +232,7 @@ for my $test (
         date => DateTime->now,
         state => 'fixed',
         banner_id => 'fixed',
-        banner_text => 'This problem has been fixed.',
+        banner_text => 'fixed',
         fixed => 1
     },
     {
@@ -240,7 +240,7 @@ for my $test (
         date => DateTime->now,
         state => 'fixed - user',
         banner_id => 'fixed',
-        banner_text => 'This problem has been fixed.',
+        banner_text => 'fixed',
         fixed => 1
     },
     {
@@ -248,7 +248,7 @@ for my $test (
         date => DateTime->now,
         state => 'fixed - council',
         banner_id => 'fixed',
-        banner_text => 'This problem has been fixed.',
+        banner_text => 'fixed',
         fixed => 1
     },
     {
@@ -256,7 +256,7 @@ for my $test (
         date => DateTime->now,
         state => 'closed',
         banner_id => 'closed',
-        banner_text => 'This problem has been closed.',
+        banner_text => 'closed',
         fixed => 0
     },
     {
@@ -264,7 +264,7 @@ for my $test (
         date => DateTime->now,
         state => 'investigating',
         banner_id => 'progress',
-        banner_text => 'This problem is in progress.',
+        banner_text => 'progress',
         fixed => 0
     },
     {
@@ -272,7 +272,7 @@ for my $test (
         date => DateTime->now,
         state => 'planned',
         banner_id => 'progress',
-        banner_text => 'This problem is in progress.',
+        banner_text => 'progress',
         fixed => 0
     },
     {
@@ -280,7 +280,7 @@ for my $test (
         date => DateTime->now,
         state => 'in progress',
         banner_id => 'progress',
-        banner_text => 'This problem is in progress.',
+        banner_text => 'progress',
         fixed => 0
     },
 ) {
@@ -299,7 +299,11 @@ for my $test (
         }
 
         is $banner->{id}, $test->{banner_id}, 'banner id';
-        is $banner->{text}, $test->{banner_text}, 'banner text';
+        if ($test->{banner_text}) {
+            ok $banner->{text} =~ /$test->{banner_text}/i, 'banner text';
+        } else {
+            is $banner->{text}, $test->{banner_text}, 'banner text';
+        }
 
         my $update_form = $mech->form_name( 'updateForm' );
         if ( $test->{fixed} ) {
diff --git a/t/app/controller/report_new.t b/t/app/controller/report_new.t
index 2875af537..909588766 100644
--- a/t/app/controller/report_new.t
+++ b/t/app/controller/report_new.t
@@ -374,7 +374,7 @@ foreach my $test (
         # submit initial pc form
         $mech->submit_form_ok( { with_fields => { pc => $test->{pc} } },
             "submit location" );
-        is_deeply $mech->form_errors, [], "no errors for pc '$test->{pc}'";
+        is_deeply $mech->page_errors, [], "no errors for pc '$test->{pc}'";
 
         # click through to the report page
         $mech->follow_link_ok( { text_regex => qr/skip this step/i, },
@@ -385,7 +385,7 @@ foreach my $test (
             "submit form" );
 
         # check that we got the errors expected
-        is_deeply $mech->form_errors, $test->{errors}, "check errors";
+        is_deeply $mech->page_errors, $test->{errors}, "check errors";
 
         # check that fields have changed as expected
         my $new_values = {
@@ -466,7 +466,7 @@ foreach my $test (
     );
 
     # check that we got the errors expected
-    is_deeply $mech->form_errors, [], "check there were no errors";
+    is_deeply $mech->page_errors, [], "check there were no errors";
 
     # check that the user has been created/ not changed
     my $user =
@@ -576,7 +576,7 @@ subtest "test password errors for a user who is signing in as they report" => su
     );
 
     # check that we got the errors expected
-    is_deeply $mech->form_errors, [
+    is_deeply $mech->page_errors, [
         "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the \x{2018}sign in by email\x{2019} section of the form.",
     ], "check there were errors";
 };
@@ -623,7 +623,7 @@ subtest "test report creation for a user who is signing in as they report" => su
     );
 
     # check that we got the errors expected
-    is_deeply $mech->form_errors, [
+    is_deeply $mech->page_errors, [
         'You have successfully signed in; please check and confirm your details are accurate:',
     ], "check there were errors";
 
@@ -801,7 +801,7 @@ subtest "check that a lat/lon off coast leads to /around" => sub {
     is $mech->uri->path, '/around', "redirected to '/around'";
 
     is_deeply         #
-      $mech->form_errors,
+      $mech->page_errors,
       [     'That spot does not appear to be covered by a council. If you have'
           . ' tried to report an issue past the shoreline, for example, please'
           . ' specify the closest point on land.' ],    #
diff --git a/t/app/controller/report_new_open311.t b/t/app/controller/report_new_open311.t
index dc3583e6b..863571ad0 100644
--- a/t/app/controller/report_new_open311.t
+++ b/t/app/controller/report_new_open311.t
@@ -113,10 +113,10 @@ foreach my $test (
         # submit initial pc form
         $mech->submit_form_ok( { with_fields => { pc => $test->{pc} } },
             "submit location" );
-        is_deeply $mech->form_errors, [], "no errors for pc '$test->{pc}'";
+        is_deeply $mech->page_errors, [], "no errors for pc '$test->{pc}'";
 
         # click through to the report page
-        $mech->follow_link_ok( { text => 'skip this step', },
+        $mech->follow_link_ok( { text_regex => qr/skip this step/i, },
             "follow 'skip this step' link" );
 
         # submit the main form
@@ -124,7 +124,7 @@ foreach my $test (
             "submit form" );
 
         # check that we got the errors expected
-        is_deeply $mech->form_errors, $test->{errors}, "check errors";
+        is_deeply $mech->page_errors, $test->{errors}, "check errors";
 
         # check that fields have changed as expected
         my $new_values = {
@@ -136,7 +136,7 @@ foreach my $test (
 
         if ( $test->{fields}->{category} eq 'Street lighting' ) {
             my $result = scraper {
-                process 'div#category_meta div select#form_type option', 'option[]' => '@value';
+                process 'select#form_type option', 'option[]' => '@value';
             }
             ->scrape( $mech->response );
 
diff --git a/t/app/controller/report_updates.t b/t/app/controller/report_updates.t
index 0337a881b..cf6af16cb 100644
--- a/t/app/controller/report_updates.t
+++ b/t/app/controller/report_updates.t
@@ -271,7 +271,7 @@ for my $test (
         $mech->submit_form_ok( { with_fields => $test->{fields} },
             'submit update' );
 
-        is_deeply $mech->form_errors, $test->{field_errors}, 'field errors';
+        is_deeply $mech->page_errors, $test->{field_errors}, 'field errors';
 
         my $values = {
             %{ $test->{fields} },
@@ -640,7 +640,7 @@ for my $test (
             'submit update'
         );
 
-        is_deeply $mech->form_errors, $test->{field_errors}, 'check there were errors';
+        is_deeply $mech->page_errors, $test->{field_errors}, 'check there were errors';
 
         SKIP: {
             skip( "Incorrect password", 5 ) unless $test->{form_values}{password_sign_in} eq $pw;