Fixing remaining tests related to themes

cakephp · May 20, 2014 · aa3a44e · aa3a44e
1 parent 67207db
commit aa3a44e
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 24 deletions.
diff --git a/tests/TestCase/Controller/PagesControllerTest.php b/tests/TestCase/Controller/PagesControllerTest.php
@@ -42,12 +42,6 @@ public function testDisplay() {
 		$Pages->display('index');
 		$this->assertRegExp('/posts index/', $Pages->response->body());
 		$this->assertEquals('index', $Pages->viewVars['page']);
-
-		$Pages->viewPath = 'Themed';
-		$Pages->display('TestTheme', 'Posts', 'index');
-		$this->assertRegExp('/posts index themed view/', $Pages->response->body());
-		$this->assertEquals('TestTheme', $Pages->viewVars['page']);
-		$this->assertEquals('Posts', $Pages->viewVars['subpage']);
 	}
 
 /**

diff --git a/tests/TestCase/Core/AppTest.php b/tests/TestCase/Core/AppTest.php
@@ -248,19 +248,4 @@ public function testPluginPath() {
 		$this->assertPathEquals($expected, $path);
 	}
 
-/**
- * test that themePath can find paths for themes.
- *
- * @return void
- */
-	public function testThemePath() {
-		$path = App::themePath('test_theme');
-		$expected = TEST_APP . 'TestApp' . DS . 'Template' . DS . 'Themed' . DS . 'TestTheme' . DS;
-		$this->assertPathEquals($expected, $path);
-
-		$path = App::themePath('TestTheme');
-		$expected = TEST_APP . 'TestApp' . DS . 'Template' . DS . 'Themed' . DS . 'TestTheme' . DS;
-		$this->assertPathEquals($expected, $path);
-	}
-
 }
diff --git a/tests/TestCase/Core/PluginTest.php b/tests/TestCase/Core/PluginTest.php
@@ -244,7 +244,7 @@ public function testPathNotFound() {
  */
 	public function testLoadAll() {
 		Plugin::loadAll();
-		$expected = ['Company', 'PluginJs', 'TestPlugin', 'TestPluginTwo'];
+		$expected = ['Company', 'PluginJs', 'TestPlugin', 'TestPluginTwo', 'TestTheme'];
 		$this->assertEquals($expected, Plugin::loaded());
 	}
 
@@ -267,7 +267,7 @@ public function testLoadAllWithPluginAlreadyLoaded() {
 	public function testLoadAllWithDefaults() {
 		$defaults = array('bootstrap' => true, 'ignoreMissing' => true);
 		Plugin::loadAll(array($defaults));
-		$expected = ['Company', 'PluginJs', 'TestPlugin', 'TestPluginTwo'];
+		$expected = ['Company', 'PluginJs', 'TestPlugin', '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'));

diff --git a/tests/TestCase/Network/Email/EmailTest.php b/tests/TestCase/Network/Email/EmailTest.php
@@ -1471,6 +1471,7 @@ public function testSendRenderJapanese() {
  * @return void
  */
 	public function testSendRenderThemed() {
+		Plugin::load('TestTheme');
 		$this->CakeEmail->reset();
 		$this->CakeEmail->transport('debug');
 
@@ -1613,7 +1614,7 @@ public function testSendRenderWithImage() {
  * @return void
  */
 	public function testSendRenderPlugin() {
-		Plugin::load(['TestPlugin', 'TestPluginTwo']);
+		Plugin::load(['TestPlugin', 'TestPluginTwo', 'TestTheme']);
 
 		$this->CakeEmail->reset();
 		$this->CakeEmail->transport('debug');