Write more tests, fix filesystem support for s3

NithMario · Feb 8, 2019 · 2c69c37 · 2c69c37
1 parent dc21bfa
commit 2c69c37
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 3 deletions.
diff --git a/composer.json b/composer.json
@@ -17,7 +17,8 @@
         "orchestra/testbench": "~3.0",
         "laravel/framework": "5.7.*",
         "vlucas/phpdotenv": "^2.2",
-        "psy/psysh": "@stable"
+        "psy/psysh": "@stable",
+        "league/flysystem-aws-s3-v3": "~1.0"
     },
     "autoload": {
         "psr-4": {

diff --git a/phpunit.xml b/phpunit.xml
@@ -29,5 +29,6 @@
         <env name="QUEUE_CONNECTION" value="sync"/>
         <env name="SESSION_DRIVER" value="array"/>
         <env name="DB_CONNECTION" value="sqlite"/>
+        <env name="AWS_DEFAULT_REGION" value="us-west-2"/>
     </php>
 </phpunit>
diff --git a/tests/BootstrapsTenancyTest.php b/tests/BootstrapsTenancyTest.php
@@ -51,7 +51,11 @@ public function filesystem_is_suffixed()
             if ($override = config("tenancy.filesystem.root_override.{$disk}")) {
                 $correct_path_prefix = str_replace("%storage_path%", storage_path(), $override);
             } else {
-                $correct_path_prefix = $old_storage_facade_roots[$disk] . "/$suffix/";
+                if ($base = $old_storage_facade_roots[$disk]) {
+                    $correct_path_prefix = $base . "/$suffix/";
+                } else {
+                    $correct_path_prefix = "$suffix/";
+                }
             }
 
             $this->assertSame($correct_path_prefix, $current_path_prefix);

diff --git a/tests/ReidentificationTest.php b/tests/ReidentificationTest.php
@@ -29,7 +29,11 @@ public function storage_facade_roots_are_correct()
             if ($override = config("tenancy.filesystem.root_override.{$disk}")) {
                 $correct_path_prefix = str_replace("%storage_path%", storage_path(), $override);
             } else {
-                $correct_path_prefix = $originals[$disk] . "/$suffix/";
+                if ($base = $originals[$disk]) {
+                    $correct_path_prefix = $base . "/$suffix/";
+                } else {
+                    $correct_path_prefix = "$suffix/";
+                }
             }
 
             $this->assertSame($correct_path_prefix, $current_path_prefix);

diff --git a/tests/TenantStorageTest.php b/tests/TenantStorageTest.php
@@ -15,6 +15,18 @@ public function setUp()
         $this->storage = app(StorageDriver::class);
     }
 
+    /** @test */
+    public function deleting_a_tenant_works()
+    {
+        $abc = tenant()->create('abc.localhost');
+
+        $this->assertTrue(tenant()->all()->contains($abc));
+
+        tenant()->delete($abc['uuid']);
+
+        $this->assertFalse(tenant()->all()->contains($abc));
+    }
+
     /** @test */
     public function put_works_with_key_and_value_as_separate_args()
     {

diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -67,6 +67,11 @@ protected function getEnvironmentSetUp($app)
                 'suffix' => '.sqlite',
             ],
             'database.connections.sqlite.database' => ':memory:',
+            'tenancy.filesystem.disks' => [
+                'local',
+                'public',
+                's3',
+            ],
         ]);
     }