1
0
Fork 0
mirror of https://github.com/archtechx/tenancy.git synced 2026-02-05 16:54:05 +00:00

Automigration test, config key, QueueTenancyBootstrapper support for QueueFake

This commit is contained in:
Samuel Štancl 2019-10-04 21:09:19 +02:00
parent be02f22484
commit 1df2b9d66d
3 changed files with 29 additions and 3 deletions

View file

@ -90,6 +90,7 @@ return [
], ],
'home_url' => '/app', 'home_url' => '/app',
'migrate_after_creation' => false, // run migrations after creating a tenant 'migrate_after_creation' => false, // run migrations after creating a tenant
'queue_automatic_migration' => false, // queue the automatic post-tenant-creation migrations
'delete_database_after_tenant_deletion' => false, // delete the tenant's database after deleting the tenant 'delete_database_after_tenant_deletion' => false, // delete the tenant's database after deleting the tenant
'queue_database_creation' => false, 'queue_database_creation' => false,
'queue_database_deletion' => false, 'queue_database_deletion' => false,

View file

@ -5,6 +5,7 @@ declare(strict_types=1);
namespace Stancl\Tenancy\TenancyBootstrappers; namespace Stancl\Tenancy\TenancyBootstrappers;
use Illuminate\Contracts\Foundation\Application; use Illuminate\Contracts\Foundation\Application;
use Illuminate\Support\Testing\Fakes\QueueFake;
use Stancl\Tenancy\Contracts\TenancyBootstrapper; use Stancl\Tenancy\Contracts\TenancyBootstrapper;
use Stancl\Tenancy\Tenant; use Stancl\Tenancy\Tenant;
@ -21,9 +22,11 @@ class QueueTenancyBootstrapper implements TenancyBootstrapper
$this->app = $app; $this->app = $app;
$bootstrapper = &$this; $bootstrapper = &$this;
$this->app['queue']->createPayloadUsing(function () use (&$bootstrapper) { if (! $queue = $this->app['queue'] instanceof QueueFake) {
return $bootstrapper->getPayload(); $queue->createPayloadUsing(function () use (&$bootstrapper) {
}); return $bootstrapper->getPayload();
});
}
} }
public function start(Tenant $tenant) public function start(Tenant $tenant)

View file

@ -5,9 +5,11 @@ declare(strict_types=1);
namespace Stancl\Tenancy\Tests; namespace Stancl\Tenancy\Tests;
use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Queue;
use Illuminate\Support\Facades\Storage; use Illuminate\Support\Facades\Storage;
use Stancl\Tenancy\Exceptions\DomainsOccupiedByOtherTenantException; use Stancl\Tenancy\Exceptions\DomainsOccupiedByOtherTenantException;
use Stancl\Tenancy\Exceptions\TenantWithThisIdAlreadyExistsException; use Stancl\Tenancy\Exceptions\TenantWithThisIdAlreadyExistsException;
use Stancl\Tenancy\Jobs\QueuedTenantDatabaseMigrator;
use Stancl\Tenancy\Tenant; use Stancl\Tenancy\Tenant;
use Stancl\Tenancy\TenantManager; use Stancl\Tenancy\TenantManager;
@ -244,4 +246,24 @@ class TenantManagerTest extends TestCase
$this->expectException(TenantWithThisIdAlreadyExistsException::class); $this->expectException(TenantWithThisIdAlreadyExistsException::class);
Tenant::create(['bar.localhost'], ['id' => $id]); Tenant::create(['bar.localhost'], ['id' => $id]);
} }
/** @test */
public function automigration_can_be_queued()
{
Queue::fake();
config([
'tenancy.migrate_after_creation' => true,
'tenancy.queue_automatic_migration' => true,
]);
$tenant = Tenant::new()->save();
tenancy()->initialize($tenant);
Queue::assertPushed(QueuedTenantDatabaseMigrator::class);
$this->assertFalse(\Schema::hasTable('users'));
(new QueuedTenantDatabaseMigrator($tenant))->handle();
$this->assertTrue(\Schema::hasTable('users'));
}
} }