php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-27 12:33:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

'yii\mail\MessageInterface' updated:

Browse Source 
- setter methods renamed to have pure name
- method 'createMessage' renamed to 'compose'
This commit is contained in:
Klimov Paul
2013-11-05 14:57:13 +02:00
parent c7e054789e
commit 87af95f712
9 changed files with 159 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
tests/unit/framework/mail/BaseMailerTest.php
View File

@@ -84,10 +84,10 @@ class BaseMailerTest extends TestCase
$this->assertTrue(is_object($view), 'Unable to get default view!');
}
public function testCreateMessage()
public function testComposeMessage()
{
$mailer = new Mailer();
$message = $mailer->createMessage();
$message = $mailer->compose();
$this->assertTrue(is_object($message), 'Unable to create message instance!');
$this->assertEquals($mailer->messageClass, get_class($message), 'Invalid message class!');
@@ -95,7 +95,7 @@ class BaseMailerTest extends TestCase
'id' => 'test-id',
'encoding' => 'test-encoding',
);
$message = $mailer->createMessage($messageConfig);
$message = $mailer->compose($messageConfig);
foreach ($messageConfig as $name => $value) {
$this->assertEquals($value, $message->$name, 'Unable to apply message config!');
@@ -103,21 +103,34 @@ class BaseMailerTest extends TestCase
}
/**
* @depends testCreateMessage
* @depends testComposeMessage
*/
public function testDefaultMessageConfig()
{
$mailer = new Mailer();
$messageConfig = array(
$notPropertyConfig = [
'from' => 'from@domain.com',
'to' => 'to@domain.com',
'cc' => 'cc@domain.com',
'bcc' => 'bcc@domain.com',
'subject' => 'Test subject',
'text' => 'Test text body',
'html' => 'Test HTML body',
];
$propertyConfig = [
'id' => 'test-id',
'encoding' => 'test-encoding',
);
];
$messageConfig = array_merge($notPropertyConfig, $propertyConfig);
$mailer->messageConfig = $messageConfig;
$message = $mailer->createMessage();
$message = $mailer->compose();
foreach ($messageConfig as $name => $value) {
foreach ($notPropertyConfig as $name => $value) {
$this->assertEquals($value, $message->{'_' . $name});
}
foreach ($propertyConfig as $name => $value) {
$this->assertEquals($value, $message->$name);
}
}
@@ -190,22 +203,50 @@ class Message extends BaseMessage
{
public $id;
public $encoding;
public $_from;
public $_to;
public $_cc;
public $_bcc;
public $_subject;
public $_text;
public $_html;
public function setCharset($charset) {}
public function setFrom($from) {}
public function from($from) {
$this->_from = $from;
return $this;
}
public function setTo($to) {}
public function to($to) {
$this->_to = $to;
return $this;
}
public function setCc($cc) {}
public function cc($cc) {
$this->_cc = $cc;
return $this;
}
public function setBcc($bcc) {}
public function bcc($bcc) {
$this->_bcc = $bcc;
return $this;
}
public function setSubject($subject) {}
public function subject($subject) {
$this->_subject = $subject;
return $this;
}
public function setText($text) {}
public function text($text) {
$this->_text = $text;
return $this;
}
public function setHtml($html) {}
public function html($html) {
$this->_html = $html;
return $this;
}
public function attachContent($content, array $options = []) {}

18
tests/unit/framework/mail/BaseMessageTest.php
View File

@@ -43,7 +43,7 @@ class BaseMessageTest extends TestCase
public function testRender()
{
$mailer = $this->getMailer();
$message = $mailer->createMessage();
$message = $mailer->compose();
$viewName = 'test/text/view';
$message->renderText($viewName);
@@ -59,7 +59,7 @@ class BaseMessageTest extends TestCase
public function testSend()
{
$mailer = $this->getMailer();
$message = $mailer->createMessage();
$message = $mailer->compose();
$message->send();
$this->assertEquals($message, $mailer->sentMessages[0], 'Unable to send message!');
}
@@ -94,21 +94,21 @@ class TestMessage extends BaseMessage
public function setCharset($charset) {}
public function setFrom($from) {}
public function from($from) {}
public function setTo($to) {}
public function to($to) {}
public function setCc($cc) {}
public function cc($cc) {}
public function setBcc($bcc) {}
public function bcc($bcc) {}
public function setSubject($subject) {}
public function subject($subject) {}
public function setText($text) {
public function text($text) {
$this->text = $text;
}
public function setHtml($html) {
public function html($html) {
$this->html = $html;
}