Permalink
Browse files

updating email tests to match previous change.

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7970 3807eeeb-6ff5-0310-8944-8be069107fe0
  • Loading branch information...
1 parent 4f0256f commit 07512511812b3fe5c95e8f843257ed04f30c7478 gwoo committed Jan 2, 2009
@@ -257,19 +257,26 @@ class EmailComponent extends Object{
*/
var $__smtpConnection = null;
/**
- * Startup component
+ * Initialize component
*
* @param object $controller Instantiating controller
* @access public
*/
- function initialize(&$controller, $settings) {
+ function initialize(&$controller, $settings = array()) {
$this->Controller =& $controller;
if (Configure::read('App.encoding') !== null) {
$this->charset = Configure::read('App.encoding');
}
$this->_set($settings);
}
/**
+ * Startup component
+ *
+ * @param object $controller Instantiating controller
+ * @access public
+ */
+ function startup(&$controller) {}
+/**
* Send an email using the specified content, template and layout
*
* @param mixed $content Either an array of text lines, or a string with contents
@@ -84,7 +84,7 @@ function setUp() {
@$this->Controller->Component->init($this->Controller);
set_error_handler('simpleTestErrorHandler');
- $this->Controller->Email->startup($this->Controller);
+ $this->Controller->Email->initialize($this->Controller, array());
ClassRegistry::addObject('view', new View($this->Controller));
Configure::write('viewPaths', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS));

0 comments on commit 0751251

Please sign in to comment.