laravel 7

akaunting · Mar 7, 2020 · 3c3bef7 · 3c3bef7
1 parent 3ab35b8
commit 3c3bef7
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 33 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -15,7 +15,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v1
+        uses: actions/checkout@v2
 
       - name: Cache composer
         uses: actions/cache@v1
@@ -24,7 +24,7 @@ jobs:
           key: php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}
 
       - name: Setup PHP
-        uses: shivammathur/setup-php@v1
+        uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
           extension-csv: bcmath, ctype, dom, fileinfo, intl, gd, json, mbstring, pdo, pdo_sqlite, openssl, sqlite, xml, zip
@@ -34,4 +34,4 @@ jobs:
         run: composer install --no-interaction --no-scripts --no-suggest --prefer-source
 
       - name: Execute tests
-        run: vendor/bin/phpunit
+        run: vendor/bin/phpunit
diff --git a/composer.json b/composer.json
@@ -1,4 +1,4 @@
-{  
+{
     "name": "akaunting/firewall",
     "description": "Web Application Firewall (WAF) package for Laravel",
     "keywords": [
@@ -14,7 +14,7 @@
     ],
     "license": "MIT",
     "authors": [
-        {  
+        {
             "name": "Denis Duliçi",
             "email": "info@akaunting.com",
             "homepage": "https://akaunting.com",
@@ -28,8 +28,8 @@
         "jenssegers/agent": "2.6.*"
     },
     "require-dev": {
-        "phpunit/phpunit": "5.7.*",
-        "orchestra/testbench": "3.4.*|3.5.*|3.6.*|3.7.*|3.8.*"
+        "phpunit/phpunit": ">=5.7",
+        "orchestra/testbench": ">=3.4"
     },
     "autoload": {
         "psr-4": {

diff --git a/phpunit.xml b/phpunit.xml
@@ -28,5 +28,6 @@
         <env name="QUEUE_DRIVER" value="sync"/>
         <env name="QUEUE_CONNECTION" value="sync"/>
         <env name="MAIL_DRIVER" value="array"/>
+        <env name="MAIL_MAILER" value="array"/>
     </php>
 </phpunit>
diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -7,8 +7,6 @@
 
 abstract class TestCase extends BaseTestCase
 {
-    protected $database;
-
     protected function setUp(): void
     {
         parent::setUp();
@@ -24,8 +22,6 @@ protected function setUp(): void
     protected function tearDown(): void
     {
         parent::tearDown();
-
-        $this->deleteDatabase();
     }
 
     protected function getPackageProviders($app)
@@ -35,6 +31,18 @@ protected function getPackageProviders($app)
         ];
     }
 
+    protected function setUpDatabase()
+    {
+        config(['database.default' => 'testbench']);
+
+        config(['database.connections.testbench' => [
+                'driver'   => 'sqlite',
+                'database' => ':memory:',
+                'prefix'   => '',
+            ],
+        ]);
+    }
+
     protected function setUpConfig()
     {
         config(['firewall' => require __DIR__ . '/../src/Config/firewall.php']);
@@ -47,28 +55,6 @@ protected function setUpConfig()
         config(['firewall.middleware.xss.methods' => ['all']]);
     }
 
-    protected function setUpDatabase()
-    {
-        if (!file_exists($path = __DIR__ . '/databases')) {
-            mkdir($path);
-        }
-
-        touch($this->database = tempnam($path, 'database.sqlite.'));
-
-        app()->config->set(
-            'database.connections.testbench', [
-                'driver'   => 'sqlite',
-                'database' => $this->database,
-                'prefix'   => '',
-            ]
-        );
-    }
-
-    protected function deleteDatabase()
-    {
-        @unlink($this->database);
-    }
-
     public function getNextClosure()
     {
         return function () {