Skip to content

Commit 90f3790

Browse files
lcharettelcharette
authored
Release 4.4.3
2 parents 427106c + 3f87fe8 commit 90f3790

22 files changed

+114
-75
lines changed

‎CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
66
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
77

8+
## [v4.4.3]
9+
10+
### Fixed
11+
- Changed some private methods to protected in tests for easier extension.
12+
- Tentative fix for duplication of user_name in user Factories.
13+
- Factories now uses `::class` reference instead of string.
14+
- Fix `ExceptionHandlerTest` test to speed things up.
15+
816
## [v4.4.2]
917

1018
### Fixed
@@ -973,3 +981,4 @@ See [http://learn.userfrosting.com/upgrading/40-to-41](Upgrading 4.0.x to 4.1.x
973981
[v4.4.0]: https://github.com/userfrosting/UserFrosting/compare/v4.3.3...v4.4.0
974982
[v4.4.1]: https://github.com/userfrosting/UserFrosting/compare/v4.4.0...v4.4.1
975983
[v4.4.2]: https://github.com/userfrosting/UserFrosting/compare/v4.4.1...v4.4.2
984+
[v4.4.3]: https://github.com/userfrosting/UserFrosting/compare/v4.4.2...v4.4.3

‎app/defines.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
namespace UserFrosting;
1212

1313
// Some standard defines
14-
define('UserFrosting\VERSION', '4.4.1');
14+
define('UserFrosting\VERSION', '4.4.3');
1515
define('UserFrosting\DS', '/');
1616
define('UserFrosting\PHP_MIN_VERSION', '7.1');
1717
define('UserFrosting\PHP_RECOMMENDED_VERSION', '7.3');

‎app/sprinkles/account/factories/Group.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,12 @@
99
*/
1010

1111
use League\FactoryMuffin\Faker\Facade as Faker;
12+
use UserFrosting\Sprinkle\Account\Database\Models\Group;
1213

1314
/*
1415
* General factory for the Group Model
1516
*/
16-
$fm->define('UserFrosting\Sprinkle\Account\Database\Models\Group')->setDefinitions([
17+
$fm->define(Group::class)->setDefinitions([
1718
'name' => Faker::word(),
1819
'description' => Faker::paragraph(),
1920
'slug' => function ($object, $saved) {

‎app/sprinkles/account/factories/Permissions.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,12 @@
99
*/
1010

1111
use League\FactoryMuffin\Faker\Facade as Faker;
12+
use UserFrosting\Sprinkle\Account\Database\Models\Permission;
1213

1314
/*
1415
* General factory for the Permission Model
1516
*/
16-
$fm->define('UserFrosting\Sprinkle\Account\Database\Models\Permission')->setDefinitions([
17+
$fm->define(Permission::class)->setDefinitions([
1718
'name' => Faker::word(),
1819
'description' => Faker::paragraph(),
1920
'conditions' => Faker::word(),

‎app/sprinkles/account/factories/Roles.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,12 @@
99
*/
1010

1111
use League\FactoryMuffin\Faker\Facade as Faker;
12+
use UserFrosting\Sprinkle\Account\Database\Models\Role;
1213

1314
/*
1415
* General factory for the Role Model
1516
*/
16-
$fm->define('UserFrosting\Sprinkle\Account\Database\Models\Role')->setDefinitions([
17+
$fm->define(Role::class)->setDefinitions([
1718
'name' => Faker::word(),
1819
'description' => Faker::paragraph(),
1920
'slug' => function ($object, $saved) {

‎app/sprinkles/account/factories/Users.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,17 @@
99
*/
1010

1111
use League\FactoryMuffin\Faker\Facade as Faker;
12+
use UserFrosting\Sprinkle\Account\Database\Models\User;
1213

1314
/*
1415
* General factory for the User Model
1516
*/
16-
$fm->define('UserFrosting\Sprinkle\Account\Database\Models\User')->setDefinitions([
17-
'user_name' => Faker::username(),
17+
$fm->define(User::class)->setDefinitions([
1818
'first_name' => Faker::firstNameMale(),
1919
'last_name' => Faker::firstNameMale(),
20+
'user_name' => function ($object, $saved) {
21+
return $object->first_name . '_' . $object->last_name;
22+
},
2023
'email' => Faker::unique()->email(),
2124
'locale' => 'en_US',
2225
'flag_verified' => 1,

‎app/sprinkles/account/tests/Integration/Controller/AccountControllerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1753,7 +1753,7 @@ public function testVerifyWithFailedValidation()
17531753
/**
17541754
* @return AccountController
17551755
*/
1756-
private function getController()
1756+
protected function getController()
17571757
{
17581758
return new AccountController($this->ci);
17591759
}

‎app/sprinkles/account/tests/Integration/Database/Models/UserModelTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public function testUserHardDeleteWithUserRelations()
7676
$this->assertSame(1, Persistence::where('user_id', $user->id)->count());
7777

7878
//$user->roles - role_users
79-
$role = $fm->create('UserFrosting\Sprinkle\Account\Database\Models\Role');
79+
$role = $fm->create(Role::class);
8080
$user->roles()->attach($role->id);
8181
$this->assertSame(1, $user->roles()->count());
8282

‎app/sprinkles/account/tests/Integration/FactoriesTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
use UserFrosting\Tests\TestCase;
1414
use UserFrosting\Sprinkle\Account\Database\Models\Interfaces\UserInterface;
15+
use UserFrosting\Sprinkle\Account\Database\Models\User;
1516
use UserFrosting\Sprinkle\Core\Tests\TestDatabase;
1617
use UserFrosting\Sprinkle\Core\Tests\RefreshDatabase;
1718

@@ -35,7 +36,7 @@ public function testUserFactory()
3536

3637
$fm = $this->ci->factory;
3738

38-
$user = $fm->create('UserFrosting\Sprinkle\Account\Database\Models\User');
39+
$user = $fm->create(User::class);
3940
$this->assertInstanceOf(UserInterface::class, $user);
4041
}
4142
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ public function testPageListWithNoPermission()
112112
/**
113113
* @return ActivityController
114114
*/
115-
private function getController()
115+
protected function getController()
116116
{
117117
return new ActivityController($this->ci);
118118
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ public function testGetModalConfirmClearCacheWithNoPermission()
166166
/**
167167
* @return AdminController
168168
*/
169-
private function getController()
169+
protected function getController()
170170
{
171171
return new AdminController($this->ci);
172172
}

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

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
namespace UserFrosting\Sprinkle\Admin\Tests\Integration\Controller;
1212

13+
use UserFrosting\Sprinkle\Account\Database\Models\Group;
1314
use UserFrosting\Sprinkle\Account\Tests\withTestUser;
1415
use UserFrosting\Sprinkle\Admin\Controller\GroupController;
1516
use UserFrosting\Sprinkle\Core\Tests\RefreshDatabase;
@@ -133,7 +134,7 @@ public function testGetUsersWithNoPermission(GroupController $controller)
133134

134135
// Create test group
135136
$fm = $this->ci->factory;
136-
$group = $fm->create('UserFrosting\Sprinkle\Account\Database\Models\Group');
137+
$group = $fm->create(Group::class);
137138

138139
// Get controller
139140
$controller = $this->getController();
@@ -156,7 +157,7 @@ public function testpageInfoWithNoPermission(GroupController $controller)
156157

157158
// Create test group
158159
$fm = $this->ci->factory;
159-
$group = $fm->create('UserFrosting\Sprinkle\Account\Database\Models\Group');
160+
$group = $fm->create(Group::class);
160161

161162
// Get controller
162163
$controller = $this->getController();
@@ -179,7 +180,7 @@ public function testpageInfoWithPartialPermissions(GroupController $controller)
179180

180181
// Create test group
181182
$fm = $this->ci->factory;
182-
$group = $fm->create('UserFrosting\Sprinkle\Account\Database\Models\Group');
183+
$group = $fm->create(Group::class);
183184

184185
// Give user partial permissions
185186
$this->giveUserTestPermission($testUser, 'uri_group'); // Can view, but can't edit or delete
@@ -245,7 +246,7 @@ public function testDeleteWithNoPermission(GroupController $controller)
245246

246247
// Create test group
247248
$fm = $this->ci->factory;
248-
$group = $fm->create('UserFrosting\Sprinkle\Account\Database\Models\Group');
249+
$group = $fm->create(Group::class);
249250

250251
// Get controller
251252
$controller = $this->getController();
@@ -268,7 +269,7 @@ public function testGetModalConfirmDeleteWithNoPermission(GroupController $contr
268269

269270
// Create test group
270271
$fm = $this->ci->factory;
271-
$group = $fm->create('UserFrosting\Sprinkle\Account\Database\Models\Group');
272+
$group = $fm->create(Group::class);
272273

273274
// Get controller
274275
$controller = $this->getController();
@@ -314,7 +315,7 @@ public function testGetModalEditWithNoPermission(GroupController $controller)
314315

315316
// Create test group
316317
$fm = $this->ci->factory;
317-
$group = $fm->create('UserFrosting\Sprinkle\Account\Database\Models\Group');
318+
$group = $fm->create(Group::class);
318319

319320
// Get controller
320321
$controller = $this->getController();
@@ -341,7 +342,7 @@ public function testUpdateInfoWithNoPermission(GroupController $controller)
341342

342343
// Create a group
343344
$fm = $this->ci->factory;
344-
$group = $fm->create('UserFrosting\Sprinkle\Account\Database\Models\Group');
345+
$group = $fm->create(Group::class);
345346

346347
// Get controller
347348
$controller = $this->getController();
@@ -383,19 +384,19 @@ public function testUpdateInfoWithNoGroup(GroupController $controller)
383384
/**
384385
* @return GroupController
385386
*/
386-
private function getController()
387+
protected function getController()
387388
{
388389
return new GroupController($this->ci);
389390
}
390391

391-
private function setupUser()
392+
protected function setupUser()
392393
{
393394
// Guest user, won't have any access
394395
$testUser = $this->createTestUser(false, true);
395396

396397
// Create test role
397398
$fm = $this->ci->factory;
398-
$fm->create('UserFrosting\Sprinkle\Account\Database\Models\Group', [
399+
$fm->create(Group::class, [
399400
'slug' => 'foo',
400401
'name' => 'bar',
401402
]);

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ public function testDelete(GroupController $controller)
309309
{
310310
// Create test group
311311
$fm = $this->ci->factory;
312-
$group = $fm->create('UserFrosting\Sprinkle\Account\Database\Models\Group');
312+
$group = $fm->create(Group::class);
313313

314314
// Get controller stuff
315315
$result = $controller->delete($this->getRequest(), $this->getResponse(), ['slug' => $group->slug]);
@@ -377,7 +377,7 @@ public function testDeleteWithUserInGroup(GroupController $controller)
377377

378378
// Create test group
379379
$fm = $this->ci->factory;
380-
$group = $fm->create('UserFrosting\Sprinkle\Account\Database\Models\Group');
380+
$group = $fm->create(Group::class);
381381

382382
// Associate user to group
383383
$testUser->group()->associate($group);
@@ -441,7 +441,7 @@ public function testGetModalConfirmDeleteWithUserInGroup(GroupController $contro
441441

442442
// Create test group
443443
$fm = $this->ci->factory;
444-
$group = $fm->create('UserFrosting\Sprinkle\Account\Database\Models\Group');
444+
$group = $fm->create(Group::class);
445445

446446
// Associate user to group
447447
$testUser->group()->associate($group);
@@ -516,7 +516,7 @@ public function testUpdateInfo(GroupController $controller)
516516
{
517517
// Create a group
518518
$fm = $this->ci->factory;
519-
$group = $fm->create('UserFrosting\Sprinkle\Account\Database\Models\Group', [
519+
$group = $fm->create(Group::class, [
520520
'name' => 'barbar',
521521
'slug' => 'foofoo',
522522
]);
@@ -621,7 +621,7 @@ public function testUpdateInfoWithDuplicateSlug(GroupController $controller)
621621
{
622622
// Create a group
623623
$fm = $this->ci->factory;
624-
$group2 = $fm->create('UserFrosting\Sprinkle\Account\Database\Models\Group');
624+
$group2 = $fm->create(Group::class);
625625

626626
// Set post data
627627
$data = [
@@ -651,7 +651,7 @@ public function testUpdateInfoWithDuplicateName(GroupController $controller)
651651
{
652652
// Create a group
653653
$fm = $this->ci->factory;
654-
$group2 = $fm->create('UserFrosting\Sprinkle\Account\Database\Models\Group');
654+
$group2 = $fm->create(Group::class);
655655

656656
// Set post data
657657
$data = [
@@ -675,19 +675,19 @@ public function testUpdateInfoWithDuplicateName(GroupController $controller)
675675
/**
676676
* @return GroupController
677677
*/
678-
private function getController(): GroupController
678+
protected function getController(): GroupController
679679
{
680680
return new GroupController($this->ci);
681681
}
682682

683-
private function setupUser(): void
683+
protected function setupUser(): void
684684
{
685685
// Admin user, WILL have access
686686
$this->createTestUser(true, true);
687687

688688
// Create test role
689689
$fm = $this->ci->factory;
690-
$fm->create('UserFrosting\Sprinkle\Account\Database\Models\Group', [
690+
$fm->create(Group::class, [
691691
'slug' => 'foo',
692692
'name' => 'bar',
693693
]);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,12 +140,12 @@ public function testpageListWithNoPermission(PermissionController $controller)
140140
/**
141141
* @return PermissionController
142142
*/
143-
private function getController()
143+
protected function getController()
144144
{
145145
return new PermissionController($this->ci);
146146
}
147147

148-
private function setupUser()
148+
protected function setupUser()
149149
{
150150
$this->createTestUser(false, true);
151151
}

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
namespace UserFrosting\Sprinkle\Admin\Tests\Integration\Controller;
1212

13+
use UserFrosting\Sprinkle\Account\Database\Models\Permission;
1314
use UserFrosting\Sprinkle\Account\Tests\withTestUser;
1415
use UserFrosting\Sprinkle\Admin\Controller\PermissionController;
1516
use UserFrosting\Sprinkle\Core\Tests\RefreshDatabase;
@@ -162,19 +163,19 @@ public function testpageList(PermissionController $controller)
162163
/**
163164
* @return PermissionController
164165
*/
165-
private function getController()
166+
protected function getController()
166167
{
167168
return new PermissionController($this->ci);
168169
}
169170

170-
private function setupUser()
171+
protected function setupUser()
171172
{
172173
// Admin user, WILL have access
173174
$testUser = $this->createTestUser(true, true);
174175

175176
// Create test Permission
176177
$fm = $this->ci->factory;
177-
$permission = $fm->create('UserFrosting\Sprinkle\Account\Database\Models\Permission', [
178+
$permission = $fm->create(Permission::class, [
178179
'slug' => 'foo',
179180
'name' => 'bar',
180181
]);

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
namespace UserFrosting\Sprinkle\Admin\Tests\Integration\Controller;
1212

13+
use UserFrosting\Sprinkle\Account\Database\Models\Role;
1314
use UserFrosting\Sprinkle\Account\Tests\withTestUser;
1415
use UserFrosting\Sprinkle\Admin\Controller\RoleController;
1516
use UserFrosting\Sprinkle\Core\Tests\TestDatabase;
@@ -278,19 +279,19 @@ public function testUpdateInfoWithNoRole(RoleController $controller)
278279
/**
279280
* @return RoleController
280281
*/
281-
private function getController()
282+
protected function getController()
282283
{
283284
return new RoleController($this->ci);
284285
}
285286

286-
private function setupUser()
287+
protected function setupUser()
287288
{
288289
// Guest user, won't have any access
289290
$testUser = $this->createTestUser(false, true);
290291

291292
// Create test role
292293
$fm = $this->ci->factory;
293-
$role = $fm->create('UserFrosting\Sprinkle\Account\Database\Models\Role', [
294+
$role = $fm->create(Role::class, [
294295
'slug' => 'foo',
295296
'name' => 'bar',
296297
]);

0 commit comments

Comments
 (0)