And... done fixing the tests

cakephp · May 20, 2014 · 7ebb15c · 7ebb15c
1 parent aa3a44e
commit 7ebb15c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/tests/TestCase/Core/PluginTest.php b/tests/TestCase/Core/PluginTest.php
@@ -287,7 +287,7 @@ public function testLoadAllWithDefaultsAndOverride() {
 		));
 		Plugin::routes();
 
-		$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 routes', Configure::read('PluginTest.test_plugin.routes'));

diff --git a/tests/TestCase/Network/Email/EmailTest.php b/tests/TestCase/Network/Email/EmailTest.php
@@ -1484,10 +1484,10 @@ public function testSendRenderThemed() {
 		$result = $this->CakeEmail->send();
 
 		$this->assertContains('In TestTheme', $result['message']);
-		$this->assertContains('/theme/TestTheme/img/test.jpg', $result['message']);
+		$this->assertContains('/test_theme/img/test.jpg', $result['message']);
 		$this->assertContains('Message-ID: ', $result['headers']);
 		$this->assertContains('To: ', $result['headers']);
-		$this->assertContains('/theme/TestTheme/img/test.jpg', $result['message']);
+		$this->assertContains('/test_theme/img/test.jpg', $result['message']);
 	}
 
 /**

diff --git a/tests/TestCase/View/Helper/HtmlHelperTest.php b/tests/TestCase/View/Helper/HtmlHelperTest.php
@@ -440,7 +440,7 @@ public function testImageWithTimestampping() {
 	public function testImageTagWithTheme() {
 		$this->skipIf(!is_writable(WWW_ROOT), 'Cannot write to webroot.');
 
-		$testfile = WWW_ROOT . 'theme/test_theme/img/__cake_test_image.gif';
+		$testfile = WWW_ROOT . 'test_theme/img/__cake_test_image.gif';
 		new File($testfile, true);
 
 		Configure::write('Asset.timestamp', true);