diff options
Diffstat (limited to 't/app/controller')
| -rw-r--r-- | t/app/controller/admin.t | 15 | ||||
| -rw-r--r-- | t/app/controller/index.t | 6 | ||||
| -rw-r--r-- | t/app/controller/report_new.t | 6 |
3 files changed, 18 insertions, 9 deletions
diff --git a/t/app/controller/admin.t b/t/app/controller/admin.t index bf7a9ed70..1757e386f 100644 --- a/t/app/controller/admin.t +++ b/t/app/controller/admin.t @@ -181,9 +181,9 @@ subtest 'check contact creation' => sub { } } ); $mech->content_contains( 'test category' ); - $mech->content_contains( '<td>test@example.com' ); + $mech->content_contains( 'test@example.com' ); $mech->content_contains( '<td>test note' ); - $mech->content_contains( '<td>Public' ); + $mech->content_contains( 'Private: No' ); $mech->submit_form_ok( { with_fields => { category => 'private category', @@ -193,7 +193,7 @@ subtest 'check contact creation' => sub { } } ); $mech->content_contains( 'private category' ); - $mech->content_contains( '<td>Non Public' ); + $mech->content_contains( 'Private: Yes' ); $mech->submit_form_ok( { with_fields => { category => 'test/category', @@ -215,17 +215,18 @@ subtest 'check contact editing' => sub { } } ); $mech->content_contains( 'test category' ); - $mech->content_contains( '<td>test2@example.com' ); + $mech->content_contains( 'test2@example.com' ); $mech->content_contains( '<td>test2 note' ); - $mech->content_contains( '<td>Public' ); + $mech->content_contains( 'Private: No' ); + $mech->get_ok('/admin/body_edit/2650/test%20category'); $mech->submit_form_ok( { with_fields => { email => 'test2@example.com', note => 'test2 note', non_public => 'on', } } ); - $mech->content_contains( '<td>Non Public' ); + $mech->content_contains( 'Private: Yes' ); $mech->get_ok('/admin/body_edit/2650/test%20category'); $mech->content_contains( '<td><strong>test2@example.com' ); @@ -241,7 +242,7 @@ subtest 'check contact updating' => sub { $mech->tick( 'confirmed', 'test category' ); $mech->submit_form_ok({form_number => 1}); - $mech->content_like(qr'test2@example.com</td>[^<]*<td>Yes's); + $mech->content_like(qr'test2@example.com</td>[^<]*<td>\s*Confirmed: Yes's); $mech->get_ok('/admin/body_edit/2650/test%20category'); $mech->content_like(qr{test2\@example.com[^<]*</td>[^<]*<td><strong>Yes}s); }; diff --git a/t/app/controller/index.t b/t/app/controller/index.t index 7fc15ab4b..308dd2c32 100644 --- a/t/app/controller/index.t +++ b/t/app/controller/index.t @@ -13,7 +13,11 @@ subtest "check that the form goes to /around" => sub { is $mech->uri->path, '/', "still on '/'"; # submit form - $mech->submit_form_ok( { with_fields => { pc => 'SW1A 1AA', } } ); + FixMyStreet::override_config { + MAPIT_URL => 'http://mapit.mysociety.org/', + }, sub { + $mech->submit_form_ok( { with_fields => { pc => 'SW1A 1AA', } } ); + }; # check that we are at /around is $mech->uri->path, '/around', "Got to /around"; diff --git a/t/app/controller/report_new.t b/t/app/controller/report_new.t index 79072bcfe..92bc54ba4 100644 --- a/t/app/controller/report_new.t +++ b/t/app/controller/report_new.t @@ -25,7 +25,11 @@ subtest "test that bare requests to /report/new get redirected" => sub { is $mech->uri->path, '/', "went to /"; is_deeply { $mech->uri->query_form }, {}, "query empty"; - $mech->get_ok('/report/new?pc=SW1A%201AA'); + FixMyStreet::override_config { + MAPIT_URL => 'http://mapit.mysociety.org/', + }, sub { + $mech->get_ok('/report/new?pc=SW1A%201AA'); + }; is $mech->uri->path, '/around', "went to /around"; is_deeply { $mech->uri->query_form }, { pc => 'SW1A 1AA' }, "pc correctly transferred"; |