From 66e733f8b1442a9e8f017a67cb4ea557b3235697 Mon Sep 17 00:00:00 2001 From: mark_story Date: Tue, 13 May 2014 22:12:39 -0400 Subject: [PATCH] Fix test I forgot to fix in b8fa7ce1349e48047539a83f574c3ff87849cafa --- .../Case/Controller/Component/EmailComponentTest.php | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/lib/Cake/Test/Case/Controller/Component/EmailComponentTest.php b/lib/Cake/Test/Case/Controller/Component/EmailComponentTest.php index ce13a4c9d84..4434f87b7a5 100644 --- a/lib/Cake/Test/Case/Controller/Component/EmailComponentTest.php +++ b/lib/Cake/Test/Case/Controller/Component/EmailComponentTest.php @@ -272,20 +272,17 @@ public function testTemplates() { $this->assertTextEquals($expected, DebugCompTransport::$lastEmail); $this->Controller->EmailTest->sendAs = 'both'; - $expected = str_replace('{CONTENTTYPE}', 'multipart/mixed; boundary="{boundary}"', $header); + $expected = str_replace('{CONTENTTYPE}', 'multipart/alternative; boundary="{boundary}"', $header); $expected .= "--{boundary}\n" . - 'Content-Type: multipart/alternative; boundary="alt-{boundary}"' . "\n\n" . - '--alt-{boundary}' . "\n" . 'Content-Type: text/plain; charset=UTF-8' . "\n" . 'Content-Transfer-Encoding: 8bit' . "\n\n" . $text . "\n\n" . - '--alt-{boundary}' . "\n" . + '--{boundary}' . "\n" . 'Content-Type: text/html; charset=UTF-8' . "\n" . 'Content-Transfer-Encoding: 8bit' . "\n\n" . $html . - "\n\n" . - '--alt-{boundary}--' . "\n\n\n" . + "\n\n\n" . '--{boundary}--' . "\n"; $expected = '
' . $expected . '
';