Unverified Commit c90fdf22 authored by Viral Solani's avatar Viral Solani Committed by GitHub

Merge pull request #100 from viralsolani/analysis-zYxwy0

Apply fixes from StyleCI
parents 24a3605a f84ac048
......@@ -63,7 +63,7 @@ class RegisterController extends Controller
}*/
if (config('access.users.confirm_email') || config('access.users.requires_approval')) {
$user = $this->user->create($request->only('first_name', 'last_name', 'email', 'password','is_term_accept'));
$user = $this->user->create($request->only('first_name', 'last_name', 'email', 'password', 'is_term_accept'));
event(new UserRegistered($user));
return redirect($this->redirectPath())->withFlashSuccess(
......
......@@ -79,7 +79,7 @@ class UserRepository extends BaseRepository
}
/**
* Create User
* Create User.
*
* @param array $data
* @param bool $provider
......@@ -115,7 +115,6 @@ class UserRepository extends BaseRepository
$user->confirmed = 1;
}
DB::transaction(function () use ($user) {
if ($user->save()) {
/*
......
<?php
use Illuminate\Support\Facades\Schema;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
class AddNullConstraintOnCreatedByOnUserTable extends Migration
{
......@@ -14,7 +14,7 @@ class AddNullConstraintOnCreatedByOnUserTable extends Migration
public function up()
{
Schema::table('users', function (Blueprint $table) {
$table->integer('created_by')->nullable()->change();
$table->integer('created_by')->nullable()->change();
});
}
......
......@@ -2,16 +2,12 @@
namespace Tests\Feature;
use Faker\Generator;
use Tests\BrowserKitTestCase;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Event;
use App\Events\Frontend\Auth\UserLoggedIn;
use App\Events\Frontend\Auth\UserRegistered;
use Illuminate\Support\Facades\Event;
use Tests\BrowserKitTestCase;
class RegistrationTest extends BrowserKitTestCase
{
/** @test */
public function registration_page_loads_properly()
{
......@@ -42,10 +38,11 @@ class RegistrationTest extends BrowserKitTestCase
}
/**
* Test the registration form
* Test it works with confirming email on or off, and that the confirm email notification is sent
* Note: Captcha is disabled by default in phpunit.xml.
*/
* Test the registration form
* Test it works with confirming email on or off, and that the confirm email notification is sent
* Note: Captcha is disabled by default in phpunit.xml.
*/
/** @test */
public function test_registration_form()
{
......@@ -55,7 +52,6 @@ class RegistrationTest extends BrowserKitTestCase
config(['access.users.confirm_email' => false]);
config(['access.users.requires_approval' => false]);
$this->visit('/register')
->type('John', 'first_name')
->type('Doe', 'last_name')
......@@ -67,13 +63,12 @@ class RegistrationTest extends BrowserKitTestCase
->seePageIs('/')
->seeInDatabase(config('access.users_table'),
[
'email' => 'john.doe@example.com',
'email' => 'john.doe@example.com',
'first_name' => 'John',
'last_name' => 'Doe',
'confirmed' => 1,
'last_name' => 'Doe',
'confirmed' => 1,
]);
Event::assertDispatched(UserRegistered::class);
}
}
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