Updated Controller:: doc block and ControllerMergeVarsTest::

This commit is contained in:
Bryan Crowe 2013-09-25 22:53:23 -04:00
parent 915b51b239
commit ab4bc16463
2 changed files with 3 additions and 3 deletions

View file

@ -88,7 +88,7 @@ class Controller extends Object implements CakeEventListener {
* An array containing the names of helpers this controller uses. The array elements should
* not contain the "Helper" part of the classname.
*
* Example: `public $helpers = array('Html', 'JavaScript', 'Time', 'Ajax');`
* Example: `public $helpers = array('Html', 'Js', 'Time', 'Ajax');`
*
* @var mixed A single name as a string or a list of names as an array.
* @link http://book.cakephp.org/2.0/en/controllers.html#components-helpers-and-uses

View file

@ -94,7 +94,7 @@ class MergeVarPluginAppController extends MergeVarsAppController {
*
* @var array
*/
public $helpers = array('JavaScript');
public $helpers = array('Js');
/**
* parent for mergeVars
@ -205,7 +205,7 @@ class ControllerMergeVarsTest extends CakeTestCase {
$expected = array(
'MergeVar' => array('format' => 'html', 'terse'),
'JavaScript' => null
'Js' => null
);
$this->assertEquals($expected, $Controller->helpers, 'Helpers are unexpected.');