[Rt-commit] [rtir] 11/30: Switch hardcoded "Blocks" queue name in tests to "Countermeasures"

Shawn Moore shawn at bestpractical.com
Fri May 13 19:53:06 EDT 2016


This is an automated email from the git hooks/post-receive script.

shawn pushed a commit to branch 3.4/countermeasures
in repository rtir.

commit a35a8855302ccbab9daac64881fb4d7151d01a0f
Author: Shawn M Moore <shawn at bestpractical.com>
Date:   Wed Feb 24 23:54:31 2016 +0000

    Switch hardcoded "Blocks" queue name in tests to "Countermeasures"
---
 t/009-attachments-processing.t        |  2 +-
 t/articles/on-create.t                |  2 +-
 t/articles/on-update.t                |  4 ++--
 t/block/pending-no-regexp.t           |  4 ++--
 t/block/pending-regexp.t              |  8 ++++----
 t/constituency/basics.t               |  6 +++---
 t/constituency/email.t                |  4 ++--
 t/constituency/propagation-inherit.t  |  4 ++--
 t/constituency/propagation-no.t       |  2 +-
 t/constituency/propagation-reject.t   |  6 +++---
 t/custom-fields/defaults-config.t     | 10 +++++-----
 t/custom-fields/defaults-on-linking.t |  2 +-
 t/custom-fields/ip.t                  | 22 +++++++++++-----------
 t/custom-fields/ipv6.t                | 22 +++++++++++-----------
 t/custom-fields/on-transactions.t     |  4 ++--
 15 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/t/009-attachments-processing.t b/t/009-attachments-processing.t
index 1d38144..676ce58 100644
--- a/t/009-attachments-processing.t
+++ b/t/009-attachments-processing.t
@@ -149,7 +149,7 @@ $agent->goto_create_rtir_ticket('Investigations');
     unlink $filename or die "couldn't delete file '$filename': $!";
 }
 
-$agent->goto_create_rtir_ticket('Blocks');
+$agent->goto_create_rtir_ticket('Countermeasures');
 
 {
     my $content = "this is test";
diff --git a/t/articles/on-create.t b/t/articles/on-create.t
index e1092d8..17b2f13 100644
--- a/t/articles/on-create.t
+++ b/t/articles/on-create.t
@@ -35,7 +35,7 @@ diag "create an article" if $ENV{'TEST_VERBOSE'};
     is($agent->status, 200, "attempt to create succeeded");
 }
 
-foreach ( 'Incidents', 'Incident Reports', 'Investigations', 'Blocks' ) {
+foreach ( 'Incidents', 'Incident Reports', 'Investigations', 'Countermeasures' ) {
     my $queue = RT::Queue->new(RT->SystemUser);
     $queue->Load( $_ );
     ok $agent->goto_create_ticket( $queue ), "UI -> create ticket";
diff --git a/t/articles/on-update.t b/t/articles/on-update.t
index a2dc340..b47c066 100644
--- a/t/articles/on-update.t
+++ b/t/articles/on-update.t
@@ -34,12 +34,12 @@ diag "create an article" if $ENV{'TEST_VERBOSE'};
 }
 
 my $incident_id;
-foreach my $queue ( 'Incidents', 'Incident Reports', 'Investigations', 'Blocks' ) {
+foreach my $queue ( 'Incidents', 'Incident Reports', 'Investigations', 'Countermeasures' ) {
     my $id = $agent->create_rtir_ticket_ok(
         $queue,
         {
             Subject => "test",
-            ( $queue eq 'Blocks' ? ( Incident => $incident_id ) : () ),
+            ( $queue eq 'Countermeasures' ? ( Incident => $incident_id ) : () ),
         },
     );
     $incident_id = $id if $queue eq 'Incidents';
diff --git a/t/block/pending-no-regexp.t b/t/block/pending-no-regexp.t
index 50f80fb..56cb621 100644
--- a/t/block/pending-no-regexp.t
+++ b/t/block/pending-no-regexp.t
@@ -27,7 +27,7 @@ Subject: [$rtname #$block_id] This is a test
 
 test
 EOF
-    my ($status, $id) = RT::Test->send_via_mailgate($text, queue => 'Blocks');
+    my ($status, $id) = RT::Test->send_via_mailgate($text, queue => 'Countermeasures');
     is $status >> 8, 0, "The mail gateway exited ok";
     is $id, $block_id, "replied to the ticket";
     $agent->ticket_status_is( $block_id, 'active');
@@ -50,7 +50,7 @@ Subject: [$rtname #$block_id] This is a test
 
 some text
 EOF
-    my ($status, $id) = RT::Test->send_via_mailgate($text, queue => 'Blocks');
+    my ($status, $id) = RT::Test->send_via_mailgate($text, queue => 'Countermeasures');
     is $status >> 8, 0, "The mail gateway exited ok";
     is $id, $block_id, "replied to the ticket";
     $agent->ticket_status_is( $block_id, 'removed');
diff --git a/t/block/pending-regexp.t b/t/block/pending-regexp.t
index 730294d..6f2a102 100644
--- a/t/block/pending-regexp.t
+++ b/t/block/pending-regexp.t
@@ -28,7 +28,7 @@ Subject: [$rtname #$block_id] This is a test
 
 some text
 EOF
-    my ($status, $id) = RT::Test->send_via_mailgate($text, queue => 'Blocks');
+    my ($status, $id) = RT::Test->send_via_mailgate($text, queue => 'Countermeasures');
     is $status >> 8, 0, "The mail gateway exited ok";
     is $id, $block_id, "replied to the ticket";
     $agent->ticket_status_is( $block_id, 'pending activation');
@@ -43,7 +43,7 @@ Subject: [$rtname #$block_id] This is a test
 TestPendingBlock
 
 EOF
-    my ($status, $id) = RT::Test->send_via_mailgate($text, queue => 'Blocks');
+    my ($status, $id) = RT::Test->send_via_mailgate($text, queue => 'Countermeasures');
     is $status >> 8, 0, "The mail gateway exited ok";
     is $id, $block_id, "replied to the ticket";
     $agent->ticket_status_is( $block_id, 'active');
@@ -66,7 +66,7 @@ Subject: [$rtname #$block_id] This is a test
 
 some text
 EOF
-    my ($status, $id) = RT::Test->send_via_mailgate($text, queue => 'Blocks');
+    my ($status, $id) = RT::Test->send_via_mailgate($text, queue => 'Countermeasures');
     is $status >> 8, 0, "The mail gateway exited ok";
     is $id, $block_id, "replied to the ticket";
     $agent->ticket_status_is( $block_id, 'pending removal');
@@ -81,7 +81,7 @@ Subject: [$rtname #$block_id] This is a test
 TestPendingBlock
 
 EOF
-    my ($status, $id) = RT::Test->send_via_mailgate($text, queue => 'Blocks');
+    my ($status, $id) = RT::Test->send_via_mailgate($text, queue => 'Countermeasures');
     is $status >> 8, 0, "The mail gateway exited ok";
     is $id, $block_id, "replied to the ticket";
     $agent->ticket_status_is( $block_id, 'removed');
diff --git a/t/constituency/basics.t b/t/constituency/basics.t
index c309df8..38a57e2 100644
--- a/t/constituency/basics.t
+++ b/t/constituency/basics.t
@@ -25,7 +25,7 @@ diag "load and check basic properties of the CF" if $ENV{'TEST_VERBOSE'};
 
 diag "check that CF applies to all RTIR's queues" if $ENV{'TEST_VERBOSE'};
 {
-    foreach ( 'Incidents', 'Incident Reports', 'Investigations', 'Blocks' ) {
+    foreach ( 'Incidents', 'Incident Reports', 'Investigations', 'Countermeasures' ) {
         my $queue = RT::Queue->new( $RT::SystemUser );
         $queue->Load( $_ );
         ok( $queue->id, 'loaded queue '. $_ );
@@ -50,7 +50,7 @@ diag "fetch list of constituencies and check that groups exist" if $ENV{'TEST_VE
 diag "check that there is no option to set 'no value' on create" if $ENV{'TEST_VERBOSE'};
 {
     my $default = RT->Config->Get('RTIR_CustomFieldsDefaults')->{'Constituency'};
-    foreach my $queue( 'Incidents', 'Incident Reports', 'Investigations', 'Blocks' ) {
+    foreach my $queue( 'Incidents', 'Incident Reports', 'Investigations', 'Countermeasures' ) {
         diag "'$queue' queue" if $ENV{'TEST_VERBOSE'};
 
         $agent->goto_create_rtir_ticket( $queue );
@@ -121,7 +121,7 @@ ok( RT::Test->add_rights(
     { Principal => 'Privileged', Right => [qw(ModifyCustomField SeeCustomField)], },
 ), 'set rights');
 
-foreach my $name('Incident Reports', 'Incidents', 'Investigations', 'Blocks' ) {
+foreach my $name('Incident Reports', 'Incidents', 'Investigations', 'Countermeasures' ) {
     my $queue = RT::Test->load_or_create_queue(
         Name => "$name",
         CorrespondAddress => 'rt at example.com',
diff --git a/t/constituency/email.t b/t/constituency/email.t
index 49cd172..14135eb 100644
--- a/t/constituency/email.t
+++ b/t/constituency/email.t
@@ -58,7 +58,7 @@ diag "create a ticket via gate" if $ENV{'TEST_VERBOSE'};
 {
     my $i = 0;
     my $val = RT->Config->Get('RTIR_CustomFieldsDefaults')->{'Constituency'}; # we have one default
-    foreach my $queue( 'Incidents', 'Incident Reports', 'Investigations', 'Blocks' ) {
+    foreach my $queue( 'Incidents', 'Incident Reports', 'Investigations', 'Countermeasures' ) {
         diag "create a ticket in the '$queue' queue" if $ENV{'TEST_VERBOSE'};
 
         my $text = <<EOF;
@@ -92,7 +92,7 @@ diag "create a ticket via gate using Extension header" if $ENV{'TEST_VERBOSE'};
     ok $val, 'find not default value';
 
     my $incident_id; # block couldn't be created without incident id
-    foreach my $queue( 'Incidents', 'Incident Reports', 'Investigations', 'Blocks' ) {
+    foreach my $queue( 'Incidents', 'Incident Reports', 'Investigations', 'Countermeasures' ) {
         diag "create a ticket in the '$queue' queue" if $ENV{'TEST_VERBOSE'};
 
         my $text = <<EOF;
diff --git a/t/constituency/propagation-inherit.t b/t/constituency/propagation-inherit.t
index 6256b49..da3f8ff 100644
--- a/t/constituency/propagation-inherit.t
+++ b/t/constituency/propagation-inherit.t
@@ -105,7 +105,7 @@ diag "create an incident with EDUNET, then create children using Incident input
             'EDUNET', 'correct value';
     }
 
-    foreach my $queue( 'Incident Reports', 'Investigations', 'Blocks' ) {
+    foreach my $queue( 'Incident Reports', 'Investigations', 'Countermeasures' ) {
         diag "create a ticket in the '$queue' queue" if $ENV{'TEST_VERBOSE'};
 
         my $id = $agent->create_rtir_ticket_ok(
@@ -139,7 +139,7 @@ diag "create an incident with EDUNET, then create children using Incident input
 diag "check that constituency propagates from a child to a parent after 'Edit', and back"
     if $ENV{'TEST_VERBOSE'};
 {
-    foreach my $queue( 'Incident Reports', 'Investigations', 'Blocks' ) {
+    foreach my $queue( 'Incident Reports', 'Investigations', 'Countermeasures' ) {
         diag "create an incident for linking" if $ENV{'TEST_VERBOSE'};
 
         my $incident_id = $agent->create_rtir_ticket_ok(
diff --git a/t/constituency/propagation-no.t b/t/constituency/propagation-no.t
index defba31..b5b6b39 100644
--- a/t/constituency/propagation-no.t
+++ b/t/constituency/propagation-no.t
@@ -40,7 +40,7 @@ diag "create an incident with EDUNET and then linked tickets with GOVNET,"
             'EDUNET', 'correct value';
     }
 
-    foreach my $queue( 'Incident Reports', 'Investigations', 'Blocks' ) {
+    foreach my $queue( 'Incident Reports', 'Investigations', 'Countermeasures' ) {
         diag "create a ticket in the '$queue' queue" if $ENV{'TEST_VERBOSE'};
 
         my $id = $agent->create_rtir_ticket_ok(
diff --git a/t/constituency/propagation-reject.t b/t/constituency/propagation-reject.t
index d4605d7..c468ee4 100644
--- a/t/constituency/propagation-reject.t
+++ b/t/constituency/propagation-reject.t
@@ -112,7 +112,7 @@ diag "create an incident with EDUNET, then try to create children using"
             'correct value';
     }
 
-    foreach my $queue( 'Incident Reports', 'Investigations', 'Blocks' ) {
+    foreach my $queue( 'Incident Reports', 'Investigations', 'Countermeasures' ) {
         diag "create a ticket in the '$queue - GOVNET' queue" if $ENV{'TEST_VERBOSE'};
 
         my $id = $agent->create_rtir_ticket(
@@ -145,7 +145,7 @@ diag "create an incident with EDUNET and check that we can create children"
             'Incidents - EDUNET', 'correct value';
     }
 
-    foreach my $queue( 'Incident Reports', 'Investigations', 'Blocks' ) {
+    foreach my $queue( 'Incident Reports', 'Investigations', 'Countermeasures' ) {
         diag "create a ticket in the '$queue - EDUNET' queue" if $ENV{'TEST_VERBOSE'};
 
         my $id = $agent->create_rtir_ticket_ok(
@@ -271,7 +271,7 @@ diag "check that we can change constituency of an unlinked ticket using 'Edit' p
             'EDUNET', 'correct value';
     }
 
-    foreach my $queue( 'Blocks', 'Incident Reports', 'Investigations' ) {
+    foreach my $queue( 'Countermeasures', 'Incident Reports', 'Investigations' ) {
         my $id = $agent->create_rtir_ticket_ok(
             $queue." - EDUNET",
             {
diff --git a/t/custom-fields/defaults-config.t b/t/custom-fields/defaults-config.t
index 3557bbe..d8b330b 100644
--- a/t/custom-fields/defaults-config.t
+++ b/t/custom-fields/defaults-config.t
@@ -9,13 +9,13 @@ my $defaults = RT->Config->Get('RTIR_CustomFieldsDefaults');
 $defaults->{'How Reported'}  = 'Telephone';   # IRs
 $defaults->{'Description'}   = 'Bloody mess'; # Incs
 $defaults->{'IP'}            = '127.0.0.1';   # Invs and all
-$defaults->{'Where Blocked'} = 'On the Moon'; # Blocks
+$defaults->{'Where Blocked'} = 'On the Moon'; # Countermeasures
 
 my %test_on = (
     'Incident Reports' => 'How Reported',
     'Incidents'        => 'Description',
     'Investigations'   => 'IP',
-    'Blocks'           => 'Where Blocked',
+    'Countermeasures'  => 'Where Blocked',
 );
 
 my %replace_with = (
@@ -30,7 +30,7 @@ my $agent = default_agent();
 
 {
     my $incident_id; # block couldn't be created without incident id
-    foreach my $queue( 'Incidents', 'Incident Reports', 'Investigations', 'Blocks' ) {
+    foreach my $queue( 'Incidents', 'Incident Reports', 'Investigations', 'Countermeasures' ) {
         my $cf_name = $test_on{ $queue };
         my $cf_default = $defaults->{ $cf_name };
         my $cf_replace = $replace_with{ $cf_name };
@@ -49,7 +49,7 @@ my $agent = default_agent();
                 $queue,
                 {
                     Subject => "test",
-                    ( $queue eq 'Blocks' ? ( Incident => $incident_id ) : () ),
+                    ( $queue eq 'Countermeasures' ? ( Incident => $incident_id ) : () ),
                 },
             );
             $incident_id = $id if $queue eq 'Incidents';
@@ -66,7 +66,7 @@ my $agent = default_agent();
                 $queue,
                 {
                     Subject => "test",
-                    ( $queue eq 'Blocks' ? ( Incident => $incident_id ) : () ),
+                    ( $queue eq 'Countermeasures' ? ( Incident => $incident_id ) : () ),
                 },
                 { $cf_name => $cf_replace }
             );
diff --git a/t/custom-fields/defaults-on-linking.t b/t/custom-fields/defaults-on-linking.t
index c5fc932..5392643 100644
--- a/t/custom-fields/defaults-on-linking.t
+++ b/t/custom-fields/defaults-on-linking.t
@@ -15,7 +15,7 @@ my $cf_name = 'test';
     );
     ok( $id, "created custom field" ) or diag "error: $msg";
 
-    for my $q ('Incident Reports', 'Investigations', 'Incidents', 'Blocks') {
+    for my $q ('Incident Reports', 'Investigations', 'Incidents', 'Countermeasures') {
         my $q_obj = RT::Queue->new($RT::SystemUser);
         $q_obj->Load($q);
         ok( $q_obj->id, "Loaded queue '$q'" );
diff --git a/t/custom-fields/ip.t b/t/custom-fields/ip.t
index d78256b..45097ce 100644
--- a/t/custom-fields/ip.t
+++ b/t/custom-fields/ip.t
@@ -26,7 +26,7 @@ diag "load and check basic properties of the IP CF" if $ENV{'TEST_VERBOSE'};
 
 diag "check that CF applies to all RTIR's queues" if $ENV{'TEST_VERBOSE'};
 {
-    foreach ( 'Incidents', 'Incident Reports', 'Investigations', 'Blocks' ) {
+    foreach ( 'Incidents', 'Incident Reports', 'Investigations', 'Countermeasures' ) {
         my $queue = RT::Queue->new( $RT::SystemUser );
         $queue->Load( $_ );
         ok( $queue->id, 'loaded queue '. $_ );
@@ -41,7 +41,7 @@ diag "create a ticket via web and set IP" if $ENV{'TEST_VERBOSE'};
 {
     my $i = 0;
     my $incident_id; # block couldn't be created without incident id
-    foreach my $queue( 'Incidents', 'Incident Reports', 'Investigations', 'Blocks' ) {
+    foreach my $queue( 'Incidents', 'Incident Reports', 'Investigations', 'Countermeasures' ) {
         diag "create a ticket in the '$queue' queue" if $ENV{'TEST_VERBOSE'};
 
         my $val = '192.168.20.'. ++$i;
@@ -49,7 +49,7 @@ diag "create a ticket via web and set IP" if $ENV{'TEST_VERBOSE'};
             $queue,
             {
                 Subject => "test ip",
-                ( $queue eq 'Blocks' ? ( Incident => $incident_id ) : () ),
+                ( $queue eq 'Countermeasures' ? ( Incident => $incident_id ) : () ),
             },
             { IP => $val },
         );
@@ -68,7 +68,7 @@ diag "create a ticket via web with IP in message" if $ENV{'TEST_VERBOSE'};
 {
     my $i = 0;
     my $incident_id; # block couldn't be created without incident id
-    foreach my $queue( 'Incidents', 'Incident Reports', 'Investigations', 'Blocks' ) {
+    foreach my $queue( 'Incidents', 'Incident Reports', 'Investigations', 'Countermeasures' ) {
         diag "create a ticket in the '$queue' queue" if $ENV{'TEST_VERBOSE'};
 
         my $val = '192.168.20.'. ++$i;
@@ -76,7 +76,7 @@ diag "create a ticket via web with IP in message" if $ENV{'TEST_VERBOSE'};
             $queue,
             {
                 Subject => "test ip in message",
-                ($queue eq 'Blocks'? (Incident => $incident_id): ()),
+                ($queue eq 'Countermeasures'? (Incident => $incident_id): ()),
                 Content => "$val",
             },
         );
@@ -95,7 +95,7 @@ diag "create a ticket via web with CIDR" if $ENV{'TEST_VERBOSE'};
 {
     my $i = 0;
     my $incident_id; # block couldn't be created without incident id
-    foreach my $queue( 'Incidents', 'Incident Reports', 'Investigations', 'Blocks' ) {
+    foreach my $queue( 'Incidents', 'Incident Reports', 'Investigations', 'Countermeasures' ) {
         diag "create a ticket in the '$queue' queue" if $ENV{'TEST_VERBOSE'};
 
         my $val = '172.16.'. ++$i .'/31'; # add two hosts
@@ -103,7 +103,7 @@ diag "create a ticket via web with CIDR" if $ENV{'TEST_VERBOSE'};
             $queue,
             {
                 Subject => "test ip",
-                ($queue eq 'Blocks'? (Incident => $incident_id): ()),
+                ($queue eq 'Countermeasures'? (Incident => $incident_id): ()),
             },
             { IP => $val },
         );
@@ -125,7 +125,7 @@ diag "create a ticket via web with CIDR in message" if $ENV{'TEST_VERBOSE'};
 {
     my $i = 0;
     my $incident_id; # block couldn't be created without incident id
-    foreach my $queue( 'Incidents', 'Incident Reports', 'Investigations', 'Blocks' ) {
+    foreach my $queue( 'Incidents', 'Incident Reports', 'Investigations', 'Countermeasures' ) {
         diag "create a ticket in the '$queue' queue" if $ENV{'TEST_VERBOSE'};
 
         my $val = '172.16.'. ++$i .'/31'; # add two hosts
@@ -133,7 +133,7 @@ diag "create a ticket via web with CIDR in message" if $ENV{'TEST_VERBOSE'};
             $queue,
             {
                 Subject => "test ip in message",
-                ($queue eq 'Blocks'? (Incident => $incident_id): ()),
+                ($queue eq 'Countermeasures'? (Incident => $incident_id): ()),
                 Content => "$val",
             },
         );
@@ -155,14 +155,14 @@ diag "create a ticket and edit IP field using Edit page" if $ENV{'TEST_VERBOSE'}
 {
     my $i = 0;
     my $incident_id; # block couldn't be created without incident id
-    foreach my $queue( 'Incidents', 'Incident Reports', 'Investigations', 'Blocks' ) {
+    foreach my $queue( 'Incidents', 'Incident Reports', 'Investigations', 'Countermeasures' ) {
         diag "create a ticket in the '$queue' queue" if $ENV{'TEST_VERBOSE'};
 
         my $id = $agent->create_rtir_ticket_ok(
             $queue,
             {
                 Subject => "test ip in message",
-                ($queue eq 'Blocks'? (Incident => $incident_id): ()),
+                ($queue eq 'Countermeasures'? (Incident => $incident_id): ()),
             },
         );
         $incident_id = $id if $queue eq 'Incidents';
diff --git a/t/custom-fields/ipv6.t b/t/custom-fields/ipv6.t
index b3394f9..3ffd335 100644
--- a/t/custom-fields/ipv6.t
+++ b/t/custom-fields/ipv6.t
@@ -62,7 +62,7 @@ diag "load and check basic properties of the IP CF" if $ENV{'TEST_VERBOSE'};
 
 diag "check that CF applies to all RTIR's queues" if $ENV{'TEST_VERBOSE'};
 {
-    foreach ( 'Incidents', 'Incident Reports', 'Investigations', 'Blocks' ) {
+    foreach ( 'Incidents', 'Incident Reports', 'Investigations', 'Countermeasures' ) {
         my $queue = RT::Queue->new( $RT::SystemUser );
         $queue->Load( $_ );
         ok( $queue->id, 'loaded queue '. $_ );
@@ -78,14 +78,14 @@ for my $short (sort keys %valid) {
     my $full = $valid{$short};
     my $abbrev = $abbrev_of{$short};
     my $incident_id; # block couldn't be created without incident id
-    foreach my $queue( 'Incidents', 'Incident Reports', 'Investigations', 'Blocks' ) {
+    foreach my $queue( 'Incidents', 'Incident Reports', 'Investigations', 'Countermeasures' ) {
         diag "create a ticket in the '$queue' queue" if $ENV{'TEST_VERBOSE'};
 
         my $id = $agent->create_rtir_ticket_ok(
             $queue,
             {
                 Subject => "test ip",
-                ( $queue eq 'Blocks' ? ( Incident => $incident_id ) : () ),
+                ( $queue eq 'Countermeasures' ? ( Incident => $incident_id ) : () ),
             },
             { IP => $short },
         );
@@ -105,14 +105,14 @@ for my $short (sort keys %test_set) {
     my $full = $valid{$short};
     my $abbrev = $abbrev_of{$short};
     my $incident_id; # block couldn't be created without incident id
-    foreach my $queue( 'Incidents', 'Incident Reports', 'Investigations', 'Blocks' ) {
+    foreach my $queue( 'Incidents', 'Incident Reports', 'Investigations', 'Countermeasures' ) {
         diag "create a ticket in the '$queue' queue" if $ENV{'TEST_VERBOSE'};
 
         my $id = $agent->create_rtir_ticket_ok(
             $queue,
             {
                 Subject => "test ip in message",
-                ($queue eq 'Blocks'? (Incident => $incident_id): ()),
+                ($queue eq 'Countermeasures'? (Incident => $incident_id): ()),
                 Content => "$short",
             },
         );
@@ -132,14 +132,14 @@ for my $short (sort keys %test_cidr) {
     my $full = $test_cidr{$short};
     my $abbrev = $abbrev_of{$short};
     my $incident_id; # block couldn't be created without incident id
-    foreach my $queue( 'Incidents', 'Incident Reports', 'Investigations', 'Blocks' ) {
+    foreach my $queue( 'Incidents', 'Incident Reports', 'Investigations', 'Countermeasures' ) {
         diag "create a ticket in the '$queue' queue" if $ENV{'TEST_VERBOSE'};
 
         my $id = $agent->create_rtir_ticket_ok(
             $queue,
             {
                 Subject => "test ip",
-                ($queue eq 'Blocks'? (Incident => $incident_id): ()),
+                ($queue eq 'Countermeasures'? (Incident => $incident_id): ()),
             },
             { IP => $short },
         );
@@ -163,14 +163,14 @@ for my $short (sort keys %test_cidr) {
     my $abbrev = $abbrev_of{$short};
 
     my $incident_id; # block couldn't be created without incident id
-    foreach my $queue( 'Incidents', 'Incident Reports', 'Investigations', 'Blocks' ) {
+    foreach my $queue( 'Incidents', 'Incident Reports', 'Investigations', 'Countermeasures' ) {
         diag "create a ticket in the '$queue' queue" if $ENV{'TEST_VERBOSE'};
 
         my $id = $agent->create_rtir_ticket_ok(
             $queue,
             {
                 Subject => "test ip in message",
-                ($queue eq 'Blocks'? (Incident => $incident_id): ()),
+                ($queue eq 'Countermeasures'? (Incident => $incident_id): ()),
                 Content => "$short",
             },
         );
@@ -192,14 +192,14 @@ diag "create a ticket and edit IP field using Edit page" if $ENV{'TEST_VERBOSE'}
 {
     my $i = 0;
     my $incident_id; # block couldn't be created without incident id
-    foreach my $queue( 'Incidents', 'Incident Reports', 'Investigations', 'Blocks' ) {
+    foreach my $queue( 'Incidents', 'Incident Reports', 'Investigations', 'Countermeasures' ) {
         diag "create a ticket in the '$queue' queue" if $ENV{'TEST_VERBOSE'};
 
         my $id = $agent->create_rtir_ticket_ok(
             $queue,
             {
                 Subject => "test ip in message",
-                ($queue eq 'Blocks'? (Incident => $incident_id): ()),
+                ($queue eq 'Countermeasures'? (Incident => $incident_id): ()),
             },
         );
         $incident_id = $id if $queue eq 'Incidents';
diff --git a/t/custom-fields/on-transactions.t b/t/custom-fields/on-transactions.t
index 1cc04dc..3e8dd31 100644
--- a/t/custom-fields/on-transactions.t
+++ b/t/custom-fields/on-transactions.t
@@ -17,7 +17,7 @@ my $cf;
     );
     ok( $id, "created custom field" ) or diag "error: $msg";
 
-    for my $q ('Incident Reports', 'Investigations', 'Incidents', 'Blocks') {
+    for my $q ('Incident Reports', 'Investigations', 'Incidents', 'Countermeasures') {
         my $q_obj = RT::Queue->new($RT::SystemUser);
         $q_obj->Load($q);
         ok( $q_obj->id, "Loaded queue '$q'" );
@@ -41,7 +41,7 @@ my $inc_id = $agent->create_incident( { Subject => "incident" } );
 ok $inc_id, "created an incident";
 
 my @tickets;
-foreach my $qname ('Incident Reports', 'Investigations', 'Blocks') {
+foreach my $qname ('Incident Reports', 'Investigations', 'Countermeasures') {
     $agent->goto_create_rtir_ticket( $qname );
     my $form = $agent->form_name('TicketCreate');
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the rt-commit mailing list