2 files changed, 1 insertions, 30 deletions

diff --git a/t/app/controller/report_inspect.t b/t/app/controller/report_inspect.t
index ef05288c7..d319f778a 100644
--- a/t/app/controller/report_inspect.t
+++ b/t/app/controller/report_inspect.t
@@ -144,7 +144,7 @@ FixMyStreet::override_config {
         $mech->get_ok("/report/$report_id");
         $mech->submit_form_ok({ button => 'save', with_fields => {
             public_update => "This is a public update.", include_update => "1",
-            state => 'action scheduled', raise_defect => 1,
+            state => 'action scheduled',
         } });
         $mech->get_ok("/report/$report_id");
         $mech->submit_form_ok({ with_fields => {
@@ -153,28 +153,23 @@ FixMyStreet::override_config {
         $report->discard_changes;
         my $comment = ($report->comments( undef, { order_by => { -desc => 'id' } } )->all)[1]->text;
         is $comment, "This is a public update.", 'Update was created';
-        is $report->get_extra_metadata('inspected'), 1, 'report marked as inspected';
         is $report->user->get_extra_metadata('reputation'), $reputation, "User reputation wasn't changed";
         $mech->get_ok("/report/$report_id");
         my $meta = $mech->extract_update_metas;
         like $meta->[0], qr/State changed to: Action scheduled/, 'First update mentions action scheduled';
-        like $meta->[2], qr/Posted by .*defect raised/, 'Update mentions defect raised';
 
         $user->unset_extra_metadata('categories');
         $user->update;
     };
 
     subtest "test update is required when instructing" => sub {
-        $report->unset_extra_metadata('inspected');
         $report->update;
-        $report->inspection_log_entry->delete;
         $report->comments->delete_all;
         $mech->get_ok("/report/$report_id");
         $mech->submit_form_ok({ button => 'save', with_fields => { public_update => undef, include_update => "1" } });
         is_deeply $mech->page_errors, [ "Please provide a public update for this report." ], 'errors match';
         $report->discard_changes;
         is $report->comments->count, 0, "Update wasn't created";
-        is $report->get_extra_metadata('inspected'), undef, 'report not marked as inspected';
     };
 
     subtest "test location changes" => sub {
@@ -627,7 +622,6 @@ FixMyStreet::override_config {
 
     subtest "test positive reputation" => sub {
         $user->user_body_permissions->create({ body => $oxon, permission_type => 'report_instruct' });
-        $report->unset_extra_metadata('inspected');
         $report->update;
         $report->inspection_log_entry->delete if $report->inspection_log_entry;
         my $reputation = $report->user->get_extra_metadata("reputation") || 0;
@@ -636,24 +630,16 @@ FixMyStreet::override_config {
             state => 'in progress', include_update => undef,
         } });
         $report->discard_changes;
-        is $report->get_extra_metadata('inspected'), undef, 'report not marked as inspected';
 
         $mech->submit_form_ok({ button => 'save', with_fields => {
             state => 'action scheduled', include_update => undef,
         } });
         $report->discard_changes;
-        is $report->get_extra_metadata('inspected'), undef, 'report not marked as inspected';
         is $report->user->get_extra_metadata('reputation'), $reputation+1, "User reputation was increased";
 
         $mech->submit_form_ok({ button => 'save', with_fields => {
             state => 'action scheduled', include_update => undef,
-            raise_defect => 1,
         } });
-        $report->discard_changes;
-        is $report->get_extra_metadata('inspected'), 1, 'report marked as inspected';
-        $mech->get_ok("/report/$report_id");
-        my $meta = $mech->extract_update_metas;
-        like $meta->[-1], qr/Updated by .*defect raised/, 'Update mentions defect raised';
     };
 
     subtest "Oxfordshire-specific traffic management options are shown" => sub {
diff --git a/t/app/sendreport/inspection_required.t b/t/app/sendreport/inspection_required.t
index 64d6f70ee..5eff516f5 100644
--- a/t/app/sendreport/inspection_required.t
+++ b/t/app/sendreport/inspection_required.t
@@ -34,21 +34,8 @@ subtest "Report isn't sent if uninspected" => sub {
     is $report->whensent, undef, "Report hasn't been sent";
 };
 
-subtest 'Report is sent when inspected' => sub {
-    $mech->clear_emails_ok;
-    $report->set_extra_metadata(inspected => 1);
-    $report->update;
-
-    FixMyStreet::Script::Reports::send();
-
-    $report->discard_changes;
-    $mech->email_count_is( 1 );
-    ok $report->whensent, 'Report marked as sent';
-};
-
 subtest 'Uninspected report is sent when made by trusted user' => sub {
     $mech->clear_emails_ok;
-    $report->unset_extra_metadata('inspected');
     $report->whensent( undef );
     $report->update;
 
@@ -63,7 +50,6 @@ subtest 'Uninspected report is sent when made by trusted user' => sub {
     $report->discard_changes;
     $mech->email_count_is( 1 );
     ok $report->whensent, 'Report marked as sent';
-    is $report->get_extra_metadata('inspected'), undef, 'Report not marked as inspected';
 };
 
 subtest "Uninspected report isn't sent when user rep is too low" => sub {
@@ -94,7 +80,6 @@ subtest 'Uninspected report is sent when user rep is high enough' => sub {
     $report->discard_changes;
     $mech->email_count_is( 1 );
     ok $report->whensent, 'Report marked as sent';
-    is $report->get_extra_metadata('inspected'), undef, 'Report not marked as inspected';
 };
 
 done_testing();