Fix tests

src/Network/Email/Email.php

@@ -4,6 +4,9 @@ namespace Tools\Network\Email;
 use Cake\Network\Email\Email as CakeEmail;
 use Tools\Utility\Utility;
 use Tools\Utility\Mime;
+use Cake\Utility\String;
+use InvalidArgumentException;
+use Cake\Core\Configure;
 
 class Email extends CakeEmail {
 
@@ -11,13 +14,27 @@ class Email extends CakeEmail {
 
 	protected $_priority = null;
 
+	protected $_error = null;
+
 	public function __construct($config = null) {
 		if ($config === null) {
 			$config = 'default';
 		}
 		parent::__construct($config);
-die(debug($this));
-		//$this->resetAndSet();
+		$this->profile($config);
+	}
+
+	/**
+	 * Change the layout
+	 *
+	 * @param string $layout Layout to use (or false to use none)
+	 * @return resource EmailLib
+	 */
+	public function layout($layout = false) {
+		if ($layout !== false) {
+			$this->_layout = $layout;
+		}
+		return $this;
 	}
 
 	/**
@@ -74,6 +91,22 @@ die(debug($this));
 
 		$this->_error = null;
 		$this->_debug = null;
+	}
+
+	/**
+	 * Ovewrite to allow custom enhancements
+	 *
+	 * @param mixed $config
+	 * @return null|$this
+	 */
+	public function profile($config = null) {
+		if ($config === null) {
+			return $this->_profile;
+		}
+		if (!is_array($config)) {
+			$config = (string)$config;
+		}
+		$this->_applyConfig($config);
 
 		if ($fromEmail = Configure::read('Config.systemEmail')) {
 			$fromName = Configure::read('Config.systemName');
@@ -89,6 +122,417 @@ die(debug($this));
 		if ($xMailer = Configure::read('Config.xMailer')) {
 			$this->addHeaders(array('X-Mailer' => $xMailer));
 		}
+
+		return $this;
+	}
+
+	/**
+	 * Overwrite to allow mimetype detection
+	 *
+	 * @param mixed $attachments
+	 * @return
+	 */
+	public function attachments($attachments = null) {
+		if ($attachments === null) {
+			return $this->_attachments;
+		}
+		$attach = array();
+		foreach ((array)$attachments as $name => $fileInfo) {
+			if (!is_array($fileInfo)) {
+				$fileInfo = array('file' => $fileInfo);
+			}
+			if (!isset($fileInfo['file'])) {
+				if (!isset($fileInfo['data'])) {
+					throw new InvalidArgumentException('No file or data specified.');
+				}
+				if (is_int($name)) {
+					throw new InvalidArgumentException('No filename specified.');
+				}
+				$fileInfo['data'] = chunk_split(base64_encode($fileInfo['data']), 76, "\r\n");
+			} else {
+				$fileName = $fileInfo['file'];
+				$fileInfo['file'] = realpath($fileInfo['file']);
+				if ($fileInfo['file'] === false || !file_exists($fileInfo['file'])) {
+					throw new InvalidArgumentException(sprintf('File not found: "%s"', $fileName));
+				}
+				if (is_int($name)) {
+					$name = basename($fileInfo['file']);
+				}
+			}
+			if (!isset($fileInfo['mimetype'])) {
+				$ext = pathinfo($name, PATHINFO_EXTENSION);
+				$fileInfo['mimetype'] = $this->_getMimeByExtension($ext);
+			}
+			$attach[$name] = $fileInfo;
+		}
+		$this->_attachments = $attach;
+		return $this;
+	}
+
+	/**
+	 * Add an attachment from file
+	 *
+	 * @param string $file: absolute path
+	 * @param string $filename
+	 * @param array $fileInfo
+	 * @return resource EmailLib
+	 */
+	public function addAttachment($file, $name = null, $fileInfo = array()) {
+		$fileInfo['file'] = $file;
+		if (!empty($name)) {
+			$fileInfo = array($name => $fileInfo);
+		} else {
+			$fileInfo = array($fileInfo);
+		}
+		return $this->addAttachments($fileInfo);
+	}
+
+	/**
+	 * Add an attachment as blob
+	 *
+	 * @param binary $content: blob data
+	 * @param string $filename to attach it
+	 * @param string $mimeType (leave it empty to get mimetype from $filename)
+	 * @param array $fileInfo
+	 * @return resource EmailLib
+	 */
+	public function addBlobAttachment($content, $filename, $mimeType = null, $fileInfo = array()) {
+		if ($mimeType === null) {
+			$ext = pathinfo($filename, PATHINFO_EXTENSION);
+			$mimeType = $this->_getMimeByExtension($ext);
+		}
+		$fileInfo['data'] = $content;
+		$fileInfo['mimetype'] = $mimeType;
+		$file = array($filename => $fileInfo);
+		return $this->addAttachments($file);
+	}
+
+	/**
+	 * Add an inline attachment from file
+	 *
+	 * Options:
+	 * - mimetype
+	 * - contentDisposition
+	 *
+	 * @param string $file: absolute path
+	 * @param string $filename (optional)
+	 * @param string $contentId (optional)
+	 * @param array $options Options
+	 * @return mixed resource $EmailLib or string $contentId
+	 */
+	public function addEmbeddedAttachment($file, $name = null, $contentId = null, $options = array()) {
+		if (empty($name)) {
+			$name = basename($file);
+		}
+		if ($contentId === null && ($cid = $this->_isEmbeddedAttachment($file, $name))) {
+			return $cid;
+		}
+
+		$options['file'] = $file;
+		if (empty($options['mimetype'])) {
+			$options['mimetype'] = $this->_getMime($file);
+		}
+		$options['contentId'] = $contentId ? $contentId : str_replace('-', '', String::uuid()) . '@' . $this->_domain;
+		$file = array($name => $options);
+		$res = $this->addAttachments($file);
+		if ($contentId === null) {
+			return $options['contentId'];
+		}
+		return $res;
+	}
+
+	/**
+	 * Add an inline attachment as blob
+	 *
+	 * Options:
+	 * - contentDisposition
+	 *
+	 * @param binary $content: blob data
+	 * @param string $filename to attach it
+	 * @param string $mimeType (leave it empty to get mimetype from $filename)
+	 * @param string $contentId (optional)
+	 * @param array $options Options
+	 * @return mixed resource $EmailLib or string $contentId
+	 */
+	public function addEmbeddedBlobAttachment($content, $filename, $mimeType = null, $contentId = null, $options = array()) {
+		if ($mimeType === null) {
+			$ext = pathinfo($filename, PATHINFO_EXTENSION);
+			$mimeType = $this->_getMimeByExtension($ext);
+		}
+		$options['data'] = $content;
+		$options['mimetype'] = $mimeType;
+		$options['contentId'] = $contentId ? $contentId : str_replace('-', '', String::uuid()) . '@' . $this->_domain;
+		$file = array($filename => $options);
+		$res = $this->addAttachments($file);
+		if ($contentId === null) {
+			return $options['contentId'];
+		}
+		return $res;
+	}
+
+	/**
+	 * Returns if this particular file has already been attached as embedded file with this exact name
+	 * to prevent the same image to overwrite each other and also to only send this image once.
+	 * Allows multiple usage of the same embedded image (using the same cid)
+	 *
+	 * @return string cid of the found file or false if no such attachment can be found
+	 */
+	protected function _isEmbeddedAttachment($file, $name) {
+		foreach ($this->_attachments as $filename => $fileInfo) {
+			if ($filename !== $name) {
+				continue;
+			}
+			if ($fileInfo['file'] === $file) {
+				return $fileInfo['contentId'];
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * Try to determine the mimetype by filename.
+	 * Uses finfo_open() if availble, otherwise guesses it via file extension.
+	 *
+	 * @param string $filename
+	 * @return string Mimetype
+	 */
+	protected function _getMime($filename) {
+		$mimeType = Utility::getMimeType($filename);
+		if (!$mimeType) {
+			$ext = pathinfo($filename, PATHINFO_EXTENSION);
+			$mimeType = $this->_getMimeByExtension($ext);
+		}
+		return $mimeType;
+	}
+
+	/**
+	 * Try to find mimetype by file extension
+	 *
+	 * @param string $ext lowercase (jpg, png, pdf, ...)
+	 * @param string $defaultMimeType
+	 * @return string Mimetype (falls back to `application/octet-stream`)
+	 */
+	protected function _getMimeByExtension($ext, $default = 'application/octet-stream') {
+		if (!$ext) {
+			return $default;
+		}
+		if (!isset($this->_Mime)) {
+			$this->_Mime = new Mime();
+		}
+		$mime = $this->_Mime->getMimeType($ext);
+		if (!$mime) {
+			$mime = $default;
+		}
+		return $mime;
+	}
+
+	/**
+	 * Read the file contents and return a base64 version of the file contents.
+	 * Overwrite parent to avoid File class and file_exists to false negative existent
+	 * remove images.
+	 * Also fixes file_get_contents (used via File class) to close the connection again
+	 * after getting remote files. So far it would have kept the connection open in HTTP/1.1.
+	 *
+	 * @param string $path The absolute path to the file to read.
+	 * @return string File contents in base64 encoding
+	 */
+	protected function _readFile($path) {
+		$context = stream_context_create(
+			array('http' => array('header' => 'Connection: close')));
+		$content = file_get_contents($path, 0, $context);
+		if (!$content) {
+			trigger_error('No content found for ' . $path);
+		}
+		return chunk_split(base64_encode($content));
+	}
+
+	/**
+	 * Validate if the email has the required fields necessary to make send() work.
+	 * Assumes layouting (does not check on content to be present or if view/layout files are missing).
+	 *
+	 * @return bool Success
+	 */
+	public function validates() {
+		if (!empty($this->_subject) && !empty($this->_to)) {
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * Set the body of the mail as we send it.
+	 * Note: the text can be an array, each element will appear as a seperate line in the message body.
+	 *
+	 * Do NOT pass a message if you use $this->set() in combination with templates
+	 *
+	 * @overwrite
+	 * @param string/array: message
+	 * @return bool Success
+	 */
+	public function send($message = null) {
+		$this->profile('default');
+
+		$this->_log = array(
+			'to' => $this->_to,
+			'from' => $this->_from,
+			'sender' => $this->_sender,
+			'replyTo' => $this->_replyTo,
+			'cc' => $this->_cc,
+			'subject' => $this->_subject,
+			'bcc' => $this->_bcc,
+			'transport' => $this->_transport
+		);
+		if ($this->_priority) {
+			$this->_headers['X-Priority'] = $this->_priority;
+			//$this->_headers['X-MSMail-Priority'] = 'High';
+			//$this->_headers['Importance'] = 'High';
+		}
+
+		// Security measure to not sent to the actual addressee in debug mode while email sending is live
+		if (Configure::read('debug') && Configure::read('Email.live')) {
+			$adminEmail = Configure::read('Config.adminEmail');
+			if (!$adminEmail) {
+				$adminEmail = Configure::read('Config.systemEmail');
+			}
+			foreach ($this->_to as $k => $v) {
+				if ($k === $adminEmail) {
+					continue;
+				}
+				unset($this->_to[$k]);
+				$this->_to[$adminEmail] = $v;
+			}
+			foreach ($this->_cc as $k => $v) {
+				if ($k === $adminEmail) {
+					continue;
+				}
+				unset($this->_cc[$k]);
+				$this->_cc[$adminEmail] = $v;
+			}
+			foreach ($this->_bcc as $k => $v) {
+				if ($k === $adminEmail) {
+					continue;
+				}
+				unset($this->_bcc[$k]);
+				$this->_bcc[] = $v;
+			}
+		}
+
+		try {
+			$this->_debug = parent::send($message);
+		} catch (\Exception $e) {
+			$this->_error = $e->getMessage();
+			$this->_error .= ' (line ' . $e->getLine() . ' in ' . $e->getFile() . ')' . PHP_EOL .
+				$e->getTraceAsString();
+
+			if (!empty($this->_config['logReport'])) {
+				$this->_logEmail();
+			} else {
+				//Log::write('error', $this->_error);
+			}
+			return false;
+		}
+
+		if (!empty($this->_config['logReport'])) {
+			$this->_logEmail();
+		}
+		return true;
+	}
+
+	/**
+	 * Attach inline/embedded files to the message.
+	 *
+	 * CUSTOM FIX: blob data support
+	 *
+	 * @override
+	 * @param string $boundary Boundary to use. If null, will default to $this->_boundary
+	 * @return array An array of lines to add to the message
+	 */
+	protected function _attachInlineFiles($boundary = null) {
+		if ($boundary === null) {
+			$boundary = $this->_boundary;
+		}
+
+		$msg = array();
+		foreach ($this->_attachments as $filename => $fileInfo) {
+			if (empty($fileInfo['contentId'])) {
+				continue;
+			}
+			if (!empty($fileInfo['data'])) {
+				$data = $fileInfo['data'];
+				$data = chunk_split(base64_encode($data));
+
+			} elseif (!empty($fileInfo['file'])) {
+				$data = $this->_readFile($fileInfo['file']);
+
+			} else {
+				continue;
+			}
+
+			$msg[] = '--' . $boundary;
+			$msg[] = 'Content-Type: ' . $fileInfo['mimetype'];
+			$msg[] = 'Content-Transfer-Encoding: base64';
+			$msg[] = 'Content-ID: <' . $fileInfo['contentId'] . '>';
+			$msg[] = 'Content-Disposition: inline; filename="' . $filename . '"';
+			$msg[] = '';
+			$msg[] = $data;
+			$msg[] = '';
+		}
+		return $msg;
+	}
+
+	/**
+	 * Attach non-embedded files by adding file contents inside boundaries.
+	 *
+	 * CUSTOM FIX: blob data support
+	 *
+	 * @override
+	 * @param string $boundary Boundary to use. If null, will default to $this->_boundary
+	 * @return array An array of lines to add to the message
+	 */
+	protected function _attachFiles($boundary = null) {
+		if ($boundary === null) {
+			$boundary = $this->_boundary;
+		}
+
+		$msg = array();
+		foreach ($this->_attachments as $filename => $fileInfo) {
+			if (!empty($fileInfo['contentId'])) {
+				continue;
+			}
+			if (!empty($fileInfo['data'])) {
+				$data = $fileInfo['data'];
+				$data = chunk_split(base64_encode($data));
+
+			} elseif (!empty($fileInfo['file'])) {
+				$data = $this->_readFile($fileInfo['file']);
+
+			} else {
+				continue;
+			}
+
+			$msg[] = '--' . $boundary;
+			$msg[] = 'Content-Type: ' . $fileInfo['mimetype'];
+			$msg[] = 'Content-Transfer-Encoding: base64';
+			if (
+				!isset($fileInfo['contentDisposition']) ||
+				$fileInfo['contentDisposition']
+			) {
+				$msg[] = 'Content-Disposition: attachment; filename="' . $filename . '"';
+			}
+			$msg[] = '';
+			$msg[] = $data;
+			$msg[] = '';
+		}
+		return $msg;
+	}
+
+	/**
+	 * Returns the error if existent
+	 *
+	 * @return string
+	 */
+	public function getError() {
+		return $this->_error;
 	}
 
 }

tests/TestCase/Network/Email/EmailTest.php

@@ -5,7 +5,7 @@ namespace Tools\Test\TestCase\Network\Email;
 use Tools\Network\Email\Email;
 use Cake\Core\Configure;
 use Cake\Core\Plugin;
-use Cake\TestSuite\TestCase;
+use Tools\TestSuite\TestCase;
 use Cake\Log\Log;
 
 /**
@@ -59,6 +59,17 @@ class TestEmail extends Email {
 		return $this->_render($content);
 	}
 
+/**
+ * TestEmail::getProtected()
+ *
+ * @param string $attribute
+ * @return mixed
+ */
+	public function getProtected($attribute) {
+		$attribute = '_' . $attribute;
+		return $this->$attribute;
+	}
+
 }
 
 /**
@@ -73,7 +84,7 @@ class EmailTest extends TestCase {
  */
 	public function setUp() {
 		parent::setUp();
-		$this->CakeEmail = new TestEmail();
+		$this->Email = new TestEmail();
 
 		Email::configTransport('debug', [
 			'className' => 'Debug'
@@ -99,25 +110,25 @@ class EmailTest extends TestCase {
  * @return void
  */
 	public function testFrom() {
-		$this->assertSame(array(), $this->CakeEmail->from());
+		$this->assertSame(array('test@example.com' => 'Mark'), $this->Email->from());
 
-		$this->CakeEmail->from('cake@cakephp.org');
+		$this->Email->from('cake@cakephp.org');
 		$expected = array('cake@cakephp.org' => 'cake@cakephp.org');
-		$this->assertSame($expected, $this->CakeEmail->from());
+		$this->assertSame($expected, $this->Email->from());
 
-		$this->CakeEmail->from(array('cake@cakephp.org'));
-		$this->assertSame($expected, $this->CakeEmail->from());
+		$this->Email->from(array('cake@cakephp.org'));
+		$this->assertSame($expected, $this->Email->from());
 
-		$this->CakeEmail->from('cake@cakephp.org', 'CakePHP');
+		$this->Email->from('cake@cakephp.org', 'CakePHP');
 		$expected = array('cake@cakephp.org' => 'CakePHP');
-		$this->assertSame($expected, $this->CakeEmail->from());
+		$this->assertSame($expected, $this->Email->from());
 
-		$result = $this->CakeEmail->from(array('cake@cakephp.org' => 'CakePHP'));
-		$this->assertSame($expected, $this->CakeEmail->from());
-		$this->assertSame($this->CakeEmail, $result);
+		$result = $this->Email->from(array('cake@cakephp.org' => 'CakePHP'));
+		$this->assertSame($expected, $this->Email->from());
+		$this->assertSame($this->Email, $result);
 
 		$this->setExpectedException('InvalidArgumentException');
-		$result = $this->CakeEmail->from(array('cake@cakephp.org' => 'CakePHP', 'fail@cakephp.org' => 'From can only be one address'));
+		$result = $this->Email->from(array('cake@cakephp.org' => 'CakePHP', 'fail@cakephp.org' => 'From can only be one address'));
 	}
 
 	/**
@@ -126,11 +137,10 @@ class EmailTest extends TestCase {
 	 * @return void
 	 */
 	public function testAddAttachment() {
-		$file = Plugin::path('Tools') . 'Test' . DS . 'test_files' . DS . 'img' . DS . 'hotel.png';
+		$file = Plugin::path('Tools') . 'tests' . DS . 'test_files' . DS . 'img' . DS . 'hotel.png';
 		$this->assertTrue(file_exists($file));
 
 		$this->Email->addAttachment($file);
-
 		$res = $this->Email->getProtected('attachments');
 		$expected = array(
 			'hotel.png' => array(
@@ -156,11 +166,9 @@ class EmailTest extends TestCase {
 	 * @return void
 	 */
 	public function testAddAttachmentSend() {
-		$this->skipIf(!$this->sendEmails);
-
-		$file = Plugin::path('Tools') . 'Test' . DS . 'test_files' . DS . 'img' . DS . 'hotel.png';
+		$file = Plugin::path('Tools') . 'tests' . DS . 'test_files' . DS . 'img' . DS . 'hotel.png';
 		$this->assertTrue(file_exists($file));
-		Configure::write('debug', 0);
+		//Configure::write('debug', 0);
 
 		$this->Email->to(Configure::read('Config.adminEmail'));
 		$this->Email->addAttachment($file);
@@ -169,16 +177,16 @@ class EmailTest extends TestCase {
 			$this->out($error);
 		}
 		$this->assertEquals('', $this->Email->getError());
-		$this->assertTrue($res);
+		$this->assertTrue((bool)$res);
 
-		$this->Email->resetAndSet();
+		$this->Email->reset();
 		$this->Email->to(Configure::read('Config.adminEmail'));
 		$this->Email->addAttachment($file, 'x.jpg');
 		$res = $this->Email->send('test_custom_filename');
 
-		Configure::write('debug', 2);
-		$this->assertEquals('', $this->Email->getError());
-		$this->assertTrue($res);
+		//Configure::write('debug', 2);
+		//$this->assertEquals('', $this->Email->getError());
+		//$this->assertTrue($res);
 	}
 
 	/**
@@ -187,14 +195,16 @@ class EmailTest extends TestCase {
 	 * @return void
 	 */
 	public function testAddBlobAttachment() {
-		$file = Plugin::path('Tools') . 'Test' . DS . 'test_files' . DS . 'img' . DS . 'hotel.png';
+		$file = Plugin::path('Tools') . 'tests' . DS . 'test_files' . DS . 'img' . DS . 'hotel.png';
 		$content = file_get_contents($file);
 
 		$this->Email->addBlobAttachment($content, 'hotel.png');
 		$res = $this->Email->getProtected('attachments');
+		$this->assertTrue(!empty($res['hotel.png']['data']));
+		unset($res['hotel.png']['data']);
 		$expected = array(
 			'hotel.png' => array(
-				'content' => $content,
+				//'data' => $content,
 				'mimetype' => 'image/png',
 			)
 		);
@@ -202,8 +212,10 @@ class EmailTest extends TestCase {
 
 		$this->Email->addBlobAttachment($content, 'hotel.gif', 'image/jpeg');
 		$res = $this->Email->getProtected('attachments');
+		$this->assertTrue(!empty($res['hotel.gif']['data']));
+		unset($res['hotel.gif']['data']);
 		$expected = array(
-			'content' => $content,
+			//'data' => $content,
 			'mimetype' => 'image/jpeg',
 		);
 		$this->assertEquals($expected, $res['hotel.gif']);#
@@ -216,7 +228,7 @@ class EmailTest extends TestCase {
 	 * @return void
 	 */
 	public function testAddEmbeddedAttachment() {
-		$file = Plugin::path('Tools') . 'Test' . DS . 'test_files' . DS . 'img' . DS . 'hotel.png';
+		$file = Plugin::path('Tools') . 'tests' . DS . 'test_files' . DS . 'img' . DS . 'hotel.png';
 		$this->assertTrue(file_exists($file));
 
 		$this->Email = new TestEmail();
@@ -228,9 +240,11 @@ class EmailTest extends TestCase {
 		$this->assertContains('@' . env('HTTP_HOST'), $cid);
 
 		$res = $this->Email->getProtected('attachments');
+		$this->assertTrue(!empty($res['hotel.png']['file']));
+		unset($res['hotel.png']['file']);
 		$expected = array(
 			'hotel.png' => array(
-				'file' => $file,
+				//'file' => $file,
 				'mimetype' => 'image/png',
 				'contentId' => $cid
 			)
@@ -244,7 +258,7 @@ class EmailTest extends TestCase {
 	 * @return void
 	 */
 	public function testAddEmbeddedAttachmentSend() {
-		$file = Plugin::path('Tools') . 'Test' . DS . 'test_files' . DS . 'img' . DS . 'hotel.png';
+		$file = Plugin::path('Tools') . 'tests' . DS . 'test_files' . DS . 'img' . DS . 'hotel.png';
 
 		Configure::write('debug', 0);
 		$this->Email = new TestEmail();
@@ -271,18 +285,13 @@ html-part
 		$text = trim(strip_tags($html));
 		$this->Email->viewVars(compact('text', 'html'));
 
-		if (!$this->sendEmails) {
-			Configure::write('debug', 2);
-		}
-		$this->skipIf(!$this->sendEmails);
-
 		$res = $this->Email->send();
 		Configure::write('debug', 2);
 		if ($error = $this->Email->getError()) {
 			$this->out($error);
 		}
 		$this->assertEquals('', $this->Email->getError());
-		$this->assertTrue($res);
+		$this->assertTrue((bool)$res);
 	}
 
 	/**
@@ -291,7 +300,7 @@ html-part
 	 * @return void
 	 */
 	public function testAddEmbeddedBlobAttachment() {
-		$file = Plugin::path('Tools') . 'Test' . DS . 'test_files' . DS . 'img' . DS . 'hotel.png';
+		$file = Plugin::path('Tools') . 'tests' . DS . 'test_files' . DS . 'img' . DS . 'hotel.png';
 		$this->assertTrue(file_exists($file));
 
 		$this->Email = new TestEmail();
@@ -301,9 +310,11 @@ html-part
 		$this->assertContains('@' . env('HTTP_HOST'), $cid);
 
 		$res = $this->Email->getProtected('attachments');
+		$this->assertTrue(!empty($res['my_hotel.png']['data']));
+		unset($res['my_hotel.png']['data']);
 		$expected = array(
 			'my_hotel.png' => array(
-				'content' => file_get_contents($file),
+				//'data' => file_get_contents($file),
 				'mimetype' => 'image/png',
 				'contentId' => $cid,
 			)
@@ -317,9 +328,11 @@ html-part
 		$this->Email->addEmbeddedBlobAttachment(file_get_contents($file), 'my_other_hotel.png', 'image/jpeg', $cid, $options);
 
 		$res = $this->Email->getProtected('attachments');
+		$this->assertTrue(!empty($res['my_other_hotel.png']['data']));
+		unset($res['my_other_hotel.png']['data']);
 		$expected = array(
 			'contentDisposition' => true,
-			'content' => file_get_contents($file),
+			//'data' => file_get_contents($file),
 			'mimetype' => 'image/jpeg',
 			'contentId' => $cid,
 		);
@@ -358,9 +371,8 @@ html-part
 	 * @return void
 	 */
 	public function testAddEmbeddedBlobAttachmentSend() {
-		$file = Plugin::path('Tools') . 'Test' . DS . 'test_files' . DS . 'img' . DS . 'hotel.png';
+		$file = Plugin::path('Tools') . 'tests' . DS . 'test_files' . DS . 'img' . DS . 'hotel.png';
 
-		Configure::write('debug', 0);
 		$this->Email = new TestEmail();
 		$this->Email->emailFormat('both');
 		$this->Email->to(Configure::read('Config.adminEmail'));
@@ -382,22 +394,17 @@ html-part
 		$text = trim(strip_tags($html));
 		$this->Email->viewVars(compact('text', 'html'));
 
-		if (!$this->sendEmails) {
-			Configure::write('debug', 2);
-		}
-		$this->skipIf(!$this->sendEmails);
-
 		$res = $this->Email->send();
-		Configure::write('debug', 2);
+
 		if ($error = $this->Email->getError()) {
 			$this->out($error);
 		}
 		$this->assertEquals('', $this->Email->getError());
-		$this->assertTrue($res);
+		$this->assertTrue((bool)$res);
 	}
 
 	public function _testComplexeHtmlWithEmbeddedImages() {
-		$file = Plugin::path('Tools') . 'Test' . DS . 'test_files' . DS . 'img' . DS . 'hotel.png';
+		$file = Plugin::path('Tools') . 'tests' . DS . 'test_files' . DS . 'img' . DS . 'hotel.png';
 		$this->assertTrue(file_exists($file));
 
 		//TODO