remove render-template-as-string

it was just a testing crutch, and isn't required
cakephp · Nov 14, 2014 · adaabac · adaabac
1 parent 23b9701
commit adaabac
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 28 deletions.
diff --git a/src/View/BakeView.php b/src/View/BakeView.php
@@ -148,10 +148,6 @@ protected function _getViewFileName($name = null) {
  * @return string Bake template to evaluate
  */
 	protected function _getViewFileContents($name) {
-		if (strpos($name, '<') !== false) {
-			return $name;
-		}
-
 		$filename = $this->_getViewFileName($name);
 		return file_get_contents($filename);
 	}

diff --git a/tests/TestCase/View/BakeViewTest.php b/tests/TestCase/View/BakeViewTest.php
@@ -48,21 +48,6 @@ public function tearDown() {
 		unset($this->View);
 	}
 
-/**
- * test rendering a string
- *
- * @return void
- */
-	public function testRenderString() {
-		$template = 'The value of aVariable is: <%= $aVariable %>.';
-
-		$this->View->set(['aVariable' => 123]);
-		$result = $this->View->render($template);
-		$expected = 'The value of aVariable is: 123.';
-
-		$this->assertSame($expected, $result, 'variables in erb-style tags should be evaluated');
-	}
-
 /**
  * test rendering a template file
  *
@@ -82,11 +67,9 @@ public function testRenderTemplate() {
  * @return void
  */
 	public function testRenderIgnorePhpTags() {
-		$template = 'The value of aVariable is: <%= $aVariable %>. Not <?php echo $aVariable ?>.';
-
 		$this->View->set(['aVariable' => 123]);
-		$result = $this->View->render($template);
-		$expected = 'The value of aVariable is: 123. Not <?php echo $aVariable ?>.';
+		$result = $this->View->render('view_tests/simple_php');
+		$expected = "The value of aVariable is: 123. Not <?php echo \$aVariable ?>.\n";
 
 		$this->assertSame($expected, $result, 'variables in php tags should be treated as strings');
 	}
@@ -97,11 +80,9 @@ public function testRenderIgnorePhpTags() {
  * @return void
  */
 	public function testRenderIgnorePhpShortTags() {
-		$template = 'The value of aVariable is: <%= $aVariable %>. Not <?= $aVariable ?>.';
-
 		$this->View->set(['aVariable' => 123]);
-		$result = $this->View->render($template);
-		$expected = 'The value of aVariable is: 123. Not <?= $aVariable ?>.';
+		$result = $this->View->render('view_tests/simple_php_short_tags');
+		$expected = "The value of aVariable is: 123. Not <?= \$aVariable ?>.\n";
 
 		$this->assertSame($expected, $result, 'variables in php tags should be treated as strings');
 	}
@@ -131,7 +112,7 @@ public function testRenderNewlines() {
  * @return void
  */
 	public function testSwallowLeadingWhitespace() {
-		$result = $this->View->render('view_tests/leading-whitespace');
+		$result = $this->View->render('view_tests/leading_whitespace');
 		$expected = $this->_getCompareTemplate('leading-whitespace');
 
 		$this->assertSame(

diff --git a/...te/Bake/view_tests/leading-whitespace.ctp → ...te/Bake/view_tests/leading_whitespace.ctp b/...te/Bake/view_tests/leading-whitespace.ctp → ...te/Bake/view_tests/leading_whitespace.ctp
diff --git a/tests/test_app/TestApp/Template/Bake/view_tests/simple_php.ctp b/tests/test_app/TestApp/Template/Bake/view_tests/simple_php.ctp
@@ -0,0 +1 @@
+The value of aVariable is: <%= $aVariable %>. Not <?php echo $aVariable ?>.
diff --git a/tests/test_app/TestApp/Template/Bake/view_tests/simple_php_short_tags.ctp b/tests/test_app/TestApp/Template/Bake/view_tests/simple_php_short_tags.ctp
@@ -0,0 +1 @@
+The value of aVariable is: <%= $aVariable %>. Not <?= $aVariable ?>.
diff --git a/...view_tests_compare/leading-whitespace.ctp → ...view_tests_compare/leading_whitespace.ctp b/...view_tests_compare/leading-whitespace.ctp → ...view_tests_compare/leading_whitespace.ctp