From b3cf4a1bb45d9c00b923f7ce7813394e4498a37c Mon Sep 17 00:00:00 2001 From: Eileen McNaughton Date: Thu, 21 Sep 2023 14:43:31 +1200 Subject: [PATCH] Loosen regex --- tests/phpunit/CRM/Mailing/BaseMailingSystemTest.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/tests/phpunit/CRM/Mailing/BaseMailingSystemTest.php b/tests/phpunit/CRM/Mailing/BaseMailingSystemTest.php index 7884ec4f48..4844ebcd98 100644 --- a/tests/phpunit/CRM/Mailing/BaseMailingSystemTest.php +++ b/tests/phpunit/CRM/Mailing/BaseMailingSystemTest.php @@ -66,6 +66,8 @@ abstract class CRM_Mailing_BaseMailingSystemTest extends CiviUnitTestCase { /** * Generate a fully-formatted mailing with standard email headers. + * + * @throws \CRM_Core_Exception */ public function testBasicHeaders(): void { $allMessages = $this->runMailingSuccess([ @@ -77,15 +79,15 @@ abstract class CRM_Mailing_BaseMailingSystemTest extends CiviUnitTestCase { $offset = $k + 1; - $this->assertEquals("FIXME", $message->from->name); - $this->assertEquals("info@EXAMPLE.ORG", $message->from->email); + $this->assertEquals('FIXME', $message->from->name); + $this->assertEquals('info@EXAMPLE.ORG', $message->from->email); $this->assertEquals("Mr. Foo{$offset} Anderson II", $message->to[0]->name); $this->assertEquals("mail{$offset}@nul.example.com", $message->to[0]->email); $this->assertMatchesRegularExpression('#^text/plain; charset=utf-8#', $message->headers['Content-Type']); - $this->assertMatchesRegularExpression(';^b\.[\d\.a-f]+@chaos.org$;', $message->headers['Return-Path']); - $this->assertMatchesRegularExpression(';^b\.[\d\.a-f]+@chaos.org$;', $message->headers['X-CiviMail-Bounce'][0]); - $this->assertMatchesRegularExpression(';^\$;', $message->headers['List-Unsubscribe'][0]); + $this->assertMatchesRegularExpression(';^b\.[\d\.a-z]+@chaos.org$;', $message->headers['Return-Path']); + $this->assertMatchesRegularExpression(';^b\.[\d\.a-z]+@chaos.org$;', $message->headers['X-CiviMail-Bounce'][0]); + $this->assertMatchesRegularExpression(';^\$;', $message->headers['List-Unsubscribe'][0]); $this->assertEquals('bulk', $message->headers['Precedence'][0]); } } -- 2.25.1