Enable usage of exception

Distilleries · Feb 13, 2018 · 5dab40c · 5dab40c
1 parent b935a3f
commit 5dab40c
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 37 deletions.
diff --git a/src/Distilleries/Expendable/Models/BaseModel.php b/src/Distilleries/Expendable/Models/BaseModel.php
@@ -55,6 +55,13 @@ public function getAllColumnsNames()
                 $reverse     = true;
                 break;
 
+            case 'sqlite':
+                $query       = "PRAGMA table_info('" . $this->getTable()."')";
+                $column_name = 'name';
+                $reverse     = true;
+                break;
+
+
             case 'mysql':
                 $query       = 'SHOW COLUMNS FROM ' . $this->getTable();
                 $column_name = 'Field';

diff --git a/tests/ExpendableTestCase.php b/tests/ExpendableTestCase.php
@@ -1,5 +1,7 @@
 <?php
 
+use Illuminate\Contracts\Debug\ExceptionHandler;
+
 abstract class ExpendableTestCase extends \Orchestra\Testbench\BrowserKit\TestCase
 {
 
@@ -80,4 +82,22 @@ protected function getPackageAliases($app)
             'Excel'          => 'Maatwebsite\Excel\Facades\Excel',
         ];
     }
+
+
+    protected function disableExceptionHandling()
+    {
+        $this->oldExceptionHandler = $this->app->make(ExceptionHandler::class);
+        $this->app->instance(ExceptionHandler::class, new class extends \Distilleries\Expendable\Exceptions\Handler {
+            public function __construct() {}
+            public function report(\Exception $e) {}
+            public function render($request, \Exception $e) {
+                throw $e;
+            }
+        });
+    }
+    protected function withExceptionHandling()
+    {
+        $this->app->instance(ExceptionHandler::class, $this->oldExceptionHandler);
+        return $this;
+    }
 }
diff --git a/tests/Http/Controllers/Backend/LanguageControllerTest.php b/tests/Http/Controllers/Backend/LanguageControllerTest.php
@@ -176,41 +176,6 @@ public function testSearch()
     }
 
 
-    public function testSearchWithException()
-    {
-        $faker    = Faker\Factory::create();
-        $data     = [
-            'libelle'     => str_replace('\'', '', $faker->country),
-            'iso'         => $faker->countryCode,
-            'not_visible' => 0,
-            'is_default'  => 1,
-            'status'      => 1,
-        ];
-        $language = \Distilleries\Expendable\Models\Language::create($data);
-        $response = $this->call('POST', action('Backend\LanguageController@postSearch'), [
-            'ids' => [$language->id]
-        ]);
-
-        $result = json_decode($response->getContent());
-        $this->assertEquals($language->id, $result[0]->id);
-        $this->assertEquals($language->libelle, $result[0]->libelle);
-
-        try
-        {
-            $response = $this->call('POST', action('Backend\LanguageController@postSearch'), [
-                'term' => $data['iso'].$data['iso'].$data['iso']
-            ]);
-
-            $this->assertEquals(500, $response->getStatusCode());
-
-        } catch (\Exception $e)
-        {
-            $this->assertEquals('Database driver not supported: sqlite', $e->getMessage());
-        }
-
-
-    }
-
     public function testDestroyNoId()
     {
 
@@ -261,7 +226,7 @@ public function testExportError()
 
     public function testExportCsv()
     {
-
+        $this->disableExceptionHandling();
         $faker = Faker\Factory::create();
         $data  = [
             'libelle'     => str_replace('\'', '', $faker->country),
@@ -270,8 +235,8 @@ public function testExportCsv()
             'is_default'  => 1,
             'status'      => 1,
         ];
-        \Distilleries\Expendable\Models\Language::create($data);
 
+        \Distilleries\Expendable\Models\Language::create($data);
         \File::delete(storage_path('exports'));
         $dateBegin = date('Y-m-d', time() - (24 * 60 * 60));
         $dateEnd   = date('Y-m-d', time() + (24 * 60 * 60));

diff --git a/tests/Http/Controllers/Backend/LoginControllerTest.php b/tests/Http/Controllers/Backend/LoginControllerTest.php
@@ -204,6 +204,8 @@ public function testPostReminder()
 
     public function testGetResetNoToken()
     {
+        $this->disableExceptionHandling();
+
         try {
             $this->call('GET', action('Backend\LoginController@getReset'));
         } catch (\Symfony\Component\HttpKernel\Exception\NotFoundHttpException $e) {

diff --git a/tests/Http/Controllers/Backend/UserControllerTest.php b/tests/Http/Controllers/Backend/UserControllerTest.php
@@ -332,6 +332,7 @@ public function testSaveProfile()
 
     public function testSaveProfileNotAuthorize()
     {
+        $this->disableExceptionHandling();
 
         $faker = Faker\Factory::create();
         $role  = \Distilleries\Expendable\Models\Role::create([

diff --git a/tests/Http/Controllers/Frontend/AssetControllerTest.php b/tests/Http/Controllers/Frontend/AssetControllerTest.php
@@ -8,6 +8,8 @@ class AssetControllerTest extends ExpendableTestCase
 
     public function testAssetNotFound()
     {
+        $this->disableExceptionHandling();
+
         try {
             $response = $this->call('GET', 'storage/moximanager/' . rand());
             $this->assertEquals(404, $response->getStatusCode());
@@ -20,6 +22,7 @@ public function testAssetNotFound()
 
     public function testAssetNotAllowed()
     {
+        $this->disableExceptionHandling();
 
         \File::makeDirectory(storage_path('other'), 0755, false, true);
         copy(realpath(__DIR__ . '/../../../data/5601729.gif'), storage_path('other/5601729.gif'));

diff --git a/tests/Models/BaseModelTest.php b/tests/Models/BaseModelTest.php
@@ -37,6 +37,7 @@ public function testGetChoice()
 
     public function testGetAllColumnsNames()
     {
+        $this->disableExceptionHandling();
         list($data, $model) = $this->addContent();
 
         try
@@ -91,6 +92,7 @@ public function testScopeBetweenUpdateWithNoResult()
 
     public function testScopeSearchWithResult()
     {
+        $this->disableExceptionHandling();
         try
         {
             list($data, $model) = $this->addContent();
@@ -108,6 +110,7 @@ public function testScopeSearchWithResult()
 
     public function testScopeSearchWithNoResult()
     {
+        $this->disableExceptionHandling();
         try
         {
             list($data, $model) = $this->addContent();