diff options
Diffstat (limited to 't/app')
| -rw-r--r-- | t/app/model/problem.t | 13 | ||||
| -rw-r--r-- | t/app/sendreport/inspection_required.t | 12 |
2 files changed, 13 insertions, 12 deletions
diff --git a/t/app/model/problem.t b/t/app/model/problem.t index efc9057da..27f6aed66 100644 --- a/t/app/model/problem.t +++ b/t/app/model/problem.t @@ -2,6 +2,7 @@ use FixMyStreet::TestMech; use FixMyStreet; use FixMyStreet::App; use FixMyStreet::DB; +use FixMyStreet::Script::Reports; use Sub::Override; my $problem_rs = FixMyStreet::DB->resultset('Problem'); @@ -541,7 +542,7 @@ foreach my $test ( { } ); FixMyStreet::override_config $override, sub { - $problem_rs->send_reports(); + FixMyStreet::Script::Reports::send(); }; $mech->email_count_is( $test->{ email_count } ); @@ -619,7 +620,7 @@ subtest 'check can set mutiple emails as a single contact' => sub { } ); FixMyStreet::override_config $override, sub { - $problem_rs->send_reports(); + FixMyStreet::Script::Reports::send(); }; $mech->email_count_is(1); @@ -652,7 +653,7 @@ subtest 'check can turn on report sent email alerts' => sub { send_fail_count => 0, } ); - $problem_rs->send_reports(); + FixMyStreet::Script::Reports::send(); $mech->email_count_is( 2 ); my @emails = $mech->get_email; @@ -698,7 +699,7 @@ subtest 'check iOS app store test reports not sent' => sub { send_fail_count => 0, } ); - $problem_rs->send_reports(); + FixMyStreet::Script::Reports::send(); $mech->email_count_is( 0 ); @@ -727,7 +728,7 @@ subtest 'check reports from abuser not sent' => sub { send_fail_count => 0, } ); - $problem_rs->send_reports(); + FixMyStreet::Script::Reports::send(); $mech->email_count_is( 1 ); @@ -743,7 +744,7 @@ subtest 'check reports from abuser not sent' => sub { my $abuse = FixMyStreet::DB->resultset('Abuse')->create( { email => $problem->user->email } ); $mech->clear_emails_ok; - $problem_rs->send_reports(); + FixMyStreet::Script::Reports::send(); $mech->email_count_is( 0 ); diff --git a/t/app/sendreport/inspection_required.t b/t/app/sendreport/inspection_required.t index c8cb30592..03c7ff944 100644 --- a/t/app/sendreport/inspection_required.t +++ b/t/app/sendreport/inspection_required.t @@ -1,7 +1,7 @@ use FixMyStreet; use FixMyStreet::DB; use FixMyStreet::TestMech; -use FixMyStreet::SendReport::Email; +use FixMyStreet::Script::Reports; ok( my $mech = FixMyStreet::TestMech->new, 'Created mech object' ); @@ -31,7 +31,7 @@ my $report = $reports[0]; subtest "Report isn't sent if uninspected" => sub { $mech->clear_emails_ok; - FixMyStreet::DB->resultset('Problem')->send_reports(); + FixMyStreet::Script::Reports::send(); $mech->email_count_is( 0 ); is $report->whensent, undef, "Report hasn't been sent"; @@ -42,7 +42,7 @@ subtest 'Report is sent when inspected' => sub { $report->set_extra_metadata(inspected => 1); $report->update; - FixMyStreet::DB->resultset('Problem')->send_reports(); + FixMyStreet::Script::Reports::send(); $report->discard_changes; $mech->email_count_is( 1 ); @@ -61,7 +61,7 @@ subtest 'Uninspected report is sent when made by trusted user' => sub { }); ok $user->has_permission_to('trusted', $report->bodies_str_ids), 'User can make trusted reports'; - FixMyStreet::DB->resultset('Problem')->send_reports(); + FixMyStreet::Script::Reports::send(); $report->discard_changes; $mech->email_count_is( 1 ); @@ -81,7 +81,7 @@ subtest "Uninspected report isn't sent when user rep is too low" => sub { $contact->set_extra_metadata(reputation_threshold => 20); $contact->update; - FixMyStreet::DB->resultset('Problem')->send_reports(); + FixMyStreet::Script::Reports::send(); $report->discard_changes; $mech->email_count_is( 0 ); @@ -92,7 +92,7 @@ subtest 'Uninspected report is sent when user rep is high enough' => sub { $user->set_extra_metadata(reputation => 21); $user->update; - FixMyStreet::DB->resultset('Problem')->send_reports(); + FixMyStreet::Script::Reports::send(); $report->discard_changes; $mech->email_count_is( 1 ); |