Updating View class properties, and committing additional core tests

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4460 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
nate 2007-02-06 17:18:23 +00:00
parent 3500fa5917
commit a175687bd5
4 changed files with 193 additions and 0 deletions

View file

@ -82,6 +82,12 @@ class View extends Object {
* @var string
*/
var $field = null;
/**
* Name of current model ID this view context is attached to
*
* @var string
*/
var $modelId = null;
/**
* An array of names of models the particular controller wants to use.
*

View file

@ -0,0 +1,53 @@
<?php
/* SVN FILE: $Id$ */
/**
* Short description for file.
*
* Long description for file
*
* PHP versions 4 and 5
*
* CakePHP Test Suite <https://trac.cakephp.org/wiki/Developement/TestSuite>
* Copyright (c) 2006, Larry E. Masters Shorewood, IL. 60431
* Author(s): Larry E. Masters aka PhpNut <phpnut@gmail.com>
*
* Licensed under The Open Group Test Suite License
* Redistributions of files must retain the above copyright notice.
*
* @filesource
* @author Larry E. Masters aka PhpNut <phpnut@gmail.com>
* @copyright Copyright (c) 2006, Larry E. Masters Shorewood, IL. 60431
* @link http://www.phpnut.com/projects/
* @package test_suite
* @subpackage test_suite.cases.app
* @since CakePHP Test Suite v 1.0.0.0
* @version $Revision$
* @modifiedby $LastChangedBy$
* @lastmodified $Date$
* @license http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
*/
require_once LIBS.'inflector.php';
/**
* Short description for class.
*
* @package test_suite
* @subpackage test_suite.cases.libs
* @since CakePHP Test Suite v 1.0.0.0
*/
class InflectorTest extends UnitTestCase {
function setUp() {
$this->inflector = new Inflector();
}
function testInflectingStuff() {
$this->assertEqual($this->inflector->pluralize('Bus'), 'Buses', 'Badness!');
$this->assertEqual($this->inflector->pluralize('bus'), 'buses', 'Badness!');
}
function tearDown() {
unset($this->inflector);
}
}
?>

View file

@ -0,0 +1,72 @@
<?php
/* SVN FILE: $Id$ */
/**
* Short description for file.
*
* Long description for file
*
* PHP versions 4 and 5
*
* CakePHP Test Suite <https://trac.cakephp.org/wiki/Developement/TestSuite>
* Copyright (c) 2006, Larry E. Masters Shorewood, IL. 60431
* Author(s): Larry E. Masters aka PhpNut <phpnut@gmail.com>
*
* Licensed under The Open Group Test Suite License
* Redistributions of files must retain the above copyright notice.
*
* @filesource
* @author Larry E. Masters aka PhpNut <phpnut@gmail.com>
* @copyright Copyright (c) 2006, Larry E. Masters Shorewood, IL. 60431
* @link http://www.phpnut.com/projects/
* @package test_suite
* @subpackage test_suite.cases.app
* @since CakePHP Test Suite v 1.0.0.0
* @version $Revision$
* @modifiedby $LastChangedBy$
* @lastmodified $Date$
* @license http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
*/
require_once LIBS.'../app_helper.php';
require_once LIBS.'class_registry.php';
require_once LIBS.DS.'view'.DS.'view.php';
require_once LIBS.DS.'view'.DS.'helper.php';
require_once LIBS.DS.'view'.DS.'helpers'.DS.'html.php';
require_once LIBS.DS.'view'.DS.'helpers'.DS.'form.php';
require_once LIBS.DS.'controller'.DS.'controller.php';
class TheTestController extends Controller {
var $name = 'TheTest';
var $uses = null;
}
/**
* Short description for class.
*
* @package test_suite
* @subpackage test_suite.cases.libs
* @since CakePHP Test Suite v 1.0.0.0
*/
class FormHelperTest extends UnitTestCase {
function setUp() {
$this->form = new FormHelper();
$this->form->Html = new HtmlHelper();
$view = new View(new TheTestController());
ClassRegistry::addObject('view', $view);
}
function testFormInput() {
$result = $this->form->input('Model/field', array('type' => 'text'));
$expected = '<div class="input"><label for="ModelField">Field</label><input name="data[Model][field]" value="" id="ModelField" type="text" /></div>';
$this->assertEqual($result, $expected, "Badness! Expected '{$expected}', got '{$result}'.");
$result = $this->form->input('Model/password');
$expected = '<div class="input"><label for="ModelPassword">Password</label><input type="password" name="data[Model][password]" id="ModelPassword" value="" /></div>';
$this->assertEqual($result, $expected, "Badness! Expected '{$expected}', got '{$result}'.");
}
function tearDown() {
unset($this->form);
}
}
?>

View file

@ -0,0 +1,62 @@
<?php
/* SVN FILE: $Id$ */
/**
* Short description for file.
*
* Long description for file
*
* PHP versions 4 and 5
*
* CakePHP Test Suite <https://trac.cakephp.org/wiki/Developement/TestSuite>
* Copyright (c) 2006, Larry E. Masters Shorewood, IL. 60431
* Author(s): Larry E. Masters aka PhpNut <phpnut@gmail.com>
*
* Licensed under The Open Group Test Suite License
* Redistributions of files must retain the above copyright notice.
*
* @filesource
* @author Larry E. Masters aka PhpNut <phpnut@gmail.com>
* @copyright Copyright (c) 2006, Larry E. Masters Shorewood, IL. 60431
* @link http://www.phpnut.com/projects/
* @package test_suite
* @subpackage test_suite.cases.app
* @since CakePHP Test Suite v 1.0.0.0
* @version $Revision$
* @modifiedby $LastChangedBy$
* @lastmodified $Date$
* @license http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
*/
require_once LIBS.'../app_helper.php';
require_once LIBS.DS.'view'.DS.'helper.php';
require_once LIBS.DS.'view'.DS.'helpers'.DS.'html.php';
require_once LIBS.DS.'view'.DS.'helpers'.DS.'form.php';
require_once LIBS.DS.'view'.DS.'helpers'.DS.'javascript.php';
/**
* Short description for class.
*
* @package test_suite
* @subpackage test_suite.cases.libs
* @since CakePHP Test Suite v 1.0.0.0
*/
class JavascriptTest extends UnitTestCase {
function setUp() {
$this->js = new JavascriptHelper();
$this->js->Html = new HtmlHelper();
$this->js->Form = new FormHelper();
}
function testObjectGeneration() {
$object = array('title' => 'New thing', 'indexes' => array(5, 6, 7, 8));
$result = $this->js->object($object);
$expected = '{"title":"New thing", "indexes":[5, 6, 7, 8]}';
$this->assertEqual($result, $expected, "Error generating JavaScript object, expected '{$expected}', got '{$result}'.");
}
function tearDown() {
unset($this->js);
}
}
?>