laravel
diff --git a/‎src/Illuminate/Mail/Mailable.php
Copy file name to clipboardExpand all lines: src/Illuminate/Mail/Mailable.php
+12-3Lines changed: 12 additions & 3 deletions b/‎src/Illuminate/Mail/Mailable.php
Copy file name to clipboardExpand all lines: src/Illuminate/Mail/Mailable.php
+12-3Lines changed: 12 additions & 3 deletions
diff --git a/‎tests/Mail/MailMailableAssertionsTest.php
Copy file name to clipboardExpand all lines: tests/Mail/MailMailableAssertionsTest.php
+25-4Lines changed: 25 additions & 4 deletions b/‎tests/Mail/MailMailableAssertionsTest.php
Copy file name to clipboardExpand all lines: tests/Mail/MailMailableAssertionsTest.php
+25-4Lines changed: 25 additions & 4 deletions
@@ -976,10 +976,13 @@ public function metadata($key, $value)
      * Assert that the given text is present in the HTML email body.
      *
      * @param  string  $string
+     * @param  bool  $escape
      * @return $this
      */
-    public function assertSeeInHtml($string)
+    public function assertSeeInHtml($string, $escape = true)
     {
+        $string = $escape ? e($string) : $string;
+
         [$html, $text] = $this->renderForAssertions();
 
         PHPUnit::assertTrue(
@@ -994,10 +997,13 @@ public function assertSeeInHtml($string)
      * Assert that the given text is not present in the HTML email body.
      *
      * @param  string  $string
+     * @param  bool  $escape
      * @return $this
      */
-    public function assertDontSeeInHtml($string)
+    public function assertDontSeeInHtml($string, $escape = true)
     {
+        $string = $escape ? e($string) : $string;
+
         [$html, $text] = $this->renderForAssertions();
 
         PHPUnit::assertFalse(
@@ -1012,10 +1018,13 @@ public function assertDontSeeInHtml($string)
      * Assert that the given text strings are present in order in the HTML email body.
      *
      * @param  array  $strings
+     * @param  bool  $escape
      * @return $this
      */
-    public function assertSeeInOrderInHtml($strings)
+    public function assertSeeInOrderInHtml($strings, $escape = true)
     {
+        $strings = $escape ? array_map('e', ($strings)) : $strings;
+
         [$html, $text] = $this->renderForAssertions();
 
         PHPUnit::assertThat($strings, new SeeInOrder($html));
 
@@ -44,7 +44,9 @@ public function testMailableAssertSeeInHtmlPassesWhenPresent()
     {
         $mailable = new MailableAssertionsStub;
 
-        $mailable->assertSeeInHtml('<li>First Item</li>');
+        $mailable->assertSeeInHtml('Fourth & Fifth Item');
+
+        $mailable->assertSeeInHtml('<li>First Item</li>', false);
     }
 
     public function testMailableAssertSeeInHtmlFailsWhenAbsent()
@@ -63,13 +65,22 @@ public function testMailableAssertDontSeeInHtmlPassesWhenAbsent()
         $mailable->assertDontSeeInHtml('<li>Fourth Item</li>');
     }
 
-    public function testMailableAssertDontSeeInHtmlFailsWhenPresent()
+    public function testMailableAssertDontSeeInHtmlEscapedFailsWhenPresent()
     {
         $mailable = new MailableAssertionsStub;
 
         $this->expectException(AssertionFailedError::class);
 
-        $mailable->assertDontSeeInHtml('<li>First Item</li>');
+        $mailable->assertDontSeeInHtml('Fourth & Fifth Item');
+    }
+
+    public function testMailableAssertDontSeeInHtmlUnescapedFailsWhenPresent()
+    {
+        $mailable = new MailableAssertionsStub;
+
+        $this->expectException(AssertionFailedError::class);
+
+        $mailable->assertDontSeeInHtml('<li>First Item</li>', false);
     }
 
     public function testMailableAssertSeeInOrderTextPassesWhenPresentInOrder()
@@ -100,11 +111,17 @@ public function testMailableAssertInOrderHtmlPassesWhenPresentInOrder()
     {
         $mailable = new MailableAssertionsStub;
 
+        $mailable->assertSeeInOrderInHtml([
+            'Third Item',
+            'Fourth & Fifth Item',
+            'Sixth Item',
+        ]);
+
         $mailable->assertSeeInOrderInHtml([
             '<li>First Item</li>',
             '<li>Second Item</li>',
             '<li>Third Item</li>',
-        ]);
+        ], false);
     }
 
     public function testMailableAssertInOrderHtmlFailsWhenAbsentInOrder()
@@ -130,6 +147,8 @@ protected function renderForAssertions()
         - First Item
         - Second Item
         - Third Item
+        - Fourth & Fifth Item
+        - Sixth Item
         EOD;
 
         $html = <<<'EOD'
@@ -146,6 +165,8 @@ protected function renderForAssertions()
         <li>First Item</li>
         <li>Second Item</li>
         <li>Third Item</li>
+        <li>Fourth &amp; Fifth Item</li>
+        <li>Sixth Item</li>
         </ul>
         </body>
         </html>