Skip to content

Commit

Permalink
Fixing test cases for EmailComponent
Browse files Browse the repository at this point in the history
  • Loading branch information
ADmad committed Nov 26, 2010
1 parent 15ca240 commit 70ae66e
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions cake/tests/cases/libs/controller/components/email.test.php
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -693,7 +693,7 @@ function testSendDebug() {
$this->assertPattern('/Subject: Cake Debug Test\n/', $result); $this->assertPattern('/Subject: Cake Debug Test\n/', $result);
$this->assertPattern('/Reply-To: noreply@example.com\n/', $result); $this->assertPattern('/Reply-To: noreply@example.com\n/', $result);
$this->assertPattern('/From: noreply@example.com\n/', $result); $this->assertPattern('/From: noreply@example.com\n/', $result);
$this->assertPattern('/Date: ' . date(DATE_RFC2822) . '\n/', $result); $this->assertPattern('/Date: ' . preg_quote(date(DATE_RFC2822)) . '\n/', $result);
$this->assertPattern('/X-Mailer: CakePHP Email Component\n/', $result); $this->assertPattern('/X-Mailer: CakePHP Email Component\n/', $result);
$this->assertPattern('/Content-Type: text\/plain; charset=UTF-8\n/', $result); $this->assertPattern('/Content-Type: text\/plain; charset=UTF-8\n/', $result);
$this->assertPattern('/Content-Transfer-Encoding: 7bitParameters:\n/', $result); $this->assertPattern('/Content-Transfer-Encoding: 7bitParameters:\n/', $result);
Expand Down Expand Up @@ -721,7 +721,7 @@ function testSendDebugWithNoSessions() {
$this->assertPattern('/Subject: Cake Debug Test\n/', $result); $this->assertPattern('/Subject: Cake Debug Test\n/', $result);
$this->assertPattern('/Reply-To: noreply@example.com\n/', $result); $this->assertPattern('/Reply-To: noreply@example.com\n/', $result);
$this->assertPattern('/From: noreply@example.com\n/', $result); $this->assertPattern('/From: noreply@example.com\n/', $result);
$this->assertPattern('/Date: ' . date(DATE_RFC2822) . '\n/', $result); $this->assertPattern('/Date: ' . preg_quote(date(DATE_RFC2822)) . '\n/', $result);
$this->assertPattern('/X-Mailer: CakePHP Email Component\n/', $result); $this->assertPattern('/X-Mailer: CakePHP Email Component\n/', $result);
$this->assertPattern('/Content-Type: text\/plain; charset=UTF-8\n/', $result); $this->assertPattern('/Content-Type: text\/plain; charset=UTF-8\n/', $result);
$this->assertPattern('/Content-Transfer-Encoding: 7bitParameters:\n/', $result); $this->assertPattern('/Content-Transfer-Encoding: 7bitParameters:\n/', $result);
Expand Down Expand Up @@ -1217,10 +1217,10 @@ function testFormatAddressAliases() {


$result = $this->Controller->EmailTest->formatAddress('email@example.com', true); $result = $this->Controller->EmailTest->formatAddress('email@example.com', true);
$this->assertEqual($result, '<email@example.com>'); $this->assertEqual($result, '<email@example.com>');

$result = $this->Controller->EmailTest->formatAddress('<email@example.com>', true); $result = $this->Controller->EmailTest->formatAddress('<email@example.com>', true);
$this->assertEqual($result, '<email@example.com>'); $this->assertEqual($result, '<email@example.com>');

$result = $this->Controller->EmailTest->formatAddress('alias name <email@example.com>', true); $result = $this->Controller->EmailTest->formatAddress('alias name <email@example.com>', true);
$this->assertEqual($result, '<email@example.com>'); $this->assertEqual($result, '<email@example.com>');
} }
Expand Down

0 comments on commit 70ae66e

Please sign in to comment.