Browse Source

Fix failing tests in View package.

mark_story 8 years ago
parent
commit
f076f59e7c

+ 2 - 1
src/View/ViewVarsTrait.php

@@ -108,7 +108,8 @@ trait ViewVarsTrait
 
         foreach (['name', 'helpers', 'plugin'] as $prop) {
             if (isset($this->{$prop})) {
-                $builder->{$prop}($this->{$prop});
+                $method = 'set' . ucfirst($prop);
+                $builder->{$method}($this->{$prop});
             }
         }
         $builder->setOptions($viewOptions);

+ 9 - 10
tests/TestCase/View/ViewBuilderTest.php

@@ -39,7 +39,6 @@ class ViewBuilderTest extends TestCase
             ['theme', 'TestPlugin'],
             ['template', 'edit'],
             ['name', 'Articles'],
-            ['autoLayout', true],
             ['className', 'Cake\View\JsonView'],
         ];
     }
@@ -95,13 +94,13 @@ class ViewBuilderTest extends TestCase
      */
     public function testBoolProperties($property, $value)
     {
-        $get = 'enable' . ucfirst($property);
-        $set = 'is' . ucfirst($property) . 'Enabled';
+        $set = 'enable' . ucfirst($property);
+        $get = 'is' . ucfirst($property) . 'Enabled';
 
         $builder = new ViewBuilder();
-        $this->assertFalse($builder->{$property}(), 'Default value should be null');
-        $this->assertSame($builder, $builder->{$property}($value), 'Setter returns this');
-        $this->assertSame($value, $builder->{$property}(), 'Getter gets value.');
+        $this->assertNull($builder->{$get}(), 'Default value should be null');
+        $this->assertSame($builder, $builder->{$set}($value), 'Setter returns this');
+        $this->assertSame($value, $builder->{$get}(), 'Getter gets value.');
     }
 
     /**
@@ -151,7 +150,7 @@ class ViewBuilderTest extends TestCase
      */
     public function testStringPropertiesDeprecated($property, $value)
     {
-        $this->deprecated(function () {
+        $this->deprecated(function () use ($value, $property) {
             $builder = new ViewBuilder();
             $this->assertNull($builder->{$property}(), 'Default value should be null');
             $this->assertSame($builder, $builder->{$property}($value), 'Setter returns this');
@@ -168,7 +167,7 @@ class ViewBuilderTest extends TestCase
      */
     public function testBoolPropertiesDeprecated($property, $value)
     {
-        $this->deprecated(function () {
+        $this->deprecated(function () use ($value, $property) {
             $builder = new ViewBuilder();
             $this->assertNull($builder->{$property}(), 'Default value should be null');
             $this->assertSame($builder, $builder->{$property}($value), 'Setter returns this');
@@ -185,7 +184,7 @@ class ViewBuilderTest extends TestCase
      */
     public function testArrayPropertiesDeprecated($property, $value)
     {
-        $this->deprecated(function () {
+        $this->deprecated(function () use ($value, $property) {
             $builder = new ViewBuilder();
             $this->assertSame([], $builder->{$property}(), 'Default value should be empty list');
             $this->assertSame($builder, $builder->{$property}($value), 'Setter returns this');
@@ -202,7 +201,7 @@ class ViewBuilderTest extends TestCase
      */
     public function testArrayPropertyMergeDeprecated($property, $value)
     {
-        $this->deprecated(function () {
+        $this->deprecated(function () use ($value, $property) {
             $builder = new ViewBuilder();
             $builder->{$property}($value);
 

+ 2 - 2
tests/test_app/TestApp/View/Cell/ArticlesCell.php

@@ -78,7 +78,7 @@ class ArticlesCell extends \Cake\View\Cell
     {
         $this->template = 'derp';
         $this->counter++;
-        $this->viewBuilder()->template('alternate_teaser_list');
+        $this->viewBuilder()->setTemplate('alternate_teaser_list');
     }
 
     /**
@@ -89,7 +89,7 @@ class ArticlesCell extends \Cake\View\Cell
      */
     public function customTemplatePath()
     {
-        $this->viewBuilder()->templatePath('Cell/Articles/Subdir');
+        $this->viewBuilder()->setTemplatePath('Cell/Articles/Subdir');
     }
 
     /**