collateral test fixes

cakephp · Nov 14, 2014 · 323bccc · 323bccc
1 parent a809c67
commit 323bccc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/Shell/Task/TemplateTask.php b/src/Shell/Task/TemplateTask.php
@@ -56,7 +56,7 @@ public function getView() {
 			return $this->View;
 		}
 
-		$theme = isset($this->params['template']) ? $this->params['template'] : '';
+		$theme = isset($this->params['theme']) ? $this->params['theme'] : '';
 
 		$viewOptions = [
 			'helpers' => ['Bake'],

diff --git a/tests/TestCase/Core/PluginTest.php b/tests/TestCase/Core/PluginTest.php
@@ -248,7 +248,7 @@ public function testClassPathNotFound() {
  */
 	public function testLoadAll() {
 		Plugin::loadAll();
-		$expected = ['Company', 'PluginJs', 'TestPlugin', 'TestPluginFour', 'TestPluginTwo', 'TestTheme'];
+		$expected = ['Company', 'PluginJs', 'TestBakeTheme', 'TestPlugin', 'TestPluginFour', 'TestPluginTwo', 'TestTheme'];
 		$this->assertEquals($expected, Plugin::loaded());
 	}
 
@@ -271,7 +271,7 @@ public function testLoadAllWithPluginAlreadyLoaded() {
 	public function testLoadAllWithDefaults() {
 		$defaults = array('bootstrap' => true, 'ignoreMissing' => true);
 		Plugin::loadAll(array($defaults));
-		$expected = ['Company', 'PluginJs', 'TestPlugin', 'TestPluginFour', 'TestPluginTwo', 'TestTheme'];
+		$expected = ['Company', 'PluginJs', 'TestBakeTheme', 'TestPlugin', 'TestPluginFour', 'TestPluginTwo', 'TestTheme'];
 		$this->assertEquals($expected, Plugin::loaded());
 		$this->assertEquals('loaded js plugin bootstrap', Configure::read('PluginTest.js_plugin.bootstrap'));
 		$this->assertEquals('loaded plugin bootstrap', Configure::read('PluginTest.test_plugin.bootstrap'));
@@ -292,7 +292,7 @@ public function testLoadAllWithDefaultsAndOverride() {
 		));
 		Plugin::routes();
 
-		$expected = ['Company', 'PluginJs', 'TestPlugin', 'TestPluginFour', 'TestPluginTwo', 'TestTheme'];
+		$expected = ['Company', 'PluginJs', 'TestBakeTheme', 'TestPlugin', 'TestPluginFour', 'TestPluginTwo', 'TestTheme'];
 		$this->assertEquals($expected, Plugin::loaded());
 		$this->assertEquals('loaded js plugin bootstrap', Configure::read('PluginTest.js_plugin.bootstrap'));
 		$this->assertEquals('loaded plugin routes', Configure::read('PluginTest.test_plugin.routes'));