Updated tests

Author: Andrey Helldar

tests/Commands/CreatorTest.php

@@ -18,7 +18,6 @@ public function testCreateAction()
         $this->assertFileDoesNotExist($path);
 
         $this->artisan('make:migration:action', compact('name'))->run();
-        $this->await();
 
         $this->assertFileExists($path);
     }

tests/Commands/MakeTest.php

@@ -17,7 +17,6 @@ public function testMakingFiles()
         $this->assertFileDoesNotExist($path);
 
         $this->artisan('make:migration:action', compact('name'))->run();
-        $this->await();
 
         $this->assertFileExists($path);
 

tests/Commands/StatusTest.php

@@ -21,7 +21,11 @@ public function testStatusCommand()
 
         $this->assertDatabaseCount($this->table, 0);
 
-        $this->artisan('migrate:actions:status')->expectsTable([], [])->run();
+        if ($this->is6x()) {
+            $this->artisan('migrate:actions:status')->run();
+        } else {
+            $this->artisan('migrate:actions:status')->expectsTable([], [])->run();
+        }
 
         $filename = date('Y_m_d_His') . '_status';
 

tests/Concerns/AssertDatabase.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace Tests\Concerns;
+
+use Illuminate\Support\Facades\DB;
+
+/** @mixin \Tests\TestCase */
+trait AssertDatabase
+{
+    protected function assertDatabaseCount($table, int $count, $connection = null)
+    {
+        $actual = DB::connection($connection)->table($table)->count();
+
+        $this->assertEquals($count, $actual);
+    }
+}

tests/Concerns/Laraveable.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace Tests\Concerns;
+
+use Illuminate\Foundation\Application;
+use Illuminate\Support\Str;
+
+trait Laraveable
+{
+    protected function is6x(): bool
+    {
+        return $this->majorVersion() === 6;
+    }
+
+    protected function is7x(): bool
+    {
+        return $this->majorVersion() === 7;
+    }
+
+    protected function is8x(): bool
+    {
+        return $this->majorVersion() === 8;
+    }
+
+    protected function majorVersion(): int
+    {
+        return Str::before(Application::VERSION, '.');
+    }
+}

tests/Concerns/Sleepable.php

@@ -7,19 +7,21 @@
 use Illuminate\Support\Facades\DB;
 use Orchestra\Testbench\TestCase as BaseTestCase;
 use Tests\Concerns\Actionable;
+use Tests\Concerns\AssertDatabase;
 use Tests\Concerns\Database;
 use Tests\Concerns\Files;
+use Tests\Concerns\Laraveable;
 use Tests\Concerns\Settings;
-use Tests\Concerns\Sleepable;
 
 abstract class TestCase extends BaseTestCase
 {
     use Actionable;
+    use AssertDatabase;
     use Database;
     use Files;
+    use Laraveable;
     use RefreshDatabase;
     use Settings;
-    use Sleepable;
 
     protected function setUp(): void
     {