From cdc21643611fe3858617cf1128cbfc68e5e220ae Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sat, 3 Jul 2021 21:52:50 +0200
Subject: [PATCH] ICalTest: minor simplifications

Follow up on 2384.

1. This test does not actually need a regular expression to test the mime message, an `assertStringContainsString()` assertion is sufficient.
2. Remove duplicate information from the `$expected` parameter. The `Content-Type: text/calendar; method=` part will always be the same. Only the method name will change.
---
 test/PHPMailer/ICalTest.php | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/test/PHPMailer/ICalTest.php b/test/PHPMailer/ICalTest.php
index 8b62783c..b1fbad52 100644
--- a/test/PHPMailer/ICalTest.php
+++ b/test/PHPMailer/ICalTest.php
@@ -28,7 +28,7 @@ final class ICalTest extends TestCase
      * @covers       \PHPMailer\PHPMailer\PHPMailer::createBody
      *
      * @param string $methodLine The Ical method line to use.
-     * @param string $expected   The expected content type header.
+     * @param string $expected   The expected method in the content type header.
      */
     public function testICalMethod($methodLine, $expected)
     {
@@ -62,7 +62,10 @@ final class ICalTest extends TestCase
             . "\r\nEND:VCALENDAR";
         $this->buildBody();
         $this->Mail->preSend();
-        self::assertMatchesRegularExpression(
+
+        $expected = 'Content-Type: text/calendar; method=' . $expected . ';';
+
+        self::assertStringContainsString(
             $expected,
             $this->Mail->getSentMIMEMessage(),
             'Wrong ICal method in Content-Type header'
@@ -79,45 +82,45 @@ final class ICalTest extends TestCase
         return [
             'Valid method: request (default)' => [
                 'methodLine' => "\r\nMETHOD:REQUEST",
-                'expected'   => '/Content-Type: text\/calendar; method=REQUEST;/',
+                'expected'   => 'REQUEST',
             ],
             'Valid method: publish' => [
                 'methodLine' => "\r\nMETHOD:PUBLISH",
-                'expected'   => '/Content-Type: text\/calendar; method=PUBLISH;/',
+                'expected'   => 'PUBLISH',
             ],
             'Valid method: reply' => [
                 'methodLine' => "\r\nMETHOD:REPLY",
-                'expected'   => '/Content-Type: text\/calendar; method=REPLY;/',
+                'expected'   => 'REPLY',
             ],
             'Valid method: add' => [
                 'methodLine' => "\r\nMETHOD:ADD",
-                'expected'   => '/Content-Type: text\/calendar; method=ADD;/',
+                'expected'   => 'ADD',
             ],
             'Valid method: cancel' => [
                 'methodLine' => "\r\nMETHOD:CANCEL",
-                'expected'   => '/Content-Type: text\/calendar; method=CANCEL;/',
+                'expected'   => 'CANCEL',
             ],
             'Valid method: refresh' => [
                 'methodLine' => "\r\nMETHOD:REFRESH",
-                'expected'   => '/Content-Type: text\/calendar; method=REFRESH;/',
+                'expected'   => 'REFRESH',
             ],
             'Valid method: counter' => [
                 'methodLine' => "\r\nMETHOD:COUNTER",
-                'expected'   => '/Content-Type: text\/calendar; method=COUNTER;/',
+                'expected'   => 'COUNTER',
             ],
             'Valid method: declinecounter' => [
                 'methodLine' => "\r\nMETHOD:DECLINECOUNTER",
-                'expected'   => '/Content-Type: text\/calendar; method=DECLINECOUNTER;/',
+                'expected'   => 'DECLINECOUNTER',
             ],
             // Test ICal invalid method to use default (REQUEST).
             'Invalid method' => [
                 'methodLine' => "\r\nMETHOD:INVALID",
-                'expected'   => '/Content-Type: text\/calendar; method=REQUEST;/',
+                'expected'   => 'REQUEST',
             ],
             // Test ICal missing method to use default (REQUEST).
             'Missing method' => [
                 'methodLine' => '',
-                'expected'   => '/Content-Type: text\/calendar; method=REQUEST;/',
+                'expected'   => 'REQUEST',
             ],
         ];
     }