Merge branch '6.0/update-investigation-tests'

Author: cbrandtbuffalo

html/Callbacks/RTIR/Ticket/Create.html/BeforeCreate

@@ -116,7 +116,7 @@ unless ($$skip_create) {
         results => $results,
     );
 
-    if ( $ARGSRef->{CreateWithInvestigation} ) {
+    if ( $ARGSRef->{InvestigationSubmitTicket} ) {
         $$checks_failure_ref += RT::IR->FilterRTAddresses(
             ARGSRef => \%ARGS,
             Fields => {

html/RTIR/Incident/Create.html

@@ -60,11 +60,4 @@
 
 <%ARGS>
 $Title                   => loc("Create a new Incident")
-
-$CreateWithInvestigation => 0
-$CreateIncident          => $CreateWithInvestigation
-
-$Split                   => undef
-
-$Child                   => undef
 </%ARGS>

lib/RT/IR/Test/Web.pm

@@ -259,14 +259,14 @@ sub create_incident_and_investigation {
 
     local $Test::Builder::Level = $Test::Builder::Level + 1;
 
-    if($ir_id) {
-        $self->display_ticket( $ir_id );
+    if ($ir_id) {
+        $self->display_ticket($ir_id);
+
         # Select the "New" link from the Display page
-        $self->follow_link_ok({text => "New"}, "Followed 'New (Incident)' link");
+        $self->follow_link_ok( { id => "create-incident" }, "Followed 'New (Incident)' link" );
     }
-    else 
-    {
-        $self->goto_create_rtir_ticket('Incidents'.($constituency?' - '.$constituency : ''));
+    else {
+        $self->goto_create_rtir_ticket( 'Incidents' . ( $constituency ? ' - ' . $constituency : '' ) );
     }
 
     # Fill out forms
@@ -277,9 +277,17 @@ sub create_incident_and_investigation {
     }
 
     while (my ($f, $v) = each %$cfs) {
-        $self->set_custom_field( 'Incidents'.($constituency ? ' - '.$constituency:''), $f, $v);
+        if ( $f =~ s!Investigation!! ) {
+            my $field_name
+                = $self->custom_field_input( 'Investigations' . ( $constituency ? ' - ' . $constituency : '' ), $f )
+                or next;
+            $self->field( "Investigation$field_name", $v );
+        }
+        else {
+            $self->set_custom_field( 'Incidents'.($constituency ? ' - '.$constituency:''), $f, $v);
+        }
     }
-    $self->click("CreateWithInvestigation");
+    $self->click("InvestigationSubmitTicket");
     my $msg = $ir_id
         ? "Attempting to create new incident and investigation linked to child $ir_id"
         : "Attempting to create new incident and investigation";

t/002-test-reject.t

@@ -169,5 +169,4 @@ diag "test that after bulk reject links to incidents are still there" if $ENV{'T
     $agent->has_tag('a', "$id", 'we have link to ticket');
 }
 
-undef $agent;
 done_testing;

t/003-resolve-IR-when-all-incidents-resolved.t

@@ -43,7 +43,6 @@ like(
 
 ir_status('resolved');
 
-undef $agent;
 done_testing;
 
 sub ir_status {

t/005-resolve-investigations.t

@@ -32,5 +32,4 @@ like($agent->content, qr/Status changed from \S*open\S* to \S*resolved\S*/, "sit
 $agent->follow_link_ok({text => "Re-open"}, "Followed 'open' link");
 like($agent->content, qr/Status changed from \S*resolved\S* to \S*open\S*/, "site says ticket got re-opened");
 
-undef $agent;
 done_testing;

t/006-saved-searches.t

@@ -72,5 +72,4 @@ is($agent->value('SavedSearchOwner'), $DT_id, "privacy is correct");
 
 # ... should also do tests for the RTIR "refine" thing, which is like QB.
 
-undef $agent;
 done_testing;

t/009-attachments-processing.t

@@ -232,5 +232,4 @@ $agent->goto_create_rtir_ticket('Countermeasures');
     unlink $filename or die "couldn't delete file '$filename': $!";
 }
 
-undef $agent;
 done_testing;

t/010-bulk-reject.t

@@ -65,5 +65,4 @@ foreach( @irs ) {
     $agent->ticket_status_is( $_, 'rejected', "Ticket #$_ is rejected" );
 }
 
-undef $agent;
 done_testing;

t/011-merge.t

@@ -108,5 +108,4 @@ diag "merge two IRs that are linked to different Incidents" if $ENV{'TEST_VERBOS
     $agent->ticket_is_linked_to_inc( $ir1_id, [$inc1_id, $inc2_id] );
 }
 
-undef $agent;
 done_testing;