diff options
| author | Struan Donald <struan@exo.org.uk> | 2012-05-16 18:09:46 +0100 |
|---|---|---|
| committer | Struan Donald <struan@exo.org.uk> | 2012-05-16 18:09:46 +0100 |
| commit | 51901828ee898f05f515abfabac635453666ee7b (patch) | |
| tree | 78c65a3c5e1d5a1afc4f70ff73912cda45fd3ec2 | |
| parent | 23aa50cd6e1fb77de2d1e3ae8d29a8f8408a7930 (diff) | |
make banner tests a bit more tolerant
| -rw-r--r-- | perllib/FixMyStreet/TestMech.pm | 1 | ||||
| -rw-r--r-- | t/app/controller/report_updates.t | 20 |
2 files changed, 17 insertions, 4 deletions
diff --git a/perllib/FixMyStreet/TestMech.pm b/perllib/FixMyStreet/TestMech.pm index 7daf01f56..dc42c1aba 100644 --- a/perllib/FixMyStreet/TestMech.pm +++ b/perllib/FixMyStreet/TestMech.pm @@ -225,6 +225,7 @@ sub form_errors { my $result = scraper { process 'div.form-error', 'errors[]', 'TEXT'; process 'p.form-error', 'errors[]', 'TEXT'; + process 'p.error', 'errors[]', 'TEXT'; } ->scrape( $mech->response ); return $result->{errors} || []; diff --git a/t/app/controller/report_updates.t b/t/app/controller/report_updates.t index 9c2b0861b..0337a881b 100644 --- a/t/app/controller/report_updates.t +++ b/t/app/controller/report_updates.t @@ -872,7 +872,11 @@ for my $test ( is_deeply $values, $test->{initial_values}, 'initial form values'; - is $mech->extract_problem_banner->{text}, $test->{initial_banner}, 'initial banner'; + if ( !defined( $test->{initial_banner} ) ) { + is $mech->extract_problem_banner->{text}, undef, 'initial banner'; + } else { + like $mech->extract_problem_banner->{text}, qr/@{[ $test->{initial_banner} ]}/i, 'initial banner'; + } $mech->submit_form_ok( { @@ -883,7 +887,11 @@ for my $test ( is $mech->uri->path, "/report/" . $report_id, "redirected to report page"; - is $mech->extract_problem_banner->{text}, $test->{endstate_banner}, 'submitted banner'; + if ( !defined( $test->{endstate_banner} ) ) { + is $mech->extract_problem_banner->{text}, undef, 'endstate banner'; + } else { + like $mech->extract_problem_banner->{text}, qr/@{[ $test->{endstate_banner} ]}/i, 'endstate banner'; + } $mech->email_count_is(0); @@ -1029,8 +1037,12 @@ foreach my $test ( is_deeply $values, $test->{initial_values}, 'initial form values'; - is $mech->extract_problem_banner->{text}, $test->{initial_banner}, - 'initial banner'; + if ( !defined( $test->{initial_banner} ) ) { + is $mech->extract_problem_banner->{text}, undef, 'initial banner'; + } else { + like $mech->extract_problem_banner->{text}, qr/@{[ $test->{initial_banner} ]}/i, + 'initial banner'; + } $mech->submit_form_ok( { with_fields => $test->{fields}, }, 'submit update' ); |