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

Correcting session errors in EmailTest test case

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5348 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
phpnut 2007-06-26 04:28:24 +00:00
parent 32ac42c055
commit 40a47a5e90
3 changed files with 39 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cake/libs/controller/components/email.php
View file

@ -158,7 +158,7 @@ class EmailComponent extends Object{
var $smtpOptions = array('port'=> 25, var $smtpOptions = array('port'=> 25,
'host' => 'localhost', 'host' => 'localhost',
'timeout' => 30); 'timeout' => 30);
/** /**
* Enter description here... * Enter description here...
* *
@ -495,7 +495,7 @@ class EmailComponent extends Object{
return @mail($this->to, $this->subject, $this->__message, $this->__header, $this->additionalParams); return @mail($this->to, $this->subject, $this->__message, $this->__header, $this->additionalParams);
} }
/** /**
* Sends out email via SMTP * Sends out email via SMTP
* *
* @access private * @access private
*/ */
@ -512,7 +512,7 @@ class EmailComponent extends Object{
fputs($smtpConnect, "DATE" . $this->_newLine); fputs($smtpConnect, "DATE" . $this->_newLine);
fputs($smtpConnect, "To: {$this->to}\r\nFrom: {$this->smtpOptions['from']}\r\n{$thos->subject}\r\n{$this->__header}\r\n\r\n{$this->__message}\r\n"); fputs($smtpConnect, "To: {$this->to}\r\nFrom: {$this->smtpOptions['from']}\r\n{$thos->subject}\r\n{$this->__header}\r\n\r\n{$this->__message}\r\n");
fputs($smtpConnect, "QUIT" . $this->_newLine); fputs($smtpConnect, "QUIT" . $this->_newLine);
fclose($smtpConnect); fclose($smtpConnect);
} }
/** /**
* Enter description here... * Enter description here...

45
cake/tests/cases/libs/controller/components/email.test.php
View file

@ -1,10 +1,31 @@
<?php <?php
/* SVN FILE: $Id$ */ /* SVN FILE: $Id$ */
/** /**
* Series of tests for email component * Series of tests for email component.
*
* Long description for file
*
* PHP versions 4 and 5
*
* CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
* Copyright 2005-2007, Cake Software Foundation, Inc.
* 1785 E. Sahara Avenue, Suite 490-204
* Las Vegas, Nevada 89104
*
* Licensed under The Open Group Test Suite License
* Redistributions of files must retain the above copyright notice.
*
* @filesource
* @copyright Copyright 2005-2007, Cake Software Foundation, Inc.
* @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
* @package cake
* @subpackage cake.cake.tests.cases.libs.controller.components
* @since CakePHP(tm) v 1.2.0.5347
* @version $Revision$
* @modifiedby $LastChangedBy$
* @lastmodified $Date$
* @license http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
*/ */
require_once LIBS . '/controller/components/email.php'; require_once LIBS . '/controller/components/email.php';
class EmailTestController extends Controller { class EmailTestController extends Controller {
@ -17,20 +38,24 @@ class EmailTest extends CakeTestCase {
var $name = 'Email'; var $name = 'Email';
function setUp() { function setUp() {
$this->Controller =& new Controller(); $this->Controller =& new EmailTestController();
$this->Controller->_initComponents();
$this->View =& new View($this->Controller); restore_error_handler();
ClassRegistry::addObject('view', $this->View); @$this->Controller->_initComponents();
set_error_handler('simpleTestErrorHandler');
$this->Controller->Email->startup($this->Controller);
ClassRegistry::addObject('view', new View($this->Controller));
} }
function testConstruction() { function testConstruction() {
$this->assertTrue(is_object($this->Email)); $this->assertTrue(is_object($this->Controller->Email));
} }
function testBadSmtpSent() { function testBadSmtpSent() {
$this->Controller->Email->smtpOptions['host'] = 'caketest.com'; $this->Controller->Email->smtpOptions['host'] = 'caketest.com';
$this->Controller->Email->delivery = 'smtp'; $this->Controller->Email->delivery = 'smtp';
$this->assertFalse($this->Email->send('This should not work')); $this->assertFalse($this->Controller->Email->send('This should not work'));
} }
} }
?> ?>

2
cake/tests/cases/libs/file.test.php
View file

@ -41,7 +41,7 @@ class FileTest extends UnitTestCase {
function testBasic() { function testBasic() {
$file = dirname(__FILE__) . DS . basename(__FILE__); $file = dirname(__FILE__) . DS . basename(__FILE__);
$this->File =& new File($file); $this->File =& new File($file);
$result = $this->File->pwd(); $result = $this->File->pwd();