mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-09-30 10:33:30 +00:00
Some code optimisations.
This commit is contained in:
@@ -382,6 +382,9 @@ class PiggyBankControllerTest extends TestCase
|
||||
*/
|
||||
public function testRemove(): void
|
||||
{
|
||||
$this->markTestIncomplete('Needs to be rewritten for v4.8.0');
|
||||
|
||||
return;
|
||||
// mock stuff
|
||||
$journalRepos = $this->mock(JournalRepositoryInterface::class);
|
||||
$currencyRepos = $this->mock(CurrencyRepositoryInterface::class);
|
||||
@@ -405,6 +408,9 @@ class PiggyBankControllerTest extends TestCase
|
||||
*/
|
||||
public function testRemoveMobile(): void
|
||||
{
|
||||
$this->markTestIncomplete('Needs to be rewritten for v4.8.0');
|
||||
|
||||
return;
|
||||
// mock stuff
|
||||
$journalRepos = $this->mock(JournalRepositoryInterface::class);
|
||||
$currencyRepos = $this->mock(CurrencyRepositoryInterface::class);
|
||||
|
@@ -102,7 +102,8 @@ class MonthReportGeneratorTest extends TestCase
|
||||
* @covers \FireflyIII\Generator\Report\Audit\MonthReportGenerator
|
||||
*/
|
||||
public function testBasicNoCurrency(): void
|
||||
{$this->markTestIncomplete('Needs to be rewritten for v4.8.0');
|
||||
{
|
||||
$this->markTestIncomplete('Needs to be rewritten for v4.8.0');
|
||||
|
||||
return;
|
||||
/** @var Account $account */
|
||||
@@ -144,7 +145,8 @@ class MonthReportGeneratorTest extends TestCase
|
||||
* @covers \FireflyIII\Generator\Report\Audit\MonthReportGenerator
|
||||
*/
|
||||
public function testBasicWithForeign(): void
|
||||
{$this->markTestIncomplete('Needs to be rewritten for v4.8.0');
|
||||
{
|
||||
$this->markTestIncomplete('Needs to be rewritten for v4.8.0');
|
||||
|
||||
return;
|
||||
/** @var Account $account */
|
||||
@@ -193,7 +195,8 @@ class MonthReportGeneratorTest extends TestCase
|
||||
* @covers \FireflyIII\Generator\Report\Audit\MonthReportGenerator
|
||||
*/
|
||||
public function testBasicWithTransactions(): void
|
||||
{$this->markTestIncomplete('Needs to be rewritten for v4.8.0');
|
||||
{
|
||||
$this->markTestIncomplete('Needs to be rewritten for v4.8.0');
|
||||
|
||||
return;
|
||||
/** @var Account $account */
|
||||
|
@@ -27,8 +27,9 @@ use FireflyIII\Models\Account;
|
||||
use FireflyIII\Models\Transaction;
|
||||
use FireflyIII\Services\Internal\Destroy\AccountDestroyService;
|
||||
use FireflyIII\Services\Internal\Destroy\JournalDestroyService;
|
||||
use Tests\TestCase;
|
||||
use Log;
|
||||
use Tests\TestCase;
|
||||
|
||||
/**
|
||||
* Class AccountDestroyServiceTest
|
||||
*/
|
||||
|
@@ -31,8 +31,8 @@ use FireflyIII\Models\Transaction;
|
||||
use FireflyIII\Models\TransactionJournal;
|
||||
use FireflyIII\Services\Internal\Destroy\JournalDestroyService;
|
||||
use FireflyIII\Services\Internal\Update\AccountUpdateService;
|
||||
use Tests\TestCase;
|
||||
use Log;
|
||||
use Tests\TestCase;
|
||||
|
||||
/**
|
||||
* Class AccountUpdateServiceTest
|
||||
|
@@ -32,9 +32,9 @@ use FireflyIII\Factory\TransactionJournalMetaFactory;
|
||||
use FireflyIII\Models\TransactionJournal;
|
||||
use FireflyIII\Services\Internal\Update\JournalUpdateService;
|
||||
use FireflyIII\Services\Internal\Update\TransactionUpdateService;
|
||||
use Log;
|
||||
use Mockery;
|
||||
use Tests\TestCase;
|
||||
use Log;
|
||||
|
||||
/**
|
||||
* Class JournalUpdateServiceTest
|
||||
|
@@ -29,8 +29,8 @@ use FireflyIII\Factory\CategoryFactory;
|
||||
use FireflyIII\Models\Transaction;
|
||||
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
|
||||
use FireflyIII\Services\Internal\Update\TransactionUpdateService;
|
||||
use Tests\TestCase;
|
||||
use Log;
|
||||
use Tests\TestCase;
|
||||
|
||||
/**
|
||||
* Class TransactionUpdateServiceTest
|
||||
|
@@ -35,9 +35,10 @@ use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
|
||||
use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface;
|
||||
use FireflyIII\Support\Import\JobConfiguration\Bunq\ChooseAccountsHandler;
|
||||
use Illuminate\Support\Collection;
|
||||
use Log;
|
||||
use Mockery;
|
||||
use Tests\TestCase;
|
||||
use Log;
|
||||
|
||||
/**
|
||||
* Class ChooseAccountsHandlerTest
|
||||
*/
|
||||
|
@@ -27,8 +27,8 @@ namespace Tests\Unit\Support\Import\JobConfiguration\Bunq;
|
||||
use FireflyIII\Models\ImportJob;
|
||||
use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface;
|
||||
use FireflyIII\Support\Import\JobConfiguration\Bunq\NewBunqJobHandler;
|
||||
use Tests\TestCase;
|
||||
use Log;
|
||||
use Tests\TestCase;
|
||||
|
||||
/**
|
||||
* Class NewBunqJobHandlerTest
|
||||
@@ -43,6 +43,7 @@ class NewBunqJobHandlerTest extends TestCase
|
||||
parent::setUp();
|
||||
Log::info(sprintf('Now in %s.', \get_class($this)));
|
||||
}
|
||||
|
||||
/**
|
||||
* @covers \FireflyIII\Support\Import\JobConfiguration\Bunq\NewBunqJobHandler
|
||||
*/
|
||||
|
@@ -34,9 +34,9 @@ use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface;
|
||||
use FireflyIII\Support\Import\JobConfiguration\File\ConfigureRolesHandler;
|
||||
use Illuminate\Support\Collection;
|
||||
use League\Csv\Reader;
|
||||
use Log;
|
||||
use Mockery;
|
||||
use Tests\TestCase;
|
||||
use Log;
|
||||
|
||||
/**
|
||||
* Class ConfigureRolesHandlerTest
|
||||
|
@@ -28,9 +28,10 @@ use FireflyIII\Models\ImportJob;
|
||||
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
|
||||
use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface;
|
||||
use FireflyIII\Support\Import\JobConfiguration\File\ConfigureUploadHandler;
|
||||
use Log;
|
||||
use Mockery;
|
||||
use Tests\TestCase;
|
||||
use Log;
|
||||
|
||||
/**
|
||||
* Class ConfigureUploadHandlerTest
|
||||
*/
|
||||
|
@@ -31,9 +31,10 @@ use FireflyIII\Models\ImportJob;
|
||||
use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface;
|
||||
use FireflyIII\Support\Import\JobConfiguration\File\NewFileJobHandler;
|
||||
use Illuminate\Support\Collection;
|
||||
use Log;
|
||||
use Mockery;
|
||||
use Tests\TestCase;
|
||||
use Log;
|
||||
|
||||
/**
|
||||
* Class NewFileJobHandlerTest
|
||||
*/
|
||||
|
@@ -38,9 +38,9 @@ use FireflyIII\Services\Spectre\Object\Holder;
|
||||
use FireflyIII\Services\Spectre\Object\Login;
|
||||
use FireflyIII\Support\Import\JobConfiguration\Spectre\ChooseAccountsHandler;
|
||||
use Illuminate\Support\Collection;
|
||||
use Log;
|
||||
use Mockery;
|
||||
use Tests\TestCase;
|
||||
use Log;
|
||||
|
||||
/**
|
||||
* Class ChooseAccountsHandlerTest
|
||||
@@ -55,6 +55,7 @@ class ChooseAccountsHandlerTest extends TestCase
|
||||
parent::setUp();
|
||||
Log::info(sprintf('Now in %s.', \get_class($this)));
|
||||
}
|
||||
|
||||
/**
|
||||
* @covers \FireflyIII\Support\Import\JobConfiguration\Spectre\ChooseAccountsHandler
|
||||
*/
|
||||
|
@@ -35,10 +35,10 @@ use FireflyIII\Services\Spectre\Object\Login;
|
||||
use FireflyIII\Services\Spectre\Object\Token;
|
||||
use FireflyIII\Services\Spectre\Request\CreateTokenRequest;
|
||||
use FireflyIII\Support\Import\JobConfiguration\Spectre\ChooseLoginHandler;
|
||||
use Log;
|
||||
use Mockery;
|
||||
use Preferences;
|
||||
use Tests\TestCase;
|
||||
use Log;
|
||||
|
||||
/**
|
||||
* Class ChooseLoginHandlerTest
|
||||
|
@@ -32,10 +32,11 @@ use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface;
|
||||
use FireflyIII\Services\Spectre\Object\Token;
|
||||
use FireflyIII\Services\Spectre\Request\CreateTokenRequest;
|
||||
use FireflyIII\Support\Import\JobConfiguration\Spectre\DoAuthenticateHandler;
|
||||
use Log;
|
||||
use Mockery;
|
||||
use Preferences;
|
||||
use Tests\TestCase;
|
||||
use Log;
|
||||
|
||||
/**
|
||||
* Class DoAuthenticateHandlerTest
|
||||
*/
|
||||
|
@@ -27,8 +27,9 @@ namespace Tests\Unit\Support\Import\Placeholder;
|
||||
use FireflyIII\Exceptions\FireflyException;
|
||||
use FireflyIII\Support\Import\Placeholder\ColumnValue;
|
||||
use FireflyIII\Support\Import\Placeholder\ImportTransaction;
|
||||
use Tests\TestCase;
|
||||
use Log;
|
||||
use Tests\TestCase;
|
||||
|
||||
/**
|
||||
* Class ImportTransactionTest
|
||||
*/
|
||||
@@ -475,38 +476,6 @@ class ImportTransactionTest extends TestCase
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Basic amount info. Should return something like '1.0'.
|
||||
*
|
||||
* @covers \FireflyIII\Support\Import\Placeholder\ImportTransaction
|
||||
*/
|
||||
public function testCalculateAmountNegatedPositive(): void
|
||||
{
|
||||
$importTransaction = new ImportTransaction;
|
||||
$importTransaction->amountNegated = '1.56';
|
||||
try {
|
||||
$this->assertEquals('-1.56', $importTransaction->calculateAmount());
|
||||
} catch (FireflyException $e) {
|
||||
$this->assertTrue(false, $e->getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Basic amount info. Should return something like '1.0'.
|
||||
*
|
||||
* @covers \FireflyIII\Support\Import\Placeholder\ImportTransaction
|
||||
*/
|
||||
public function testCalculateAmountNegatedNegative(): void
|
||||
{
|
||||
$importTransaction = new ImportTransaction;
|
||||
$importTransaction->amountNegated = '-1.56';
|
||||
try {
|
||||
$this->assertEquals('1.56', $importTransaction->calculateAmount());
|
||||
} catch (FireflyException $e) {
|
||||
$this->assertTrue(false, $e->getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* With no amount data, object should return ''
|
||||
*
|
||||
@@ -539,6 +508,38 @@ class ImportTransactionTest extends TestCase
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Basic amount info. Should return something like '1.0'.
|
||||
*
|
||||
* @covers \FireflyIII\Support\Import\Placeholder\ImportTransaction
|
||||
*/
|
||||
public function testCalculateAmountNegatedNegative(): void
|
||||
{
|
||||
$importTransaction = new ImportTransaction;
|
||||
$importTransaction->amountNegated = '-1.56';
|
||||
try {
|
||||
$this->assertEquals('1.56', $importTransaction->calculateAmount());
|
||||
} catch (FireflyException $e) {
|
||||
$this->assertTrue(false, $e->getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Basic amount info. Should return something like '1.0'.
|
||||
*
|
||||
* @covers \FireflyIII\Support\Import\Placeholder\ImportTransaction
|
||||
*/
|
||||
public function testCalculateAmountNegatedPositive(): void
|
||||
{
|
||||
$importTransaction = new ImportTransaction;
|
||||
$importTransaction->amountNegated = '1.56';
|
||||
try {
|
||||
$this->assertEquals('-1.56', $importTransaction->calculateAmount());
|
||||
} catch (FireflyException $e) {
|
||||
$this->assertTrue(false, $e->getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Basic amount info with positive modifier (Rabobank C)
|
||||
*
|
||||
|
@@ -40,11 +40,11 @@ use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface;
|
||||
use FireflyIII\Services\Bunq\ApiContext;
|
||||
use FireflyIII\Services\Bunq\MonetaryAccount;
|
||||
use FireflyIII\Support\Import\Routine\Bunq\StageNewHandler;
|
||||
use Log;
|
||||
use Mockery;
|
||||
use Preferences;
|
||||
use Tests\Object\FakeApiContext;
|
||||
use Tests\TestCase;
|
||||
use Log;
|
||||
|
||||
/**
|
||||
* Class StageNewHandlerTest
|
||||
@@ -211,7 +211,7 @@ class StageNewHandlerTest extends TestCase
|
||||
'default_avatar_status' => null,
|
||||
'restriction_chat' => null,
|
||||
],
|
||||
'iban' => 'SM72C9584723533916792029340'
|
||||
'iban' => 'SM72C9584723533916792029340',
|
||||
],
|
||||
],
|
||||
];
|
||||
@@ -298,7 +298,7 @@ class StageNewHandlerTest extends TestCase
|
||||
'default_avatar_status' => null,
|
||||
'restriction_chat' => null,
|
||||
],
|
||||
'iban' => 'SM72C9584723533916792029340'
|
||||
'iban' => 'SM72C9584723533916792029340',
|
||||
],
|
||||
|
||||
],
|
||||
|
@@ -28,8 +28,8 @@ use FireflyIII\Models\AccountType;
|
||||
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
|
||||
use FireflyIII\Support\Import\Routine\File\AssetAccountMapper;
|
||||
use Illuminate\Support\Collection;
|
||||
use Tests\TestCase;
|
||||
use Log;
|
||||
use Tests\TestCase;
|
||||
|
||||
/**
|
||||
* Class AssetAccountMapperTest
|
||||
|
@@ -24,7 +24,6 @@ declare(strict_types=1);
|
||||
namespace Tests\Unit\Support\Import\Routine\File;
|
||||
|
||||
|
||||
use Log;
|
||||
use FireflyIII\Exceptions\FireflyException;
|
||||
use FireflyIII\Models\ImportJob;
|
||||
use FireflyIII\Support\Import\Routine\File\CSVProcessor;
|
||||
@@ -33,6 +32,7 @@ use FireflyIII\Support\Import\Routine\File\ImportableCreator;
|
||||
use FireflyIII\Support\Import\Routine\File\LineReader;
|
||||
use FireflyIII\Support\Import\Routine\File\MappedValuesValidator;
|
||||
use FireflyIII\Support\Import\Routine\File\MappingConverger;
|
||||
use Log;
|
||||
use Tests\TestCase;
|
||||
|
||||
/**
|
||||
@@ -50,6 +50,7 @@ class CSVProcessorTest extends TestCase
|
||||
parent::setUp();
|
||||
Log::info(sprintf('Now in %s.', \get_class($this)));
|
||||
}
|
||||
|
||||
/**
|
||||
* @covers \FireflyIII\Support\Import\Routine\File\CSVProcessor
|
||||
*/
|
||||
|
@@ -27,8 +27,8 @@ namespace Tests\Unit\Support\Import\Routine\File;
|
||||
use FireflyIII\Support\Import\Placeholder\ColumnValue;
|
||||
use FireflyIII\Support\Import\Placeholder\ImportTransaction;
|
||||
use FireflyIII\Support\Import\Routine\File\ImportableCreator;
|
||||
use Tests\TestCase;
|
||||
use Log;
|
||||
use Tests\TestCase;
|
||||
|
||||
/**
|
||||
* Class ImportableCreatorTest
|
||||
|
@@ -31,8 +31,8 @@ use FireflyIII\Models\ImportJob;
|
||||
use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface;
|
||||
use FireflyIII\Support\Import\Routine\File\LineReader;
|
||||
use Illuminate\Support\Collection;
|
||||
use Tests\TestCase;
|
||||
use Log;
|
||||
use Tests\TestCase;
|
||||
|
||||
/**
|
||||
* Class LineReaderTest
|
||||
|
@@ -33,9 +33,9 @@ use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
|
||||
use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface;
|
||||
use FireflyIII\Support\Import\Routine\File\MappedValuesValidator;
|
||||
use Illuminate\Support\Collection;
|
||||
use Log;
|
||||
use stdClass;
|
||||
use Tests\TestCase;
|
||||
use Log;
|
||||
|
||||
/**
|
||||
* Class MappedValuesValidatorTest
|
||||
|
@@ -28,8 +28,9 @@ use FireflyIII\Exceptions\FireflyException;
|
||||
use FireflyIII\Models\ImportJob;
|
||||
use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface;
|
||||
use FireflyIII\Support\Import\Routine\File\MappingConverger;
|
||||
use Tests\TestCase;
|
||||
use Log;
|
||||
use Tests\TestCase;
|
||||
|
||||
/**
|
||||
* Class MappingConvergerTest
|
||||
*/
|
||||
|
@@ -28,8 +28,8 @@ use FireflyIII\Models\Account;
|
||||
use FireflyIII\Models\AccountType;
|
||||
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
|
||||
use FireflyIII\Support\Import\Routine\File\OpposingAccountMapper;
|
||||
use Tests\TestCase;
|
||||
use Log;
|
||||
use Tests\TestCase;
|
||||
|
||||
/**
|
||||
* Class OpposingAccountMapperTest
|
||||
|
@@ -35,10 +35,10 @@ use FireflyIII\Services\Spectre\Object\Login;
|
||||
use FireflyIII\Services\Spectre\Request\ListAccountsRequest;
|
||||
use FireflyIII\Services\Spectre\Request\ListLoginsRequest;
|
||||
use FireflyIII\Support\Import\Routine\Spectre\StageAuthenticatedHandler;
|
||||
use Log;
|
||||
use Mockery;
|
||||
use Preferences;
|
||||
use Tests\TestCase;
|
||||
use Log;
|
||||
|
||||
/**
|
||||
* Class StageAuthenticatedHandlerTest
|
||||
|
@@ -36,10 +36,10 @@ use FireflyIII\Services\Spectre\Request\ListCustomersRequest;
|
||||
use FireflyIII\Services\Spectre\Request\ListLoginsRequest;
|
||||
use FireflyIII\Services\Spectre\Request\NewCustomerRequest;
|
||||
use FireflyIII\Support\Import\Routine\Spectre\StageNewHandler;
|
||||
use Log;
|
||||
use Mockery;
|
||||
use Preferences;
|
||||
use Tests\TestCase;
|
||||
use Log;
|
||||
|
||||
/**
|
||||
* Class StageNewHandlerTest
|
||||
|
@@ -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
|
||||
|
@@ -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
|
||||
|
@@ -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
|
||||
*/
|
||||
|
@@ -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
|
||||
|
@@ -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
|
||||
*/
|
||||
|
@@ -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;
|
||||
|
||||
|
||||
/**
|
||||
|
@@ -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);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
@@ -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;
|
||||
|
@@ -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
|
||||
*/
|
||||
|
Reference in New Issue
Block a user