From dc30f80034de7432d0db92593ff9b029e99bfa98 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Wed, 13 May 2020 00:05:03 -0700
Subject: [PATCH] BaseMailingSystemTest - Allow either old or new style URLs
 for "extern/open"

---
 tests/phpunit/CRM/Mailing/BaseMailingSystemTest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/phpunit/CRM/Mailing/BaseMailingSystemTest.php b/tests/phpunit/CRM/Mailing/BaseMailingSystemTest.php
index 286d4c8da8..8c4b414669 100644
--- a/tests/phpunit/CRM/Mailing/BaseMailingSystemTest.php
+++ b/tests/phpunit/CRM/Mailing/BaseMailingSystemTest.php
@@ -151,7 +151,7 @@ abstract class CRM_Mailing_BaseMailingSystemTest extends CiviUnitTestCase {
         // Default footer
         "Sample Footer for HTML formatted content" .
         ".*\n" .
-        "<img src=\".*extern/open.php.*\"" .
+        "<img src=\".*(extern/open.php|civicrm/mailing/open).*\"" .
         ";",
         $htmlPart->text
       );
@@ -206,7 +206,7 @@ abstract class CRM_Mailing_BaseMailingSystemTest extends CiviUnitTestCase {
         "Sample Footer for HTML formatted content" .
         ".*\n" .
         // Open-tracking code
-        "<img src=\".*extern/open.php.*\"" .
+        "<img src=\".*(extern/open.php|civicrm/mailing/open).*\"" .
         ";",
         $htmlPart->text
       );
-- 
2.25.1