[Rt-commit] [rtir] 10/30: Rename create_block and goto_edit_block test functions
Shawn Moore
shawn at bestpractical.com
Fri May 13 19:53:05 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 1073c9b17b9f11a5db9c728f6e1bf7407754e5eb
Author: Shawn M Moore <shawn at bestpractical.com>
Date: Wed Feb 24 23:51:27 2016 +0000
Rename create_block and goto_edit_block test functions
---
lib/RT/IR/Test/Web.pm | 8 ++++----
t/block/pending-no-regexp.t | 2 +-
t/block/pending-regexp.t | 2 +-
t/block/status-basics.t | 6 +++---
t/block/status-editor-regression.t | 4 ++--
t/custom-fields/ip.t | 8 ++++----
t/custom-fields/ipv6.t | 8 ++++----
t/dates/started.t | 2 +-
t/walk-web.t | 2 +-
9 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/lib/RT/IR/Test/Web.pm b/lib/RT/IR/Test/Web.pm
index 93da117..b81211c 100644
--- a/lib/RT/IR/Test/Web.pm
+++ b/lib/RT/IR/Test/Web.pm
@@ -66,9 +66,9 @@ sub create_investigation {
local $Test::Builder::Level = $Test::Builder::Level + 1;
return (shift)->create_rtir_ticket_ok( 'Investigations', @_ );
}
-sub create_block {
+sub create_countermeasure {
local $Test::Builder::Level = $Test::Builder::Level + 1;
- return (shift)->create_rtir_ticket_ok( 'Blocks', @_ );
+ return (shift)->create_rtir_ticket_ok( 'Countermeasures', @_ );
}
sub goto_create_rtir_ticket {
@@ -308,14 +308,14 @@ qr{<td class="labeltop">Correspondents:</td>\s*<td class="value">\s*<span class=
);
}
-sub goto_edit_block {
+sub goto_edit_countermeasure {
my $self = shift;
my $id = shift;
$self->display_ticket($id);
return $self->follow_link_ok( { text => 'Edit', n => '1' },
- "Followed 'Edit' (block) link" );
+ "Followed 'Edit' (countermeasure) link" );
}
sub resolve_rtir_ticket {
diff --git a/t/block/pending-no-regexp.t b/t/block/pending-no-regexp.t
index d385b00..50f80fb 100644
--- a/t/block/pending-no-regexp.t
+++ b/t/block/pending-no-regexp.t
@@ -12,7 +12,7 @@ my $agent = default_agent();
my $inc_id = $agent->create_incident( {Subject => "incident with block"});
my $rtname = RT->Config->Get('rtname');
-my $block_id = $agent->create_block( {
+my $block_id = $agent->create_countermeasure( {
Subject => "block",
Incident => $inc_id,
Requestors => 'rt-test at example.com',
diff --git a/t/block/pending-regexp.t b/t/block/pending-regexp.t
index ef9c4ff..730294d 100644
--- a/t/block/pending-regexp.t
+++ b/t/block/pending-regexp.t
@@ -13,7 +13,7 @@ my $agent = default_agent();
my $rtname = RT->Config->Get('rtname');
my $inc_id = $agent->create_incident( {Subject => "incident with block"});
-my $block_id = $agent->create_block( {
+my $block_id = $agent->create_countermeasure( {
Subject => "block",
Incident => $inc_id,
Requestors => 'rt-test at example.com',
diff --git a/t/block/status-basics.t b/t/block/status-basics.t
index 12cfd15..7489460 100644
--- a/t/block/status-basics.t
+++ b/t/block/status-basics.t
@@ -9,7 +9,7 @@ RT::Test->started_ok;
my $agent = default_agent();
my $inc_id = $agent->create_incident( {Subject => "incident with block"});
-my $block_id = $agent->create_block( {Subject => "block", Incident => $inc_id});
+my $block_id = $agent->create_countermeasure( {Subject => "block", Incident => $inc_id});
$agent->ticket_status_is( $block_id, 'pending activation');
@@ -62,7 +62,7 @@ diag "prepare for removing using the link";
diag "test activation after reply using 'Activate' link";
{
- my $block_id = $agent->create_block( {Subject => "block", Incident => $inc_id});
+ my $block_id = $agent->create_countermeasure( {Subject => "block", Incident => $inc_id});
$agent->ticket_status_is( $block_id, 'pending activation');
$agent->follow_link_ok({ text => 'Reply' }, "Go to reply page");
@@ -83,7 +83,7 @@ diag "test activation after reply using 'Activate' link";
diag "test activation after reply using Edit page";
{
- my $block_id = $agent->create_block( {Subject => "block", Incident => $inc_id});
+ my $block_id = $agent->create_countermeasure( {Subject => "block", Incident => $inc_id});
$agent->ticket_status_is( $block_id, 'pending activation');
$agent->follow_link_ok({ text => 'Reply' }, "Go to reply page");
diff --git a/t/block/status-editor-regression.t b/t/block/status-editor-regression.t
index e0137b9..80eb97c 100644
--- a/t/block/status-editor-regression.t
+++ b/t/block/status-editor-regression.t
@@ -9,9 +9,9 @@ RT::Test->started_ok;
my $agent = default_agent();
my $incident = $agent->create_incident( {Subject => 'Incident to test Block editing'});
-my $block = $agent->create_block( {Incident => $incident});
+my $block = $agent->create_countermeasure( {Incident => $incident});
-$agent->goto_edit_block( $block);
+$agent->goto_edit_countermeasure( $block);
$agent->content_unlike(qr{<option (?:value=.*)?>Use system default\(\)</option>}, "The option 'Use system default()' does not exist.");
diff --git a/t/custom-fields/ip.t b/t/custom-fields/ip.t
index 82ad500..d78256b 100644
--- a/t/custom-fields/ip.t
+++ b/t/custom-fields/ip.t
@@ -550,14 +550,14 @@ diag "merge ticket, IPs should be merged";
'Incidents',
{ Subject => "test" },
);
- my $b1_id = $agent->create_block(
+ my $b1_id = $agent->create_countermeasure(
{
Subject => "test ip",
Incident => $incident_id,
},
{ IP => '172.16.0.1' },
);
- my $b2_id = $agent->create_block(
+ my $b2_id = $agent->create_countermeasure(
{
Subject => "test ip",
Incident => $incident_id,
@@ -590,14 +590,14 @@ diag "merge ticket with the same IP";
'Incidents',
{ Subject => "test" },
);
- my $b1_id = $agent->create_block(
+ my $b1_id = $agent->create_countermeasure(
{
Subject => "test ip",
Incident => $incident_id,
},
{ IP => '172.16.0.1' },
);
- my $b2_id = $agent->create_block(
+ my $b2_id = $agent->create_countermeasure(
{
Subject => "test ip",
Incident => $incident_id,
diff --git a/t/custom-fields/ipv6.t b/t/custom-fields/ipv6.t
index cf464a2..b3394f9 100644
--- a/t/custom-fields/ipv6.t
+++ b/t/custom-fields/ipv6.t
@@ -505,14 +505,14 @@ diag "merge ticket, IPs should be merged";
'Incidents',
{ Subject => "test" },
);
- my $b1_id = $agent->create_block(
+ my $b1_id = $agent->create_countermeasure(
{
Subject => "test ip",
Incident => $incident_id,
},
{ IP => '::172.16.0.1' },
);
- my $b2_id = $agent->create_block(
+ my $b2_id = $agent->create_countermeasure(
{
Subject => "test ip",
Incident => $incident_id,
@@ -545,14 +545,14 @@ diag "merge ticket with the same IP";
'Incidents',
{ Subject => "test" },
);
- my $b1_id = $agent->create_block(
+ my $b1_id = $agent->create_countermeasure(
{
Subject => "test ip",
Incident => $incident_id,
},
{ IP => '::172.16.0.1' },
);
- my $b2_id = $agent->create_block(
+ my $b2_id = $agent->create_countermeasure(
{
Subject => "test ip",
Incident => $incident_id,
diff --git a/t/dates/started.t b/t/dates/started.t
index 376fa4b..a34ebc0 100644
--- a/t/dates/started.t
+++ b/t/dates/started.t
@@ -85,7 +85,7 @@ diag "started date of an IR" if $ENV{'TEST_VERBOSE'};
diag "started date of a block" if $ENV{'TEST_VERBOSE'};
{
my $inc_id = $agent->create_incident( {Subject => "started date"});
- my $block_id = $agent->create_block( {Subject => "started date", Incident => $inc_id});
+ my $block_id = $agent->create_countermeasure( {Subject => "started date", Incident => $inc_id});
my $block = RT::Ticket->new( $RT::SystemUser );
$block->Load( $block_id );
diff --git a/t/walk-web.t b/t/walk-web.t
index d14ca3f..eb0a454 100644
--- a/t/walk-web.t
+++ b/t/walk-web.t
@@ -16,7 +16,7 @@ my @tickets;
push @tickets, $m->create_incident({ Subject => "test Incident" });
push @tickets, $m->create_ir({ Subject => "test IR" });
push @tickets, $m->create_investigation({ Subject => "test Inv", Requestor => 'root at example.com' });
-push @tickets, $m->create_block({ Subject => "test Block", Incident => $tickets[0] });
+push @tickets, $m->create_countermeasure({ Subject => "test Block", Incident => $tickets[0] });
my @links = (
'/RTIR/',
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the rt-commit
mailing list