archtechx/tenancy
1
0
Fork 0
mirror of https://github.com/archtechx/tenancy.git synced 2025-12-12 11:14:04 +00:00
Code Activity

Restructure config

Browse source
This commit is contained in:
Samuel Štancl 2020-05-21 15:05:05 +02:00
parent 15a7e52208
commit fbe43fbb04
10 changed files with 57 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

10
tests/CommandsTest.php
View file

@ -38,6 +38,16 @@ class CommandsTest extends TestCase
Event::listen(TenancyEnded::class, RevertToCentralContext::class);
}
public function tearDown(): void
{
parent::tearDown();
// Cleanup tenancy config cache
if (file_exists(base_path('config/tenancy.php'))) {
unlink(base_path('config/tenancy.php'));
}
}
/** @test */
public function migrate_command_doesnt_change_the_db_connection()
{

2
tests/DatabasePreparationTest.php
View file

@ -21,7 +21,7 @@ class DatabasePreparationTest extends TestCase
/** @test */
public function database_can_be_created_after_tenant_creation()
{
config(['tenancy.template_tenant_connection' => 'mysql']);
config(['tenancy.database.template_tenant_connection' => 'mysql']);
Event::listen(TenantCreated::class, JobPipeline::make([CreateDatabase::class])->send(function (TenantCreated $event) {
return $event->tenant;

10
tests/DatabaseUsersTest.php
View file

@ -27,9 +27,9 @@ class DatabaseUsersTest extends TestCase
parent::setUp();
config([
'tenancy.database_managers.mysql' => PermissionControlledMySQLDatabaseManager::class,
'tenancy.database.managers.mysql' => PermissionControlledMySQLDatabaseManager::class,
'tenancy.database.suffix' => '',
'tenancy.template_tenant_connection' => 'mysql',
'tenancy.database.template_tenant_connection' => 'mysql',
]);
Event::listen(TenantCreated::class, JobPipeline::make([CreateDatabase::class])->send(function (TenantCreated $event) {
@ -97,9 +97,9 @@ class DatabaseUsersTest extends TestCase
public function having_existing_databases_without_users_and_switching_to_permission_controlled_mysql_manager_doesnt_break_existing_dbs()
{
config([
'tenancy.database_managers.mysql' => MySQLDatabaseManager::class,
'tenancy.database.managers.mysql' => MySQLDatabaseManager::class,
'tenancy.database.suffix' => '',
'tenancy.template_tenant_connection' => 'mysql',
'tenancy.database.template_tenant_connection' => 'mysql',
'tenancy.bootstrappers' => [
DatabaseTenancyBootstrapper::class,
],
@ -116,7 +116,7 @@ class DatabaseUsersTest extends TestCase
tenancy()->initialize($tenant); // check if everything works
tenancy()->end();
config(['tenancy.database_managers.mysql' => PermissionControlledMySQLDatabaseManager::class]);
config(['tenancy.database.managers.mysql' => PermissionControlledMySQLDatabaseManager::class]);
tenancy()->initialize($tenant); // check if everything works

6
tests/TenantDatabaseManagerTest.php
View file

@ -37,7 +37,7 @@ class TenantDatabaseManagerTest extends TestCase
})->toListener());
config()->set([
"tenancy.database_managers.$driver" => $databaseManager,
"tenancy.database.managers.$driver" => $databaseManager,
'tenancy.internal_prefix' => 'tenancy_',
]);
@ -131,7 +131,7 @@ class TenantDatabaseManagerTest extends TestCase
public function schema_manager_uses_schema_to_separate_tenant_dbs()
{
config([
'tenancy.database_managers.pgsql' => \Stancl\Tenancy\TenantDatabaseManagers\PostgreSQLSchemaManager::class,
'tenancy.database.managers.pgsql' => \Stancl\Tenancy\TenantDatabaseManagers\PostgreSQLSchemaManager::class,
'tenancy.boostrappers' => [
DatabaseTenancyBootstrapper::class,
],
@ -179,7 +179,7 @@ class TenantDatabaseManagerTest extends TestCase
public function tenant_database_can_be_created_on_a_foreign_server()
{
config([
'tenancy.database_managers.mysql' => PermissionControlledMySQLDatabaseManager::class,
'tenancy.database.managers.mysql' => PermissionControlledMySQLDatabaseManager::class,
'database.connections.mysql2' => [
'driver' => 'mysql',
'host' => 'mysql2', // important line

1
tests/TestCase.php
View file

@ -76,7 +76,6 @@ abstract class TestCase extends \Orchestra\Testbench\TestCase
'--realpath' => true,
'--force' => true,
],
'tenancy.storage.connection' => 'central',
'tenancy.bootstrappers.redis' => \Stancl\Tenancy\Bootstrappers\RedisTenancyBootstrapper::class,
'queue.connections.central' => [
'driver' => 'sync',