diff options
Diffstat (limited to 't/cobrand')
| -rw-r--r-- | t/cobrand/bexley.t | 6 | ||||
| -rw-r--r-- | t/cobrand/isleofwight.t | 4 | ||||
| -rw-r--r-- | t/cobrand/westminster.t | 4 |
3 files changed, 9 insertions, 5 deletions
diff --git a/t/cobrand/bexley.t b/t/cobrand/bexley.t index 3937129d3..480f1ce2d 100644 --- a/t/cobrand/bexley.t +++ b/t/cobrand/bexley.t @@ -45,7 +45,7 @@ FixMyStreet::override_config { MAPIT_URL => 'http://mapit.uk/', MAP_TYPE => 'Bexley', STAGING_FLAGS => { send_reports => 1, skip_checks => 0 }, - COBRAND_FEATURES => { open311_email => { bexley => { p1 => 'p1@bexley', lighting => 'thirdparty@notbexley.example.com' } } }, + COBRAND_FEATURES => { open311_email => { bexley => { p1 => 'p1@bexley', lighting => 'thirdparty@notbexley.example.com,another@notbexley.example.com' } } }, }, sub { subtest 'cobrand displays council name' => sub { @@ -81,9 +81,9 @@ FixMyStreet::override_config { { 'name' => 'dangerous', description => 'Was it dangerous?', 'value' => 'Yes' }, { 'name' => 'reportType', description => 'Type of report', 'value' => 'Vandalism' }, ] }, - { category => 'Lamp post', code => 'LAMP', email => 'thirdparty', + { category => 'Lamp post', code => 'LAMP', email => 'thirdparty.*another', extra => { 'name' => 'dangerous', description => 'Was it dangerous?', 'value' => 'No' } }, - { category => 'Lamp post', code => 'LAMP', email => 'p1.*thirdparty', + { category => 'Lamp post', code => 'LAMP', email => 'thirdparty.*another', extra => { 'name' => 'dangerous', description => 'Was it dangerous?', 'value' => 'Yes' } }, ) { ($report) = $mech->create_problems_for_body(1, $body->id, 'On Road', { diff --git a/t/cobrand/isleofwight.t b/t/cobrand/isleofwight.t index 67088bc54..1eb710e97 100644 --- a/t/cobrand/isleofwight.t +++ b/t/cobrand/isleofwight.t @@ -255,7 +255,7 @@ subtest "fixing passes along the correct message" => sub { like $cgi->param('description'), qr/^FMS-Update:/, 'FMS update prefix included'; unlike $cgi->param('description'), qr/The customer indicated that this issue had been fixed/, 'No fixed message included'; - $c = $mech->create_comment_for_problem($p, $p->user, 'Name', 'Update text', 'f', 'confirmed', 'fixed - user', { confirmed => \'current_timestamp' }); + $c = $mech->create_comment_for_problem($p, $p->user, 'Name', 'Update text', 'f', 'confirmed', 'fixed - user'); $c->discard_changes; # Otherwise cannot set_nanosecond $id = $o->post_service_request_update($c); @@ -367,7 +367,7 @@ my $alert = FixMyStreet::App->model('DB::Alert')->create( { } )->confirm; subtest "sends branded alert emails" => sub { - $mech->create_comment_for_problem($p, $system_user, 'Other User', 'This is some update text', 'f', 'confirmed', undef, { confirmed => DateTime->now->add( minutes => 5 ) }); + $mech->create_comment_for_problem($p, $system_user, 'Other User', 'This is some update text', 'f', 'confirmed', undef); $mech->clear_emails_ok; FixMyStreet::override_config { diff --git a/t/cobrand/westminster.t b/t/cobrand/westminster.t index 303401de6..84def0917 100644 --- a/t/cobrand/westminster.t +++ b/t/cobrand/westminster.t @@ -3,6 +3,10 @@ use Test::MockModule; use FixMyStreet::TestMech; use FixMyStreet::Script::Reports; +# disable info logs for this test run +FixMyStreet::App->log->disable('info'); +END { FixMyStreet::App->log->enable('info'); } + ok( my $mech = FixMyStreet::TestMech->new, 'Created mech object' ); my $cobrand = Test::MockModule->new('FixMyStreet::Cobrand::Westminster'); |