[Rt-commit] r8722 - in rt/branches/3.7-EXPERIMENTAL-TUNIS: t/web

[sartak at bestpractical.com]

Author: sartak
Date: Fri Aug 24 14:29:03 2007
New Revision: 8722

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

Log:
 r19912 at onn:  sartak | 2007-08-24 14:28:59 -0400
 Fix mismerge


Modified: rt/branches/3.7-EXPERIMENTAL-TUNIS/t/web/crypt-gnupg.t
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL-TUNIS/t/web/crypt-gnupg.t	(original)
+++ rt/branches/3.7-EXPERIMENTAL-TUNIS/t/web/crypt-gnupg.t	Fri Aug 24 14:29:03 2007
@@ -43,8 +43,6 @@
                  'no-permission-warning' => undef);
 RT->Config->Set( 'MailPlugins' => 'Auth::MailFrom', 'Auth::GnuPG' );
 
-RT->Config->Set( 'MailPlugins' => 'Auth::MailFrom', 'Auth::GnuPG' );
-
 ok(my $user = RT::User->new($RT::SystemUser));
 ok($user->Load('root'), "Loaded user 'root'");
 $user->SetEmailAddress('recipient at example.com');
@@ -125,43 +123,6 @@
         "RT's outgoing mail looks encrypted"
     );
 
-    like( $msg->Content,
-            qr/Some content/,
-            "incoming mail did NOT have original body"
-    );
-    my ($content_type) = /(Content-Type: .*)/;
-    my ($mime_version) = /(MIME-Version: .*)/;
-    $_ = strip_headers($_);
-
-    $_ = << "MAIL";
-From: recipient\@example.com
-To: general\@$RT::rtname
-Subject: This is just RT's response fed back into RT
-$mime_version
-$content_type
-
-
-$_
-MAIL
-
-    my ($status, $id) = RT::Test->send_via_mailgate($_);
-    is ($status >> 8, 0, "The mail gateway exited normally");
-    ok ($id, "got id of a newly created ticket - $id");
-
-    my $tick = RT::Ticket->new( $RT::SystemUser );
-    $tick->Load( $id );
-    ok($tick->id, "loaded ticket #$id");
-
-    is($tick->Subject, "This is just RT's response fed back into RT");
-    my $txn = $tick->Transactions->First;
-    my ($msg, @attachments) = @{$txn->Attachments->ItemsArrayRef};
-
-    is($msg->GetHeader('X-RT-Incoming-Encryption'),
-        'Success',
-        "RT's outgoing mail was indeed encrypted");
-    is($msg->GetHeader('X-RT-Privacy'),
-        'PGP');
-
     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");
 }