Fixing left over action from previos refactoring of viewClass/view.

cakephp · Mar 8, 2011 · de57802 · lorenzo · Mar 9, 2011 · markstory
1 parent 0d3288b
commit de57802
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/cake/libs/view/view.php b/cake/libs/view/view.php
@@ -680,7 +680,7 @@ protected function _getViewFileName($name = null) {
 		}
 
 		if ($name === null) {
-			$name = $this->action;
+			$name = $this->view;
 		}
 		$name = str_replace('/', DS, $name);
 

diff --git a/cake/tests/cases/libs/view/view.test.php b/cake/tests/cases/libs/view/view.test.php
@@ -701,6 +701,20 @@ function testRender() {
 		$this->assertPattern("/<div id=\"content\">posts index<\/div>/", $result);
 	}
 
+/**
+ * test that View::$view works
+ *
+ * @return void
+ */
+	function testRenderUsingViewProperty() {
+		$this->PostsController->view = 'cache_form';
+		$View = new TestView($this->PostsController);
+
+		$this->assertEquals('cache_form', $View->view);
+		$result = $View->render();
+		$this->assertRegExp('/Add User/', $result);
+	}
+
 /**
  * test that view vars can replace the local helper variables
  * and not overwrite the $this->Helper references