mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2024-12-27 17:31:09 -06:00
New code for user profile bug. [skip ci]
This commit is contained in:
parent
de9fde6859
commit
52663de13d
@ -53,10 +53,6 @@ class ChartController extends BaseController
|
|||||||
$start = Session::get('start');
|
$start = Session::get('start');
|
||||||
$end = Session::get('end');
|
$end = Session::get('end');
|
||||||
|
|
||||||
\Log::debug('Draw home account chart.');
|
|
||||||
\Log::debug('From: ' . $start . ' (' . $start->timezone . ')');
|
|
||||||
\Log::debug('Until: ' . $end);
|
|
||||||
|
|
||||||
if (is_null($account)) {
|
if (is_null($account)) {
|
||||||
// get, depending on preferences:
|
// get, depending on preferences:
|
||||||
/** @var \Firefly\Helper\Preferences\PreferencesHelperInterface $prefs */
|
/** @var \Firefly\Helper\Preferences\PreferencesHelperInterface $prefs */
|
||||||
|
@ -89,6 +89,12 @@ class EloquentUserRepository implements UserRepositoryInterface
|
|||||||
/** @noinspection PhpUndefinedFieldInspection */
|
/** @noinspection PhpUndefinedFieldInspection */
|
||||||
$user->password = $password;
|
$user->password = $password;
|
||||||
/** @noinspection PhpUndefinedMethodInspection */
|
/** @noinspection PhpUndefinedMethodInspection */
|
||||||
|
if($user->validate()) {
|
||||||
|
$user->save();
|
||||||
|
} else {
|
||||||
|
var_dump($user->errors()->all());
|
||||||
|
exit;
|
||||||
|
}
|
||||||
$user->save();
|
$user->save();
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
|
@ -42,7 +42,7 @@ class User extends Ardent implements UserInterface, RemindableInterface
|
|||||||
|
|
||||||
public static $rules
|
public static $rules
|
||||||
= [
|
= [
|
||||||
'email' => 'required|email|unique:users,email',
|
'email' => 'required|email',
|
||||||
'migrated' => 'required|numeric|between:0,1',
|
'migrated' => 'required|numeric|between:0,1',
|
||||||
'password' => 'required|between:60,60',
|
'password' => 'required|between:60,60',
|
||||||
'reset' => 'between:32,32',
|
'reset' => 'between:32,32',
|
||||||
|
62
app/tests/controllers/ChartControllerTest.php
Normal file
62
app/tests/controllers/ChartControllerTest.php
Normal 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();
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user