Dev: Better error message from test run

LimeSurvey · Oct 27, 2017 · 28c2c08 · 28c2c08
1 parent 4fcbd5c
commit 28c2c08
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/application/core/LSYii_Application.php b/application/core/LSYii_Application.php
@@ -299,10 +299,15 @@ public function getPlugin()
      */
     public function onException($event){
         if(Yii::app() instanceof CWebApplication){
-            if($event->exception->statusCode=='404'){
-                Yii::app()->setComponent('errorHandler',array(
-                    'errorAction'=>'surveys/error',
-                ));
+            if (defined('PHP_ENV') && PHP_ENV == 'test') {
+                // If run from phpunit, die with exception message.
+                die($event->exception->getMessage());
+            } else {
+                if($event->exception->statusCode=='404'){
+                    Yii::app()->setComponent('errorHandler',array(
+                        'errorAction'=>'surveys/error',
+                    ));
+                }
             }
         }
     }

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -222,3 +222,5 @@
 require_once(__DIR__ . '/TestHelper.php');
 require_once(__DIR__ . '/TestBaseClass.php');
 require_once(__DIR__ . '/DummyController.php');
+
+define('PHP_ENV', 'test');