Browse Source

All tests should now be passing

AD7six 11 years ago
parent
commit
5c15aa2ef8

+ 5 - 0
src/Shell/Task/TemplateTask.php

@@ -48,6 +48,10 @@ class TemplateTask extends Shell {
  */
 	public function initialize() {
 		$this->View = new BakeView(new Request(), new Response());
+		$this->View->theme = isset($this->params['template']) ? $this->params['template'] : '';
+		if ($this->View->theme === 'default') {
+			$this->View->theme = '';
+		}
 	}
 
 /**
@@ -70,6 +74,7 @@ class TemplateTask extends Shell {
 		try {
 			return $this->View->render($template);
 		} catch (MissingTemplateException $e) {
+			$this->log($e->getMessage());
 			return '';
 		}
 	}

+ 10 - 10
tests/TestCase/Shell/Task/TemplateTaskTest.php

@@ -50,16 +50,16 @@ class TemplateTaskTest extends TestCase {
 
 /**
  * test generate
- *
- * @return void
- */
-	public function testGenerate() {
-		$this->Task->initialize();
-		$this->Task->expects($this->any())->method('in')->will($this->returnValue(1));
+	*
+	* @return void
+	*/
+		public function testGenerate() {
+			$this->Task->initialize();
+			$this->Task->expects($this->any())->method('in')->will($this->returnValue(1));
 
-		$result = $this->Task->generate('classes', 'test_object', array('test' => 'foo'));
-		$expected = "I got rendered\nfoo";
-		$this->assertTextEquals($expected, $result);
+			$result = $this->Task->generate('classes/test_object', array('test' => 'foo'));
+			$expected = "I got rendered\nfoo";
+			$this->assertTextEquals($expected, $result);
 	}
 
 /**
@@ -79,7 +79,7 @@ class TemplateTaskTest extends TestCase {
 			'schema' => '',
 			'namespace' => ''
 		));
-		$result = $this->Task->generate('classes', 'fixture');
+		$result = $this->Task->generate('tests/fixture');
 		$this->assertRegExp('/ArticlesFixture extends .*TestFixture/', $result);
 	}
 }

+ 1 - 1
tests/test_app/TestApp/Template/Bake/test/classes/test_object.ctp

@@ -1,2 +1,2 @@
 I got rendered
-<?= $test; ?>
+<%= $test; %>

tests/test_app/TestApp/Template/Bake/test/views/admin_edit.ctp → tests/test_app/TestApp/Template/Bake/views/admin_edit.ctp


tests/test_app/TestApp/Template/Bake/test/views/admin_form.ctp → tests/test_app/TestApp/Template/Bake/views/admin_form.ctp