Permalink
Browse files

Updated Controller:: doc block and ControllerMergeVarsTest::

  • Loading branch information...
1 parent 915b51b commit ab4bc164636ed60f6ae96b6ed17a87d97023a2dc @bcrowe bcrowe committed Sep 26, 2013
Showing with 3 additions and 3 deletions.
  1. +1 −1 lib/Cake/Controller/Controller.php
  2. +2 −2 lib/Cake/Test/Case/Controller/ControllerMergeVarsTest.php
View
2 lib/Cake/Controller/Controller.php
@@ -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
4 lib/Cake/Test/Case/Controller/ControllerMergeVarsTest.php
@@ -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 @@ public function testMergeVarsWithPlugin() {
$expected = array(
'MergeVar' => array('format' => 'html', 'terse'),
- 'JavaScript' => null
+ 'Js' => null
);
$this->assertEquals($expected, $Controller->helpers, 'Helpers are unexpected.');

0 comments on commit ab4bc16

Please sign in to comment.