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

Some code optimisations.

Browse Source
This commit is contained in:
James Cole
2019-04-09 15:42:25 +02:00
parent 97726c3822
commit 80896b7181
37 changed files with 153 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/Unit/TransactionRules/Actions/AddTagTest.php
View File

@@ -27,8 +27,8 @@ use FireflyIII\Models\RuleAction;
use FireflyIII\Models\Tag;
use FireflyIII\Models\TransactionJournal;
use FireflyIII\TransactionRules\Actions\AddTag;
use Tests\TestCase;
use Log;
use Tests\TestCase;
/**
* Class AddTagTest

2
tests/Unit/TransactionRules/Actions/AppendDescriptionTest.php
View File

@@ -25,8 +25,8 @@ namespace Tests\Unit\TransactionRules\Actions;
use FireflyIII\Models\RuleAction;
use FireflyIII\Models\TransactionJournal;
use FireflyIII\TransactionRules\Actions\AppendDescription;
use Tests\TestCase;
use Log;
use Tests\TestCase;
/**
* Class AppendDescriptionTest

3
tests/Unit/TransactionRules/Actions/AppendNotesTest.php
View File

@@ -26,8 +26,9 @@ use FireflyIII\Models\Note;
use FireflyIII\Models\RuleAction;
use FireflyIII\Models\TransactionJournal;
use FireflyIII\TransactionRules\Actions\AppendNotes;
use Tests\TestCase;
use Log;
use Tests\TestCase;
/**
* Class AppendNotesTest
*/

2
tests/Unit/TransactionRules/Actions/ClearBudgetTest.php
View File

@@ -26,8 +26,8 @@ use FireflyIII\Models\RuleAction;
use FireflyIII\Models\Transaction;
use FireflyIII\Models\TransactionJournal;
use FireflyIII\TransactionRules\Actions\ClearBudget;
use Tests\TestCase;
use Log;
use Tests\TestCase;
/**
* Class ClearBudgetTest

3
tests/Unit/TransactionRules/Actions/ClearCategoryTest.php
View File

@@ -26,8 +26,9 @@ use FireflyIII\Models\RuleAction;
use FireflyIII\Models\Transaction;
use FireflyIII\Models\TransactionJournal;
use FireflyIII\TransactionRules\Actions\ClearCategory;
use Tests\TestCase;
use Log;
use Tests\TestCase;
/**
* Class ClearCategoryTest
*/

2
tests/Unit/TransactionRules/Actions/ClearNotesTest.php
View File

@@ -27,8 +27,8 @@ use FireflyIII\Models\Note;
use FireflyIII\Models\RuleAction;
use FireflyIII\Models\TransactionJournal;
use FireflyIII\TransactionRules\Actions\ClearNotes;
use Tests\TestCase;
use Log;
use Tests\TestCase;
/**

72
tests/Unit/TransactionRules/Actions/ConvertToDepositTest.php
View File

@@ -48,42 +48,6 @@ class ConvertToDepositTest extends TestCase
Log::info(sprintf('Now in %s.', \get_class($this)));
}
/**
* Convert a withdrawal to a deposit.
*
* @covers \FireflyIII\TransactionRules\Actions\ConvertToDeposit
*/
public function testActWithdrawal()
{
$revenue = $this->getRandomRevenue();
$name = 'Random revenue #' . random_int(1, 10000);
$journal = $this->getRandomWithdrawal();
// journal is a withdrawal:
$this->assertEquals(TransactionType::WITHDRAWAL, $journal->transactionType->type);
// mock used stuff:
$factory = $this->mock(AccountFactory::class);
$factory->shouldReceive('setUser')->once();
$factory->shouldReceive('findOrCreate')->once()->withArgs([$name, AccountType::REVENUE])->andReturn($revenue);
// fire the action:
$ruleAction = new RuleAction;
$ruleAction->action_value = $name;
$action = new ConvertToDeposit($ruleAction);
try {
$result = $action->act($journal);
} catch (Exception $e) {
$this->assertTrue(false, $e->getMessage());
}
$this->assertTrue($result);
// journal is now a deposit.
$journal->refresh();
$this->assertEquals(TransactionType::DEPOSIT, $journal->transactionType->type);
}
/**
* Convert a transfer to a deposit.
*
@@ -120,5 +84,41 @@ class ConvertToDepositTest extends TestCase
$this->assertEquals(TransactionType::DEPOSIT, $journal->transactionType->type);
}
/**
* Convert a withdrawal to a deposit.
*
* @covers \FireflyIII\TransactionRules\Actions\ConvertToDeposit
*/
public function testActWithdrawal()
{
$revenue = $this->getRandomRevenue();
$name = 'Random revenue #' . random_int(1, 10000);
$journal = $this->getRandomWithdrawal();
// journal is a withdrawal:
$this->assertEquals(TransactionType::WITHDRAWAL, $journal->transactionType->type);
// mock used stuff:
$factory = $this->mock(AccountFactory::class);
$factory->shouldReceive('setUser')->once();
$factory->shouldReceive('findOrCreate')->once()->withArgs([$name, AccountType::REVENUE])->andReturn($revenue);
// fire the action:
$ruleAction = new RuleAction;
$ruleAction->action_value = $name;
$action = new ConvertToDeposit($ruleAction);
try {
$result = $action->act($journal);
} catch (Exception $e) {
$this->assertTrue(false, $e->getMessage());
}
$this->assertTrue($result);
// journal is now a deposit.
$journal->refresh();
$this->assertEquals(TransactionType::DEPOSIT, $journal->transactionType->type);
}
}

6
tests/Unit/TransactionRules/Actions/ConvertToTransferTest.php
View File

@@ -65,7 +65,8 @@ class ConvertToTransferTest extends TestCase
// mock used stuff:
$accountRepos = $this->mock(AccountRepositoryInterface::class);
$accountRepos->shouldReceive('setUser')->once();
$accountRepos->shouldReceive('findByName')->withArgs([$asset->name, [AccountType::ASSET, AccountType::LOAN, AccountType::DEBT, AccountType::MORTGAGE]])->andReturn($asset);
$accountRepos->shouldReceive('findByName')->withArgs([$asset->name, [AccountType::ASSET, AccountType::LOAN, AccountType::DEBT, AccountType::MORTGAGE]])
->andReturn($asset);
// fire the action:
$ruleAction = new RuleAction;
@@ -100,7 +101,8 @@ class ConvertToTransferTest extends TestCase
// mock used stuff:
$accountRepos = $this->mock(AccountRepositoryInterface::class);
$accountRepos->shouldReceive('setUser')->once();
$accountRepos->shouldReceive('findByName')->withArgs([$asset->name, [AccountType::ASSET, AccountType::LOAN, AccountType::DEBT, AccountType::MORTGAGE]])->andReturn($asset);
$accountRepos->shouldReceive('findByName')->withArgs([$asset->name, [AccountType::ASSET, AccountType::LOAN, AccountType::DEBT, AccountType::MORTGAGE]])
->andReturn($asset);
// fire the action:
$ruleAction = new RuleAction;

24
tests/Unit/TransactionRules/Triggers/FromAccountStartsTest.php
View File

@@ -49,7 +49,7 @@ class FromAccountStartsTest extends TestCase
*/
public function testTriggered(): void
{
$repository = $this->mock(JournalRepositoryInterface::class);
$repository = $this->mock(JournalRepositoryInterface::class);
$accountRepos = $this->mock(AccountRepositoryInterface::class);
/** @var TransactionJournal $journal */
$journal = $this->user()->transactionJournals()->inRandomOrder()->first();
@@ -67,7 +67,7 @@ class FromAccountStartsTest extends TestCase
*/
public function testTriggeredLonger(): void
{
$repository = $this->mock(JournalRepositoryInterface::class);
$repository = $this->mock(JournalRepositoryInterface::class);
$accountRepos = $this->mock(AccountRepositoryInterface::class);
/** @var TransactionJournal $journal */
@@ -86,7 +86,7 @@ class FromAccountStartsTest extends TestCase
*/
public function testTriggeredNot(): void
{
$repository = $this->mock(JournalRepositoryInterface::class);
$repository = $this->mock(JournalRepositoryInterface::class);
$accountRepos = $this->mock(AccountRepositoryInterface::class);
/** @var TransactionJournal $journal */
@@ -105,11 +105,11 @@ class FromAccountStartsTest extends TestCase
*/
public function testWillMatchEverythingEmpty(): void
{
$repository = $this->mock(JournalRepositoryInterface::class);
$repository = $this->mock(JournalRepositoryInterface::class);
$accountRepos = $this->mock(AccountRepositoryInterface::class);
$value = '';
$result = FromAccountStarts::willMatchEverything($value);
$value = '';
$result = FromAccountStarts::willMatchEverything($value);
$this->assertTrue($result);
}
@@ -118,11 +118,11 @@ class FromAccountStartsTest extends TestCase
*/
public function testWillMatchEverythingNotNull(): void
{
$repository = $this->mock(JournalRepositoryInterface::class);
$repository = $this->mock(JournalRepositoryInterface::class);
$accountRepos = $this->mock(AccountRepositoryInterface::class);
$value = 'x';
$result = FromAccountStarts::willMatchEverything($value);
$value = 'x';
$result = FromAccountStarts::willMatchEverything($value);
$this->assertFalse($result);
}
@@ -131,11 +131,11 @@ class FromAccountStartsTest extends TestCase
*/
public function testWillMatchEverythingNull(): void
{
$repository = $this->mock(JournalRepositoryInterface::class);
$repository = $this->mock(JournalRepositoryInterface::class);
$accountRepos = $this->mock(AccountRepositoryInterface::class);
$value = null;
$result = FromAccountStarts::willMatchEverything($value);
$value = null;
$result = FromAccountStarts::willMatchEverything($value);
$this->assertTrue($result);
}
}

7
tests/Unit/TransactionRules/Triggers/HasAttachmentTest.php
View File

@@ -22,10 +22,11 @@ declare(strict_types=1);
namespace Tests\Unit\TransactionRules\Triggers;
use DB;
use FireflyIII\Models\TransactionJournal;
use FireflyIII\TransactionRules\Triggers\HasAttachment;
use Tests\TestCase;
use DB;
/**
* Class HasAttachmentTest
*/
@@ -57,8 +58,8 @@ class HasAttachmentTest extends TestCase
$withdrawal->attachments()->save($attachment);
DB::table('attachments')
->where('attachable_type', TransactionJournal::class)
->where('attachable_id', $withdrawal->id)->delete();
->where('attachable_type', TransactionJournal::class)
->where('attachable_id', $withdrawal->id)->delete();
$withdrawal->attachments()->saveMany([]);
$this->assertEquals(0, $withdrawal->attachments()->count());