kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-29 18:20:01 +00:00
Code Issues Projects Releases Wiki Activity

Clean up code [skip ci]

Browse Source
This commit is contained in:
James Cole
2019-06-09 09:41:23 +02:00
parent 42bd5d05b5
commit 851c4d2907
13 changed files with 58 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
tests/Api/V1/Controllers/AvailableBudgetControllerTest.php
View File

@@ -61,10 +61,10 @@ class AvailableBudgetControllerTest extends TestCase
*/
public function testStore(): void
{
$repository = $this->mock(BudgetRepositoryInterface::class);
$transformer = $this->mock(AvailableBudgetTransformer::class);
$factory = $this->mock(TransactionCurrencyFactory::class);
$availableBudget = new AvailableBudget;
$repository = $this->mock(BudgetRepositoryInterface::class);
$transformer = $this->mock(AvailableBudgetTransformer::class);
$factory = $this->mock(TransactionCurrencyFactory::class);
$availableBudget = new AvailableBudget;
// mock transformer
$transformer->shouldReceive('setParameters')->withAnyArgs()->atLeast()->once();
@@ -102,10 +102,10 @@ class AvailableBudgetControllerTest extends TestCase
public function testStoreNoCurrencyAtAll(): void
{
// mock stuff:
$repository = $this->mock(BudgetRepositoryInterface::class);
$transformer = $this->mock(AvailableBudgetTransformer::class);
$factory = $this->mock(TransactionCurrencyFactory::class);
$availableBudget = new AvailableBudget;
$repository = $this->mock(BudgetRepositoryInterface::class);
$transformer = $this->mock(AvailableBudgetTransformer::class);
$factory = $this->mock(TransactionCurrencyFactory::class);
$availableBudget = new AvailableBudget;
// mock transformer
$transformer->shouldReceive('setParameters')->withAnyArgs()->atLeast()->once();
@@ -146,9 +146,9 @@ class AvailableBudgetControllerTest extends TestCase
$availableBudget = $this->user()->availableBudgets()->first();
// mock stuff:
$repository = $this->mock(BudgetRepositoryInterface::class);
$transformer = $this->mock(AvailableBudgetTransformer::class);
$factory = $this->mock(TransactionCurrencyFactory::class);
$repository = $this->mock(BudgetRepositoryInterface::class);
$transformer = $this->mock(AvailableBudgetTransformer::class);
$factory = $this->mock(TransactionCurrencyFactory::class);
// mock transformer
$transformer->shouldReceive('setParameters')->withAnyArgs()->atLeast()->once();

4
tests/Api/V1/Controllers/BillControllerTest.php
View File

@@ -59,8 +59,8 @@ class BillControllerTest extends TestCase
public function testStoreMinOverMax(): void
{
// create stuff
$bill = $this->user()->bills()->first();
$repository = $this->mock(BillRepositoryInterface::class);
$bill = $this->user()->bills()->first();
$repository = $this->mock(BillRepositoryInterface::class);
// mock calls:
$repository->shouldReceive('setUser')->once();

7
tests/Api/V1/Controllers/BudgetControllerTest.php
View File

@@ -27,16 +27,9 @@ namespace Tests\Api\V1\Controllers;
use FireflyIII\Helpers\Collector\TransactionCollectorInterface;
use FireflyIII\Models\Budget;
use FireflyIII\Models\BudgetLimit;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\Bill\BillRepositoryInterface;
use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
use FireflyIII\Transformers\BudgetLimitTransformer;
use FireflyIII\Transformers\BudgetTransformer;
use FireflyIII\Transformers\TransactionTransformer;
use Illuminate\Pagination\LengthAwarePaginator;
use Illuminate\Support\Collection;
use Laravel\Passport\Passport;
use Log;
use Tests\TestCase;

8
tests/Api/V1/Controllers/BudgetLimitControllerTest.php
View File

@@ -25,17 +25,9 @@ namespace Tests\Api\V1\Controllers;
use FireflyIII\Helpers\Collector\TransactionCollectorInterface;
use FireflyIII\Models\Budget;
use FireflyIII\Models\BudgetLimit;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\Bill\BillRepositoryInterface;
use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
use FireflyIII\Transformers\BudgetLimitTransformer;
use FireflyIII\Transformers\TransactionTransformer;
use Illuminate\Pagination\LengthAwarePaginator;
use Illuminate\Support\Collection;
use Laravel\Passport\Passport;
use Log;
use Tests\TestCase;

7
tests/Api/V1/Controllers/CategoryControllerTest.php
View File

@@ -26,15 +26,8 @@ namespace Tests\Api\V1\Controllers;
use FireflyIII\Helpers\Collector\TransactionCollectorInterface;
use FireflyIII\Models\Category;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\Bill\BillRepositoryInterface;
use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
use FireflyIII\Transformers\CategoryTransformer;
use FireflyIII\Transformers\TransactionTransformer;
use Illuminate\Pagination\LengthAwarePaginator;
use Illuminate\Support\Collection;
use Laravel\Passport\Passport;
use Log;
use Tests\TestCase;

24
tests/Api/V1/Controllers/CurrencyControllerTest.php
View File

@@ -25,36 +25,12 @@ namespace Tests\Api\V1\Controllers;
use FireflyIII\Helpers\Collector\TransactionCollectorInterface;
use FireflyIII\Models\AvailableBudget;
use FireflyIII\Models\Bill;
use FireflyIII\Models\BudgetLimit;
use FireflyIII\Models\Preference;
use FireflyIII\Models\Recurrence;
use FireflyIII\Models\Rule;
use FireflyIII\Models\TransactionCurrency;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\Bill\BillRepositoryInterface;
use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;
use FireflyIII\Repositories\Recurring\RecurringRepositoryInterface;
use FireflyIII\Repositories\Rule\RuleRepositoryInterface;
use FireflyIII\Repositories\User\UserRepositoryInterface;
use FireflyIII\Transformers\AccountTransformer;
use FireflyIII\Transformers\AvailableBudgetTransformer;
use FireflyIII\Transformers\BillTransformer;
use FireflyIII\Transformers\BudgetLimitTransformer;
use FireflyIII\Transformers\CurrencyExchangeRateTransformer;
use FireflyIII\Transformers\CurrencyTransformer;
use FireflyIII\Transformers\RecurrenceTransformer;
use FireflyIII\Transformers\RuleTransformer;
use FireflyIII\Transformers\TransactionTransformer;
use Illuminate\Pagination\LengthAwarePaginator;
use Illuminate\Support\Collection;
use Laravel\Passport\Passport;
use Log;
use Mockery;
use Preferences;
use Tests\TestCase;

1
tests/Api/V1/Controllers/PreferencesControllerTest.php
View File

@@ -27,7 +27,6 @@ use FireflyIII\Models\Preference;
use FireflyIII\Transformers\PreferenceTransformer;
use Laravel\Passport\Passport;
use Log;
use Mockery;
use Preferences;
use Tests\TestCase;

74
tests/Api/V1/Controllers/RecurrenceControllerTest.php
View File

@@ -24,16 +24,10 @@ declare(strict_types=1);
namespace Tests\Api\V1\Controllers;
use Carbon\Carbon;
use FireflyIII\Factory\CategoryFactory;
use FireflyIII\Models\AccountType;
use FireflyIII\Models\Recurrence;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;
use FireflyIII\Repositories\Recurring\RecurringRepositoryInterface;
use FireflyIII\Transformers\RecurrenceTransformer;
use FireflyIII\Validation\AccountValidator;
use Illuminate\Support\Collection;
use Laravel\Passport\Passport;
use Log;
use Tests\TestCase;
@@ -615,7 +609,7 @@ class RecurrenceControllerTest extends TestCase
public function testStoreFailInvalidDestinationId(): void
{
// mock stuff:
$repository = $this->mock(RecurringRepositoryInterface::class);
$repository = $this->mock(RecurringRepositoryInterface::class);
$validator = $this->mock(AccountValidator::class);
$assetAccount = $this->getRandomAsset();
@@ -664,10 +658,10 @@ class RecurrenceControllerTest extends TestCase
'message' => 'The given data was invalid.',
'errors' => [
'transactions.0.destination_id' => [
null
null,
],
'transactions.0.destination_name' => [
null
null,
],
],
]
@@ -686,8 +680,8 @@ class RecurrenceControllerTest extends TestCase
public function testStoreFailInvalidMonthly(): void
{
// mock stuff:
$repository = $this->mock(RecurringRepositoryInterface::class);
$validator = $this->mock(AccountValidator::class);
$repository = $this->mock(RecurringRepositoryInterface::class);
$validator = $this->mock(AccountValidator::class);
// mock calls:
$repository->shouldReceive('setUser')->atLeast()->once();
@@ -751,8 +745,8 @@ class RecurrenceControllerTest extends TestCase
public function testStoreFailInvalidNdom(): void
{
// mock stuff:
$repository = $this->mock(RecurringRepositoryInterface::class);
$validator = $this->mock(AccountValidator::class);
$repository = $this->mock(RecurringRepositoryInterface::class);
$validator = $this->mock(AccountValidator::class);
// mock calls to validator:
$validator->shouldReceive('setTransactionType')->atLeast()->once()->withArgs(['withdrawal']);
@@ -816,8 +810,8 @@ class RecurrenceControllerTest extends TestCase
public function testStoreFailInvalidNdomCount(): void
{
// mock stuff:
$repository = $this->mock(RecurringRepositoryInterface::class);
$validator = $this->mock(AccountValidator::class);
$repository = $this->mock(RecurringRepositoryInterface::class);
$validator = $this->mock(AccountValidator::class);
// mock calls to validator:
$validator->shouldReceive('setTransactionType')->atLeast()->once()->withArgs(['withdrawal']);
@@ -881,8 +875,8 @@ class RecurrenceControllerTest extends TestCase
public function testStoreFailInvalidNdomHigh(): void
{
// mock stuff:
$repository = $this->mock(RecurringRepositoryInterface::class);
$validator = $this->mock(AccountValidator::class);
$repository = $this->mock(RecurringRepositoryInterface::class);
$validator = $this->mock(AccountValidator::class);
// mock calls:
$repository->shouldReceive('setUser')->atLeast()->once();
@@ -947,8 +941,8 @@ class RecurrenceControllerTest extends TestCase
public function testStoreFailInvalidWeekly(): void
{
// mock stuff:
$repository = $this->mock(RecurringRepositoryInterface::class);
$validator = $this->mock(AccountValidator::class);
$repository = $this->mock(RecurringRepositoryInterface::class);
$validator = $this->mock(AccountValidator::class);
// mock calls to validator:
$validator->shouldReceive('setTransactionType')->atLeast()->once()->withArgs(['withdrawal']);
@@ -1013,8 +1007,8 @@ class RecurrenceControllerTest extends TestCase
public function testStoreFailNoAsset(): void
{
// mock stuff:
$repository = $this->mock(RecurringRepositoryInterface::class);
$validator = $this->mock(AccountValidator::class);
$repository = $this->mock(RecurringRepositoryInterface::class);
$validator = $this->mock(AccountValidator::class);
// mock calls to validator:
$validator->shouldReceive('setTransactionType')->atLeast()->once()->withArgs(['withdrawal']);
@@ -1058,7 +1052,7 @@ class RecurrenceControllerTest extends TestCase
[
'message' => 'The given data was invalid.',
'errors' => [
'transactions.0.source_id' => [
'transactions.0.source_id' => [
null,
'This value is invalid for this field.',
],
@@ -1086,8 +1080,8 @@ class RecurrenceControllerTest extends TestCase
$expenseAccount = $this->getRandomExpense();
// mock stuff:
$repository = $this->mock(RecurringRepositoryInterface::class);
$validator = $this->mock(AccountValidator::class);
$repository = $this->mock(RecurringRepositoryInterface::class);
$validator = $this->mock(AccountValidator::class);
// mock calls:
$repository->shouldReceive('setUser')->atLeast()->once();
@@ -1130,11 +1124,11 @@ class RecurrenceControllerTest extends TestCase
[
'message' => 'The given data was invalid.',
'errors' => [
'transactions.0.source_id' => [
null
'transactions.0.source_id' => [
null,
],
'transactions.0.source_name' => [
null
null,
],
],
]
@@ -1154,8 +1148,8 @@ class RecurrenceControllerTest extends TestCase
public function testStoreFailNotAssetName(): void
{
// mock stuff:
$repository = $this->mock(RecurringRepositoryInterface::class);
$validator = $this->mock(AccountValidator::class);
$repository = $this->mock(RecurringRepositoryInterface::class);
$validator = $this->mock(AccountValidator::class);
// mock calls:
$repository->shouldReceive('setUser')->atLeast()->once();
@@ -1199,12 +1193,12 @@ class RecurrenceControllerTest extends TestCase
[
'message' => 'The given data was invalid.',
'errors' => [
'transactions.0.source_id' => [
'transactions.0.source_id' => [
null,
'This value is invalid for this field.',
],
'transactions.0.source_name' => [
null
null,
],
],
]
@@ -1224,8 +1218,8 @@ class RecurrenceControllerTest extends TestCase
public function testStoreFailRepetitions(): void
{
// mock stuff:
$repository = $this->mock(RecurringRepositoryInterface::class);
$validator = $this->mock(AccountValidator::class);
$repository = $this->mock(RecurringRepositoryInterface::class);
$validator = $this->mock(AccountValidator::class);
// mock calls:
$repository->shouldReceive('setUser')->atLeast()->once();
@@ -1281,7 +1275,7 @@ class RecurrenceControllerTest extends TestCase
public function testStoreFailTransactions(): void
{
// mock stuff:
$repository = $this->mock(RecurringRepositoryInterface::class);
$repository = $this->mock(RecurringRepositoryInterface::class);
$this->mock(AccountValidator::class);
// mock calls:
$repository->shouldReceive('setUser')->atLeast()->once();
@@ -1337,9 +1331,9 @@ class RecurrenceControllerTest extends TestCase
$recurrence = $this->user()->recurrences()->first();
// mock stuff:
$repository = $this->mock(RecurringRepositoryInterface::class);
$transformer = $this->mock(RecurrenceTransformer::class);
$validator = $this->mock(AccountValidator::class);
$repository = $this->mock(RecurringRepositoryInterface::class);
$transformer = $this->mock(RecurrenceTransformer::class);
$validator = $this->mock(AccountValidator::class);
$assetAccount = $this->getRandomAsset();
$otherAssetAccount = $this->getRandomAsset($assetAccount->id);
@@ -1409,9 +1403,9 @@ class RecurrenceControllerTest extends TestCase
$recurrence = $this->user()->recurrences()->first();
// mock stuff:
$repository = $this->mock(RecurringRepositoryInterface::class);
$transformer = $this->mock(RecurrenceTransformer::class);
$validator = $this->mock(AccountValidator::class);
$repository = $this->mock(RecurringRepositoryInterface::class);
$transformer = $this->mock(RecurrenceTransformer::class);
$validator = $this->mock(AccountValidator::class);
// mock calls to transformer:
$transformer->shouldReceive('setParameters')->withAnyArgs()->atLeast()->once();

11
tests/Api/V1/Controllers/RuleControllerTest.php
View File

@@ -28,7 +28,6 @@ use FireflyIII\Jobs\ExecuteRuleOnExistingTransactions;
use FireflyIII\Jobs\Job;
use FireflyIII\Models\Rule;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
use FireflyIII\Repositories\Rule\RuleRepositoryInterface;
use FireflyIII\TransactionRules\TransactionMatcher;
use FireflyIII\Transformers\RuleTransformer;
@@ -246,11 +245,11 @@ class RuleControllerTest extends TestCase
*/
public function testTriggerRule(): void
{
$rule = $this->user()->rules()->first();
$repository = $this->mock(AccountRepositoryInterface::class);
$ruleRepos = $this->mock(RuleRepositoryInterface::class);
$asset = $this->getRandomAsset();
$expense = $this->getRandomExpense();
$rule = $this->user()->rules()->first();
$repository = $this->mock(AccountRepositoryInterface::class);
$ruleRepos = $this->mock(RuleRepositoryInterface::class);
$asset = $this->getRandomAsset();
$expense = $this->getRandomExpense();
$repository->shouldReceive('setUser')->once();
$ruleRepos->shouldReceive('setUser')->once();

6
tests/Api/V1/Controllers/RuleGroupControllerTest.php
View File

@@ -158,9 +158,9 @@ class RuleGroupControllerTest extends TestCase
*/
public function testTrigger(): void
{
$group = $this->user()->ruleGroups()->first();
$rule = $this->user()->rules()->first();
$asset = $this->getRandomAsset();
$group = $this->user()->ruleGroups()->first();
$rule = $this->user()->rules()->first();
$asset = $this->getRandomAsset();
$expense = $this->getRandomExpense();
$ruleGroupRepos = $this->mock(RuleGroupRepositoryInterface::class);

4
tests/Api/V1/Controllers/TagControllerTest.php
View File

@@ -24,12 +24,8 @@ declare(strict_types=1);
namespace Tests\Api\V1\Controllers;
use FireflyIII\Helpers\Collector\TransactionCollectorInterface;
use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
use FireflyIII\Repositories\Tag\TagRepositoryInterface;
use FireflyIII\Transformers\TagTransformer;
use FireflyIII\Transformers\TransactionTransformer;
use Illuminate\Pagination\LengthAwarePaginator;
use Illuminate\Support\Collection;
use Laravel\Passport\Passport;
use Log;
use Tests\TestCase;

3
tests/Api/V1/Controllers/TransactionControllerTest.php
View File

@@ -901,6 +901,7 @@ class TransactionControllerTest extends TestCase
public function testUpdateFailTypes(): void
{
$this->markTestIncomplete('Needs to be rewritten for v4.8.0');
return;
// mock data:
$group = $this->getRandomWithdrawalGroup();
@@ -961,6 +962,7 @@ class TransactionControllerTest extends TestCase
public function testUpdateFailWithdrawalSource(): void
{
$this->markTestIncomplete('Needs to be rewritten for v4.8.0');
return;
// mock data:
$group = $this->getRandomWithdrawalGroup();
@@ -1023,6 +1025,7 @@ class TransactionControllerTest extends TestCase
public function testUpdateOK(): void
{
$this->markTestIncomplete('Needs to be rewritten for v4.8.0');
return;
// mock data:
$group = $this->getRandomWithdrawalGroup();

1
tests/Api/V1/Controllers/UserControllerTest.php
View File

@@ -27,7 +27,6 @@ namespace Tests\Api\V1\Controllers;
use FireflyIII\Repositories\User\UserRepositoryInterface;
use FireflyIII\Transformers\UserTransformer;
use FireflyIII\User;
use Illuminate\Support\Collection;
use Laravel\Passport\Passport;
use Log;
use Mockery;