[Rt-commit] rt branch, 3.8/multipart-mail-fail, created. rt-3.8.9-42-gefe68af
Kevin Falcone
falcone at bestpractical.com
Fri Mar 18 12:22:34 EDT 2011
The branch, 3.8/multipart-mail-fail has been created
at efe68af7073d8c3c4e2684a8700e02d86dd7a957 (commit)
- Log -----------------------------------------------------------------
commit 02ca1b08615567b8bd64984d98bbf7f31e6a0785
Author: sunnavy <sunnavy at bestpractical.com>
Date: Thu Oct 21 15:03:14 2010 +0800
move parse_mail to Test.pm
(cherry picked from commit 22403d5fc8a96640db2c8383e38ccce3d469dc36)
falcone wants to use parse_mail in a test file without copying it.
diff --git a/lib/RT/Test.pm b/lib/RT/Test.pm
index 95fff18..e1990d0 100644
--- a/lib/RT/Test.pm
+++ b/lib/RT/Test.pm
@@ -75,7 +75,7 @@ wrap 'HTTP::Request::Common::form_data',
};
-our @EXPORT = qw(is_empty);
+our @EXPORT = qw(is_empty parse_mail);
our ($port, $dbname);
our @SERVERS;
@@ -1295,6 +1295,14 @@ sub process_in_file {
return ($out_fh, $out_conf);
}
+sub parse_mail {
+ my $mail = shift;
+ require RT::EmailParser;
+ my $parser = RT::EmailParser->new;
+ $parser->ParseMIMEEntityFromScalar( $mail );
+ return $parser->Entity;
+}
+
END {
my $Test = RT::Test->builder;
return if $Test->{Original_Pid} != $$;
diff --git a/t/mail/charsets-outgoing.t b/t/mail/charsets-outgoing.t
index e8f78cc..e3f13fb 100644
--- a/t/mail/charsets-outgoing.t
+++ b/t/mail/charsets-outgoing.t
@@ -320,12 +320,3 @@ foreach my $set ( 'ru', 'latin1' ) {
}
} # subject tag set
-
-sub parse_mail {
- my $mail = shift;
- require RT::EmailParser;
- my $parser = new RT::EmailParser;
- $parser->ParseMIMEEntityFromScalar( $mail );
- return $parser->Entity;
-}
-
diff --git a/t/mail/extractsubjecttag.t b/t/mail/extractsubjecttag.t
index 5a25488..fcaba8c 100644
--- a/t/mail/extractsubjecttag.t
+++ b/t/mail/extractsubjecttag.t
@@ -88,11 +88,3 @@ EOF
unlike($freshticket->Subject,qr/\[\Q$subject_tag\E #$ticketid\]/,'Stripped Queue Subject Tag correctly');
}
-
-sub parse_mail {
- my $mail = shift;
- require RT::EmailParser;
- my $parser = new RT::EmailParser;
- $parser->ParseMIMEEntityFromScalar( $mail );
- return $parser->Entity;
-}
commit 490b434d7b028fc814f8f22bec9bbafe37e234ac
Author: Kevin Falcone <falcone at bestpractical.com>
Date: Thu Mar 17 17:42:44 2011 -0400
Simple test for incoming multipart email being sent back out as an attachment
diff --git a/t/mail/multipart.t b/t/mail/multipart.t
new file mode 100644
index 0000000..f33b636
--- /dev/null
+++ b/t/mail/multipart.t
@@ -0,0 +1,96 @@
+#!/usr/bin/perl -w
+# BEGIN BPS TAGGED BLOCK {{{
+#
+# COPYRIGHT:
+#
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC
+# <jesse.com>
+#
+# (Except where explicitly superseded by other copyright notices)
+#
+#
+# LICENSE:
+#
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+#
+# This work is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301 or visit their web page on the internet at
+# http://www.gnu.org/copyleft/gpl.html.
+#
+#
+# CONTRIBUTION SUBMISSION POLICY:
+#
+# (The following paragraph is not intended to limit the rights granted
+# to you to modify and distribute this software under the terms of
+# the GNU General Public License and is only of importance to you if
+# you choose to contribute your changes and enhancements to the
+# community by submitting them to Best Practical Solutions, LLC.)
+#
+# By intentionally submitting any modifications, corrections or
+# derivatives to this work, or any other work intended for use with
+# Request Tracker, to Best Practical Solutions, LLC, you confirm that
+# you are the copyright holder for those contributions and you grant
+# Best Practical Solutions, LLC a nonexclusive, worldwide, irrevocable,
+# royalty-free, perpetual, license to use, copy, create derivative
+# works based on those contributions, and sublicense and distribute
+# those contributions and any derivatives thereof.
+#
+# END BPS TAGGED BLOCK }}}
+
+=head1 NAME
+
+rt-mailgate - Mail interface to RT3.
+
+=cut
+
+use strict;
+use warnings;
+
+use RT::Test tests => 7;
+use RT::Test::Email;
+my ($baseurl, $m) = RT::Test->started_ok;
+
+my $queue = RT::Test->load_or_create_queue( Name => 'General' );
+my $user = RT::Test->load_or_create_user( Name => 'bob', EmailAddress => 'bob at example.com' );
+$queue->AddWatcher( Type => 'AdminCc', PrincipalId => $user->PrincipalObj->Id );
+
+my $text = <<EOF;
+Subject: Badly handled multipart email
+From: root\@localhost
+To: rt\@@{[RT->Config->Get('rtname')]}
+Content-Type: multipart/alternative; boundary=20cf3071cac0cb9772049eb22371
+
+--20cf3071cac0cb9772049eb22371
+Content-Type: text/plain; charset=ISO-8859-1
+
+Hi
+
+--20cf3071cac0cb9772049eb22371
+Content-Type: text/html; charset=ISO-8859-1
+Content-Transfer-Encoding: quoted-printable
+
+<div>Hi</div>
+
+--20cf3071cac0cb9772049eb22371--
+EOF
+
+my ( $status, $id ) = RT::Test->send_via_mailgate($text);
+is( $status >> 8, 0, "The mail gateway exited normally" );
+ok( $id, "Created ticket" );
+
+my @msgs = RT::Test->fetch_caught_mails;
+is(@msgs,2,"sent 2 emails");
+diag("We're skipping any testing of the autoreply");
+
+my $entity = parse_mail($msgs[1]);
+is($entity->parts,1,"Only a single part email");
commit 8422935fef3a45deb8d92462befc96784bf2f5e1
Author: sunnavy <sunnavy at bestpractical.com>
Date: Fri Mar 18 14:04:16 2011 +0800
only one entity seems more right
diff --git a/t/mail/multipart.t b/t/mail/multipart.t
index f33b636..e252fc0 100644
--- a/t/mail/multipart.t
+++ b/t/mail/multipart.t
@@ -93,4 +93,4 @@ is(@msgs,2,"sent 2 emails");
diag("We're skipping any testing of the autoreply");
my $entity = parse_mail($msgs[1]);
-is($entity->parts,1,"Only a single part email");
+is($entity->parts, 0, "only one entity");
commit 26c3208ea0136e6af967ea6ee4af153382ffdf86
Author: sunnavy <sunnavy at bestpractical.com>
Date: Fri Mar 18 16:17:54 2011 +0800
Txn->Attachments is cached, so do not limit rows
diff --git a/lib/RT/Action/SendEmail.pm b/lib/RT/Action/SendEmail.pm
index 49762b7..7fd4eab 100755
--- a/lib/RT/Action/SendEmail.pm
+++ b/lib/RT/Action/SendEmail.pm
@@ -932,7 +932,6 @@ sub SetSubject {
}
my $message = $self->TransactionObj->Attachments;
- $message->RowsPerPage(1);
if ( $self->{'Subject'} ) {
$subject = $self->{'Subject'};
} elsif ( my $first = $message->First ) {
commit efe68af7073d8c3c4e2684a8700e02d86dd7a957
Author: Kevin Falcone <falcone at bestpractical.com>
Date: Fri Mar 18 12:15:37 2011 -0400
3.8 doesn't test warnings, so it has 2 fewer tests per file than 4.0
diff --git a/t/mail/multipart.t b/t/mail/multipart.t
index e252fc0..dc97b26 100644
--- a/t/mail/multipart.t
+++ b/t/mail/multipart.t
@@ -56,7 +56,7 @@ rt-mailgate - Mail interface to RT3.
use strict;
use warnings;
-use RT::Test tests => 7;
+use RT::Test tests => 5;
use RT::Test::Email;
my ($baseurl, $m) = RT::Test->started_ok;
-----------------------------------------------------------------------
More information about the Rt-commit
mailing list