adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 11:28:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Increasing code coverage for View and ThemeView

Browse source
This commit is contained in:
phpnut 2009-11-25 23:17:15 -06:00
parent 948f6b21e5
commit f83a024a10
3 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
cake/libs/view/theme.php
View file

@ -67,11 +67,8 @@ class ThemeView extends View {
} }
$paths = array_merge($themePaths, $paths); $paths = array_merge($themePaths, $paths);
} }
$this->__paths = $paths;
if (empty($this->__paths)) { return $this->__paths;
$this->__paths = $paths;
}
return $paths;
} }
} }
?> ?>

10
cake/libs/view/view.php
View file

@ -609,7 +609,7 @@ class View extends Object {
function entity() { function entity() {
$assoc = ($this->association) ? $this->association : $this->model; $assoc = ($this->association) ? $this->association : $this->model;
if (!empty($this->entityPath)) { if (!empty($this->entityPath)) {
$path = explode('.',$this->entityPath); $path = explode('.', $this->entityPath);
$count = count($path); $count = count($path);
if ( if (
($count == 1 && !empty($this->association)) || ($count == 1 && !empty($this->association)) ||
@ -944,12 +944,8 @@ class View extends Object {
} }
$paths[] = App::pluginPath($plugin) . 'views' . DS; $paths[] = App::pluginPath($plugin) . 'views' . DS;
} }
$paths = array_merge($paths, $viewPaths); $this->__paths = array_merge($paths, $viewPaths);
return $this->__paths;
if (empty($this->__paths)) {
$this->__paths = $paths;
}
return $paths;
} }
} }

7
cake/tests/cases/libs/view/view.test.php
View file

@ -477,6 +477,13 @@ class ViewTest extends CakeTestCase {
$result = $this->View->element('test_element'); $result = $this->View->element('test_element');
$this->assertEqual($result, 'this is the test element'); $this->assertEqual($result, 'this is the test element');
$result = $this->View->element('plugin_element', array('plugin' => 'test_plugin'));
$this->assertEqual($result, 'this is the plugin element using params[plugin]');
$this->View->plugin = 'test_plugin';
$result = $this->View->element('test_plugin_element');
$this->assertEqual($result, 'this is the test set using View::$plugin plugin element');
$result = $this->View->element('non_existant_element'); $result = $this->View->element('non_existant_element');
$this->assertPattern('/Not Found:/', $result); $this->assertPattern('/Not Found:/', $result);
$this->assertPattern('/non_existant_element/', $result); $this->assertPattern('/non_existant_element/', $result);