Fix hardcoded view name and default values.

cakephp · Sep 18, 2012 · 39443e3 · 39443e3
1 parent 4e9e1d8
commit 39443e3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/lib/Cake/Network/Email/Email.php b/lib/Cake/Network/Email/Email.php
@@ -182,7 +182,7 @@ class Email {
  *
  * @var string
  */
-	protected $_viewRender = 'View';
+	protected $_viewRender = 'Cake\View\View';
 
 /**
  * Vars to sent to render
@@ -1179,7 +1179,7 @@ public function reset() {
 		$this->_headers = array();
 		$this->_layout = 'default';
 		$this->_template = '';
-		$this->_viewRender = 'View';
+		$this->_viewRender = 'Cake\View\View';
 		$this->_viewVars = array();
 		$this->_theme = null;
 		$this->_helpers = array('Html');

diff --git a/lib/Cake/Test/TestCase/Network/Email/EmailTest.php b/lib/Cake/Test/TestCase/Network/Email/EmailTest.php
@@ -1530,13 +1530,13 @@ public function testConstructWithConfigString() {
  */
 	public function testViewRender() {
 		$result = $this->CakeEmail->viewRender();
-		$this->assertEquals('View', $result);
+		$this->assertEquals('Cake\View\View', $result);
 
-		$result = $this->CakeEmail->viewRender('Theme');
-		$this->assertInstanceOf('CakeEmail', $result);
+		$result = $this->CakeEmail->viewRender('Cake\View\ThemeView');
+		$this->assertInstanceOf('Cake\Network\Email\Email', $result);
 
 		$result = $this->CakeEmail->viewRender();
-		$this->assertEquals('Theme', $result);
+		$this->assertEquals('Cake\View\ThemeView', $result);
 	}
 
 /**