From 8e6d48d5ee351594fc92f1e680ba4a2219ed57ca Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Thu, 15 Jan 2015 15:33:21 +0000 Subject: Remove need for cron-wrapper with existing scripts Call the necessary boilerplate in each script so you can call them directly. Remove boilerplate from files that don't need it. --- t/app/controller/reports.t | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 't/app/controller') diff --git a/t/app/controller/reports.t b/t/app/controller/reports.t index 1b4fc3526..ecb43f447 100644 --- a/t/app/controller/reports.t +++ b/t/app/controller/reports.t @@ -85,7 +85,7 @@ $fife_problems[10]->update( { }); # Run the cron script that makes the data for /reports so we don't get an error. -system( "bin/cron-wrapper update-all-reports" ); +system( "bin/update-all-reports" ); # check that we can get the page $mech->get_ok('/reports'); -- cgit v1.2.3 From c4d726bacd492bd4281b9eddbdc29d3190444d3c Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Tue, 20 Jan 2015 12:51:07 +0000 Subject: Rename 'body_edit' admin endpoint to 'body'. --- t/app/controller/admin.t | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 't/app/controller') diff --git a/t/app/controller/admin.t b/t/app/controller/admin.t index 9ff5b5c90..58d7e0e96 100644 --- a/t/app/controller/admin.t +++ b/t/app/controller/admin.t @@ -201,12 +201,12 @@ subtest 'check contact creation' => sub { note => 'test/note', non_public => 'on', } } ); - $mech->get_ok('/admin/body_edit/' . $body->id . '/test/category'); + $mech->get_ok('/admin/body/' . $body->id . '/test/category'); }; subtest 'check contact editing' => sub { - $mech->get_ok('/admin/body_edit/' . $body->id .'/test%20category'); + $mech->get_ok('/admin/body/' . $body->id .'/test%20category'); $mech->submit_form_ok( { with_fields => { email => 'test2@example.com', @@ -219,7 +219,7 @@ subtest 'check contact editing' => sub { $mech->content_contains( 'test2 note' ); $mech->content_contains( 'Private: No' ); - $mech->get_ok('/admin/body_edit/' . $body->id . '/test%20category'); + $mech->get_ok('/admin/body/' . $body->id . '/test%20category'); $mech->submit_form_ok( { with_fields => { email => 'test2@example.com', note => 'test2 note', @@ -228,12 +228,12 @@ subtest 'check contact editing' => sub { $mech->content_contains( 'Private: Yes' ); - $mech->get_ok('/admin/body_edit/' . $body->id . '/test%20category'); + $mech->get_ok('/admin/body/' . $body->id . '/test%20category'); $mech->content_contains( 'test2@example.com' ); }; subtest 'check contact updating' => sub { - $mech->get_ok('/admin/body_edit/' . $body->id . '/test%20category'); + $mech->get_ok('/admin/body/' . $body->id . '/test%20category'); $mech->content_like(qr{test2\@example.com[^<]*[^<]*No}s); $mech->get_ok('/admin/body/' . $body->id); @@ -243,7 +243,7 @@ subtest 'check contact updating' => sub { $mech->submit_form_ok({form_number => 1}); $mech->content_like(qr'test2@example.com[^<]*\s*Confirmed: Yes's); - $mech->get_ok('/admin/body_edit/' . $body->id . '/test%20category'); + $mech->get_ok('/admin/body/' . $body->id . '/test%20category'); $mech->content_like(qr{test2\@example.com[^<]*[^<]*Yes}s); }; -- cgit v1.2.3 From 18ab1363f57e5db40a1103c1c89cb423de1b5274 Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Tue, 20 Jan 2015 13:05:42 +0000 Subject: Add tests for admin message, cobrand email alert. --- t/app/controller/admin.t | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 't/app/controller') diff --git a/t/app/controller/admin.t b/t/app/controller/admin.t index 58d7e0e96..f63a72117 100644 --- a/t/app/controller/admin.t +++ b/t/app/controller/admin.t @@ -266,7 +266,7 @@ subtest 'check open311 configuring' => sub { } ); $mech->content_contains('Council contacts configured via Open311'); - $mech->content_contains('Configuration updated - contacts will be generated automatically later'); + $mech->content_contains('Values updated'); my $conf = FixMyStreet::App->model('DB::Body')->find( $body->id ); is $conf->endpoint, 'http://example.com/open311', 'endpoint configured'; @@ -286,7 +286,7 @@ subtest 'check open311 configuring' => sub { } ); - $mech->content_contains('Configuration updated'); + $mech->content_contains('Values updated'); $conf = FixMyStreet::App->model('DB::Body')->find( $body->id ); is $conf->endpoint, 'http://example.org/open311', 'endpoint updated'; -- cgit v1.2.3