Commit 130e2c18 authored by Viral Solani's avatar Viral Solani

Merge branch 'develop' of https://github.com/viralsolani/laravel-adminpanel into develop

parents 02641fb5 600bea81
...@@ -97,7 +97,6 @@ class UserRepository extends BaseRepository ...@@ -97,7 +97,6 @@ class UserRepository extends BaseRepository
$user = $this->createUserStub($data); $user = $this->createUserStub($data);
DB::transaction(function () use ($user, $data, $roles, $permissions) { DB::transaction(function () use ($user, $data, $roles, $permissions) {
if ($user->save()) { if ($user->save()) {
//User Created, Validate Roles //User Created, Validate Roles
......
...@@ -2,14 +2,14 @@ ...@@ -2,14 +2,14 @@
namespace Tests\Feature\Backend; namespace Tests\Feature\Backend;
use Tests\TestCase; use App\Events\Backend\Access\User\UserCreated;
use App\Models\Access\Permission\Permission;
use App\Models\Access\Role\Role; use App\Models\Access\Role\Role;
use App\Models\Access\User\User; use App\Models\Access\User\User;
use App\Notifications\Frontend\Auth\UserNeedsConfirmation;
use Illuminate\Support\Facades\Event; use Illuminate\Support\Facades\Event;
use Illuminate\Support\Facades\Notification; use Illuminate\Support\Facades\Notification;
use App\Models\Access\Permission\Permission; use Tests\TestCase;
use App\Events\Backend\Access\User\UserCreated;
use App\Notifications\Frontend\Auth\UserNeedsConfirmation;
class ManageUsersTest extends TestCase class ManageUsersTest extends TestCase
{ {
...@@ -108,14 +108,13 @@ class ManageUsersTest extends TestCase ...@@ -108,14 +108,13 @@ class ManageUsersTest extends TestCase
} }
/** @test */ /** @test */
function a_user_requires_a_confirm_password() public function a_user_requires_a_confirm_password()
{ {
$user = factory(User::class)->states('active', 'confirmed')->make()->toArray(); $user = factory(User::class)->states('active', 'confirmed')->make()->toArray();
$user['password'] = 'Viral@1234'; $user['password'] = 'Viral@1234';
$user['password_confirmation'] = 'Viral@1235'; $user['password_confirmation'] = 'Viral@1235';
$this->withExceptionHandling() $this->withExceptionHandling()
->actingAs($this->admin) ->actingAs($this->admin)
->post(route('admin.access.user.store'), $user) ->post(route('admin.access.user.store'), $user)
...@@ -123,7 +122,6 @@ class ManageUsersTest extends TestCase ...@@ -123,7 +122,6 @@ class ManageUsersTest extends TestCase
} }
/** @test */ /** @test */
public function a_user_requires_a_role() public function a_user_requires_a_role()
{ {
$this->createUser() $this->createUser()
...@@ -166,10 +164,10 @@ class ManageUsersTest extends TestCase ...@@ -166,10 +164,10 @@ class ManageUsersTest extends TestCase
$this->assertDatabaseHas(config('access.users_table'), [ $this->assertDatabaseHas(config('access.users_table'), [
'first_name' => $user['first_name'], 'first_name' => $user['first_name'],
'last_name' => $user['last_name'], 'last_name' => $user['last_name'],
'email' => $user['email'], 'email' => $user['email'],
'status' => 1, 'status' => 1,
'confirmed' => 1, 'confirmed' => 1,
]); ]);
$this->assertDatabaseHas(config('access.roles_table'), ['name' => $role->name]); $this->assertDatabaseHas(config('access.roles_table'), ['name' => $role->name]);
$this->assertDatabaseHas(config('access.permissions_table'), ['name' => $permission->name]); $this->assertDatabaseHas(config('access.permissions_table'), ['name' => $permission->name]);
...@@ -178,7 +176,7 @@ class ManageUsersTest extends TestCase ...@@ -178,7 +176,7 @@ class ManageUsersTest extends TestCase
Event::assertDispatched(UserCreated::class); Event::assertDispatched(UserCreated::class);
} }
/** @test */ /** @test */
public function an_email_will_be_sent_to_uncomfirmed_user() public function an_email_will_be_sent_to_uncomfirmed_user()
{ {
// Make sure our events are fired // Make sure our events are fired
...@@ -204,10 +202,10 @@ class ManageUsersTest extends TestCase ...@@ -204,10 +202,10 @@ class ManageUsersTest extends TestCase
$this->assertDatabaseHas(config('access.users_table'), [ $this->assertDatabaseHas(config('access.users_table'), [
'first_name' => $user['first_name'], 'first_name' => $user['first_name'],
'last_name' => $user['last_name'], 'last_name' => $user['last_name'],
'email' => $user['email'], 'email' => $user['email'],
'status' => 1, 'status' => 1,
'confirmed' => 0, 'confirmed' => 0,
]); ]);
$this->assertDatabaseHas(config('access.roles_table'), ['name' => $role->name]); $this->assertDatabaseHas(config('access.roles_table'), ['name' => $role->name]);
$this->assertDatabaseHas(config('access.permissions_table'), ['name' => $permission->name]); $this->assertDatabaseHas(config('access.permissions_table'), ['name' => $permission->name]);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment