[Rt-commit] rt branch, 3.9-trunk, updated. rt-3.9.6-222-gaea4a96

[Shawn Moore]

The branch, 3.9-trunk has been updated
       via  aea4a96047be4d68e02233ec4b744c7ed8479852 (commit)
      from  82b984c64ea21d21bcb1303e5c378b3a6d640647 (commit)

Summary of changes:
 t/api/date.t            |    2 +-
 t/approval/basic.t      |    2 +-
 t/mail/gnupg-incoming.t |   12 ++++++------
 3 files changed, 8 insertions(+), 8 deletions(-)

- Log -----------------------------------------------------------------
commit aea4a96047be4d68e02233ec4b744c7ed8479852
Author: Shawn M Moore <sartak at bestpractical.com>
Date:   Mon Nov 29 19:58:59 2010 -0500

    Kill a bunch more needless qr''s

diff --git a/t/api/date.t b/t/api/date.t
index 476c22d..9756e51 100644
--- a/t/api/date.t
+++ b/t/api/date.t
@@ -238,7 +238,7 @@ warning_like
     my $date = RT::Date->new(RT->SystemUser);
     $date->Set( Format => 'bad' );
     is($date->Unix, 0, "bad format");
-} qr'Unknown Date format: bad';
+} qr{Unknown Date format: bad};
 
 
 { # setting value via Unix method
diff --git a/t/approval/basic.t b/t/approval/basic.t
index fda5664..2d00eb5 100644
--- a/t/approval/basic.t
+++ b/t/approval/basic.t
@@ -168,7 +168,7 @@ mail_ok {
     to => 'minion at company.com',
     subject => qr/Ticket Approved:/,
     body => qr/approved by CEO.*Its Owner may now start to act on it.*notes: And consumed they will be/s,
-}, { from => qr'CEO via RT',
+}, { from => qr/CEO via RT/,
      to => 'root at localhost',
      subject => qr/Ticket Approved/,
      body => qr/The ticket has been approved, you may now start to act on it/,
diff --git a/t/mail/gnupg-incoming.t b/t/mail/gnupg-incoming.t
index 5883d82..4e362be 100644
--- a/t/mail/gnupg-incoming.t
+++ b/t/mail/gnupg-incoming.t
@@ -61,7 +61,7 @@ RT::Test->close_mailgate_ok($mail);
         qr/^X-RT-Incoming-Encryption: Not encrypted/m,
         'recorded incoming mail that is not encrypted'
     );
-    like( $txn->Attachments->First->Content, qr'Blah');
+    like( $txn->Attachments->First->Content, qr/Blah/);
 }
 
 # test for signed mail
@@ -103,7 +103,7 @@ RT::Test->close_mailgate_ok($mail);
         'recorded incoming mail that is encrypted'
     );
     # test for some kind of PGP-Signed-By: Header
-    like( $attach->Content, qr'fnord');
+    like( $attach->Content, qr/fnord/);
 }
 
 # test for clear-signed mail
@@ -144,7 +144,7 @@ RT::Test->close_mailgate_ok($mail);
         'recorded incoming mail that is encrypted'
     );
     # test for some kind of PGP-Signed-By: Header
-    like( $attach->Content, qr'clearfnord');
+    like( $attach->Content, qr/clearfnord/);
 }
 
 # test for signed and encrypted mail
@@ -190,7 +190,7 @@ RT::Test->close_mailgate_ok($mail);
         'PGP',
         'recorded incoming mail that is encrypted'
     );
-    like( $attach->Content, qr'orz');
+    like( $attach->Content, qr/orz/);
 
     is( $orig->GetHeader('Content-Type'), 'application/x-rt-original-message');
     ok(index($orig->Content, $buf) != -1, 'found original msg');
@@ -264,7 +264,7 @@ RT::Test->close_mailgate_ok($mail);
     TODO:
     {
         local $TODO = "this test requires keys associated with queues";
-        unlike( $attach->Content, qr'should not be there either');
+        unlike( $attach->Content, qr/should not be there either/);
     }
 }
 
@@ -304,6 +304,6 @@ is(@mail, 1, 'caught outgoing mail.');
     my $tick = RT::Test->last_ticket;
     my $txn = $tick->Transactions->First;
     my ($msg, $attach) = @{$txn->Attachments->ItemsArrayRef};
-    unlike( ($attach ? $attach->Content : ''), qr'really should not be there either');
+    unlike( ($attach ? $attach->Content : ''), qr/really should not be there either/);
 }
 

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