[Rt-commit] rt branch, 4.4-trunk, updated. rt-4.4.4-188-g8c9aca29a9

? sunnavy sunnavy at bestpractical.com
Wed Nov 25 12:01:41 EST 2020


The branch, 4.4-trunk has been updated
       via  8c9aca29a97457a3faee3adb14ad63cc002301ea (commit)
       via  b1e4c79ee961ff789fe6aa2ac2c5daf8253992d4 (commit)
      from  d6a996bf5c51d7f0c7d4a04ad92e52a12d01b647 (commit)

Summary of changes:
 lib/RT/Attachment.pm    | 4 ++--
 t/mail/gnupg-incoming.t | 4 ++--
 t/mail/smime/incoming.t | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

- Log -----------------------------------------------------------------
commit b1e4c79ee961ff789fe6aa2ac2c5daf8253992d4
Author: Dianne Skoll <dianne at bestpractical.com>
Date:   Wed Nov 25 11:10:49 2020 -0500

    Rename GetCryptStatus to CryptStatus to be consistent with naming convention

diff --git a/lib/RT/Attachment.pm b/lib/RT/Attachment.pm
index e947450636..39bfcc7619 100644
--- a/lib/RT/Attachment.pm
+++ b/lib/RT/Attachment.pm
@@ -903,7 +903,7 @@ sub _SplitHeaders {
     return(@headers);
 }
 
-=head2 GetCryptStatus
+=head2 CryptStatus
 
 Returns the parsed status from the X-RT-GnuPG-Status or
 X-RT-SMIME-Status header.
@@ -917,7 +917,7 @@ If no crypto header exists, returns an empty array
 
 =cut
 
-sub GetCryptStatus {
+sub CryptStatus {
     my $self = shift;
     my @ret  = ();
 

commit 8c9aca29a97457a3faee3adb14ad63cc002301ea
Author: Dianne Skoll <dianne at bestpractical.com>
Date:   Wed Nov 25 11:11:12 2020 -0500

    Rename GetCryptStatus to CryptStatus in tests.

diff --git a/t/mail/gnupg-incoming.t b/t/mail/gnupg-incoming.t
index 5a0d0d87b0..1844a35eba 100644
--- a/t/mail/gnupg-incoming.t
+++ b/t/mail/gnupg-incoming.t
@@ -65,7 +65,7 @@ RT::Test->close_mailgate_ok($mail);
     );
     like( $txn->Attachments->First->Content, qr/Blah/);
     my ($msg) = @{ $txn->Attachments->ItemsArrayRef };
-    my @status = $msg->GetCryptStatus;
+    my @status = $msg->CryptStatus;
     cmp_deeply( \@status, [], 'Got empty array for unsigned/unencrypted attachment' );
 }
 
@@ -111,7 +111,7 @@ RT::Test->close_mailgate_ok($mail);
     # test for some kind of PGP-Signed-By: Header
     like( $attach->Content, qr/fnord/);
 
-    my @status = $msg->GetCryptStatus;
+    my @status = $msg->CryptStatus;
     cmp_deeply(
         \@status,
         [   {   'Protocol'       => 'GnuPG',
diff --git a/t/mail/smime/incoming.t b/t/mail/smime/incoming.t
index bc19dfdba1..82249d1c52 100644
--- a/t/mail/smime/incoming.t
+++ b/t/mail/smime/incoming.t
@@ -54,7 +54,7 @@ RT::Test->close_mailgate_ok($mail);
     );
     like( $txn->Attachments->First->Content, qr'Blah');
     my ($msg) = @{ $txn->Attachments->ItemsArrayRef };
-    my @status = $msg->GetCryptStatus;
+    my @status = $msg->CryptStatus;
     cmp_deeply( \@status, [], 'Got expected crypt status (Empty array)' );
 }
 
@@ -139,7 +139,7 @@ RT::Test->close_mailgate_ok($mail);
         'recorded incoming mail that is encrypted'
     );
     like( $attach->Content, qr'orzzzz');
-    my @status = $msg->GetCryptStatus;
+    my @status = $msg->CryptStatus;
     cmp_deeply(
         \@status,
         [   {   Operation   => 'Decrypt',
@@ -199,7 +199,7 @@ RT::Test->close_mailgate_ok($mail);
             "Message was signed"
         );
         like( $attach->Content, qr/This is the body/ );
-        my @status = $msg->GetCryptStatus;
+        my @status = $msg->CryptStatus;
         cmp_deeply(
             \@status,
             [   {   CreatedTimestamp => re('^\d+$'),

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


More information about the rt-commit mailing list