Fixed OIDC Logout

[bookstack] / tests / User / UserManagementTest.php

diff --git a/tests/User/UserManagementTest.php b/tests/User/UserManagementTest.php
index 38447d29323adf5474078b276f00e15d4f35a1df..df60bede6e1de83d83720ad5ed2608f7a524a9ce 100644 (file)
--- a/tests/User/UserManagementTest.php
+++ b/tests/User/UserManagementTest.php
@@ -2,22 +2,19 @@
 
 namespace Tests\User;
 
 
 namespace Tests\User;
 

-use BookStack\Actions\ActivityType;
-use BookStack\Auth\Access\UserInviteService;
-use BookStack\Auth\Role;
-use BookStack\Auth\User;
+use BookStack\Access\UserInviteService;
+use BookStack\Activity\ActivityType;

 use BookStack\Uploads\Image;
 use BookStack\Uploads\Image;

+use BookStack\Users\Models\Role;
+use BookStack\Users\Models\User;

 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Str;
 use Mockery\MockInterface;
 use RuntimeException;
 use Tests\TestCase;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Str;
 use Mockery\MockInterface;
 use RuntimeException;
 use Tests\TestCase;

-use Tests\Uploads\UsesImages;

 
 class UserManagementTest extends TestCase
 {
 
 class UserManagementTest extends TestCase
 {

-    use UsesImages;
-

     public function test_user_creation()
     {
         /** @var User $user */
     public function test_user_creation()
     {
         /** @var User $user */


@@ -148,6 +145,7 @@ class UserManagementTest extends TestCase
 
         $resp = $this->asEditor()->get("settings/users/{$editor->id}/delete");
         $resp->assertSee('Migrate Ownership');
 
         $resp = $this->asEditor()->get("settings/users/{$editor->id}/delete");
         $resp->assertSee('Migrate Ownership');

+        $this->withHtml($resp)->assertElementExists('form input[name="new_owner_id"]');

         $resp->assertSee('new_owner_id');
     }
 
         $resp->assertSee('new_owner_id');
     }
 


@@ -164,6 +162,16 @@ class UserManagementTest extends TestCase
         ]);
     }
 
         ]);
     }
 

+    public function test_delete_with_empty_owner_migration_id_works()
+    {
+        $user = $this->users->editor();
+
+        $resp = $this->asAdmin()->delete("settings/users/{$user->id}", ['new_owner_id' => '']);
+        $resp->assertRedirect('/settings/users');
+        $this->assertActivityExists(ActivityType::USER_DELETE);
+        $this->assertSessionHas('success');
+    }
+

     public function test_delete_removes_user_preferences()
     {
         $editor = $this->users->editor();
     public function test_delete_removes_user_preferences()
     {
         $editor = $this->users->editor();


@@ -282,7 +290,7 @@ class UserManagementTest extends TestCase
     public function test_user_avatar_update_and_reset()
     {
         $user = $this->users->viewer();
     public function test_user_avatar_update_and_reset()
     {
         $user = $this->users->viewer();

-        $avatarFile = $this->getTestImage('avatar-icon.png');
+        $avatarFile = $this->files->uploadedImage('avatar-icon.png');

 
         $this->assertEquals(0, $user->image_id);
 
 
         $this->assertEquals(0, $user->image_id);