Merge branch 'hotfix/3385' into develop

Close zendframework/zendframework#3385
zendframework · Jan 14, 2013 · c1d2c49 · c1d2c49
commit c1d2c49
Showing 1 changed file with 14 additions and 0 deletions.
diff --git a/test/PhpRendererTest.php b/test/PhpRendererTest.php
@@ -330,6 +330,20 @@ public function testRenderedViewModelIsRegisteredAsCurrentViewModel()
         $this->assertSame($model, $helper->getCurrent());
     }
 
+    public function testRendererRaisesExceptionInCaseOfExceptionInView()
+    {
+        $resolver = new TemplateMapResolver(array(
+            'exception' => __DIR__ . '../../Mvc/View/_files/exception.phtml',
+        ));
+        $this->renderer->setResolver($resolver);
+
+        $model = new ViewModel();
+        $model->setTemplate('exception');
+
+        $this->setExpectedException('Exception', 'thrown from view script');
+        $this->renderer->render($model);
+    }
+
     public function testRendererRaisesExceptionIfResolverCannotResolveTemplate()
     {
         $expected = '10 &gt; 9';