adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-18 10:36:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing unique script check in View::addScript() (Ticket #2262), and adding View test case

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4645 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
nate 2007-03-22 00:37:45 +00:00
parent 2a095d9ea6
commit 5e0de9b90e
2 changed files with 90 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -535,8 +535,8 @@ class View extends Object {
* @access public
*/
function addScript($name, $content = null) {
if ($content == null) {
if (!in_array($content, array_values($this->__scripts))) {
if (empty($content)) {
if (!in_array($name, array_values($this->__scripts))) {
$this->__scripts[] = $name;
}
} else {
@ -839,9 +839,10 @@ class View extends Object {
if (is_null($plugin) || !loadPluginHelper($plugin, $helper)) {
if (!loadHelper($helper)) {
$this->cakeError('missingHelperFile', array(array(
'helper' => $helper,
'file' => Inflector::underscore($helper) . '.php',
'base' => $this->base)));
'helper' => $helper,
'file' => Inflector::underscore($helper) . '.php',
'base' => $this->base
)));
exit();
}
}

84
cake/tests/cases/libs/view/view.test.php Normal file
View file

@ -0,0 +1,84 @@
<?php
/* SVN FILE: $Id$ */
/**
* Short description for file.
*
* Long description for file
*
* PHP versions 4 and 5
*
* CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
* Copyright 2005-2007, Cake Software Foundation, Inc.
* 1785 E. Sahara Avenue, Suite 490-204
* Las Vegas, Nevada 89104
*
* Licensed under The Open Group Test Suite License
* Redistributions of files must retain the above copyright notice.
*
* @filesource
* @copyright Copyright 2005-2007, Cake Software Foundation, Inc.
* @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
* @package cake.tests
* @subpackage cake.tests.cases.libs
* @since CakePHP(tm) v 1.2.0.4206
* @version $Revision$
* @modifiedby $LastChangedBy$
* @lastmodified $Date$
* @license http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
*/
require_once LIBS.'view'.DS.'view.php';
require_once LIBS.'controller'.DS.'controller.php';
class PostsController extends Controller {
var $name = 'Posts';
function index() {
$this->set('testData', 'Some test data');
$test2 = 'more data';
$test3 = 'even more data';
$this->set(compact('test2', 'test3'));
}
}
/**
* Short description for class.
*
* @package cake.tests
* @subpackage cake.tests.cases.libs
*/
class ViewTest extends UnitTestCase {
function setUp() {
$this->PostsController = new PostsController();
$this->PostsController->index();
$this->view = new View($this->PostsController);
}
function testViewVars() {
$this->assertTrue($this->view->viewVars, array('testData' => 'Some test data', 'test2' => 'more data', 'test3' => 'even more data'));
}
function testUUIDGeneration() {
$result = $this->view->uuid('form', array('controller' => 'posts', 'action' => 'index'));
$this->assertEqual($result, 'form5988016017');
$result = $this->view->uuid('form', array('controller' => 'posts', 'action' => 'index'));
$this->assertEqual($result, 'formc3dc6be854');
$result = $this->view->uuid('form', array('controller' => 'posts', 'action' => 'index'));
$this->assertEqual($result, 'form28f92cc87f');
}
function testAddInlineScripts() {
$this->view->addScript('prototype.js');
$this->view->addScript('prototype.js');
$this->assertEqual($this->view->__scripts, array('prototype.js'));
$this->view->addScript('mainEvent', 'Event.observe(window, "load", function() { doSomething(); }, true);');
$this->assertEqual($this->view->__scripts, array('prototype.js', 'mainEvent' => 'Event.observe(window, "load", function() { doSomething(); }, true);'));
}
function tearDown() {
unset($this->view);
unset($this->PostsController);
}
}
?>