Better approach to exception handling in tests

igorw · Jun 29, 2012 · cf4d355 · cf4d355
1 parent fa4a27e
commit cf4d355
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/src/app.php b/src/app.php
@@ -81,6 +81,10 @@
 ->assert('id', '[0-9a-f]{8}');
 
 $app->error(function (Exception $e) use ($app) {
+    if (!$app['catch_exceptions']) {
+        return;
+    }
+
     $code = ($e instanceof HttpException) ? $e->getStatusCode() : 500;
 
     return new Response($app['twig']->render('error.html', array(

diff --git a/tests/FunctionalTest.php b/tests/FunctionalTest.php
@@ -8,9 +8,13 @@ public function createApplication()
     {
         $app = require __DIR__.'/../src/app.php';
 
+        $app['catch_exceptions'] = false;
+
         $app['app.storage'] = $this->getMockBuilder('Igorw\Trashbin\Storage')->disableOriginalConstructor()->getMock();
 
-        unset($this->app['exception_handler']);
+        $app['twig.options'] = array('debug' => true);
+
+        unset($app['exception_handler']);
 
         return $app;
     }
@@ -94,6 +98,8 @@ public function testViewPaste()
 
     public function testViewPasteWithInvalidId()
     {
+        $this->app['catch_exceptions'] = true;
+
         $this->app['app.storage']
             ->expects($this->once())
             ->method('get')