[Rt-commit] rtir branch, 4.2/restore-previous-menu-2, repushed

[Blaine Motsinger]

The branch 4.2/restore-previous-menu-2 was deleted and repushed:
       was 3a26a4e9e2529b2fba852e89554d19999b84fd1b
       now 15bb25c98cfb1bf12ee547ad6d44c4c93a80ae60

 1: 9c64af32 =  1: 9c64af32 Restore RTIR menu into single parent
 2: 39a3da54 =  2: 39a3da54 Align menu item with queue name for Incident Reports
 3: 520265b9 =  3: 520265b9 Explain menu change in UPGRADING doc
 4: 56765d4e =  4: 56765d4e Load incident create page without a queue
 5: db1ca1c6 =  5: db1ca1c6 Link directly to create pages in menus
 6: 62f0065f =  6: 62f0065f Update tests to find links after menu updates
 7: d8d63ae7 =  7: d8d63ae7 Link directly to updated create page rather than modal
 8: e8c54449 =  8: e8c54449 Fix form name for creating tickets in tests
 9: 737e6174 =  9: 737e6174 Remove unneeded method call to fix tests
10: 3d0fbecb = 10: 3d0fbecb Fix test regex for file link names
11: 578343e7 = 11: 578343e7 Remove CreateInQueue modal element and JS
12: 92ae79de = 12: 92ae79de Add deprecated warning to CreateInQueue.html
13: 38100fcd < --:  ------- Fix default queue on create pages
--:  ------- > 13: 1eca5131 Fix default queue on create pages
14: ba174a19 = 14: a3660775 Update test library to create tickets directly
15: 3e879d7a ! 15: 15bb25c9 Update test for modal removal
    @@ -246,24 +246,19 @@
     +
     +diag "check queue visibility when created from incident" if $ENV{'TEST_VERBOSE'};
     +{
    -+    my $i = RT::Ticket->new( $rtir_user );
    -+    ($ok, $msg) = $i->Create(
    -+        Subject => 'test incident',
    -+        Queue => 'Incidents - GOVNET',
    -+    );
    -+    ok($ok, 'created test incident');
    -+
    -+    $m->get("$baseurl/RTIR/Create.html?Lifecycle=incident_reports&Incident=".$i->id);
    ++    my $id = $m->create_rtir_ticket_ok( 'Incidents - GOVNET', { Subject => 'test incident' } );
    ++
    ++    $m->get("$baseurl/RTIR/Create.html?Lifecycle=incident_reports&Incident=$id");
     +    $m->content_like(qr{Incident Reports - GOVNET</option>}, 'Queue dropdown has GOVNET incident reports queue');
     +    $m->content_unlike(qr{Incident Reports</option>}, 'Queue dropdown doesn\'t have standard incident reports queue');
     +    $m->content_unlike(qr{Incident Reports - EDUNET</option>}, 'Queue dropdown doesn\'t have EDUNET incident reports queue');
     +
    -+    $m->get("$baseurl/RTIR/Create.html?Lifecycle=investigations&Incident=".$i->id);
    ++    $m->get("$baseurl/RTIR/Create.html?Lifecycle=investigations&Incident=$id");
     +    $m->content_like(qr{Investigations - GOVNET</option>}, 'Queue dropdown has GOVNET investigations queue');
     +    $m->content_unlike(qr{Investigations</option>}, 'Queue dropdown doesn\'t have standard investigations queue');
     +    $m->content_unlike(qr{Investigations - EDUNET</option>}, 'Queue dropdown doesn\'t have EDUNET investigations queue');
     +
    -+    $m->get("$baseurl/RTIR/Create.html?Lifecycle=countermeasures&Incident=".$i->id);
    ++    $m->get("$baseurl/RTIR/Create.html?Lifecycle=countermeasures&Incident=$id");
     +    $m->content_like(qr{Countermeasures - GOVNET</option>}, 'Queue dropdown has GOVNET countermeasures queue');
     +    $m->content_unlike(qr{Countermeasures</option>}, 'Queue dropdown doesn\'t have standard countermeasures queue');
     +    $m->content_unlike(qr{Countermeasures - EDUNET</option>}, 'Queue dropdown doesn\'t have EDUNET countermeasures queue');
    @@ -271,14 +266,9 @@
     +
     +diag "check queue visibility when created from incident report" if $ENV{'TEST_VERBOSE'};
     +{
    -+    my $r = RT::Ticket->new( $rtir_user );
    -+    ($ok, $msg) = $r->Create(
    -+        Subject => 'test incident report',
    -+        Queue => 'Incident Reports - GOVNET',
    -+    );
    -+    ok($ok, 'created test incident report');
    -+
    -+    $m->get("$baseurl/RTIR/Create.html?Lifecycle=incidents&Child=".$r->id);
    ++    my $id = $m->create_rtir_ticket_ok( 'Incident Reports - GOVNET', { Subject => 'test incident report' } );
    ++
    ++    $m->get("$baseurl/RTIR/Create.html?Lifecycle=incidents&Child=$id");
     +    $m->content_like(qr{Incidents - GOVNET</option>}, 'Queue dropdown has GOVNET incidents queue');
     +    $m->content_unlike(qr{Incidents</option>}, 'Queue dropdown doesn\'t have standard incidents queue');
     +    $m->content_unlike(qr{Incidents - EDUNET</option>}, 'Queue dropdown doesn\'t have EDUNET incidents queue');
    @@ -349,4 +339,3 @@
     +
     +undef $m;
     +done_testing;
    -
16: 3a26a4e9 < --:  ------- WIP - Limit SelectRTIRQueue to constituency