IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixed test coverage for user controller.

Browse Source
This commit is contained in:
James Cole 2014-07-04 07:30:12 +02:00
parent abbbba219a
commit f5d3c770b4
2 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/controllers/UserController.php
View File

@ -36,7 +36,7 @@ class UserController extends BaseController
public function register()
{
if (Config::get('auth.allow_register') !== true) {
App::abort(404);
return View::make('error')->with('message', 'Not possible');
}
return View::make('user.register');
}
@ -44,7 +44,7 @@ class UserController extends BaseController
public function postRegister()
{
if (Config::get('auth.allow_register') !== true) {
App::abort(404);
return View::make('error')->with('message', 'Not possible');
}
$user = $this->user->register(Input::all());
if ($user) {
@ -72,18 +72,16 @@ class UserController extends BaseController
public function postRemindme()
{
$user = $this->user->findByEmail(Input::get('email'));
if ($user) {
if (!$user) {
Session::flash('error', 'No good!');
return View::make('user.remindme');
}
if (Config::get('auth.verify_reset') === true) {
$this->email->sendResetVerification($user);
return View::make('user.verification-pending');
}
if (Config::get('auth.verify_reset') === false) {
$this->email->sendPasswordMail($user);
return View::make('user.registered');
}
}
Session::flash('error', 'No good!');
return View::make('user.remindme');
}

14
app/tests/controllers/UserControllerTest.php
View File

@ -57,16 +57,14 @@ class UserControllerTest extends TestCase
$this->assertResponseOk();
}
/**
* @expectedException Symfony\Component\HttpKernel\Exception\NotFoundHttpException
*/
public function testRegisterNotAllowed()
{
// no mock for config! :(
Config::set('auth.allow_register', false);
// test
$this->call('GET', '/register');
$this->assertResponseStatus(404);
$this->assertResponseStatus(200);
$this->assertViewHas('message','Not possible');
}
/**
@ -191,12 +189,9 @@ class UserControllerTest extends TestCase
$this->call('POST', '/remindme');
$this->assertResponseOk();
$this->assertSessionHas('error');
$this->assertSessionHas('error','No good!');
}
/**
* @expectedException Symfony\Component\HttpKernel\Exception\NotFoundHttpException
*/
public function testPostRegisterNotAllowed()
{
// no mock for config! :(
@ -211,7 +206,8 @@ class UserControllerTest extends TestCase
// test
$this->call('POST', '/register', $data);
$this->assertResponseStatus(404);
$this->assertResponseStatus(200);
$this->assertViewHas('message','Not possible');
}