Merge pull request #94 from Graziel/patch-4

add checks to empty values

Author: dereuromark

src/Mailer/Transport/SimpleQueueTransport.php

@@ -49,6 +49,12 @@ public function send(Email $email) {
 			'template' => $email->template(), //template() gives 2 values - template and layout
 			'viewVars' => [$email->viewVars()]
 		];
+		
+		foreach ($settings as $setting => $value) {
+			if (array_key_exists(0, $value) && ($value[0] === null || $value[0] === [])) {
+				unset($settings[$setting]);
+			}
+		}
 
 		$QueuedTasks = TableRegistry::get('Queue.QueuedTasks');
 		$result = $QueuedTasks->createJob('Email', ['settings' => $settings]);

tests/TestCase/Mailer/Transport/SimpleQueueTransportTest.php

@@ -54,23 +54,70 @@ public function testConfig() {
 	 * @return void
 	 */
 	public function testSendWithEmail() {
-		$Email = new Email();
+		$config = [
+			'transport' => 'queue',
+			'charset' => 'utf-8',
+			'headerCharset' => 'utf-8',
+		];
+
+		$this->QueueTransport->config($config);
+		$Email = new Email($config);
+
 		$Email->from('[email protected]', 'CakePHP Test');
 		$Email->to('[email protected]', 'CakePHP');
 		$Email->cc(['[email protected]' => 'Mark Story', '[email protected]' => 'Juan Basso']);
 		$Email->bcc('[email protected]');
 		$Email->subject('Testing Message');
-		$Email->transport('queue');
-		$config = $Email->config('default');
-		$this->QueueTransport->config($config);
+		$Email->attachments(['wow.txt' => [
+			'data' => 'much wow!',
+			'mimetype' => 'text/plain',
+			'contentId' => 'important'
+		]]);
+
+		$Email->template('test_template', 'test_layout');
+		$Email->subject('Testing Message');
+		$Email->replyTo('[email protected]');
+		$Email->readReceipt('[email protected]');
+		$Email->returnPath('[email protected]');
+		$Email->domain('cakephp.org');
+		$Email->theme('EuroTheme');
+		$Email->emailFormat('both');
+		$Email->set('var1', 1);
+		$Email->set('var2', 2);
 
 		$result = $this->QueueTransport->send($Email);
 		$this->assertEquals('Email', $result['jobtype']);
 		$this->assertTrue(strlen($result['data']) < 10000);
 
 		$output = unserialize($result['data']);
+		$emailReconstructed = new Email($config);
+
+		foreach ($output['settings'] as $method => $setting) {
+			call_user_func_array([$emailReconstructed, $method], (array)$setting);
+		}
+
+		$this->assertEquals($emailReconstructed->from(), $Email->from());
+		$this->assertEquals($emailReconstructed->to(), $Email->to());
+		$this->assertEquals($emailReconstructed->cc(), $Email->cc());
+		$this->assertEquals($emailReconstructed->bcc(), $Email->bcc());
+		$this->assertEquals($emailReconstructed->subject(), $Email->subject());
+		$this->assertEquals($emailReconstructed->charset(), $Email->charset());
+		$this->assertEquals($emailReconstructed->headerCharset(), $Email->headerCharset());
+		$this->assertEquals($emailReconstructed->emailFormat(), $Email->emailFormat());
+		$this->assertEquals($emailReconstructed->replyTo(), $Email->replyTo());
+		$this->assertEquals($emailReconstructed->readReceipt(), $Email->readReceipt());
+		$this->assertEquals($emailReconstructed->returnPath(), $Email->returnPath());
+		$this->assertEquals($emailReconstructed->messageId(), $Email->messageId());
+		$this->assertEquals($emailReconstructed->domain(), $Email->domain());
+		$this->assertEquals($emailReconstructed->theme(), $Email->theme());
+		$this->assertEquals($emailReconstructed->profile(), $Email->profile());
+		$this->assertEquals($emailReconstructed->viewVars(),$Email->viewVars());
+		$this->assertEquals($emailReconstructed->template(),$Email->template());
+		
+		//for now cannot be done 'data' is base64_encode on set but not decoded when get from $email
+		//$this->assertEquals($emailReconstructed->attachments(),$Email->attachments());
+
 		//debug($output);
 		//$this->assertEquals($Email, $output['settings']);
 	}
-
 }