[Rt-commit] rt branch, 4.4-trunk, updated. rt-4.4.2-26-g432a257

[Brian Duggan]

The branch, 4.4-trunk has been updated
       via  432a2577a5a464a9610ff81cd5869b1efd848e7b (commit)
       via  70bc41ae183bc7a626a1dd30bbd357eb44faf53b (commit)
       via  619cfa6f991bfafb33ba9dc4585fe3a14f75c41b (commit)
      from  28b047bc6991143b818e88b6b30d7c54496f3efd (commit)

Summary of changes:
 docs/customizing/templates.pod      | 23 +++++++++++++++++++++++
 t/web/gnupg-select-keys-on-update.t |  4 ++--
 2 files changed, 25 insertions(+), 2 deletions(-)

- Log -----------------------------------------------------------------
commit 70bc41ae183bc7a626a1dd30bbd357eb44faf53b
Author: Brian C. Duggan <brian at bestpractical.com>
Date:   Fri Jul 21 16:53:55 2017 -0400

    Initial test warning string updates

diff --git a/t/web/gnupg-select-keys-on-update.t b/t/web/gnupg-select-keys-on-update.t
index 24d22e7..d7a315f 100644
--- a/t/web/gnupg-select-keys-on-update.t
+++ b/t/web/gnupg-select-keys-on-update.t
@@ -45,7 +45,7 @@ diag "check that signing doesn't work if there is no key";
     my @mail = RT::Test->fetch_caught_mails;
     ok !@mail, 'there are no outgoing emails';
 
-    $m->next_warning_like(qr/secret key not available/);
+    $m->next_warning_like(qr/(secret key not available|No secret key)/);
     $m->no_leftover_warnings_ok;
 }
 
@@ -82,7 +82,7 @@ diag "check that things don't work if there is no key";
     my @mail = RT::Test->fetch_caught_mails;
     ok !@mail, 'there are no outgoing emails';
 
-    $m->next_warning_like(qr/public key not found/) for 1 .. 2;
+    $m->next_warning_like(qr/(public key not found|No public key)/) for 1 .. 2;
     $m->no_leftover_warnings_ok;
 }
 

commit 432a2577a5a464a9610ff81cd5869b1efd848e7b
Merge: 70bc41a 619cfa6
Author: Brian C. Duggan <brian at bestpractical.com>
Date:   Mon Aug 7 12:50:59 2017 -0400

    Merge branch '4.4/queue-template-doc' into 4.4-trunk


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