TenantDatabaseManagerTest fully passes now

assets/config.php

@@ -70,6 +70,7 @@ return [
         'Stancl\Tenancy\Features\TenantRedirect',
     ],
     'migrate_after_creation' => false, // run migrations after creating a tenant
+    'delete_database_after_tenant_deletion' => false, // delete tenant's database after deleting him
     'queue_database_creation' => false,
     'queue_database_deletion' => false,
     'unique_id_generator' => 'Stancl\Tenancy\UUIDGenerator',

src/DatabaseManager.php

@@ -10,6 +10,7 @@ use Stancl\Tenancy\Contracts\TenantDatabaseManager;
 use Stancl\Tenancy\Exceptions\DatabaseManagerNotRegisteredException;
 use Stancl\Tenancy\Exceptions\TenantDatabaseAlreadyExistsException;
 use Stancl\Tenancy\Jobs\QueuedTenantDatabaseCreator;
+use Stancl\Tenancy\Jobs\QueuedTenantDatabaseDeleter;
 
 class DatabaseManager
 {
@@ -108,7 +109,7 @@ class DatabaseManager
         $manager = $this->getTenantDatabaseManager($tenant);
 
         if ($this->app['config']['tenancy.queue_database_creation'] ?? false) {
-            QueuedTenantDatabaseCreator::dispatch($manager, $database, 'create');
+            QueuedTenantDatabaseCreator::dispatch($manager, $database);
         } else {
             return $manager->createDatabase($database);
         }
@@ -119,8 +120,8 @@ class DatabaseManager
         $database = $tenant->getDatabaseName();
         $manager = $this->getTenantDatabaseManager($tenant);
 
-        if ($this->app['config']['tenancy.queue_database_creation'] ?? false) {
+        if ($this->app['config']['tenancy.queue_database_deletion'] ?? false) {
-            QueuedTenantDatabaseCreator::dispatch($manager, $database, 'delete');
+            QueuedTenantDatabaseDeleter::dispatch($manager, $database);
         } else {
             return $manager->deleteDatabase($database);
         }
@@ -128,6 +129,7 @@ class DatabaseManager
 
     protected function getTenantDatabaseManager(Tenant $tenant): TenantDatabaseManager
     {
+        // todo this shouldn't have to create a connection
         $this->createTenantConnection($tenant->getDatabaseName(), $tenant->getConnectionName());
         $driver = $this->getDriver($tenant->getConnectionName());
 

src/Facades/TenantFacade.php

@@ -7,6 +7,7 @@ namespace Stancl\Tenancy\Facades;
 use Illuminate\Support\Facades\Facade;
 use Stancl\Tenancy\Tenant as Tenant;
 
+// todo rename to CurrentTenant?
 class TenantFacade extends Facade
 {
     protected static function getFacadeAccessor()

src/Tenant.php

@@ -174,7 +174,7 @@ class Tenant implements ArrayAccess
     public function delete(): self
     {
         if ($this->persisted) {
-            $this->tenantManager->deleteTenant($this);
+            $this->manager->deleteTenant($this);
             $this->persisted = false;
         }
 

src/TenantManager.php

@@ -253,6 +253,11 @@ class TenantManager
         return $this->app['config']['tenancy.migrate_after_creation'] ?? false;
     }
 
+    public function shouldDeleteDatabase(): bool
+    {
+        return $this->app['config']['tenancy.delete_database_after_tenant_deletion'] ?? false;
+    }
+
     /**
      * Add an event listener.
      *

test

@@ -6,5 +6,5 @@ docker-compose up -d
 printf "Variant 1\n\n"
 docker-compose exec test env TENANCY_TEST_STORAGE_DRIVER=redis vendor/bin/phpunit --coverage-php coverage/1.cov "$@"
 printf "Variant 2\n\n"
-docker-compose exec test env TENANCY_TEST_STORAGE_DRIVER=db vendor/bin/phpunit --coverage-php coverage/3.cov "$@"
+docker-compose exec test env TENANCY_TEST_STORAGE_DRIVER=db vendor/bin/phpunit --coverage-php coverage/2.cov "$@"
 docker-compose exec test vendor/bin/phpcov merge --clover clover.xml coverage/

tests/TenantDatabaseManagerTest.php

@@ -4,11 +4,10 @@ declare(strict_types=1);
 
 namespace Stancl\Tenancy\Tests;
 
-use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Queue;
-use Stancl\Tenancy\DatabaseManager;
 use Stancl\Tenancy\Jobs\QueuedTenantDatabaseCreator;
 use Stancl\Tenancy\Jobs\QueuedTenantDatabaseDeleter;
+use Stancl\Tenancy\Tenant;
 use Stancl\Tenancy\TenantDatabaseManagers\MySQLDatabaseManager;
 use Stancl\Tenancy\TenantDatabaseManagers\PostgreSQLDatabaseManager;
 use Stancl\Tenancy\TenantDatabaseManagers\SQLiteDatabaseManager;
@@ -74,9 +73,10 @@ class TenantDatabaseManagerTest extends TestCase
     {
         Queue::fake();
 
-        config()->set('tenancy.queue_database_creation', true);
+        config()->set([
-        $db_name = 'testdatabase' . $this->randomString(10) . '.sqlite';
+            'tenancy.queue_database_creation' => true,
-        app(DatabaseManager::class)->create($db_name, 'sqlite');
+        ]);
+        Tenant::create(['test2.localhost']);
 
         Queue::assertPushed(QueuedTenantDatabaseCreator::class);
     }
@@ -86,9 +86,12 @@ class TenantDatabaseManagerTest extends TestCase
     {
         Queue::fake();
 
-        config()->set('tenancy.queue_database_deletion', true);
+        $tenant = Tenant::create(['test2.localhost']);
-        $db_name = 'testdatabase' . $this->randomString(10) . '.sqlite';
+        config()->set([
-        app(DatabaseManager::class)->delete($db_name, 'sqlite');
+            'tenancy.queue_database_deletion' => true,
+            'tenancy.delete_database_after_tenant_deletion' => true,
+        ]);
+        $tenant->delete();
 
         Queue::assertPushed(QueuedTenantDatabaseDeleter::class);
     }

tests/TenantManagerTest.php

@@ -49,14 +49,14 @@ class TenantManagerTest extends TestCase
     {
         $tenant = Tenant::new()->withDomains(['foo.localhost'])->save();
 
-        $this->assertSame($tenant, tenant()->findByDomain('foo.localhost'));
+        $this->assertSame($tenant, tenancy()->findByDomain('foo.localhost'));
     }
 
     /** @test */
     public function getIdByDomain_works()
     {
         $tenant = Tenant::new()->withDomains(['foo.localhost'])->save();
-        $this->assertSame(tenant()->getTenantIdByDomain('foo.localhost'), tenant()->getIdByDomain('foo.localhost'));
+        $this->assertSame(tenant()->getTenantIdByDomain('foo.localhost'), tenancy()->getIdByDomain('foo.localhost'));
     }
 
     /** @test */
@@ -65,7 +65,7 @@ class TenantManagerTest extends TestCase
         Tenant::new()->withDomains(['dev.localhost'])->save();
         tenancy()->init('dev.localhost');
 
-        $this->assertSame(tenant()->tenant, tenant()->find(tenant('id')));
+        $this->assertSame(tenant(), tenancy()->find(tenant('id')));
     }
 
     /** @test */
@@ -76,14 +76,6 @@ class TenantManagerTest extends TestCase
         $this->assertSame($tenant, tenancy()->getTenantById($tenant['id']));
     }
 
-    /** @test */
-    public function create_returns_the_supplied_domain()
-    {
-        $domain = 'foo.localhost';
-
-        $this->assertSame($domain, Tenant::new()->withDomains([$domain])->save()['domain']);
-    }
-
     /** @test */
     public function findByDomain_throws_an_exception_when_an_unused_domain_is_supplied()
     {