Skip to content

Commit

Permalink
Fixing fatal errors in View test.
Browse files Browse the repository at this point in the history 
Removing =& and making tests use instanceof instead of is_object()
  • Loading branch information
@markstory
markstory committed Apr 24, 2010
1 parent c03974e commit a17a38d
Show file tree
Hide file tree
Showing 2 changed files with 56 additions and 42 deletions.
2 changes: 1 addition & 1 deletion cake/libs/view/view.php
View file
Expand Up @@ -52,7 +52,7 @@ class View extends Object {
/**
* Name of the plugin.
*
* @link http://manual.cakephp.org/chapter/plugins
* @link http://manual.cakephp.org/chapter/plugins
* @var string
*/
public $plugin = null;
Expand Down
96 changes: 55 additions & 41 deletions cake/tests/cases/libs/view/view.test.php
View file
Expand Up @@ -150,6 +150,20 @@ function paths($plugin = null, $cached = true) {
return $this->_paths($plugin, $cached);
}

/**
* _render wrapper for testing (temporary).
*
* @param string $___viewFn
* @param string $___dataForView
* @param string $loadHelpers
* @param string $cached
* @return void
* @author Mark Story
*/
function render_($___viewFn, $___dataForView, $loadHelpers = true, $cached = false) {
return $this->_render($___viewFn, $___dataForView, $loadHelpers, $cached);
}

/**
* cakeError method
*
Expand All @@ -159,7 +173,7 @@ function paths($plugin = null, $cached = true) {
* @return void
*/
function cakeError($method, $messages) {
$error =& new ViewTestErrorHandler($method, $messages);
$error = new ViewTestErrorHandler($method, $messages);
return $error;
}

Expand Down Expand Up @@ -207,7 +221,7 @@ function beforeLayout() {
* @return void
*/
function afterLayout() {
$View =& ClassRegistry::getObject('afterView');
$View = ClassRegistry::getObject('afterView');
$View->output .= 'modified in the afterlife';
}
}
Expand Down Expand Up @@ -506,9 +520,9 @@ function testElement() {
*/
function testElementCacheHelperNoCache() {
$Controller = new ViewPostsController();
$View = new View($Controller);
$View = new TestView($Controller);
$empty = array();
$helpers = $View->_loadHelpers($empty, array('cache'));
$helpers = $View->loadHelpers($empty, array('cache'));
$View->loaded = $helpers;
$result = $View->element('test_element', array('ram' => 'val', 'test' => array('foo', 'bar')));
$this->assertEqual($result, 'this is the test element');
Expand Down Expand Up @@ -576,11 +590,11 @@ function testLoadHelpers() {
$View = new TestView($this->PostsController);

$loaded = array();
$result = $View->loadHelpers($loaded, array('Html', 'Form', 'Ajax'));
$result = $View->loadHelpers($loaded, array('Html', 'Form', 'Paginator'));
$this->assertTrue(is_object($result['Html']));
$this->assertTrue(is_object($result['Form']));
$this->assertTrue(is_object($result['Form']->Html));
$this->assertTrue(is_object($result['Ajax']->Html));
$this->assertTrue(is_object($result['Paginator']->Html));

$View->plugin = 'test_plugin';
$result = $View->loadHelpers($loaded, array('TestPlugin.PluggedHelper'));
Expand All @@ -595,7 +609,7 @@ function testLoadHelpers() {
*/
function testHelperCallbackTriggering() {
$this->PostsController->helpers = array('Session', 'Html', 'CallbackMock');
$View =& new TestView($this->PostsController);
$View = new TestView($this->PostsController);
$loaded = array();
$View->loaded = $View->loadHelpers($loaded, $this->PostsController->helpers);
$View->loaded['CallbackMock']->expectOnce('beforeRender');
Expand All @@ -613,7 +627,7 @@ function testHelperCallbackTriggering() {
*/
function testBeforeLayout() {
$this->PostsController->helpers = array('Session', 'TestAfter', 'Html');
$View =& new View($this->PostsController);
$View = new View($this->PostsController);
$out = $View->render('index');
$this->assertEqual($View->loaded['testAfter']->property, 'Valuation');
}
Expand All @@ -628,7 +642,7 @@ function testAfterLayout() {
$this->PostsController->helpers = array('Session', 'TestAfter', 'Html');
$this->PostsController->set('variable', 'values');

$View =& new View($this->PostsController);
$View = new View($this->PostsController);
ClassRegistry::addObject('afterView', $View);

$content = 'This is my view output';
Expand All @@ -644,35 +658,35 @@ function testAfterLayout() {
* @return void
*/
function testRenderLoadHelper() {
$this->PostsController->helpers = array('Session', 'Html', 'Form', 'Ajax');
$View =& new TestView($this->PostsController);
$this->PostsController->helpers = array('Session', 'Html', 'Form', 'Number');
$View = new TestView($this->PostsController);

$result = $View->_render($View->getViewFileName('index'), array());
$result = $View->render_($View->getViewFileName('index'), array());
$this->assertEqual($result, 'posts index');

$helpers = $View->loaded;
$this->assertTrue(is_object($helpers['html']));
$this->assertTrue(is_object($helpers['form']));
$this->assertTrue(is_object($helpers['form']->Html));
$this->assertTrue(is_object($helpers['ajax']->Html));
$this->assertTrue($helpers['html'] instanceof HtmlHelper);
$this->assertTrue($helpers['form'] instanceof FormHelper);
$this->assertTrue($helpers['form']->Html instanceof HtmlHelper);
$this->assertTrue($helpers['number'] instanceof NumberHelper);

$this->PostsController->helpers = array('Html', 'Form', 'Ajax', 'TestPlugin.PluggedHelper');
$View =& new TestView($this->PostsController);
$this->PostsController->helpers = array('Html', 'Form', 'Number', 'TestPlugin.PluggedHelper');
$View = new TestView($this->PostsController);

$result = $View->_render($View->getViewFileName('index'), array());
$result = $View->render_($View->getViewFileName('index'), array());
$this->assertEqual($result, 'posts index');

$helpers = $View->loaded;
$this->assertTrue(is_object($helpers['html']));
$this->assertTrue(is_object($helpers['form']));
$this->assertTrue(is_object($helpers['form']->Html));
$this->assertTrue(is_object($helpers['ajax']->Html));
$this->assertTrue(is_object($helpers['pluggedHelper']->OtherHelper));

$this->assertTrue(is_object($View->Html));
$this->assertTrue(is_object($View->Form));
$this->assertTrue(is_object($View->Form->Html));
$this->assertTrue(is_object($View->PluggedHelper->OtherHelper));
$this->assertTrue($helpers['html'] instanceof HtmlHelper);
$this->assertTrue($helpers['form'] instanceof FormHelper);
$this->assertTrue($helpers['form']->Html instanceof HtmlHelper);
$this->assertTrue($helpers['number'] instanceof NumberHelper);
$this->assertTrue($helpers['pluggedHelper']->OtherHelper instanceof OtherHelperHelper);

$this->assertTrue($View->Html instanceof HtmlHelper);
$this->assertTrue($View->Form instanceof FormHelper);
$this->assertTrue($View->Form->Html instanceof HtmlHelper);
$this->assertTrue($View->PluggedHelper->OtherHelper instanceof OtherHelperHelper);
$this->assertReference($View->Form, $View->loaded['form']);
$this->assertReference($View->Html, $View->loaded['html']);
$this->assertReference($View->PluggedHelper->OtherHelper, $View->loaded['otherHelper']);
Expand All @@ -685,7 +699,7 @@ function testRenderLoadHelper() {
* @return void
*/
function testRender() {
$View =& new TestView($this->PostsController);
$View = new TestView($this->PostsController);
$result = str_replace(array("\t", "\r\n", "\n"), "", $View->render('index'));

$this->assertPattern("/<meta http-equiv=\"Content-Type\" content=\"text\/html; charset=utf-8\" \/><title>/", $result);
Expand All @@ -697,7 +711,7 @@ function testRender() {
$this->PostsController->set('pause', 3);
$this->PostsController->set('page_title', 'yo what up');

$View =& new TestView($this->PostsController);
$View = new TestView($this->PostsController);
$result = str_replace(array("\t", "\r\n", "\n"), "", $View->render(false, 'flash'));

$this->assertPattern("/<title>yo what up<\/title>/", $result);
Expand All @@ -711,7 +725,7 @@ function testRender() {
$this->PostsController->params['action'] = 'index';
Configure::write('Cache.check', true);

$View =& new TestView($this->PostsController);
$View = new TestView($this->PostsController);
$result = str_replace(array("\t", "\r\n", "\n"), "", $View->render('index'));

$this->assertPattern("/<meta http-equiv=\"Content-Type\" content=\"text\/html; charset=utf-8\" \/><title>/", $result);
Expand All @@ -728,9 +742,9 @@ function testRenderLayoutWithMockCacheHelper() {
$_check = Configure::read('Cache.check');
Configure::write('Cache.check', true);

$Controller =& new ViewPostsController();
$Controller = new ViewPostsController();
$Controller->cacheAction = '1 day';
$View =& new View($Controller);
$View = new View($Controller);
$View->loaded['cache'] = new ViewTestMockCacheHelper();
$View->loaded['cache']->expectCallCount('cache', 2);

Expand All @@ -747,10 +761,10 @@ function testRenderLayoutWithMockCacheHelper() {
* @return void
*/
function testViewVarOverwritingLocalHelperVar() {
$Controller =& new ViewPostsController();
$Controller = new ViewPostsController();
$Controller->helpers = array('Session', 'Html');
$Controller->set('html', 'I am some test html');
$View =& new View($Controller);
$View = new View($Controller);
$result = $View->render('helper_overwrite', false);

$this->assertPattern('/I am some test html/', $result);
Expand All @@ -764,7 +778,7 @@ function testViewVarOverwritingLocalHelperVar() {
* @return void
*/
function testViewFileName() {
$View =& new TestView($this->PostsController);
$View = new TestView($this->PostsController);

$result = $View->getViewFileName('index');
$this->assertPattern('/posts(\/|\\\)index.ctp/', $result);
Expand Down Expand Up @@ -796,7 +810,7 @@ function testRenderCache() {
return;
}
$view = 'test_view';
$View =& new View($this->PostsController);
$View = new View($this->PostsController);
$path = CACHE . 'views' . DS . 'view_cache_'.$view;

$cacheText = '<!--cachetime:'.time().'-->some cacheText';
Expand Down Expand Up @@ -868,7 +882,7 @@ function testRenderNocache() {
* @return void
*/
function testSet() {
$View =& new TestView($this->PostsController);
$View = new TestView($this->PostsController);
$View->viewVars = array();
$View->set('somekey', 'someValue');
$this->assertIdentical($View->viewVars, array('somekey' => 'someValue'));
Expand All @@ -894,7 +908,7 @@ function testSet() {
* @return void
*/
function testEntityReference() {
$View =& new TestView($this->PostsController);
$View = new TestView($this->PostsController);
$View->model = 'Post';
$View->field = 'title';
$this->assertEqual($View->entity(), array('Post', 'title'));
Expand Down Expand Up @@ -924,7 +938,7 @@ function testBadExt() {
$this->assertPattern("/posts(\/|\\\)this_is_missing.whatever/", $result);

$this->PostsController->ext = ".bad";
$View =& new TestView($this->PostsController);
$View = new TestView($this->PostsController);
$result = str_replace(array("\t", "\r\n", "\n"), "", $View->render('index'));

$this->assertPattern("/<meta http-equiv=\"Content-Type\" content=\"text\/html; charset=utf-8\" \/><title>/", $result);
Expand Down

0 comments on commit a17a38d

Please sign in to comment.