[Rt-commit] rtir branch, 2.6/perlcritic, updated. 2.6.0-39-ge82596d

[Thomas Sibley]

The branch, 2.6/perlcritic has been updated
       via  e82596d1255b7f9a4542278c46385c75ad371dec (commit)
       via  413d4c7a6b43fa3815d956cf9c679ead544a44ca (commit)
       via  77627ae4b687f17417bd9d90f6dad1440ca02d80 (commit)
       via  9bf72c3f6e5bd61f6f9a2a5646b7ab2502fc5d0c (commit)
      from  e74660acdabceccda72f0d962218781233d33a6a (commit)

Summary of changes:
 etc/add_constituency  |    7 +++++--
 lib/RT/IR.pm          |    4 ++--
 lib/RT/IR/Test.pm     |    1 +
 lib/RT/IR/Test/Web.pm |   15 ++++++++-------
 4 files changed, 16 insertions(+), 11 deletions(-)

- Log -----------------------------------------------------------------
commit 9bf72c3f6e5bd61f6f9a2a5646b7ab2502fc5d0c
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Fri Jul 22 12:35:57 2011 -0400

    Explicit returns for etc/add_constituency

diff --git a/etc/add_constituency b/etc/add_constituency
index 56c2410..94797de 100644
--- a/etc/add_constituency
+++ b/etc/add_constituency
@@ -237,6 +237,7 @@ sub add_cf_value {
         die $msg unless $val;
         debug "Added '$value' to the constituency field";
     }
+    return 1;
 }
 
 sub grant_group_queue_rights {
@@ -258,7 +259,8 @@ sub grant_group_queue_rights {
                 die "Failed to grant $right to ". $group->Name ." for Queue ". $queue->Name;
             }
         }
-    } 
+    }
+    return 1;
 }
 
 
@@ -284,7 +286,8 @@ sub grant_group_cf_rights {
                     .".\nError: $msg";
             }
         }
-    } 
+    }
+    return 1;
 }
 
 sub group_exists {

commit 77627ae4b687f17417bd9d90f6dad1440ca02d80
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Fri Jul 22 12:35:57 2011 -0400

    Explicit returns for lib/RT/IR.pm

diff --git a/lib/RT/IR.pm b/lib/RT/IR.pm
index f76c11a..fe464df 100644
--- a/lib/RT/IR.pm
+++ b/lib/RT/IR.pm
@@ -577,8 +577,8 @@ if ( RT::IR->HasConstituency ) {
     require RT::Queue;
     package RT::Queue;
 
-    sub CorrespondAddress { GetQueueAttribute(shift, 'CorrespondAddress') }
-    sub CommentAddress { GetQueueAttribute(shift, 'CommentAddress') }
+    sub CorrespondAddress { return GetQueueAttribute(shift, 'CorrespondAddress') }
+    sub CommentAddress { return GetQueueAttribute(shift, 'CommentAddress') }
 
     sub GetQueueAttribute {
         my $queue = shift;

commit 413d4c7a6b43fa3815d956cf9c679ead544a44ca
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Fri Jul 22 12:35:57 2011 -0400

    Explicit returns for lib/RT/IR/Test.pm

diff --git a/lib/RT/IR/Test.pm b/lib/RT/IR/Test.pm
index 3bcc4b3..01a5d71 100644
--- a/lib/RT/IR/Test.pm
+++ b/lib/RT/IR/Test.pm
@@ -43,6 +43,7 @@ sub import {
     RT->Config->LoadConfig( File => 'RTIR_Config.pm' );
     RT->Config->Set( 'rtirname' => 'regression_tests' );
     require RT::IR;
+    return;
 }
 
 our $RTIR_TEST_USER = "rtir_test_user";

commit e82596d1255b7f9a4542278c46385c75ad371dec
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Fri Jul 22 12:35:57 2011 -0400

    Explicit returns for lib/RT/IR/Test/Web.pm

diff --git a/lib/RT/IR/Test/Web.pm b/lib/RT/IR/Test/Web.pm
index d59066e..f0655f6 100644
--- a/lib/RT/IR/Test/Web.pm
+++ b/lib/RT/IR/Test/Web.pm
@@ -38,7 +38,7 @@ sub goto_create_rtir_ticket {
     
 
     # set the form
-    $self->form_number(3);
+    return $self->form_number(3);
 }
 
 sub create_rtir_ticket_ok {
@@ -179,7 +179,7 @@ sub display_ticket {
     my $self = shift;
     my $id = shift;
 
-    $self->get_ok("/RTIR/Display.html?id=$id", "Loaded Display page for Ticket #$id");
+    return $self->get_ok("/RTIR/Display.html?id=$id", "Loaded Display page for Ticket #$id");
 }
 
 sub ticket_state {
@@ -239,7 +239,7 @@ sub ok_and_content_like {
     
     Test::More::is($self->status, 200, "request successful");
     #like($self->content, $re, $desc);
-    $self->content_like($re, $desc);
+    return $self->content_like($re, $desc);
 }
 
 
@@ -315,7 +315,7 @@ sub merge_ticket {
     
     Test::More::is ($self->status, 200, "Attempting to merge $type #$id to ticket #$id_to_merge_to");
     
-    $self->content_like(qr{.*<ul class="action-results">\s*<li>Merge Successful</li>.*}i, 
+    return $self->content_like(qr{.*<ul class="action-results">\s*<li>Merge Successful</li>.*}i, 
         "Successfully merged $type #$id to ticket #$id_to_merge_to");
 }
 
@@ -375,7 +375,7 @@ sub has_watchers {
 
     $self->display_ticket($id);
 
-    $self->content_like(
+    return $self->content_like(
 qr{<td class="labeltop">Correspondents:</td>\s*<td class="value">\s*([@\w\.]+)\s*<br />}ms,
         "Found $type",
     );
@@ -387,7 +387,7 @@ sub goto_edit_block {
 
     $self->display_ticket($id);
 
-    $self->follow_link_ok( { text => 'Edit', n => '1' },
+    return $self->follow_link_ok( { text => 'Edit', n => '1' },
         "Followed 'Edit' (block) link" );
 }
 
@@ -404,7 +404,7 @@ sub resolve_rtir_ticket {
 
     Test::More::is( $self->status, 200, "Attempting to resolve $type #$id" );
 
-    $self->content_like(
+    return $self->content_like(
         qr/.*State changed from \w+ to resolved.*/,
         "Successfully resolved $type #$id"
     );
@@ -458,6 +458,7 @@ sub bulk_abandon {
         $self->form_number(3);
         Test::More::ok( $self->value('BulkAbandon'), "Still on Bulk Abandon page" );
     }
+    return;
 }
 
 1;

-----------------------------------------------------------------------