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

fixing test to ensure tests dont fail on 1 second timestamp diff

Browse source
This commit is contained in:
Ceeram 2011-11-22 17:21:00 +01:00
parent 7d6637f55b
commit f57c287c43
1 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
lib/Cake/Test/Case/Controller/Component/EmailComponentTest.php
View file

@ -61,6 +61,7 @@ class DebugCompTransport extends AbstractTransport {
* @return boolean * @return boolean
*/ */
public function send(CakeEmail $email) { public function send(CakeEmail $email) {
$email->addHeaders(array('Date' => EmailComponentTest::$sentDate));
$headers = $email->getHeaders(array_fill_keys(array('from', 'replyTo', 'readReceipt', 'returnPath', 'to', 'cc', 'bcc', 'subject'), true)); $headers = $email->getHeaders(array_fill_keys(array('from', 'replyTo', 'readReceipt', 'returnPath', 'to', 'cc', 'bcc', 'subject'), true));
$to = $headers['To']; $to = $headers['To'];
$subject = $headers['Subject']; $subject = $headers['Subject'];
@ -134,6 +135,13 @@ class EmailComponentTest extends CakeTestCase {
*/ */
public $name = 'Email'; public $name = 'Email';
/**
* sentDate
*
* @var string
*/
public static $sentDate = null;
/** /**
* setUp method * setUp method
* *
@ -149,6 +157,8 @@ class EmailComponentTest extends CakeTestCase {
$this->Controller->EmailTest->initialize($this->Controller, array()); $this->Controller->EmailTest->initialize($this->Controller, array());
self::$sentDate = date(DATE_RFC2822);
App::build(array( App::build(array(
'View' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'View'. DS) 'View' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'View'. DS)
)); ));
@ -189,7 +199,7 @@ class EmailComponentTest extends CakeTestCase {
$this->Controller->EmailTest->delivery = 'DebugComp'; $this->Controller->EmailTest->delivery = 'DebugComp';
$this->Controller->EmailTest->messageId = false; $this->Controller->EmailTest->messageId = false;
$date = date(DATE_RFC2822); $date = self::$sentDate;
$message = <<<MSGBLOC $message = <<<MSGBLOC
<pre>To: postmaster@example.com <pre>To: postmaster@example.com
From: noreply@example.com From: noreply@example.com
@ -242,7 +252,7 @@ MSGBLOC;
$this->Controller->EmailTest->delivery = 'DebugComp'; $this->Controller->EmailTest->delivery = 'DebugComp';
$this->Controller->EmailTest->messageId = false; $this->Controller->EmailTest->messageId = false;
$date = date(DATE_RFC2822); $date = self::$sentDate;
$header = <<<HEADBLOC $header = <<<HEADBLOC
To: postmaster@example.com To: postmaster@example.com
From: noreply@example.com From: noreply@example.com
@ -375,7 +385,7 @@ HTMLBLOC;
$this->assertRegExp('/From: noreply@example.com\n/', $result); $this->assertRegExp('/From: noreply@example.com\n/', $result);
$this->assertRegExp('/Cc: cc@example.com\n/', $result); $this->assertRegExp('/Cc: cc@example.com\n/', $result);
$this->assertRegExp('/Bcc: bcc@example.com\n/', $result); $this->assertRegExp('/Bcc: bcc@example.com\n/', $result);
$this->assertRegExp('/Date: ' . preg_quote(date(DATE_RFC2822)) . '\n/', $result); $this->assertRegExp('/Date: ' . preg_quote(self::$sentDate) . '\n/', $result);
$this->assertRegExp('/X-Mailer: CakePHP Email Component\n/', $result); $this->assertRegExp('/X-Mailer: CakePHP Email Component\n/', $result);
$this->assertRegExp('/Content-Type: text\/plain; charset=UTF-8\n/', $result); $this->assertRegExp('/Content-Type: text\/plain; charset=UTF-8\n/', $result);
$this->assertRegExp('/Content-Transfer-Encoding: 8bitMessage:\n/', $result); $this->assertRegExp('/Content-Transfer-Encoding: 8bitMessage:\n/', $result);
@ -404,7 +414,7 @@ HTMLBLOC;
$this->assertRegExp('/Subject: Cake Debug Test\n/', $result); $this->assertRegExp('/Subject: Cake Debug Test\n/', $result);
$this->assertRegExp('/Reply-To: noreply@example.com\n/', $result); $this->assertRegExp('/Reply-To: noreply@example.com\n/', $result);
$this->assertRegExp('/From: noreply@example.com\n/', $result); $this->assertRegExp('/From: noreply@example.com\n/', $result);
$this->assertRegExp('/Date: ' . preg_quote(date(DATE_RFC2822)) . '\n/', $result); $this->assertRegExp('/Date: ' . preg_quote(self::$sentDate) . '\n/', $result);
$this->assertRegExp('/X-Mailer: CakePHP Email Component\n/', $result); $this->assertRegExp('/X-Mailer: CakePHP Email Component\n/', $result);
$this->assertRegExp('/Content-Type: text\/plain; charset=UTF-8\n/', $result); $this->assertRegExp('/Content-Type: text\/plain; charset=UTF-8\n/', $result);
$this->assertRegExp('/Content-Transfer-Encoding: 8bitMessage:\n/', $result); $this->assertRegExp('/Content-Transfer-Encoding: 8bitMessage:\n/', $result);
@ -575,7 +585,7 @@ HTMLBLOC;
$this->Controller->EmailTest->to = 'postmaster@example.com'; $this->Controller->EmailTest->to = 'postmaster@example.com';
$this->Controller->EmailTest->from = 'noreply@example.com'; $this->Controller->EmailTest->from = 'noreply@example.com';
$this->Controller->EmailTest->subject = 'Cake Debug Test'; $this->Controller->EmailTest->subject = 'Cake Debug Test';
$this->Controller->EmailTest->date = 'Today!'; $this->Controller->EmailTest->date = self::$sentDate = 'Today!';
$this->Controller->EmailTest->template = null; $this->Controller->EmailTest->template = null;
$this->Controller->EmailTest->delivery = 'DebugComp'; $this->Controller->EmailTest->delivery = 'DebugComp';