vague first draft of v3. TenantModelTest is passing

tests/TestCase.php

@@ -21,8 +21,7 @@ abstract class TestCase extends \Orchestra\Testbench\TestCase
     {
         parent::setUp();
 
-        Redis::connection('tenancy')->flushdb();
-        Redis::connection('cache')->flushdb();
+        // Redis::connection('cache')->flushdb();
 
         file_put_contents(database_path('central.sqlite'), '');
         $this->artisan('migrate:fresh', [
@@ -102,7 +101,7 @@ abstract class TestCase extends \Orchestra\Testbench\TestCase
                 '--realpath' => true,
                 '--force' => true,
             ],
-            'tenancy.storage_drivers.db.connection' => 'central',
+            'tenancy.storage.connection' => 'central',
             'tenancy.bootstrappers.redis' => \Stancl\Tenancy\TenancyBootstrappers\RedisTenancyBootstrapper::class,
             'queue.connections.central' => [
                 'driver' => 'sync',
@@ -112,8 +111,6 @@ abstract class TestCase extends \Orchestra\Testbench\TestCase
         ]);
 
         $app->singleton(\Stancl\Tenancy\TenancyBootstrappers\RedisTenancyBootstrapper::class);
-
-        $app['config']->set(['tenancy.storage_driver' => env('TENANCY_TEST_STORAGE_DRIVER', 'redis')]);
     }
 
     protected function getPackageProviders($app)

tests/v3/TenantModelTest.php

@@ -0,0 +1,109 @@
+<?php
+
+namespace Stancl\Tenancy\Tests\v3;
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Event;
+use Illuminate\Support\Facades\Schema;
+use Stancl\Tenancy\Database\Models\Tenant;
+use Stancl\Tenancy\Events\TenantCreated;
+use Stancl\Tenancy\Tests\TestCase;
+use Stancl\Tenancy\UniqueIDGenerators\UUIDGenerator;
+
+class TenantModelTest extends TestCase
+{
+    /** @test */
+    public function created_event_is_dispatched()
+    {
+        Event::fake([TenantCreated::class]);
+
+        Event::assertNotDispatched(TenantCreated::class);
+
+        Tenant::create();
+
+        Event::assertDispatched(TenantCreated::class);
+    }
+
+    /** @test */
+    public function current_tenant_can_be_resolved_from_service_container_using_typehint()
+    {
+        $tenant = Tenant::create();
+
+        tenancy()->initialize($tenant);
+
+        $this->assertSame($tenant->id, app(Tenant::class)->id);
+
+        tenancy()->end();
+
+        $this->assertSame(null, app(Tenant::class));
+    }
+
+    /** @test */
+    public function keys_which_dont_have_their_own_column_go_into_data_json_column()
+    {
+        $tenant = Tenant::create([
+            'foo' => 'bar',
+        ]);
+
+        // Test that model works correctly
+        $this->assertSame('bar', $tenant->foo);
+        $this->assertSame(null, $tenant->data);
+
+        // Low level test to test database structure
+        $this->assertSame(json_encode(['foo' => 'bar']), DB::table('tenants')->where('id', $tenant->id)->first()->data);
+        $this->assertSame(null, DB::table('tenants')->where('id', $tenant->id)->first()->foo ?? null);
+
+        // Model has the correct structure when retrieved
+        $tenant = Tenant::first();
+        $this->assertSame('bar', $tenant->foo);
+        $this->assertSame(null, $tenant->data);
+
+        // Model can be updated
+        $tenant->update([
+            'foo' => 'baz',
+            'abc' => 'xyz',
+        ]);
+
+        $this->assertSame('baz', $tenant->foo);
+        $this->assertSame('xyz', $tenant->abc);
+        $this->assertSame(null, $tenant->data);
+
+        // Model can be retrieved after update & is structure correctly
+        $tenant = Tenant::first();
+
+        $this->assertSame('baz', $tenant->foo);
+        $this->assertSame('xyz', $tenant->abc);
+        $this->assertSame(null, $tenant->data);
+    }
+
+    /** @test */
+    public function id_is_generated_when_no_id_is_supplied()
+    {
+        config(['tenancy.id_generator' => UUIDGenerator::class]);
+
+        $this->mock(UUIDGenerator::class, function ($mock) {
+            return $mock->shouldReceive('generate')->once();
+        });
+
+        $tenant = Tenant::create();
+
+        $this->assertNotNull($tenant->id);
+    }
+
+    /** @test */
+    public function autoincrement_ids_are_supported()
+    {
+        Schema::table('tenants', function (Blueprint $table) {
+            $table->bigIncrements('id')->change();
+        });
+
+        config(['tenancy.id_generator' => null]);
+
+        $tenant1 = Tenant::create();
+        $tenant2 = Tenant::create();
+
+        $this->assertSame(1, $tenant1->id);
+        $this->assertSame(2, $tenant2->id);
+    }
+}