kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

Fix actions and associated tests.

Browse Source
This commit is contained in:
James Cole
2020-08-23 16:12:16 +02:00
parent 139b3ffab4
commit fecc9f7659
8 changed files with 286 additions and 318 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
tests/Unit/TransactionRules/Actions/SetDescriptionTest.php
View File

@@ -23,7 +23,6 @@ declare(strict_types=1);
namespace Tests\Unit\TransactionRules\Actions;
use FireflyIII\Models\RuleAction;
use FireflyIII\Models\TransactionJournal;
use FireflyIII\TransactionRules\Actions\SetDescription;
use Tests\TestCase;
@@ -32,37 +31,34 @@ use Tests\TestCase;
*/
class SetDescriptionTest extends TestCase
{
/**
* Set up test
*/
public function setUp(): void
{
self::markTestIncomplete('Incomplete for refactor.');
return;
}
/**
* @covers \FireflyIII\TransactionRules\Actions\SetDescription
*/
public function testAct(): void
{
$withdrawal = $this->getRandomWithdrawal();
$newDescription = sprintf('new description #%d', $this->randomInt());
$oldDescription = $withdrawal->description;
// get journal, give fixed description
$description = 'text' . $this->randomInt();
$newDescription = 'new description' . $this->randomInt();
$journal = $this->getRandomWithdrawal();
$journal->description = $description;
$journal->save();
$array = [
'description' => $oldDescription,
'transaction_journal_id' => $withdrawal->id,
];
// fire the action:
$ruleAction = new RuleAction;
$ruleAction->action_value = $newDescription;
$action = new SetDescription($ruleAction);
$result = $action->act($journal);
$result = $action->actOnArray($array);
$this->assertTrue($result);
$journal = TransactionJournal::find($journal->id);
$withdrawal->refresh();
// assert result
$this->assertEquals($newDescription, $journal->description);
$this->assertEquals($newDescription, $withdrawal->description);
$withdrawal->description = $oldDescription;
$withdrawal->save();
}
}

146
tests/Unit/TransactionRules/Actions/SetDestinationAccountTest.php
View File

@@ -22,12 +22,9 @@ declare(strict_types=1);
namespace Tests\Unit\TransactionRules\Actions;
use DB;
use FireflyIII\Models\AccountType;
use FireflyIII\Models\RuleAction;
use FireflyIII\Models\Transaction;
use FireflyIII\Models\TransactionJournal;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Models\TransactionType;
use FireflyIII\TransactionRules\Actions\SetDestinationAccount;
use Tests\TestCase;
@@ -38,15 +35,6 @@ use Tests\TestCase;
*/
class SetDestinationAccountTest extends TestCase
{
/**
* Set up test
*/
public function setUp(): void
{
self::markTestIncomplete('Incomplete for refactor.');
return;
}
/**
* Give deposit existing asset account.
*
@@ -54,31 +42,41 @@ class SetDestinationAccountTest extends TestCase
*/
public function testActDepositExisting(): void
{
$accountRepos = $this->mock(AccountRepositoryInterface::class);
$deposit = $this->getRandomDeposit();
$destinationTr = $deposit->transactions()->where('amount', '>', 0)->first();
$destination = $destinationTr->account;
$user = $deposit->user;
$accountType = AccountType::whereType(AccountType::ASSET)->first();
$account = $user->accounts()->where('account_type_id', $accountType->id)->where('id', '!=', $destination->id)->first();
$this->assertNotEquals($destination->id, $account->id);
// get random deposit:
$deposit = $this->getRandomDeposit();
$destinationTr = $deposit->transactions()->where('amount', '>', 0)->first();
$destination = $destinationTr->account;
$oldDestination = $destinationTr->account_id;
// find account? Return account:
$accountRepos->shouldReceive('setUser');
$accountRepos->shouldReceive('findByName')->andReturn($account);
// grab unused asset account:
$user = $deposit->user;
$accountType = AccountType::whereType(AccountType::ASSET)->first();
$newDestination = $user->accounts()->where('account_type_id', $accountType->id)->where('id', '!=', $destination->id)->first();
$this->assertNotEquals($destination->id, $newDestination->id);
// array with info:
$array = [
'transaction_journal_id' => $deposit->id,
'user_id' => $this->user()->id,
'transaction_type_type' => TransactionType::DEPOSIT,
'source_account_type' => AccountType::REVENUE,
];
// fire the action:
$ruleAction = new RuleAction;
$ruleAction->action_value = $account->name;
$ruleAction->action_value = $newDestination->name;
$action = new SetDestinationAccount($ruleAction);
$result = $action->act($deposit);
$result = $action->actOnArray($array);
$this->assertTrue($result);
// test journal for new account
$destinationTr = $deposit->transactions()->where('amount', '>', 0)->first();
$newDestination = $destinationTr->account;
$this->assertNotEquals($destination->id, $newDestination->id);
$this->assertEquals($newDestination->id, $account->id);
$destinationTr->refresh();
$updatedDestination = $destinationTr->account;
$this->assertEquals($newDestination->id, $updatedDestination->id);
$this->assertEquals($destinationTr->account_id, $newDestination->id);
$destinationTr->account_id = $oldDestination;
$destinationTr->save();
}
/**
@@ -88,19 +86,29 @@ class SetDestinationAccountTest extends TestCase
*/
public function testActDepositNotExisting(): void
{
$accountRepos = $this->mock(AccountRepositoryInterface::class);
$deposit = $this->getRandomDeposit();
// get random deposit:
$deposit = $this->getRandomDeposit();
$destinationTr = $deposit->transactions()->where('amount', '>', 0)->first();
$oldDestination = $destinationTr->account;
// find account? Return account:
$accountRepos->shouldReceive('setUser');
$accountRepos->shouldReceive('findByName')->andReturn(null);
// array with info:
$array = [
'transaction_journal_id' => $deposit->id,
'user_id' => $this->user()->id,
'transaction_type_type' => TransactionType::DEPOSIT,
'source_account_type' => AccountType::REVENUE,
];
// fire the action:
$ruleAction = new RuleAction;
$ruleAction->action_value = 'Not existing asset account #' . $this->randomInt();
$ruleAction->action_value = sprintf('Not existing asset account #%d', $this->randomInt());
$action = new SetDestinationAccount($ruleAction);
$result = $action->act($deposit);
$result = $action->actOnArray($array);
$this->assertFalse($result);
// test journal for new account
$destinationTr->refresh();
$this->assertEquals($destinationTr->account_id, $oldDestination->id);
}
/**
@@ -110,22 +118,32 @@ class SetDestinationAccountTest extends TestCase
*/
public function testActWithDrawalNotExisting(): void
{
$accountRepos = $this->mock(AccountRepositoryInterface::class);
$account = $this->getRandomExpense();
$withdrawal = $this->getRandomWithdrawal();
// find account? Return account:
$accountRepos->shouldReceive('setUser');
$accountRepos->shouldReceive('findByName')->andReturn(null);
$accountRepos->shouldReceive('store')->once()->andReturn($account);
// get random withdrawal:
$withdrawal = $this->getRandomWithdrawal();
$destinationTr = $withdrawal->transactions()->where('amount', '>', 0)->first();
$oldDestination = $destinationTr->account;
// array with info:
$array = [
'transaction_journal_id' => $withdrawal->id,
'user_id' => $this->user()->id,
'transaction_type_type' => TransactionType::WITHDRAWAL,
'source_account_type' => AccountType::ASSET,
];
// fire the action:
$ruleAction = new RuleAction;
$ruleAction->action_value = 'Not existing expense account #' . $this->randomInt();
$ruleAction->action_value = sprintf('Not existing expense account #%d', $this->randomInt());
$action = new SetDestinationAccount($ruleAction);
$result = $action->act($withdrawal);
$result = $action->actOnArray($array);
$this->assertTrue($result);
// test journal for new account
$destinationTr->refresh();
$newDestination = $destinationTr->account;
$this->assertEquals($newDestination->name, $ruleAction->action_value);
$destinationTr->account_id = $oldDestination;
$destinationTr->save();
}
/**
@@ -135,31 +153,31 @@ class SetDestinationAccountTest extends TestCase
*/
public function testActWithdrawalExisting(): void
{
$accountRepos = $this->mock(AccountRepositoryInterface::class);
$withdrawal = $this->getRandomWithdrawal();
$destinationTr = $withdrawal->transactions()->where('amount', '>', 0)->first();
$destination = $destinationTr->account;
$user = $withdrawal->user;
$accountType = AccountType::whereType(AccountType::EXPENSE)->first();
$account = $user->accounts()->where('account_type_id', $accountType->id)->where('id', '!=', $destination->id)->first();
$this->assertNotEquals($destination->id, $account->id);
// get random withdrawal:
$withdrawal = $this->getRandomWithdrawal();
$destinationTr = $withdrawal->transactions()->where('amount', '>', 0)->first();
$oldDestination = $destinationTr->account;
$newDestination = $this->user()->accounts()->where('id', '!=', $oldDestination->id)->first();
// find account? Return account:
$accountRepos->shouldReceive('setUser');
$accountRepos->shouldReceive('findByName')->andReturn($account);
// array with info:
$array = [
'transaction_journal_id' => $withdrawal->id,
'user_id' => $this->user()->id,
'transaction_type_type' => TransactionType::WITHDRAWAL,
'source_account_type' => AccountType::ASSET,
];
// fire the action:
$ruleAction = new RuleAction;
$ruleAction->action_value = $account->name;
$ruleAction->action_value = $newDestination->name;
$action = new SetDestinationAccount($ruleAction);
$result = $action->act($withdrawal);
$result = $action->actOnArray($array);
$this->assertTrue($result);
// test journal for new account
$destinationTr = $withdrawal->transactions()->where('amount', '>', 0)->first();
$destinationTr->refresh();
$newDestination = $destinationTr->account;
$this->assertNotEquals($destination->id, $newDestination->id);
$this->assertEquals($newDestination->id, $account->id);
$this->assertEquals($newDestination->name, $ruleAction->action_value);
}
}

13
tests/Unit/TransactionRules/Actions/SetNotesTest.php
View File

@@ -33,16 +33,6 @@ use Tests\TestCase;
*/
class SetNotesTest extends TestCase
{
/**
* Set up test
*/
public function setUp(): void
{
self::markTestIncomplete('Incomplete for refactor.');
return;
}
/**
* @covers \FireflyIII\TransactionRules\Actions\SetNotes
*/
@@ -61,7 +51,7 @@ class SetNotesTest extends TestCase
// fire the action:
$ruleAction = new RuleAction;
$ruleAction->action_value = 'These are new notes ' . $this->randomInt();
$ruleAction->action_value = sprintf('These are new notes #%d', $this->randomInt());
$action = new SetNotes($ruleAction);
$result = $action->act($journal);
$this->assertTrue($result);
@@ -69,6 +59,7 @@ class SetNotesTest extends TestCase
// assert result
$this->assertEquals(1, $journal->notes()->count());
$this->assertEquals($note->id, $journal->notes()->first()->id);
$journal->notes()->delete();
}
/**

88
tests/Unit/TransactionRules/Actions/SetSourceAccountTest.php
View File

@@ -22,12 +22,9 @@ declare(strict_types=1);
namespace Tests\Unit\TransactionRules\Actions;
use DB;
use FireflyIII\Models\AccountType;
use FireflyIII\Models\RuleAction;
use FireflyIII\Models\Transaction;
use FireflyIII\Models\TransactionJournal;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Models\TransactionType;
use FireflyIII\TransactionRules\Actions\SetSourceAccount;
use Tests\TestCase;
@@ -36,16 +33,6 @@ use Tests\TestCase;
*/
class SetSourceAccountTest extends TestCase
{
/**
* Set up test
*/
public function setUp(): void
{
self::markTestIncomplete('Incomplete for refactor.');
return;
}
/**
* Give deposit existing revenue account.
*
@@ -53,24 +40,25 @@ class SetSourceAccountTest extends TestCase
*/
public function testActDepositExistingUpdated(): void
{
$accountRepos = $this->mock(AccountRepositoryInterface::class);
$deposit = $this->getRandomDeposit();
$sourceTr = $deposit->transactions()->where('amount', '<', 0)->first();
$source = $sourceTr->account;
$user = $deposit->user;
$accountType = AccountType::whereType(AccountType::REVENUE)->first();
$account = $user->accounts()->where('account_type_id', $accountType->id)->where('id', '!=', $source->id)->first();
$deposit = $this->getRandomDeposit();
$sourceTr = $deposit->transactions()->where('amount', '<', 0)->first();
$source = $sourceTr->account;
$user = $deposit->user;
$accountType = AccountType::whereType(AccountType::REVENUE)->first();
$account = $user->accounts()->where('account_type_id', $accountType->id)->where('id', '!=', $source->id)->first();
$this->assertNotEquals($source->id, $account->id);
// find account? Return account:
$accountRepos->shouldReceive('setUser');
$accountRepos->shouldReceive('findByName')->andReturn($account);
$array = [
'user_id' => $this->user()->id,
'transaction_journal_id' => $deposit->id,
'transaction_type_type' => TransactionType::DEPOSIT,
];
// fire the action:
$ruleAction = new RuleAction;
$ruleAction->action_value = $account->name;
$action = new SetSourceAccount($ruleAction);
$result = $action->act($deposit);
$result = $action->actOnArray($array);
$this->assertTrue($result);
// test journal for new account
@@ -78,6 +66,9 @@ class SetSourceAccountTest extends TestCase
$newSource = $sourceTr->account;
$this->assertNotEquals($source->id, $newSource->id);
$this->assertEquals($newSource->id, $account->id);
$sourceTr->account_id = $source->id;
$sourceTr->save();
}
/**
@@ -87,19 +78,19 @@ class SetSourceAccountTest extends TestCase
*/
public function testActDepositRevenue(): void
{
$accountRepos = $this->mock(AccountRepositoryInterface::class);
$account = $this->getRandomRevenue();
$deposit = $this->getRandomDeposit();
$deposit = $this->getRandomDeposit();
$accountRepos->shouldReceive('setUser');
$accountRepos->shouldReceive('findByName')->andReturn(null);
$accountRepos->shouldReceive('store')->once()->andReturn($account);
$array = [
'transaction_journal_id' => $deposit->id,
'user_id' => $this->user()->id,
'transaction_type_type' => TransactionType::DEPOSIT,
];
// fire the action:
$ruleAction = new RuleAction;
$ruleAction->action_value = 'Some new revenue #' . $this->randomInt();
$ruleAction->action_value = sprintf('Some new revenue #%d', $this->randomInt());
$action = new SetSourceAccount($ruleAction);
$result = $action->act($deposit);
$result = $action->actOnArray($array);
$this->assertTrue($result);
}
@@ -110,9 +101,7 @@ class SetSourceAccountTest extends TestCase
*/
public function testActWithdrawalExistingUpdated(): void
{
$accountRepos = $this->mock(AccountRepositoryInterface::class);
$withdrawal = $this->getRandomWithdrawal();
$withdrawal = $this->getRandomWithdrawal();
$sourceTr = $withdrawal->transactions()->where('amount', '<', 0)->first();
$source = $sourceTr->account;
$user = $withdrawal->user;
@@ -120,15 +109,17 @@ class SetSourceAccountTest extends TestCase
$account = $user->accounts()->where('account_type_id', $accountType->id)->where('id', '!=', $source->id)->first();
$this->assertNotEquals($source->id, $account->id);
$accountRepos->shouldReceive('setUser');
$accountRepos->shouldReceive('findByName')->andReturn($account);
$array = [
'user_id' => $this->user()->id,
'transaction_type_type' => TransactionType::WITHDRAWAL,
'transaction_journal_id' => $withdrawal->id,
];
// fire the action:
$ruleAction = new RuleAction;
$ruleAction->action_value = $account->name;
$action = new SetSourceAccount($ruleAction);
$result = $action->act($withdrawal);
$result = $action->actOnArray($array);
$this->assertTrue($result);
// test journal for new account
@@ -136,6 +127,9 @@ class SetSourceAccountTest extends TestCase
$newSource = $sourceTr->account;
$this->assertNotEquals($source->id, $newSource->id);
$this->assertEquals($newSource->id, $account->id);
$sourceTr->account_id = $source->id;
$sourceTr->save();
}
/**
@@ -145,17 +139,19 @@ class SetSourceAccountTest extends TestCase
*/
public function testActWithdrawalNotExisting(): void
{
$accountRepos = $this->mock(AccountRepositoryInterface::class);
$withdrawal = $this->getRandomWithdrawal();
$withdrawal = $this->getRandomWithdrawal();
$accountRepos->shouldReceive('setUser');
$accountRepos->shouldReceive('findByName')->andReturn(null);
$array = [
'user_id' => $this->user()->id,
'transaction_type_type' => TransactionType::WITHDRAWAL,
'transaction_journal_id' => $withdrawal->id,
];
// fire the action:
$ruleAction = new RuleAction;
$ruleAction->action_value = 'Some new account #' . $this->randomInt();
$ruleAction->action_value = sprintf('Some new account #%d', $this->randomInt());
$action = new SetSourceAccount($ruleAction);
$result = $action->act($withdrawal);
$result = $action->actOnArray($array);
$this->assertFalse($result);
}
}