Add command tests

src/Commands/Migrate.php

@@ -7,7 +7,6 @@ use Stancl\Tenancy\DatabaseManager;
 use Illuminate\Database\Migrations\Migrator;
 use Stancl\Tenancy\Traits\HasATenantsOption;
 use Stancl\Tenancy\Traits\DealsWithMigrations;
-use Symfony\Component\Console\Input\InputOption;
 use Illuminate\Database\Console\Migrations\MigrateCommand;
 
 class Migrate extends MigrateCommand
@@ -57,5 +56,7 @@ class Migrate extends MigrateCommand
             // Migrate
             parent::handle();
         });
+
+        $this->database->disconnect();
     }
 }

src/Commands/Rollback.php

@@ -7,7 +7,6 @@ use Stancl\Tenancy\DatabaseManager;
 use Illuminate\Database\Migrations\Migrator;
 use Stancl\Tenancy\Traits\HasATenantsOption;
 use Stancl\Tenancy\Traits\DealsWithMigrations;
-use Symfony\Component\Console\Input\InputOption;
 use Illuminate\Database\Console\Migrations\RollbackCommand;
 
 class Rollback extends RollbackCommand

src/Commands/Seed.php

@@ -6,7 +6,6 @@ use Illuminate\Console\Command;
 use Stancl\Tenancy\DatabaseManager;
 use Stancl\Tenancy\Traits\HasATenantsOption;
 use Illuminate\Database\Migrations\Migrator;
-use Symfony\Component\Console\Input\InputOption;
 use Illuminate\Database\Console\Seeds\SeedCommand;
 use Illuminate\Database\ConnectionResolverInterface;
 

src/DatabaseManager.php

@@ -9,8 +9,11 @@ use Illuminate\Database\DatabaseManager as BaseDatabaseManager;
 
 class DatabaseManager
 {
+    public $originalDefaultConnection;
+
     public function __construct(BaseDatabaseManager $database)
     {
+        $this->originalDefaultConnection = config('database.default');
         $this->database = $database;
     }
 
@@ -28,8 +31,9 @@ class DatabaseManager
 
     public function disconnect()
     {
-        $this->database->reconnect('default');
+        $default_connection = $this->originalDefaultConnection;
-        $this->database->setDefaultConnection('default');
+        $this->database->reconnect($default_connection);
+        $this->database->setDefaultConnection($default_connection);
     }
 
     public function create(string $name, string $driver = null)

src/TenantManager.php

@@ -170,6 +170,16 @@ class TenantManager
         return $tenant;
     }
 
+    /**
+     * Reconnects to the default database.
+     *
+     * @return void
+     */
+    public function disconnectDatabase()
+    {
+        $this->database->disconnect();
+    }
+
     /**
      * Get all tenants.
      *

src/Traits/BootstrapsTenancy.php

@@ -8,7 +8,7 @@ use Illuminate\Support\Facades\Storage;
 
 trait BootstrapsTenancy
 {
-    public $oldStoragePaths = [];
+    public $originalSettings = [];
 
     public function bootstrap()
     {
@@ -41,7 +41,7 @@ trait BootstrapsTenancy
 
     public function suffixFilesystemRootPaths()
     {
-        $old = $this->oldStoragePaths ?: [
+        $old = $this->originalSettings ?: [
             "storage_disks" => [],
             "storage_path" => $this->app->storagePath(),
         ];
@@ -64,6 +64,6 @@ trait BootstrapsTenancy
             $old['storage_disks'][$disk] = $root;
         }
 
-        $this->oldStoragePaths = $old;
+        $this->originalSettings = $old;
     }
 }

src/Traits/DealsWithMigrations.php

@@ -6,6 +6,6 @@ trait DealsWithMigrations
 {
     protected function getMigrationPaths()
     {
-        return [database_path('migrations/tenant')];
+        return [config('tenancy.migrations_directory')];
     }
 }

src/Traits/HasATenantsOption.php

@@ -2,6 +2,8 @@
 
 namespace Stancl\Tenancy\Traits;
 
+use Symfony\Component\Console\Input\InputOption;
+
 trait HasATenantsOption
 {
     protected function getOptions()

src/config/tenancy.php

@@ -41,4 +41,5 @@ return [
     ],
     'queue_database_creation' => false,
     'queue_database_deletion' => false,
+    'migrations_directory' => database_path('migrations/tenant'),
 ];

tests/CommandsTest.php

@@ -2,18 +2,65 @@
 
 namespace Stancl\Tenancy\Tests;
 
+use Illuminate\Support\Facades\Artisan;
+use Illuminate\Support\Facades\Schema;
+
 class CommandsTest extends TestCase
 {
-    /** @test */
+    public $autoInitTenancy = false;
-    public function migrate_command_works()
+
+    public function setUp()
     {
-        $this->markTestIncomplete();
+        parent::setUp();
+
+        config(['tenancy.migrations_directory' => database_path('../migrations')]);
+    }
+
+    /** @test */
+    public function migrate_command_doesnt_change_the_db_connection()
+    {
+        $old_connection_name = app(\Illuminate\Database\DatabaseManager::class)->connection()->getName();
+        Artisan::call('tenants:migrate');
+        $new_connection_name = app(\Illuminate\Database\DatabaseManager::class)->connection()->getName();
+
+        $this->assertEquals($old_connection_name, $new_connection_name);
+        $this->assertNotEquals('tenant', $new_connection_name);
+    }
+
+    /** @test */
+    public function migrate_command_works_without_options()
+    {
+        Artisan::call('tenants:migrate');
+        $this->assertFalse(Schema::hasTable('users'));
+        tenancy()->init();
+        $this->assertTrue(Schema::hasTable('users'));
+    }
+
+    /** @test */
+    public function migrate_command_works_with_tenants_option()
+    {
+        $tenant = tenant()->create('test.localhost');
+        Artisan::call('tenants:migrate', [
+            '--tenants' => [$tenant['uuid']]
+        ]);
+
+        $this->assertFalse(Schema::hasTable('users'));
+        tenancy()->init();
+        $this->assertFalse(Schema::hasTable('users'));
+
+        tenancy()->init('test.localhost');
+        $this->assertTrue(Schema::hasTable('users'));
     }
 
     /** @test */
     public function rollback_command_works()
     {
-        $this->markTestIncomplete();
+        Artisan::call('tenants:migrate');
+        $this->assertFalse(Schema::hasTable('users'));
+        tenancy()->init();
+        $this->assertTrue(Schema::hasTable('users'));
+        Artisan::call('tenants:rollback');
+        $this->assertFalse(Schema::hasTable('users'));
     }
 
     /** @test */

tests/DatabaseManagerTest.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace Stancl\Tenancy\Tests;
+
+class DatabaseManagerTest extends TestCase
+{
+    public $autoInitTenancy = false;
+
+    /** @test */
+    public function disconnect_method_works()
+    {
+        $old_connection_name = app(\Illuminate\Database\DatabaseManager::class)->connection()->getName();
+        tenancy()->init();
+        tenancy()->disconnectDatabase();
+        $new_connection_name = app(\Illuminate\Database\DatabaseManager::class)->connection()->getName();
+        
+        $this->assertSame($old_connection_name, $new_connection_name);
+        $this->assertNotEquals('tenant', $new_connection_name);
+    }
+}

tests/Etc/HttpKernel.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Stancl\Tenancy\Tests;
+namespace Stancl\Tenancy\Tests\Etc;
 
 use Illuminate\Foundation\Http\Kernel;
 

tests/TestCase.php

@@ -88,7 +88,7 @@ abstract class TestCase extends \Orchestra\Testbench\TestCase
      */
     protected function resolveApplicationHttpKernel($app)
     {
-        $app->singleton('Illuminate\Contracts\Http\Kernel', HttpKernel::class);
+        $app->singleton('Illuminate\Contracts\Http\Kernel', Etc\HttpKernel::class);
     }
 
     public function randomString(int $length = 10)