From dab7089d1b12f9141bb6eaf4a36c9fa495ba482d Mon Sep 17 00:00:00 2001
From: Mariusz Fik <mariusz@fidano.pl>
Date: Sun, 6 May 2018 12:45:08 +0200
Subject: [PATCH] Fix creation of an activated user.

Signed-off-by: Mariusz Fik <mariusz@fidano.pl>
---
 .../User/Assets/js/components/UserForm.vue    |  3 +-
 Modules/User/Tests/ApiUserControllerTest.php  | 53 +++++++++++++++++++
 .../User/Transformers/FullUserTransformer.php |  2 +-
 3 files changed, 56 insertions(+), 2 deletions(-)
 create mode 100644 Modules/User/Tests/ApiUserControllerTest.php

diff --git a/Modules/User/Assets/js/components/UserForm.vue b/Modules/User/Assets/js/components/UserForm.vue
index f531aa070..e7d4e7515 100644
--- a/Modules/User/Assets/js/components/UserForm.vue
+++ b/Modules/User/Assets/js/components/UserForm.vue
@@ -51,7 +51,7 @@
                                     </el-form-item>
                                     <el-form-item :label="trans('users.form.is activated')"
                                                   :class="{'el-form-item is-error': form.errors.has('activated') }">
-                                        <el-checkbox v-model="user.activated">Activated</el-checkbox>
+                                        <el-checkbox v-model="user.is_activated">Activated</el-checkbox>
                                         <div class="el-form-item__error" v-if="form.errors.has('activated')"
                                              v-text="form.errors.first('activated')"></div>
                                     </el-form-item>
@@ -161,6 +161,7 @@
                     permissions: {},
                     roles: {},
                     is_new: false,
+                    is_activated: false,
                 },
                 roles: {},
                 form: new Form(),
diff --git a/Modules/User/Tests/ApiUserControllerTest.php b/Modules/User/Tests/ApiUserControllerTest.php
new file mode 100644
index 000000000..92f02675c
--- /dev/null
+++ b/Modules/User/Tests/ApiUserControllerTest.php
@@ -0,0 +1,53 @@
+<?php
+
+namespace Modules\User\Tests;
+
+use Modules\User\Entities\Sentinel\User;
+use Modules\User\Http\Controllers\Api\UserController;
+use Modules\User\Http\Requests\CreateUserRequest;
+use Modules\User\Permissions\PermissionManager;
+use Modules\User\Repositories\UserRepository;
+use Modules\User\Repositories\UserTokenRepository;
+
+class ApiUserControllerTest extends BaseUserTestCase
+{
+    /**
+     * @var UserRepository
+     */
+    private $user;
+    /**
+     * @var PermissionManager
+     */
+    private $permissions;
+    /**
+     * @var UserTokenRepository
+     */
+    private $userToken;
+
+    public function setUp()
+    {
+        parent::setUp();
+        $this->user = app(UserRepository::class);
+        $this->permissions = app(PermissionManager::class);
+        $this->userToken = app(UserTokenRepository::class);
+    }
+
+    /** @test */
+    public function it_creates_a_new_activated_user()
+    {
+        $data = [
+            'email' => 'user@domain.tld',
+            'password' => 'Pa$$w0rd',
+            'is_activated' => true,
+        ];
+
+        $request = CreateUserRequest::create('', '', $data);
+        $controller = new UserController($this->user, $this->permissions, $this->userToken);
+
+        $controller->store($request);
+        $user = $this->user->find(1);
+
+        $this->assertInstanceOf(User::class, $user);
+        $this->assertTrue($user->isActivated());
+    }
+}
diff --git a/Modules/User/Transformers/FullUserTransformer.php b/Modules/User/Transformers/FullUserTransformer.php
index d544fd0dd..9ccb52640 100644
--- a/Modules/User/Transformers/FullUserTransformer.php
+++ b/Modules/User/Transformers/FullUserTransformer.php
@@ -17,7 +17,7 @@ public function toArray($request)
             'first_name' => $this->first_name,
             'last_name' => $this->last_name,
             'email' => $this->email,
-            'activated' => $this->isActivated(),
+            'is_activated' => $this->isActivated(),
             'last_login' => $this->last_login,
             'created_at' => $this->created_at,
             'permissions' => $permissions,