kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-04 19:50:55 +00:00
Code Issues Projects Releases Wiki Activity

Full coverage for user controller.

Browse Source
This commit is contained in:
James Cole
2014-12-31 07:17:33 +01:00
parent 7e96054dc2
commit 0cbb50ae9d
2 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/controllers/UserController.php
View File

@@ -79,14 +79,9 @@ class UserController extends BaseController
//$user = $this->user->register(Input::all()); //$user = $this->user->register(Input::all());
if ($user) { if ($user) {
if (Config::get('auth.verify_mail') === true) { $email->sendVerificationMail($user);
$email->sendVerificationMail($user);
return View::make('user.verification-pending'); return View::make('user.verification-pending');
}
$email->sendPasswordMail($user);
return View::make('user.registered');
} }
@@ -115,14 +110,9 @@ class UserController extends BaseController
return View::make('user.remindme'); return View::make('user.remindme');
} }
if (Config::get('auth.verify_reset') === true) { $email->sendResetVerification($user);
$email->sendResetVerification($user);
return View::make('user.verification-pending'); return View::make('user.verification-pending');
}
$email->sendPasswordMail($user);
return View::make('user.registered');
} }

2
tests/functional/UserControllerCest.php
View File

@@ -68,7 +68,7 @@ class UserControllerCest
$I->wantTo('post-register a new account'); $I->wantTo('post-register a new account');
$I->amOnPage('/register'); $I->amOnPage('/register');
$I->submitForm('#register', ['email' => 'noreply@gmail.com']); $I->submitForm('#register', ['email' => 'noreply@gmail.com']);
$I->see('Password sent!'); $I->see('You\'re about to get an e-mail. Please follow its instructions.');
$I->seeRecord('users', ['email' => 'noreply@gmail.com']); $I->seeRecord('users', ['email' => 'noreply@gmail.com']);
} }