Fixes tests

buggregator · Apr 30, 2024 · c0af259 · c0af259
1 parent d1de682
commit c0af259
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 17 deletions.
diff --git a/.github/workflows/phpunit-mysql.yml b/.github/workflows/phpunit-mysql.yml
@@ -5,7 +5,7 @@ name: phpunit
 
 jobs:
   phpunit:
-    name: "[MySQL] PHP 8.3-${{ matrix.os }}, ${{ matrix.stability }}"
+    name: "[MySQL:${{ matrix.mysql-version }}] PHP 8.3-${{ matrix.os }}, ${{ matrix.stability }}"
     runs-on: ${{ matrix.os }}
 
     strategy:
@@ -14,7 +14,7 @@ jobs:
         php: [ '8.3' ]
         os: [ 'ubuntu-latest' ]
         stability: [ 'prefer-stable' ]
-        mysql-version: [ '5,7', '8.0' ]
+        mysql-version: [ '5', '8' ]
 
     services:
       mysql:

diff --git a/.github/workflows/phpunit-pgsql.yml b/.github/workflows/phpunit-pgsql.yml
@@ -5,7 +5,7 @@ name: phpunit
 
 jobs:
   phpunit:
-    name: "[Postgres] PHP 8.3-${{ matrix.os }}, ${{ matrix.stability }}"
+    name: "[Postgres:${{ matrix.pgsql-version }}] PHP 8.3-${{ matrix.os }}, ${{ matrix.stability }}"
     runs-on: ${{ matrix.os }}
 
     strategy:

diff --git a/app/database/Migrations/20240428.211841_0_0_default_change_events_alter_timestamp.php b/app/database/Migrations/20240428.211841_0_0_default_change_events_alter_timestamp.php
@@ -19,8 +19,6 @@ public function up(): void
 
     public function down(): void
     {
-        $this->table('events')
-        ->alterColumn('timestamp', 'decimal', ['nullable' => false, 'defaultValue' => null, 'precision' => 10, 'scale' => 5])
-        ->update();
+
     }
 }
diff --git a/phpunit.xml b/phpunit.xml
@@ -31,13 +31,13 @@
         </testsuite>
     </testsuites>
     <logging>
-        <junit outputFile="build/report.junit.xml"/>
+        <junit outputFile=".cache/phpunit/report.junit.xml"/>
     </logging>
     <coverage>
         <report>
-            <html outputDirectory="build/coverage"/>
-            <text outputFile="build/coverage.txt"/>
-            <clover outputFile="build/logs/clover.xml"/>
+            <html outputDirectory=".cache/coverage"/>
+            <text outputFile=".cache/coverage.txt"/>
+            <clover outputFile=".cache/logs/clover.xml"/>
         </report>
     </coverage>
 </phpunit>
diff --git a/tests/DatabaseTestCase.php b/tests/DatabaseTestCase.php
@@ -24,23 +24,25 @@
 
 abstract class DatabaseTestCase extends TestCase
 {
-    use DatabaseMigrations, RefreshDatabase, Transactions, Helper, DatabaseAsserts, ShowQueries;
+    use Transactions, Helper, DatabaseAsserts, ShowQueries;
+
+    private DriverEnum $dbDriver;
 
     protected function setUp(): void
     {
         parent::setUp();
 
-        $dbDriver = $this->get(DriverEnum::class);
-        $this->getRefreshStrategy()->enableRefreshAttribute();
+        $this->dbDriver = $this->get(DriverEnum::class);
+//        $this->getRefreshStrategy()->enableRefreshAttribute();
 
         // TODO: refactor this
-        if ($dbDriver === DriverEnum::MongoDb) {
+        if ($this->dbDriver === DriverEnum::MongoDb) {
             $mongoDb = $this->get(Database::class);
             foreach ($mongoDb->listCollections() as $collection) {
                 /** @var CollectionInfo $collection */
                 $mongoDb->selectCollection($collection->getName())->drop();
             }
-        } elseif ($dbDriver === DriverEnum::InMemory) {
+        } elseif ($this->dbDriver === DriverEnum::InMemory) {
             $this->get(CacheStorageProviderInterface::class)->storage('events')->clear();
             $this->get(CacheStorageProviderInterface::class)->storage('projects')->clear();
         }
@@ -50,8 +52,10 @@ protected function tearDown(): void
     {
         parent::tearDown();
 
-        $this->cleanIdentityMap();
-        $this->getCurrentDatabaseDriver()->disconnect();
+        if ($this->dbDriver === DriverEnum::Database) {
+            $this->cleanIdentityMap();
+            $this->getCurrentDatabaseDriver()->disconnect();
+        }
     }
 
     public function persist(object ...$entity): void