Skip to content

Commit

Permalink
Corrected test assumption in View test
Browse files Browse the repository at this point in the history
- JsonModel now sets "terminal" flag to true by default, which
  invalidated a test; test now explicity disables it.
- JsonModel was missing an import for Zend\Json\Json, which was exposed
  when the test started working.
  • Loading branch information
weierophinney committed Mar 13, 2012
1 parent 1024928 commit 5178259
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 0 deletions.
1 change: 1 addition & 0 deletions library/Zend/View/Model/JsonModel.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
namespace Zend\View\Model;

use Traversable,
Zend\Json\Json,
Zend\Stdlib\ArrayUtils;

/**
Expand Down
1 change: 1 addition & 0 deletions tests/Zend/View/ViewTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@ public function testChildrenMayInvokeDifferentRenderingStrategiesThanParents()

$child2 = new Model\JsonModel(array('bar' => 'baz'));
$child2->setCaptureTo('child2');
$child2->setTerminal(false);

$this->model->setVariable('parent', 'node');
$this->model->addChild($child1);
Expand Down

0 comments on commit 5178259

Please sign in to comment.