BaseMailingSystemTest - Allow either old or new style URLs for "extern/open"

diff --git a/tests/phpunit/CRM/Mailing/BaseMailingSystemTest.php b/tests/phpunit/CRM/Mailing/BaseMailingSystemTest.php
index 286d4c8da8f552d8b14cd7ab767cc84068c8aad9..8c4b4146691e154b29d0d071a305436e2af7cea0 100644 (file)
--- 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
       );