From 7ebb15c939bdc9e6ebaae67f93d353cc47233886 Mon Sep 17 00:00:00 2001 From: Jose Lorenzo Rodriguez Date: Tue, 20 May 2014 20:53:18 +0200 Subject: [PATCH] And... done fixing the tests --- tests/TestCase/Core/PluginTest.php | 2 +- tests/TestCase/Network/Email/EmailTest.php | 4 ++-- tests/TestCase/View/Helper/HtmlHelperTest.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/TestCase/Core/PluginTest.php b/tests/TestCase/Core/PluginTest.php index eaf4c0537e9..07c0a4c5eff 100644 --- 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 index eb8274d349b..6b5b0b4a864 100644 --- 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 index 35167fc4a1c..77f2c0ff7cd 100644 --- 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);