rt 4.2.14 (#13852)

10 files changed, 64 insertions, 16 deletions

diff --git a/rt/t/mail/gnupg-outgoing-encrypted-plaintext.t b/rt/t/mail/gnupg-outgoing-encrypted-plaintext.t
index 35cfceddd..7f0f7ac85 100644
--- a/rt/t/mail/gnupg-outgoing-encrypted-plaintext.t
+++ b/rt/t/mail/gnupg-outgoing-encrypted-plaintext.t
@@ -2,7 +2,7 @@ use strict;
 use warnings;
 
 use RT::Test::GnuPG
-  tests          => 104,
+  tests          => undef,
   text_templates => 1,
   gnupg_options  => {
     passphrase    => 'rt-test',
@@ -10,7 +10,7 @@ use RT::Test::GnuPG
   };
 
 RT::Test->import_gnupg_key('rt-recipient@example.com');
-RT::Test->import_gnupg_key( 'rt-test@example.com', 'public' );
+RT::Test->import_gnupg_key( 'rt-test@example.com' );
 
 my $queue = RT::Test->load_or_create_queue(
     Name              => 'Regression',
@@ -25,3 +25,5 @@ ok $m->login, 'logged in';
 
 create_and_test_outgoing_emails( $queue, $m );
 
+undef $m;
+done_testing;
diff --git a/rt/t/mail/gnupg-outgoing-encrypted.t b/rt/t/mail/gnupg-outgoing-encrypted.t
index 96c748794..dc6a55d29 100644
--- a/rt/t/mail/gnupg-outgoing-encrypted.t
+++ b/rt/t/mail/gnupg-outgoing-encrypted.t
@@ -2,14 +2,14 @@ use strict;
 use warnings;
 
 use RT::Test::GnuPG
-  tests         => 103,
+  tests         => undef,
   gnupg_options => {
     passphrase    => 'rt-test',
     'trust-model' => 'always',
   };
 
 RT::Test->import_gnupg_key('rt-recipient@example.com');
-RT::Test->import_gnupg_key( 'rt-test@example.com', 'public' );
+RT::Test->import_gnupg_key( 'rt-test@example.com' );
 
 my $queue = RT::Test->load_or_create_queue(
     Name              => 'Regression',
@@ -24,3 +24,5 @@ ok $m->login, 'logged in';
 
 create_and_test_outgoing_emails( $queue, $m );
 
+undef $m;
+done_testing;
diff --git a/rt/t/mail/gnupg-outgoing-plain-plaintext.t b/rt/t/mail/gnupg-outgoing-plain-plaintext.t
index 32e7d5d8c..baf51e49f 100644
--- a/rt/t/mail/gnupg-outgoing-plain-plaintext.t
+++ b/rt/t/mail/gnupg-outgoing-plain-plaintext.t
@@ -2,7 +2,7 @@ use strict;
 use warnings;
 
 use RT::Test::GnuPG
-  tests          => 104,
+  tests          => undef,
   text_templates => 1,
   gnupg_options  => {
     passphrase    => 'rt-test',
@@ -10,7 +10,7 @@ use RT::Test::GnuPG
   };
 
 RT::Test->import_gnupg_key('rt-recipient@example.com');
-RT::Test->import_gnupg_key( 'rt-test@example.com', 'public' );
+RT::Test->import_gnupg_key( 'rt-test@example.com' );
 
 my $queue = RT::Test->load_or_create_queue(
     Name              => 'Regression',
@@ -23,3 +23,5 @@ my ( $baseurl, $m ) = RT::Test->started_ok;
 ok $m->login, 'logged in';
 
 create_and_test_outgoing_emails( $queue, $m );
+undef $m;
+done_testing;
diff --git a/rt/t/mail/gnupg-outgoing-plain.t b/rt/t/mail/gnupg-outgoing-plain.t
index 62ae0ed49..f8f87e1c7 100644
--- a/rt/t/mail/gnupg-outgoing-plain.t
+++ b/rt/t/mail/gnupg-outgoing-plain.t
@@ -2,14 +2,14 @@ use strict;
 use warnings;
 
 use RT::Test::GnuPG
-  tests         => 103,
+  tests         => undef,
   gnupg_options => {
     passphrase    => 'rt-test',
     'trust-model' => 'always',
   };
 
 RT::Test->import_gnupg_key('rt-recipient@example.com');
-RT::Test->import_gnupg_key( 'rt-test@example.com', 'public' );
+RT::Test->import_gnupg_key( 'rt-test@example.com' );
 
 my $queue = RT::Test->load_or_create_queue(
     Name              => 'Regression',
@@ -22,3 +22,5 @@ my ( $baseurl, $m ) = RT::Test->started_ok;
 ok $m->login, 'logged in';
 
 create_and_test_outgoing_emails( $queue, $m );
+undef $m;
+done_testing;
diff --git a/rt/t/mail/gnupg-outgoing-signed-plaintext.t b/rt/t/mail/gnupg-outgoing-signed-plaintext.t
index cf46edd52..0ff06d1ff 100644
--- a/rt/t/mail/gnupg-outgoing-signed-plaintext.t
+++ b/rt/t/mail/gnupg-outgoing-signed-plaintext.t
@@ -2,7 +2,7 @@ use strict;
 use warnings;
 
 use RT::Test::GnuPG
-  tests          => 104,
+  tests          => undef,
   text_templates => 1,
   gnupg_options  => {
     passphrase    => 'rt-test',
@@ -10,7 +10,7 @@ use RT::Test::GnuPG
   };
 
 RT::Test->import_gnupg_key('rt-recipient@example.com');
-RT::Test->import_gnupg_key( 'rt-test@example.com', 'public' );
+RT::Test->import_gnupg_key( 'rt-test@example.com' );
 
 my $queue = RT::Test->load_or_create_queue(
     Name              => 'Regression',
@@ -25,3 +25,5 @@ ok $m->login, 'logged in';
 
 create_and_test_outgoing_emails( $queue, $m );
 
+undef $m;
+done_testing;
diff --git a/rt/t/mail/gnupg-outgoing-signed.t b/rt/t/mail/gnupg-outgoing-signed.t
index 4aa262bee..00d292a40 100644
--- a/rt/t/mail/gnupg-outgoing-signed.t
+++ b/rt/t/mail/gnupg-outgoing-signed.t
@@ -2,14 +2,14 @@ use strict;
 use warnings;
 
 use RT::Test::GnuPG
-  tests         => 103,
+  tests         => undef,
   gnupg_options => {
     passphrase    => 'rt-test',
     'trust-model' => 'always',
   };
 
 RT::Test->import_gnupg_key('rt-recipient@example.com');
-RT::Test->import_gnupg_key( 'rt-test@example.com', 'public' );
+RT::Test->import_gnupg_key( 'rt-test@example.com' );
 
 my $queue = RT::Test->load_or_create_queue(
     Name              => 'Regression',
@@ -24,3 +24,5 @@ ok $m->login, 'logged in';
 
 create_and_test_outgoing_emails( $queue, $m );
 
+undef $m;
+done_testing;
diff --git a/rt/t/mail/gnupg-outgoing-signed_encrypted-plaintext.t b/rt/t/mail/gnupg-outgoing-signed_encrypted-plaintext.t
index c2753d00b..b21b34436 100644
--- a/rt/t/mail/gnupg-outgoing-signed_encrypted-plaintext.t
+++ b/rt/t/mail/gnupg-outgoing-signed_encrypted-plaintext.t
@@ -2,7 +2,7 @@ use strict;
 use warnings;
 
 use RT::Test::GnuPG
-  tests          => 104,
+  tests          => undef,
   text_templates => 1,
   gnupg_options  => {
     passphrase    => 'rt-test',
@@ -10,7 +10,7 @@ use RT::Test::GnuPG
   };
 
 RT::Test->import_gnupg_key('rt-recipient@example.com');
-RT::Test->import_gnupg_key( 'rt-test@example.com', 'public' );
+RT::Test->import_gnupg_key( 'rt-test@example.com' );
 
 my $queue = RT::Test->load_or_create_queue(
     Name              => 'Regression',
@@ -26,3 +26,5 @@ ok $m->login, 'logged in';
 
 create_and_test_outgoing_emails( $queue, $m );
 
+undef $m;
+done_testing;
diff --git a/rt/t/mail/gnupg-outgoing-signed_encrypted.t b/rt/t/mail/gnupg-outgoing-signed_encrypted.t
index 806f62d95..1399c57ea 100644
--- a/rt/t/mail/gnupg-outgoing-signed_encrypted.t
+++ b/rt/t/mail/gnupg-outgoing-signed_encrypted.t
@@ -2,14 +2,14 @@ use strict;
 use warnings;
 
 use RT::Test::GnuPG
-  tests         => 103,
+  tests         => undef,
   gnupg_options => {
     passphrase    => 'rt-test',
     'trust-model' => 'always',
   };
 
 RT::Test->import_gnupg_key('rt-recipient@example.com');
-RT::Test->import_gnupg_key( 'rt-test@example.com', 'public' );
+RT::Test->import_gnupg_key( 'rt-test@example.com' );
 
 my $queue = RT::Test->load_or_create_queue(
     Name              => 'Regression',
@@ -25,3 +25,5 @@ ok $m->login, 'logged in';
 
 create_and_test_outgoing_emails( $queue, $m );
 
+undef $m;
+done_testing;
diff --git a/rt/t/mail/mime_decoding.t b/rt/t/mail/mime_decoding.t
index 1126f1f84..97590712b 100644
--- a/rt/t/mail/mime_decoding.t
+++ b/rt/t/mail/mime_decoding.t
@@ -236,4 +236,14 @@ diag "quotes in filename";
     );
 }
 
+diag "Alternating encoded-words and not, space is preserved";
+{
+    my $str = q{A =?UTF-8?Q?B?= C =?UTF-8?Q?D?= E =?UTF-8?Q?F?= G};
+    is_string(
+        RT::I18N::DecodeMIMEWordsToUTF8($str, "Subject"),
+        q{A B C D E F G},
+        "Space is preserved between encoded-words and not"
+    );
+}
+
 done_testing;
diff --git a/rt/t/mail/one-time-recipients.t b/rt/t/mail/one-time-recipients.t
index 1bc172d71..bdbcc523d 100644
--- a/rt/t/mail/one-time-recipients.t
+++ b/rt/t/mail/one-time-recipients.t
@@ -89,6 +89,28 @@ warnings_are {
         );
         ok $status, "replied to a ticket";
     } { Cc => 'test@localhost' };
+}[];
+
+diag "Reply to ticket with multiple requestors squelched";
+warnings_are {
+    my $ticket = RT::Ticket->new( RT::CurrentUser->new( $user ) );
+    mail_ok {
+        my ($status, undef, $msg) = $ticket->Create(
+            Queue => $queue->id,
+            Subject => 'test squelch',
+            Requestor => ['test@localhost','bob@localhost','fred@localhost' ],
+        );
+        ok $status, "created ticket";
+    } { To => 'bob@localhost, fred@localhost, test@localhost' };
+
+    mail_ok {
+        my ($status,$msg) = $ticket->Correspond(
+            Content => 'squelched email',
+            SquelchMailTo => ['bob@localhost', 'fred@localhost'],
+        );
+        ok $status, "replied to a ticket";
+    } { To => 'test@localhost' };
+
 } [];
 
 diag "Reply to ticket with requestor squelched";