Skip to content

Commit b93d2ba

Browse files
lcharettelcharette
committed
Optimized user creation & fixed pgsql
1 parent cb0f3c1 commit b93d2ba

1 file changed

Lines changed: 18 additions & 50 deletions

File tree

‎app/sprinkles/admin/tests/Integration/Controller/UserControllerTest.php‎

Lines changed: 18 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -260,10 +260,7 @@ public function testCreateWithDuplicateEmail(UserController $controller)
260260
public function testDelete(UserController $controller)
261261
{
262262
// Create test user
263-
$fm = $this->ci->factory;
264-
$user = $fm->create('UserFrosting\Sprinkle\Account\Database\Models\User', [
265-
'id' => 2 // Hardcoded because pgsql is dumb
266-
]);
263+
$user = $this->createTestUser();
267264

268265
// Get controller stuff
269266
$result = $controller->delete($this->getRequest(), $this->getResponse(), ['user_name' => $user->user_name]);
@@ -711,13 +708,10 @@ public function testPageList(UserController $controller)
711708
public function testUpdateInfo(UserController $controller)
712709
{
713710
// Create a user
714-
$fm = $this->ci->factory;
715-
$user = $fm->create('UserFrosting\Sprinkle\Account\Database\Models\User', [
716-
'user_name' => 'testUpdateInfo',
717-
'first_name' => 'foo',
718-
]);
711+
$user = $this->createTestUser();
719712

720713
// Also create a group
714+
$fm = $this->ci->factory;
721715
$group = $fm->create('UserFrosting\Sprinkle\Account\Database\Models\Group');
722716

723717
// Set post data
@@ -799,10 +793,7 @@ public function testUpdateInfoWithValidationError(UserController $controller)
799793
public function testUpdateInfoWithDuplicateEmail(UserController $controller)
800794
{
801795
// Create a user
802-
$fm = $this->ci->factory;
803-
$user = $fm->create('UserFrosting\Sprinkle\Account\Database\Models\User', [
804-
'user_name' => 'testUpdateInfoWithDuplicateEmail',
805-
]);
796+
$user = $this->createTestUser();
806797

807798
// Set post data
808799
$data = [
@@ -811,13 +802,13 @@ public function testUpdateInfoWithDuplicateEmail(UserController $controller)
811802
$request = $this->getRequest()->withParsedBody($data);
812803

813804
// Get controller stuff
814-
$result = $controller->updateInfo($request, $this->getResponse(), ['user_name' => 'testUpdateInfoWithDuplicateEmail']);
805+
$result = $controller->updateInfo($request, $this->getResponse(), ['user_name' => $user->user_name]);
815806
$this->assertSame($result->getStatusCode(), 400);
816807
$this->assertJson((string) $result->getBody());
817808
$this->assertSame('[]', (string) $result->getBody());
818809

819810
// Make sure user was NOT update
820-
$editedUser = User::where('user_name', 'testUpdateInfoWithDuplicateEmail')->first();
811+
$editedUser = User::where('user_name', $user->user_name)->first();
821812
$this->assertNotSame('[email protected]', $editedUser->email);
822813
$this->assertSame($user->email, $editedUser->email);
823814

@@ -876,11 +867,7 @@ public function testUpdateInfoForMasterUser(UserController $controller)
876867
public function testUpdateField(UserController $controller)
877868
{
878869
// Create a user
879-
$fm = $this->ci->factory;
880-
$user = $fm->create('UserFrosting\Sprinkle\Account\Database\Models\User', [
881-
'user_name' => 'testUpdateField',
882-
'first_name' => 'foo',
883-
]);
870+
$user = $this->createTestUser();
884871

885872
// Set post data
886873
$data = [
@@ -1000,26 +987,20 @@ public function testUpdateFieldWithValidationError(UserController $controller)
1000987
*/
1001988
public function testUpdateFieldForFlagEnabled(UserController $controller)
1002989
{
1003-
// Create a user
1004-
$fm = $this->ci->factory;
1005-
$user = $fm->create('UserFrosting\Sprinkle\Account\Database\Models\User', [
1006-
'user_name' => 'testUpdateFieldForFlagEnabled',
1007-
]);
1008-
1009990
// Set post data
1010991
$data = [
1011992
'value' => '1',
1012993
];
1013994
$request = $this->getRequest()->withParsedBody($data);
1014995

1015996
// Get controller stuff
1016-
$result = $controller->updateField($request, $this->getResponse(), ['user_name' => $user->user_name, 'field' => 'flag_enabled']);
997+
$result = $controller->updateField($request, $this->getResponse(), ['user_name' => 'userfoo', 'field' => 'flag_enabled']);
1017998
$this->assertSame($result->getStatusCode(), 200);
1018999
$this->assertJson((string) $result->getBody());
10191000
$this->assertSame('[]', (string) $result->getBody());
10201001

10211002
// Make sure user was update
1022-
$editedUser = User::where('user_name', $user->user_name)->first();
1003+
$editedUser = User::where('user_name', 'userfoo')->first();
10231004
$this->assertSame('1', (string) $editedUser->flag_enabled);
10241005

10251006
// Test message
@@ -1036,25 +1017,21 @@ public function testUpdateFieldForFlagEnabled(UserController $controller)
10361017
*/
10371018
public function testUpdateFieldForFlagEnabledDisabled(UserController $controller)
10381019
{
1039-
// Create a user
1040-
$fm = $this->ci->factory;
1041-
$user = $fm->create('UserFrosting\Sprinkle\Account\Database\Models\User');
1042-
10431020
// Set post data
10441021
$data = [
10451022
'value' => '0',
10461023
];
10471024
$request = $this->getRequest()->withParsedBody($data);
10481025

10491026
// Get controller stuff
1050-
$result = $controller->updateField($request, $this->getResponse(), ['user_name' => $user->user_name, 'field' => 'flag_enabled']);
1027+
$result = $controller->updateField($request, $this->getResponse(), ['user_name' => 'userfoo', 'field' => 'flag_enabled']);
10511028
$this->assertSame($result->getStatusCode(), 200);
10521029
$this->assertJson((string) $result->getBody());
10531030
$this->assertSame('[]', (string) $result->getBody());
10541031

10551032
// Make sure user was update
1056-
$editedUser = User::where('user_name', $user->user_name)->first();
1057-
$this->assertSame('0', (string) $editedUser->flag_enabled);
1033+
$editedUser = User::where('user_name', 'userfoo')->first();
1034+
$this->assertEquals(0, $editedUser->flag_enabled);
10581035

10591036
// Test message
10601037
/** @var \UserFrosting\Sprinkle\Core\Alert\AlertStream $ms */
@@ -1070,24 +1047,20 @@ public function testUpdateFieldForFlagEnabledDisabled(UserController $controller
10701047
*/
10711048
public function testUpdateFieldForFlagVerified(UserController $controller)
10721049
{
1073-
// Create a user
1074-
$fm = $this->ci->factory;
1075-
$user = $fm->create('UserFrosting\Sprinkle\Account\Database\Models\User');
1076-
10771050
// Set post data
10781051
$data = [
10791052
'value' => '1',
10801053
];
10811054
$request = $this->getRequest()->withParsedBody($data);
10821055

10831056
// Get controller stuff
1084-
$result = $controller->updateField($request, $this->getResponse(), ['user_name' => $user->user_name, 'field' => 'flag_verified']);
1057+
$result = $controller->updateField($request, $this->getResponse(), ['user_name' => 'userfoo', 'field' => 'flag_verified']);
10851058
$this->assertSame($result->getStatusCode(), 200);
10861059
$this->assertJson((string) $result->getBody());
10871060
$this->assertSame('[]', (string) $result->getBody());
10881061

10891062
// Make sure user was update
1090-
$editedUser = User::where('user_name', $user->user_name)->first();
1063+
$editedUser = User::where('user_name', 'userfoo')->first();
10911064
$this->assertSame('1', (string) $editedUser->flag_verified);
10921065

10931066
// Test message
@@ -1132,24 +1105,20 @@ public function testUpdateFieldForFlagEnabledWithMasterUser(UserController $cont
11321105
*/
11331106
public function testUpdateFieldForPassword(UserController $controller)
11341107
{
1135-
// Create a user
1136-
$fm = $this->ci->factory;
1137-
$user = $fm->create('UserFrosting\Sprinkle\Account\Database\Models\User');
1138-
11391108
// Set post data
11401109
$data = [
11411110
'value' => '1234567890abc',
11421111
];
11431112
$request = $this->getRequest()->withParsedBody($data);
11441113

11451114
// Get controller stuff
1146-
$result = $controller->updateField($request, $this->getResponse(), ['user_name' => $user->user_name, 'field' => 'password']);
1115+
$result = $controller->updateField($request, $this->getResponse(), ['user_name' => 'userfoo', 'field' => 'password']);
11471116
$this->assertSame($result->getStatusCode(), 200);
11481117
$this->assertJson((string) $result->getBody());
11491118
$this->assertSame('[]', (string) $result->getBody());
11501119

11511120
// Make sure user was update
1152-
$editedUser = User::where('user_name', $user->user_name)->first();
1121+
$editedUser = User::where('user_name', 'userfoo')->first();
11531122
$this->assertNotSame('blablabla', $editedUser->password);
11541123

11551124
// Test message
@@ -1168,7 +1137,6 @@ public function testUpdateFieldForRoles(UserController $controller)
11681137
{
11691138
// Create a user
11701139
$fm = $this->ci->factory;
1171-
$user = $fm->create('UserFrosting\Sprinkle\Account\Database\Models\User');
11721140
$role = $fm->create('UserFrosting\Sprinkle\Account\Database\Models\Role');
11731141

11741142
// Expected input :
@@ -1182,13 +1150,13 @@ public function testUpdateFieldForRoles(UserController $controller)
11821150
$request = $this->getRequest()->withParsedBody($data);
11831151

11841152
// Get controller stuff
1185-
$result = $controller->updateField($request, $this->getResponse(), ['user_name' => $user->user_name, 'field' => 'roles']);
1153+
$result = $controller->updateField($request, $this->getResponse(), ['user_name' => 'userfoo', 'field' => 'roles']);
11861154
$this->assertSame($result->getStatusCode(), 200);
11871155
$this->assertJson((string) $result->getBody());
11881156
$this->assertSame('[]', (string) $result->getBody());
11891157

11901158
// Make sure user was update
1191-
$editedUser = User::where('user_name', $user->user_name)->first();
1159+
$editedUser = User::where('user_name', 'userfoo')->first();
11921160
$this->assertSame($role->id, $editedUser->roles->first()->id);
11931161

11941162
// Test message

0 commit comments

Comments
 (0)