adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-02-12 06:56:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add tests for contentDisposition flag.

Browse source 
Fixes #3042
This commit is contained in:
mark_story 2012-07-21 21:22:04 -04:00
parent 9deb966657
commit 6ce4a3a1ec
2 changed files with 50 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/Cake/Network/Email/CakeEmail.php
View file

@ -1355,7 +1355,10 @@ class CakeEmail {
$msg[] = '--' . $boundary; $msg[] = '--' . $boundary;
$msg[] = 'Content-Type: ' . $fileInfo['mimetype']; $msg[] = 'Content-Type: ' . $fileInfo['mimetype'];
$msg[] = 'Content-Transfer-Encoding: base64'; $msg[] = 'Content-Transfer-Encoding: base64';
if (!isset($fileInfo['contentDisposition']) || $fileInfo['contentDisposition']) { if (
!isset($fileInfo['contentDisposition']) ||
$fileInfo['contentDisposition']
) {
$msg[] = 'Content-Disposition: attachment; filename="' . $filename . '"'; $msg[] = 'Content-Disposition: attachment; filename="' . $filename . '"';
} }
$msg[] = ''; $msg[] = '';

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

@ -640,13 +640,20 @@ class CakeEmailTest extends CakeTestCase {
*/ */
public function testAttachments() { public function testAttachments() {
$this->CakeEmail->attachments(CAKE . 'basics.php'); $this->CakeEmail->attachments(CAKE . 'basics.php');
$expected = array('basics.php' => array('file' => CAKE . 'basics.php', 'mimetype' => 'application/octet-stream')); $expected = array(
'basics.php' => array(
'file' => CAKE . 'basics.php',
'mimetype' => 'application/octet-stream'
)
);
$this->assertSame($this->CakeEmail->attachments(), $expected); $this->assertSame($this->CakeEmail->attachments(), $expected);
$this->CakeEmail->attachments(array()); $this->CakeEmail->attachments(array());
$this->assertSame($this->CakeEmail->attachments(), array()); $this->assertSame($this->CakeEmail->attachments(), array());
$this->CakeEmail->attachments(array(array('file' => CAKE . 'basics.php', 'mimetype' => 'text/plain'))); $this->CakeEmail->attachments(array(
array('file' => CAKE . 'basics.php', 'mimetype' => 'text/plain')
));
$this->CakeEmail->addAttachments(CAKE . 'bootstrap.php'); $this->CakeEmail->addAttachments(CAKE . 'bootstrap.php');
$this->CakeEmail->addAttachments(array(CAKE . 'bootstrap.php')); $this->CakeEmail->addAttachments(array(CAKE . 'bootstrap.php'));
$this->CakeEmail->addAttachments(array('other.txt' => CAKE . 'bootstrap.php', 'license' => CAKE . 'LICENSE.txt')); $this->CakeEmail->addAttachments(array('other.txt' => CAKE . 'bootstrap.php', 'license' => CAKE . 'LICENSE.txt'));
@ -937,6 +944,43 @@ class CakeEmailTest extends CakeTestCase {
$this->assertContains('--' . $boundary . '--', $result['message']); $this->assertContains('--' . $boundary . '--', $result['message']);
} }
/**
* Test disabling content-disposition.
*
* @return void
*/
public function testSendWithNoContentDispositionAttachments() {
$this->CakeEmail->transport('debug');
$this->CakeEmail->from('cake@cakephp.org');
$this->CakeEmail->to('cake@cakephp.org');
$this->CakeEmail->subject('My title');
$this->CakeEmail->emailFormat('text');
$this->CakeEmail->attachments(array(
'cake.png' => array(
'file' => CAKE . 'VERSION.txt',
'contentDisposition' => false
)
));
$result = $this->CakeEmail->send('Hello');
$boundary = $this->CakeEmail->getBoundary();
$this->assertContains('Content-Type: multipart/mixed; boundary="' . $boundary . '"', $result['headers']);
$expected = "--$boundary\r\n" .
"Content-Type: text/plain; charset=UTF-8\r\n" .
"Content-Transfer-Encoding: 8bit\r\n" .
"\r\n" .
"Hello" .
"\r\n" .
"\r\n" .
"\r\n" .
"--{$boundary}\r\n" .
"Content-Type: application/octet-stream\r\n" .
"Content-Transfer-Encoding: base64\r\n" .
"\r\n";
$this->assertContains($expected, $result['message']);
$this->assertContains('--' . $boundary . '--', $result['message']);
}
/** /**
* testSendWithLog method * testSendWithLog method
* *