Refactor Script::Report into an object.

2 files changed, 4 insertions, 3 deletions

diff --git a/t/app/sendreport/email.t b/t/app/sendreport/email.t
index 7480d6aab..cfd70a097 100644
--- a/t/app/sendreport/email.t
+++ b/t/app/sendreport/email.t
@@ -63,8 +63,9 @@ foreach my $test ( {
         is $e->build_recipient_list( $row, {} ), $test->{count}, 'correct recipient list count';
 
         if ( $test->{unconfirmed} ) {
-            is_deeply $e->unconfirmed_counts, { 'council@example.com' => { 'category' => 1 } }, 'correct unconfirmed_counts count';
-            is_deeply $e->unconfirmed_notes, { 'council@example.com' => { 'category' => $test->{expected_note} } }, 'correct note used';
+            is_deeply $e->unconfirmed_data, { 'council@example.com' => {
+                'category' => { 'count' => 1, 'note' => $test->{expected_note} }
+            } }, 'correct unconfirmed_data';
         }
     };
 }
diff --git a/t/cobrand/bexley.t b/t/cobrand/bexley.t
index b8682edad..55ee1278e 100644
--- a/t/cobrand/bexley.t
+++ b/t/cobrand/bexley.t
@@ -156,7 +156,7 @@ FixMyStreet::override_config {
 
         $mech->submit_form_ok({ with_fields => { category => 'Gulley covers' } });
         $test_data = FixMyStreet::Script::Reports::send();
-        is $test_data, undef, 'Report not resent';
+        is_deeply $test_data, {}, 'Report not resent';
 
         $mech->submit_form_ok({ with_fields => { category => 'Lamp post' } });
         $test_data = FixMyStreet::Script::Reports::send();