[Rt-commit] r8793 - in rt/branches/3.7-EXPERIMENTAL: .

[ruz at bestpractical.com]

Author: ruz
Date: Tue Aug 28 14:44:04 2007
New Revision: 8793

Modified:
   rt/branches/3.7-EXPERIMENTAL/   (props changed)
   rt/branches/3.7-EXPERIMENTAL/t/web/crypt-gnupg.t

Log:
 r8726 at cubic-pc (orig r8725):  sartak | 2007-08-25 00:10:53 +0400
  r19917 at onn:  sartak | 2007-08-24 16:10:18 -0400
  Various little cleanups
 


Modified: rt/branches/3.7-EXPERIMENTAL/t/web/crypt-gnupg.t
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/t/web/crypt-gnupg.t	(original)
+++ rt/branches/3.7-EXPERIMENTAL/t/web/crypt-gnupg.t	Tue Aug 28 14:44:04 2007
@@ -78,9 +78,11 @@
 
 $m->get($baseurl); # ensure that the mail has been processed
 
-my $mail = file_content_unlink('t/mailbox');
-my @mail = grep {/\S/} split /%% split me! %%/, $mail;
+my $mails = file_content_unlink('t/mailbox');
+my @mail = grep {/\S/} split /%% split me! %%/, $mails;
 ok(@mail, "got some mail");
+
+$user->SetEmailAddress('general at example.com');
 for my $mail (@mail) {
     unlike $mail, qr/Some content/, "outgoing mail was encrypted";
 
@@ -97,7 +99,7 @@
 
 $body
 MAIL
-    
+ 
     my ($status, $id) = RT::Test->send_via_mailgate($mail);
     is ($status >> 8, 0, "The mail gateway exited normally");
     ok ($id, "got id of a newly created ticket - $id");
@@ -124,7 +126,7 @@
     );
 
     like($attachments[0]->Content, qr/Some content/, "RT's mail includes copy of ticket text");
-    like($attachments[0]->Content, qr/\@$RT::rtname/, "RT's mail includes this instance's name");
+    like($attachments[0]->Content, qr/$RT::rtname/, "RT's mail includes this instance's name");
 }
 
 $m->get("$baseurl/Admin/Queues/Modify.html?id=$qid");
@@ -151,8 +153,8 @@
 
 $m->get($baseurl); # ensure that the mail has been processed
 
-$mail = file_content_unlink('t/mailbox');
- at mail = grep {/\S/} split /%% split me! %%/, $mail;
+$mails = file_content_unlink('t/mailbox');
+ at mail = grep {/\S/} split /%% split me! %%/, $mails;
 ok(@mail, "got some mail");
 for (@mail) {
     like $_, qr/Some other content/, "outgoing mail was not encrypted";