Skip to content

A free open source IT asset/license management system

Updated tests

snipedc82f8f07742
diff --git a/tests/Feature/Users/Api/UpdateUserTest.php b/tests/Feature/Users/Api/UpdateUserTest.php
index 4ca1b6d3ee..93786bdd96 100644
--- a/tests/Feature/Users/Api/UpdateUserTest.php
+++ b/tests/Feature/Users/Api/UpdateUserTest.php
@@ -220,29 +220,79 @@ class UpdateUserTest extends TestCase
{
$hashed_original = Hash::make('!!094850394680980380kfejlskjfl');
$hashed_new = Hash::make('!ABCDEFGIJKL123!!!');
- $admin = User::factory()->editUsers()->create();
- $user = User::factory()->admin()->create(['username' => 'brandnewuser', 'email'=> '[email protected]', 'password' => $hashed_original, 'activated' => 1]);
+
+ $editing_user = User::factory()->editUsers()->create();
+ $adminuser = User::factory()->admin()->create(['username' => 'TestAdminUser', 'email'=> '[email protected]', 'password' => $hashed_original, 'activated' => 1]);
+ // The admin being edited
$this->assertDatabaseHas('users', [
- 'id' => $user->id,
- 'username' => 'brandnewuser',
- 'email' => '[email protected]',
+ 'id' => $adminuser->id,
+ 'username' => 'TestAdminUser',
+ 'email' => '[email protected]',
'activated' => 1,
'password' => $hashed_original,
+ 'permissions' => '{"admin":"1"}',
]);
- $this->actingAsForApi($admin)
- ->patch(route('api.users.update', $user), [
+ $this->actingAsForApi($editing_user)
+ ->patch(route('api.users.update', $adminuser), [
'username' => 'testnewusername',
'email' => '[email protected]',
'activated' => 0,
+ 'permissions' => "{'superadmin':1}",
'password' => $hashed_new,
]);
- $this->assertEquals(0, $user->refresh()->activated);
+ // These should keep their old values
+ $this->assertEquals('TestAdminUser', $adminuser->refresh()->username);
+ $this->assertEquals('[email protected]', $adminuser->refresh()->email);
+ $this->assertEquals(1, $adminuser->refresh()->activated);
+ $this->assertEquals($hashed_original, $adminuser->refresh()->password);
+ $this->assertEquals('{"admin":"1"}', $adminuser->refresh()->permissions);
}
+
+ public function testAdminsCannotEditEscalationFieldsForSuperadmins()
+ {
+ $hashed_original = Hash::make('my-awesome-password!!!!!12345');
+ $hashed_new = Hash::make('!ABCDEFGIJKL123!!!');
+
+ $editing_user = User::factory()->admin()->create();
+ $superuser = User::factory()->superuser()->create(['username' => 'TestSuperUser', 'email'=> '[email protected]', 'password' => $hashed_original, 'activated' => 1]);
+
+
+ // The admin being edited
+ $this->assertDatabaseHas('users', [
+ 'id' => $superuser->id,
+ 'username' => 'TestSuperUser',
+ 'email' => '[email protected]',
+ 'activated' => 1,
+ 'password' => $hashed_original,
+ 'permissions' => '{"superuser":"1"}',
+ ]);
+
+ $this->actingAsForApi($editing_user)
+ ->patch(route('api.users.update', $superuser), [
+ 'username' => 'testnewusername',
+ 'email' => '[email protected]',
+ 'activated' => 0,
+ 'permissions' => "{'superadmin':1}",
+ 'password' => $hashed_new,
+ ]);
+
+ // These should keep their old values
+ $this->assertEquals('TestSuperUser', $superuser->refresh()->username);
+ $this->assertEquals('[email protected]', $superuser->refresh()->email);
+ $this->assertEquals(1, $superuser->refresh()->activated);
+ $this->assertEquals($hashed_original, $superuser->refresh()->password);
+ $this->assertEquals('{"superuser":"1"}', $superuser->refresh()->permissions);
+ $this->assertNotEquals('testnewusername', $superuser->refresh()->username);
+ $this->assertNotEquals('[email protected]', $superuser->refresh()->email);
+ $this->assertNotTrue(Hash::check('super-secret-new-password', $superuser->password), $superuser->refresh()->password);
+
+ }
+
public function testUsersScopedToCompanyDuringUpdateWhenMultipleFullCompanySupportEnabled()
{
$this->settings->enableMultipleFullCompanySupport();
diff --git a/tests/Feature/Users/Ui/UpdateUserTest.php b/tests/Feature/Users/Ui/UpdateUserTest.php
index 723ce5df2e..20dfd2519b 100644
--- a/tests/Feature/Users/Ui/UpdateUserTest.php
+++ b/tests/Feature/Users/Ui/UpdateUserTest.php
@@ -110,61 +110,53 @@ class UpdateUserTest extends TestCase
public function testEditingUsersCannotEditEscalationFieldsForAdmins()
{
- $admin = User::factory()->editUsers()->create(['activated' => true]);
- $hashed_original = Hash::make('!!094850394680980380kfejlskjfl');
- $hashed_new = Hash::make('!ABCDEFGIJKL123!!!');
- $user = User::factory()->admin()->create(['username' => 'brandnewuser', 'email'=> '[email protected]', 'password' => $hashed_original, 'activated' => true]);
+ $editing_user = User::factory()->editUsers()->create(['activated' => true]);
+ $hashed_original = Hash::make('my-awesome-password!!!!!12345');
+ $admin = User::factory()->admin()->create(['username' => 'TestAdminUser', 'email'=> '[email protected]', 'password' => $hashed_original, 'activated' => true]);
$this->assertDatabaseHas('users', [
- 'id' => $user->id,
- 'username' => 'brandnewuser',
- 'email' => '[email protected]',
+ 'id' => $admin->id,
+ 'username' => 'TestAdminUser',
+ 'email' => '[email protected]',
'activated' => 1,
'password' => $hashed_original,
]);
- $this->actingAs($admin)
- ->put(route('users.update', $user), [
+ $this->actingAs($editing_user)
+ ->put(route('users.update', $admin), [
'username' => 'testnewusername',
'email' => '[email protected]',
'activated' => 0,
- 'password' => 'super-secret',
+ 'password' => 'TOTALLY-DIFFERENT-awesome-password!!!!!12345',
]);
- $this->assertDatabaseHas('users', [
- 'id' => $user->id,
- 'username' => $user->username,
- 'email' => $user->email,
- 'activated' => $user->activated,
- 'password' => $hashed_original,
- ]);
- $this->assertEquals('brandnewuser', $user->refresh()->username);
- $this->assertEquals('[email protected]', $user->refresh()->email);
- $this->assertEquals(1, $user->refresh()->activated);
- $this->assertNotEquals(Hash::check('super-secret', $user->password), $user->refresh()->password);
- $this->assertNotEquals('testnewusername', $user->refresh()->username);
- $this->assertNotEquals('[email protected]', $user->refresh()->email);
- $this->assertNotEquals(0, $user->refresh()->activated);
- $this->assertNotEquals(Hash::check('super-secret', $user->password), $user->refresh()->password);
+ $this->assertEquals('TestAdminUser', $admin->refresh()->username);
+ $this->assertEquals('[email protected]', $admin->refresh()->email);
+ $this->assertEquals(1, $admin->refresh()->activated);
+ $this->assertNotEquals(Hash::check('super-secret', $admin->password), $admin->refresh()->password);
+ $this->assertNotEquals('testnewusername', $admin->refresh()->username);
+ $this->assertNotEquals('[email protected]', $admin->refresh()->email);
+ $this->assertNotEquals(0, $admin->refresh()->activated);
+ $this->assertNotEquals(Hash::check('TOTALLY-DIFFERENT-awesome-password!!!!!12345', $admin->password), $admin->refresh()->password);
}
public function testAdminUsersCannotEditFieldsForSuperAdmins()
{
$admin = User::factory()->admin()->create(['activated' => true]);
- $hashed_original = Hash::make('my-awesome-password');
- $user = User::factory()->superuser()->create(['username' => 'brandnewuser', 'email'=> '[email protected]', 'password' => $hashed_original, 'activated' => true]);
+ $hashed_original = Hash::make('my-awesome-password!!!!!12345');
+ $superuser = User::factory()->superuser()->create(['username' => 'TestSuperUser', 'email'=> '[email protected]', 'password' => $hashed_original, 'activated' => true]);
$this->assertDatabaseHas('users', [
- 'id' => $user->id,
- 'username' => 'brandnewuser',
- 'email' => '[email protected]',
+ 'id' => $superuser->id,
+ 'username' => 'TestSuperUser',
+ 'email' => '[email protected]',
'activated' => 1,
'password' => $hashed_original,
]);
$this->actingAs($admin)
- ->put(route('users.update', $user), [
+ ->put(route('users.update', $superuser), [
'username' => 'testnewusername',
'email' => '[email protected]',
'activated' => 0,
@@ -172,20 +164,20 @@ class UpdateUserTest extends TestCase
]);
$this->assertDatabaseHas('users', [
- 'id' => $user->id,
- 'username' => $user->username,
- 'email' => $user->email,
- 'activated' => $user->activated,
+ 'id' => $superuser->id,
+ 'username' => $superuser->username,
+ 'email' => $superuser->email,
+ 'activated' => $superuser->activated,
'password' => $hashed_original,
]);
- $this->assertEquals('brandnewuser', $user->refresh()->username);
- $this->assertEquals('[email protected]', $user->refresh()->email);
- $this->assertEquals(1, $user->refresh()->activated);
- $this->assertTrue(Hash::check('my-awesome-password', $user->password), $user->refresh()->password);
- $this->assertNotEquals('testnewusername', $user->refresh()->username);
- $this->assertNotEquals('[email protected]', $user->refresh()->email);
- $this->assertNotTrue(Hash::check('super-secret-new-password', $user->password), $user->refresh()->password);
+ $this->assertEquals('TestSuperUser', $superuser->refresh()->username);
+ $this->assertEquals('[email protected]', $superuser->refresh()->email);
+ $this->assertEquals(1, $superuser->refresh()->activated);
+ $this->assertTrue(Hash::check('my-awesome-password!!!!!12345', $superuser->password), $superuser->refresh()->password);
+ $this->assertNotEquals('testnewusername', $superuser->refresh()->username);
+ $this->assertNotEquals('[email protected]', $superuser->refresh()->email);
+ $this->assertNotTrue(Hash::check('super-secret-new-password', $superuser->password), $superuser->refresh()->password);
}