Docker and Travis differs in handling new message eols (#404)

ddeboer · Mar 2, 2019 · e8e02f5 · e8e02f5
1 parent 53f2eda
commit e8e02f5
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/tests/MessageTest.php b/tests/MessageTest.php
@@ -167,7 +167,7 @@ public function testBodyCharsets(string $charset = null, string $charList, strin
         $message = $this->mailbox->getMessage(1);
 
         static::assertSame($subject, $message->getSubject());
-        static::assertSame($charList, $message->getBodyText());
+        static::assertSame($charList, \rtrim($message->getBodyText() ?: ''));
     }
 
     public function provideCharsets(): array
@@ -202,7 +202,7 @@ public function testCharsetAlias()
 
         $message = $this->mailbox->getMessage(1);
 
-        static::assertSame($text, $message->getBodyText());
+        static::assertSame($text, \rtrim($message->getBodyText() ?: ''));
     }
 
     public function testMicrosoftCharsetAlias()
@@ -222,7 +222,7 @@ public function testMicrosoftCharsetAlias()
 
         $message = $this->mailbox->getMessage(1);
 
-        static::assertSame($text, $message->getBodyText());
+        static::assertSame($text, \rtrim($message->getBodyText() ?: ''));
     }
 
     public function testUnsupportedCharset()
@@ -250,7 +250,7 @@ public function testUndefinedContentCharset()
 
         $message = $this->mailbox->getMessage(1);
 
-        static::assertSame('Hi!', $message->getBodyText());
+        static::assertSame('Hi!', \rtrim($message->getBodyText() ?: ''));
     }
 
     public function testSpecialCharsetOnHeaders()
@@ -287,7 +287,7 @@ public function testIconvFallback(string $charset, string $charList, string $enc
         $message = $this->mailbox->getMessage(1);
 
         static::assertSame($subject, $message->getSubject());
-        static::assertSame($charList, $message->getBodyText());
+        static::assertSame($charList, \rtrim($message->getBodyText() ?: ''));
     }
 
     public function provideIconvCharsets(): array
@@ -691,7 +691,7 @@ public function testPlainOnlyMessage()
 
         $message = $this->mailbox->getMessage(1);
 
-        static::assertSame('Hi', $message->getBodyText());
+        static::assertSame('Hi', \rtrim($message->getBodyText() ?: ''));
         static::assertNull($message->getBodyHtml());
     }
 
@@ -701,7 +701,7 @@ public function testHtmlOnlyMessage()
 
         $message = $this->mailbox->getMessage(1);
 
-        static::assertSame('<html><body>Hi</body></html>', $message->getBodyHtml());
+        static::assertSame('<html><body>Hi</body></html>', \rtrim($message->getBodyHtml() ?: ''));
         static::assertNull($message->getBodyText());
     }
 
@@ -785,7 +785,7 @@ public function testSimpleMessageWithoutCharset()
 
         $message = $this->mailbox->getMessage(1);
 
-        static::assertSame('Hi', $message->getBodyText());
+        static::assertSame('Hi', \rtrim($message->getBodyText() ?: ''));
     }
 
     public function testMultipartMessageWithoutCharset()