mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-09-19 10:53:37 +00:00
And.. completed the account controller.
This commit is contained in:
@@ -192,7 +192,7 @@ class AccountController extends Controller
|
|||||||
];
|
];
|
||||||
$account = $repository->store($accountData);
|
$account = $repository->store($accountData);
|
||||||
|
|
||||||
Session::flash('success', 'New account "' . $account->name . '" stored!');
|
Session::flash('success', 'New account "' . $account->name . '" stored!');
|
||||||
|
|
||||||
if (intval(Input::get('create_another')) === 1) {
|
if (intval(Input::get('create_another')) === 1) {
|
||||||
return Redirect::route('accounts.create', $request->input('what'))->withInput();
|
return Redirect::route('accounts.create', $request->input('what'))->withInput();
|
||||||
|
@@ -48,7 +48,7 @@ class AccountControllerTest extends TestCase
|
|||||||
public function createAccount()
|
public function createAccount()
|
||||||
{
|
{
|
||||||
if (is_null($this->account)) {
|
if (is_null($this->account)) {
|
||||||
$this->account = FactoryMuffin::create('FireflyIII\Models\Account');
|
$this->account = FactoryMuffin::create('FireflyIII\Models\Account');
|
||||||
Log::debug('Created a new account.');
|
Log::debug('Created a new account.');
|
||||||
//$this->account->accountType->type = 'Asset account';
|
//$this->account->accountType->type = 'Asset account';
|
||||||
//$this->account->accountType->save();
|
//$this->account->accountType->save();
|
||||||
@@ -176,12 +176,124 @@ class AccountControllerTest extends TestCase
|
|||||||
|
|
||||||
public function testStore()
|
public function testStore()
|
||||||
{
|
{
|
||||||
$this->markTestIncomplete();
|
// an account:
|
||||||
|
$this->be($this->account->user);
|
||||||
|
|
||||||
|
$data = [
|
||||||
|
'name' => 'New test account ' . rand(1, 1000),
|
||||||
|
'what' => 'asset',
|
||||||
|
'virtualBalance' => 0,
|
||||||
|
'accountRole' => 'defaultAsset',
|
||||||
|
'openingBalance' => 20,
|
||||||
|
'openingBalanceDate' => date('Y-m-d'),
|
||||||
|
'openingBalanceCurrency' => 1,
|
||||||
|
'_token' => 'replaceme'
|
||||||
|
];
|
||||||
|
|
||||||
|
// fake validation routine:
|
||||||
|
$request = $this->mock('FireflyIII\Http\Requests\AccountFormRequest');
|
||||||
|
$request->shouldReceive('input')->andReturn('');
|
||||||
|
|
||||||
|
// fake store routine:
|
||||||
|
$repository = $this->mock('FireflyIII\Repositories\Account\AccountRepositoryInterface');
|
||||||
|
$repository->shouldReceive('store')->andReturn($this->account);
|
||||||
|
|
||||||
|
$this->call('POST', '/accounts/store', $data);
|
||||||
|
$this->assertResponseStatus(302);
|
||||||
|
$this->assertSessionHas('success');
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testStoreAndRedirect()
|
||||||
|
{
|
||||||
|
// an account:
|
||||||
|
$this->be($this->account->user);
|
||||||
|
|
||||||
|
$data = [
|
||||||
|
'name' => 'New test account ' . rand(1, 1000),
|
||||||
|
'what' => 'asset',
|
||||||
|
'virtualBalance' => 0,
|
||||||
|
'accountRole' => 'defaultAsset',
|
||||||
|
'openingBalance' => 20,
|
||||||
|
'openingBalanceDate' => date('Y-m-d'),
|
||||||
|
'openingBalanceCurrency' => 1,
|
||||||
|
'_token' => 'replaceme',
|
||||||
|
'create_another' => 1,
|
||||||
|
];
|
||||||
|
|
||||||
|
// fake validation routine:
|
||||||
|
$request = $this->mock('FireflyIII\Http\Requests\AccountFormRequest');
|
||||||
|
$request->shouldReceive('input')->andReturn('');
|
||||||
|
|
||||||
|
// fake store routine:
|
||||||
|
$repository = $this->mock('FireflyIII\Repositories\Account\AccountRepositoryInterface');
|
||||||
|
$repository->shouldReceive('store')->andReturn($this->account);
|
||||||
|
|
||||||
|
$this->call('POST', '/accounts/store', $data);
|
||||||
|
$this->assertResponseStatus(302);
|
||||||
|
$this->assertSessionHas('success');
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testUpdate()
|
public function testUpdate()
|
||||||
{
|
{
|
||||||
$this->markTestIncomplete();
|
|
||||||
|
// an account:
|
||||||
|
$this->be($this->account->user);
|
||||||
|
|
||||||
|
$data = [
|
||||||
|
'name' => 'Edited test account ' . rand(1, 1000),
|
||||||
|
'active' => 1,
|
||||||
|
'accountRole' => 'defaultAsset',
|
||||||
|
'virtualBalance' => 0,
|
||||||
|
'openingBalance' => 25,
|
||||||
|
'openingBalanceDate' => date('Y-m-d'),
|
||||||
|
'openingBalanceCurrency' => 1,
|
||||||
|
'_token' => 'replaceme'
|
||||||
|
];
|
||||||
|
|
||||||
|
// fake validation routine:
|
||||||
|
$request = $this->mock('FireflyIII\Http\Requests\AccountFormRequest');
|
||||||
|
$request->shouldReceive('input')->andReturn('');
|
||||||
|
|
||||||
|
// fake update routine:
|
||||||
|
$repository = $this->mock('FireflyIII\Repositories\Account\AccountRepositoryInterface');
|
||||||
|
$repository->shouldReceive('update')->andReturn($this->account);
|
||||||
|
|
||||||
|
$this->call('POST', '/accounts/update/' . $this->account->id, $data);
|
||||||
|
$this->assertResponseStatus(302);
|
||||||
|
$this->assertSessionHas('success');
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testUpdateAndRedirect()
|
||||||
|
{
|
||||||
|
|
||||||
|
// an account:
|
||||||
|
$this->be($this->account->user);
|
||||||
|
|
||||||
|
$data = [
|
||||||
|
'name' => 'Edited test account ' . rand(1, 1000),
|
||||||
|
'active' => 1,
|
||||||
|
'accountRole' => 'defaultAsset',
|
||||||
|
'virtualBalance' => 0,
|
||||||
|
'openingBalance' => 25,
|
||||||
|
'openingBalanceDate' => date('Y-m-d'),
|
||||||
|
'openingBalanceCurrency' => 1,
|
||||||
|
'_token' => 'replaceme',
|
||||||
|
'return_to_edit' => 1,
|
||||||
|
];
|
||||||
|
|
||||||
|
// fake validation routine:
|
||||||
|
$request = $this->mock('FireflyIII\Http\Requests\AccountFormRequest');
|
||||||
|
$request->shouldReceive('input')->andReturn('');
|
||||||
|
|
||||||
|
// fake update routine:
|
||||||
|
$repository = $this->mock('FireflyIII\Repositories\Account\AccountRepositoryInterface');
|
||||||
|
$repository->shouldReceive('update')->andReturn($this->account);
|
||||||
|
|
||||||
|
$this->call('POST', '/accounts/update/' . $this->account->id, $data);
|
||||||
|
$this->assertResponseStatus(302);
|
||||||
|
$this->assertSessionHas('success');
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user