adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 11:28:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

debugtransport now also returns in correct format as stated in RFC 2822 2.3, updated tests

Browse source
This commit is contained in:
Ceeram 2011-08-29 11:21:46 +02:00
parent 2efa3b0377
commit 3be9a8a5e8
2 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/Cake/Network/Email/DebugTransport.php
View file

@ -34,7 +34,7 @@ class DebugTransport extends AbstractTransport {
public function send(CakeEmail $email) { public function send(CakeEmail $email) {
$headers = $email->getHeaders(array('from', 'sender', 'replyTo', 'readReceipt', 'returnPath', 'to', 'cc', 'bcc', 'subject')); $headers = $email->getHeaders(array('from', 'sender', 'replyTo', 'readReceipt', 'returnPath', 'to', 'cc', 'bcc', 'subject'));
$headers = $this->_headersToString($headers); $headers = $this->_headersToString($headers);
$message = implode("\n", (array)$email->message()); $message = implode("\r\n", (array)$email->message());
return array('headers' => $headers, 'message' => $message); return array('headers' => $headers, 'message' => $message);
} }

16
lib/Cake/Test/Case/Network/Email/CakeEmailTest.php
View file

@ -542,7 +542,7 @@ class CakeEmailTest extends CakeTestCase {
$result = $this->CakeEmail->send("Here is my body, with multi lines.\nThis is the second line.\r\n\r\nAnd the last."); $result = $this->CakeEmail->send("Here is my body, with multi lines.\nThis is the second line.\r\n\r\nAnd the last.");
$expected = array('headers', 'message'); $expected = array('headers', 'message');
$this->assertEquals($expected, array_keys($result)); $this->assertEquals($expected, array_keys($result));
$expected = "Here is my body, with multi lines.\nThis is the second line.\n\nAnd the last.\n\n"; $expected = "Here is my body, with multi lines.\r\nThis is the second line.\r\n\r\nAnd the last.\r\n\r\n";
$this->assertEquals($expected, $result['message']); $this->assertEquals($expected, $result['message']);
$this->assertTrue((bool)strpos($result['headers'], 'Date: ')); $this->assertTrue((bool)strpos($result['headers'], 'Date: '));
@ -550,7 +550,7 @@ class CakeEmailTest extends CakeTestCase {
$this->assertTrue((bool)strpos($result['headers'], 'To: ')); $this->assertTrue((bool)strpos($result['headers'], 'To: '));
$result = $this->CakeEmail->send("Other body"); $result = $this->CakeEmail->send("Other body");
$expected = "Other body\n\n"; $expected = "Other body\r\n\r\n";
$this->assertIdentical($result['message'], $expected); $this->assertIdentical($result['message'], $expected);
$this->assertTrue((bool)strpos($result['headers'], 'Message-ID: ')); $this->assertTrue((bool)strpos($result['headers'], 'Message-ID: '));
$this->assertTrue((bool)strpos($result['headers'], 'To: ')); $this->assertTrue((bool)strpos($result['headers'], 'To: '));
@ -710,11 +710,7 @@ class CakeEmailTest extends CakeTestCase {
$this->CakeEmail->config(array()); $this->CakeEmail->config(array());
$this->CakeEmail->attachments(array(CAKE . 'basics.php')); $this->CakeEmail->attachments(array(CAKE . 'basics.php'));
$result = $this->CakeEmail->send('body'); $result = $this->CakeEmail->send('body');
$this->assertTrue((bool)strpos($result['message'], "Content-Type: application/octet-stream\r\nContent-Transfer-Encoding: base64\r\nContent-Disposition: attachment; filename=\"basics.php\""));
$wrap = $this->CakeEmail->wrap($result['message']);
$this->assertTrue(in_array("Content-Type: application/octet-stream", $wrap));
$this->assertTrue(in_array("Content-Transfer-Encoding: base64", $wrap));
$this->assertTrue(in_array("Content-Disposition: attachment; filename=\"basics.php\"", $wrap));
$this->CakeEmail->attachments(array('my.file.txt' => CAKE . 'basics.php')); $this->CakeEmail->attachments(array('my.file.txt' => CAKE . 'basics.php'));
$result = $this->CakeEmail->send('body'); $result = $this->CakeEmail->send('body');
@ -724,9 +720,9 @@ class CakeEmailTest extends CakeTestCase {
$result = $this->CakeEmail->send('body'); $result = $this->CakeEmail->send('body');
$this->assertTrue((bool)strpos($result['message'], "Content-Type: text/plain\r\nContent-Transfer-Encoding: base64\r\nContent-Disposition: attachment; filename=\"file.txt\"")); $this->assertTrue((bool)strpos($result['message'], "Content-Type: text/plain\r\nContent-Transfer-Encoding: base64\r\nContent-Disposition: attachment; filename=\"file.txt\""));
$this->CakeEmail->attachments(array('file.txt' => array('file' => CAKE . 'basics.php', 'mimetype' => 'text/plain', 'contentId' => 'a1b1c1'))); $this->CakeEmail->attachments(array('file2.txt' => array('file' => CAKE . 'basics.php', 'mimetype' => 'text/plain', 'contentId' => 'a1b1c1')));
$this->CakeEmail->send('body'); $result = $this->CakeEmail->send('body');
$this->assertTrue((bool)strpos($result['message'], "Content-Type: text/plain\r\nContent-Transfer-Encoding: base64\r\nContent-ID: <a1b1c1>\r\nContent-Disposition: inline; filename=\"file.txt\"")); $this->assertTrue((bool)strpos($result['message'], "Content-Type: text/plain\r\nContent-Transfer-Encoding: base64\r\nContent-ID: <a1b1c1>\r\nContent-Disposition: inline; filename=\"file2.txt\""));
} }
/** /**