Started UserController Tests

Author: lcharette

CHANGELOG.md

@@ -755,4 +755,4 @@ See [http://learn.userfrosting.com/upgrading/40-to-41](Upgrading 4.0.x to 4.1.x
 [#968]: https://github.com/userfrosting/UserFrosting/issues/968
 
 [v4.2.0]: https://github.com/userfrosting/UserFrosting/compare/v4.1.22...v4.2.0
-[v4.2.1]: https://github.com/userfrosting/UserFrosting/compare/v4.2.0...v4.2.1
+[v4.2.1]: https://github.com/userfrosting/UserFrosting/compare/v4.2.0...v.4.2.1

app/sprinkles/admin/src/Controller/UserController.php

@@ -99,13 +99,13 @@ public function create(Request $request, Response $response, $args)
         /** @var \UserFrosting\Sprinkle\Core\Util\ClassMapper $classMapper */
         $classMapper = $this->ci->classMapper;
 
-        // Check if username or email already exists
-        if ($classMapper->staticMethod('user', 'findUnique', $data['user_name'], 'user_name')) {
+        // Check if username or email already exists. If not set, validator will pick it up
+        if (isset($data['user_name']) && $classMapper->staticMethod('user', 'findUnique', $data['user_name'], 'user_name')) {
             $ms->addMessageTranslated('danger', 'USERNAME.IN_USE', $data);
             $error = true;
         }
 
-        if ($classMapper->staticMethod('user', 'findUnique', $data['email'], 'email')) {
+        if (isset($data['email']) && $classMapper->staticMethod('user', 'findUnique', $data['email'], 'email')) {
             $ms->addMessageTranslated('danger', 'EMAIL.IN_USE', $data);
             $error = true;
         }
@@ -555,9 +555,6 @@ public function getModalConfirmDelete(Request $request, Response $response, $arg
      */
     public function getModalCreate(Request $request, Response $response, $args)
     {
-        // GET parameters
-        $params = $request->getQueryParams();
-
         /** @var \UserFrosting\Sprinkle\Account\Authorize\AuthorizationManager $authorizer */
         $authorizer = $this->ci->authorizer;
 

app/sprinkles/admin/tests/Integration/Controller/UserControllerGuestTest.php

@@ -0,0 +1,136 @@
+<?php
+
+/*
+ * UserFrosting (http://www.userfrosting.com)
+ *
+ * @link      https://github.com/userfrosting/UserFrosting
+ * @copyright Copyright (c) 2019 Alexander Weissman
+ * @license   https://github.com/userfrosting/UserFrosting/blob/master/LICENSE.md (MIT License)
+ */
+
+namespace UserFrosting\Sprinkle\Admin\Tests\Integration\Controller;
+
+use UserFrosting\Sprinkle\Account\Tests\withTestUser;
+use UserFrosting\Sprinkle\Admin\Controller\UserController;
+use UserFrosting\Sprinkle\Core\Tests\RefreshDatabase;
+use UserFrosting\Sprinkle\Core\Tests\TestDatabase;
+use UserFrosting\Sprinkle\Core\Tests\withController;
+use UserFrosting\Support\Exception\ForbiddenException;
+use UserFrosting\Tests\TestCase;
+
+/**
+ * Tests UserController
+ */
+class UserControllerGuestTest extends TestCase
+{
+    use TestDatabase;
+    use RefreshDatabase;
+    use withTestUser;
+    use withController;
+
+    /**
+     * @var bool DB is initialized for normal db
+     */
+    protected static $initialized = false;
+
+    /**
+     * Setup test database for controller tests
+     */
+    public function setUp()
+    {
+        parent::setUp();
+        $this->setupTestDatabase();
+
+        if ($this->usingInMemoryDatabase()) {
+
+            // Setup database, then setup User & default role
+            $this->refreshDatabase();
+            $this->setupUser();
+
+        } else if (!static::$initialized) {
+
+            // Only refresh db once
+            $this->refreshDatabase();
+            static::$initialized = true;
+        }
+    }
+
+    /**
+     */
+    public function testControllerConstructor()
+    {
+        $controller = $this->getController();
+        $this->assertInstanceOf(UserController::class, $controller);
+    }
+
+    /**
+     * @depends testControllerConstructor
+     * @return UserController
+     */
+    public function testControllerConstructorWithUser()
+    {
+        // Skip user setup if using in-memory db
+        if (!$this->usingInMemoryDatabase()) {
+            $this->setupUser();
+        }
+
+        $controller = $this->getController();
+        $this->assertInstanceOf(UserController::class, $controller);
+
+        return $controller;
+    }
+
+    /**
+     * @depends testControllerConstructorWithUser
+     * @param  UserController $controller
+     */
+    public function testCreateWithNoPermissions(UserController $controller)
+    {
+        $this->expectException(ForbiddenException::class);
+        $controller->create($this->getRequest(), $this->getResponse(), []);
+    }
+
+    /**
+     * @depends testControllerConstructorWithUser
+     * @param  UserController $controller
+     */
+    public function testDeleteWithNoPermission(UserController $controller)
+    {
+        $this->expectException(ForbiddenException::class);
+        $controller->delete($this->getRequest(), $this->getResponse(), ['user_name' => 'userfoo']);
+    }
+
+    /**
+     * @depends testControllerConstructorWithUser
+     * @param  UserController $controller
+     */
+    public function testGetListWithNoPermission(UserController $controller)
+    {
+        $this->expectException(ForbiddenException::class);
+        $controller->getList($this->getRequest(), $this->getResponse(), []);
+    }
+
+    /**
+     * @return UserController
+     */
+    private function getController()
+    {
+        return new UserController($this->ci);
+    }
+
+    /**
+     */
+    private function setupUser()
+    {
+        // Admin user, WILL have access
+        $testUser = $this->createTestUser(false, true);
+
+        // Create test user
+        $fm = $this->ci->factory;
+        $user = $fm->create('UserFrosting\Sprinkle\Account\Database\Models\User', [
+            'id'        => '9999',
+            'user_name' => 'userfoo',
+            'email'     => '[email protected]'
+        ]);
+    }
+}