IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2024-12-27 01:11:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

New code for user profile bug. [skip ci]

Browse Source
This commit is contained in:
James Cole 2014-08-05 18:40:30 +02:00
parent de9fde6859
commit 52663de13d
4 changed files with 69 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/ChartController.php
View File

@ -53,10 +53,6 @@ class ChartController extends BaseController
$start = Session::get('start');
$end = Session::get('end');
\Log::debug('Draw home account chart.');
\Log::debug('From: ' . $start . ' (' . $start->timezone . ')');
\Log::debug('Until: ' . $end);
if (is_null($account)) {
// get, depending on preferences:
/** @var \Firefly\Helper\Preferences\PreferencesHelperInterface $prefs */

6
app/lib/Firefly/Storage/User/EloquentUserRepository.php
View File

@ -89,6 +89,12 @@ class EloquentUserRepository implements UserRepositoryInterface
/** @noinspection PhpUndefinedFieldInspection */
$user->password = $password;
/** @noinspection PhpUndefinedMethodInspection */
if($user->validate()) {
$user->save();
} else {
var_dump($user->errors()->all());
exit;
}
$user->save();
return true;

2
app/models/User.php
View File

@ -42,7 +42,7 @@ class User extends Ardent implements UserInterface, RemindableInterface
public static $rules
= [
'email' => 'required|email|unique:users,email',
'email' => 'required|email',
'migrated' => 'required|numeric|between:0,1',
'password' => 'required|between:60,60',
'reset' => 'between:32,32',

62
app/tests/controllers/ChartControllerTest.php Normal file
View File

@ -0,0 +1,62 @@
<?php
use Carbon\Carbon;
use Mockery as m;
use Zizaco\FactoryMuff\Facade\FactoryMuff as f;
/**
* Class ChartControllerTest
*/
class ChartControllerTest extends TestCase
{
protected $_user;
// protected $_repository;
protected $_accounts;
public function setUp()
{
parent::setUp();
Artisan::call('migrate');
Artisan::call('db:seed');
$this->_accounts = $this->mock('Firefly\Storage\Account\AccountRepositoryInterface');
// $this->_category = $this->mock('Firefly\Helper\Controllers\CategoryInterface');
$this->_user = m::mock('User', 'Eloquent');
}
public function tearDown()
{
Mockery::close();
}
public function testCategoryShowChart()
{
$this->session(['start' => new Carbon, 'end' => new Carbon, 'range' => '1M']);
$category = f::create('Category');
// for successful binding:
Auth::shouldReceive('user')->andReturn($this->_user);
Auth::shouldReceive('check')->andReturn(true);
$this->_user->shouldReceive('getAttribute')->with('id')->once()->andReturn($category->user_id);
$this->action('GET', 'ChartController@categoryShowChart', $category->id);
$this->assertResponseOk();
}
public function testHomeAccount()
{
$account = f::create('Account');
$this->session(['start' => new Carbon, 'end' => new Carbon, 'range' => '1M']);
// for successful binding:
Auth::shouldReceive('user')->andReturn($this->_user);
Auth::shouldReceive('check')->andReturn(true);
$this->_user->shouldReceive('getAttribute')->with('id')->once()->andReturn(1);
$this->_accounts->shouldReceive('getByIds')->andReturn([$account]);
$this->action('GET', 'ChartController@homeAccount');
$this->assertResponseOk();
}
}