From 6e55d78c1907baed9ad6dc44e22d1a88beef123d Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 21 May 2026 15:06:15 +0100
Subject: [PATCH] Fixed tests

---
 tests/Feature/Users/Ui/MergeUsersTest.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/tests/Feature/Users/Ui/MergeUsersTest.php b/tests/Feature/Users/Ui/MergeUsersTest.php
index 8d5f72a16c..411393f32d 100644
--- a/tests/Feature/Users/Ui/MergeUsersTest.php
+++ b/tests/Feature/Users/Ui/MergeUsersTest.php
@@ -22,7 +22,7 @@ class MergeUsersTest extends TestCase
         Asset::factory()->count(3)->assignedToUser($user2)->create();
         Asset::factory()->count(3)->assignedToUser($user_to_merge_into)->create();
 
-        $response = $this->actingAs(User::factory()->editUsers()->viewUsers()->create())
+        $response = $this->actingAs(User::factory()->deleteUsers()->viewUsers()->create())
             ->post(route('users.merge.save', $user1->id),
                 [
                     'ids_to_merge' => [$user1->id, $user2->id],
@@ -50,7 +50,7 @@ class MergeUsersTest extends TestCase
 
         $this->assertEquals(3, $user_to_merge_into->refresh()->licenses->count());
 
-        $response = $this->actingAs(User::factory()->editUsers()->viewUsers()->create())
+        $response = $this->actingAs(User::factory()->deleteUsers()->viewUsers()->create())
             ->post(route('users.merge.save', $user1->id),
                 [
                     'ids_to_merge' => [$user1->id, $user2->id],
@@ -78,7 +78,7 @@ class MergeUsersTest extends TestCase
 
         $this->assertEquals(3, $user_to_merge_into->refresh()->accessories->count());
 
-        $response = $this->actingAs(User::factory()->editUsers()->viewUsers()->create())
+        $response = $this->actingAs(User::factory()->deleteUsers()->viewUsers()->create())
             ->post(route('users.merge.save', $user1->id),
                 [
                     'ids_to_merge' => [$user1->id, $user2->id],
@@ -106,7 +106,7 @@ class MergeUsersTest extends TestCase
 
         $this->assertEquals(3, $user_to_merge_into->refresh()->consumables->count());
 
-        $response = $this->actingAs(User::factory()->editUsers()->viewUsers()->create())
+        $response = $this->actingAs(User::factory()->deleteUsers()->viewUsers()->create())
             ->post(route('users.merge.save', $user1->id),
                 [
                     'ids_to_merge' => [$user1->id, $user2->id],
@@ -134,7 +134,7 @@ class MergeUsersTest extends TestCase
 
         $this->assertEquals(3, $user_to_merge_into->refresh()->uploads->count());
 
-        $response = $this->actingAs(User::factory()->editUsers()->viewUsers()->create())
+        $response = $this->actingAs(User::factory()->deleteUsers()->viewUsers()->create())
             ->post(route('users.merge.save', $user1->id),
                 [
                     'ids_to_merge' => [$user1->id, $user2->id],
@@ -162,7 +162,7 @@ class MergeUsersTest extends TestCase
 
         $this->assertEquals(3, $user_to_merge_into->refresh()->acceptances->count());
 
-        $response = $this->actingAs(User::factory()->editUsers()->viewUsers()->create())
+        $response = $this->actingAs(User::factory()->deleteUsers()->viewUsers()->create())
             ->post(route('users.merge.save', $user1->id),
                 [
                     'ids_to_merge' => [$user1->id, $user2->id],
@@ -190,7 +190,7 @@ class MergeUsersTest extends TestCase
 
         $this->assertEquals(3, $user_to_merge_into->refresh()->userlog->count());
 
-        $response = $this->actingAs(User::factory()->editUsers()->viewUsers()->create())
+        $response = $this->actingAs(User::factory()->deleteUsers()->viewUsers()->create())
             ->post(route('users.merge.save', $user1->id),
                 [
                     'ids_to_merge' => [$user1->id, $user2->id],