IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Improve test coverage.

Browse Source
This commit is contained in:
James Cole 2019-06-29 19:47:31 +02:00
parent 003d07504f
commit 947b83cbd1
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
39 changed files with 238 additions and 907 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

231
app/Http/Controllers/Json/AutoCompleteController.php
View File

@ -22,21 +22,16 @@ declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Json; namespace FireflyIII\Http\Controllers\Json;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Helpers\Collector\GroupCollectorInterface;
use FireflyIII\Http\Controllers\Controller; use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Models\Account; use FireflyIII\Models\Account;
use FireflyIII\Models\AccountType; use FireflyIII\Models\AccountType;
use FireflyIII\Models\TransactionCurrency; use FireflyIII\Models\TransactionCurrency;
use FireflyIII\Models\TransactionJournal;
use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
use FireflyIII\Repositories\Category\CategoryRepositoryInterface; use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface; use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;
use FireflyIII\Repositories\Tag\TagRepositoryInterface; use FireflyIII\Repositories\Tag\TagRepositoryInterface;
use FireflyIII\Support\CacheProperties;
use FireflyIII\Support\Http\Controllers\AutoCompleteCollector;
use Illuminate\Http\JsonResponse; use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Log; use Log;
@ -44,11 +39,12 @@ use Log;
/** /**
* Class AutoCompleteController. * Class AutoCompleteController.
* *
* TODO autocomplete for transaction types.
*
* @SuppressWarnings(PHPMD.CouplingBetweenObjects) * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/ */
class AutoCompleteController extends Controller class AutoCompleteController extends Controller
{ {
use AutoCompleteCollector;
/** /**
* @param Request $request * @param Request $request
@ -95,119 +91,9 @@ class AutoCompleteController extends Controller
return response()->json($return); return response()->json($return);
} }
/**
* List of all journals.
*
* @param Request $request
* @return JsonResponse
*/
public function allTransactionJournals(Request $request): JsonResponse
{
$search = (string)$request->get('search');
$cache = new CacheProperties;
$cache->addProperty('ac-all-journals');
// very unlikely a user will actually search for this string.
$key = '' === $search ? 'skjf0893j89fj2398hd89dh289h2398hr7isd8900828u209ujnxs88929282u' : $search;
$cache->addProperty($key);
if ($cache->has()) {
return response()->json($cache->get()); // @codeCoverageIgnore
}
// find everything:
/** @var GroupCollectorInterface $collector */
$collector = app(GroupCollectorInterface::class);
$collector->setLimit(250)->setPage(1);
$journals = $collector->getExtractedJournals();
$return = [];
/** @var array $journal */
foreach ($journals as $journal) {
if (strlen($journal['group_title']) > 0) {
$return[] = $journal['group_title'];
}
if (strlen($journal['description']) > 0) {
$return[] = $journal['description'];
}
}
$return = array_unique($return);
if ('' !== $search) {
$return = array_values(
array_unique(
array_filter(
$return, function (string $value) use ($search) {
return !(false === stripos($value, $search));
}, ARRAY_FILTER_USE_BOTH
)
)
);
}
$cache->store($return);
return response()->json($return);
}
/**
* @param Request $request
* @param string $subject
*
* @return JsonResponse
* @throws FireflyException
*/
public function autoComplete(Request $request, string $subject): JsonResponse
{
$search = (string)$request->get('search');
$unfiltered = null;
$filtered = null;
switch ($subject) {
default:
break;
case 'all-accounts':
$unfiltered = $this->getAccounts(
[AccountType::REVENUE, AccountType::EXPENSE, AccountType::BENEFICIARY, AccountType::DEFAULT, AccountType::ASSET, AccountType::LOAN,
AccountType::DEBT, AccountType::MORTGAGE]
);
break;
case 'expense-accounts':
$unfiltered = $this->getAccounts([AccountType::EXPENSE, AccountType::BENEFICIARY]);
break;
case 'revenue-accounts':
$unfiltered = $this->getAccounts([AccountType::REVENUE]);
break;
case 'asset-accounts':
$unfiltered = $this->getAccounts([AccountType::ASSET, AccountType::DEFAULT]);
break;
case 'categories':
$unfiltered = $this->getCategories();
break;
case 'budgets':
$unfiltered = $this->getBudgets();
break;
case 'tags':
$unfiltered = $this->getTags();
break;
case 'bills':
$unfiltered = $this->getBills();
break;
case 'currency-names':
$unfiltered = $this->getCurrencyNames();
break;
case 'transaction-types':
case 'transaction_types':
$unfiltered = $this->getTransactionTypes();
break;
}
$filtered = $this->filterResult($unfiltered, $search);
if (null === $filtered) {
throw new FireflyException(sprintf('Auto complete handler cannot handle "%s"', $subject)); // @codeCoverageIgnore
}
return response()->json($filtered);
}
/** /**
* @return JsonResponse * @return JsonResponse
* @codeCoverageIgnore
*/ */
public function budgets(): JsonResponse public function budgets(): JsonResponse
{ {
@ -221,6 +107,7 @@ class AutoCompleteController extends Controller
* @param Request $request * @param Request $request
* *
* @return JsonResponse * @return JsonResponse
* @codeCoverageIgnore
*/ */
public function categories(Request $request): JsonResponse public function categories(Request $request): JsonResponse
{ {
@ -233,11 +120,10 @@ class AutoCompleteController extends Controller
} }
/** /**
* @param Request $request
*
* @return JsonResponse * @return JsonResponse
* @codeCoverageIgnore
*/ */
public function currencies(Request $request): JsonResponse public function currencies(): JsonResponse
{ {
/** @var CurrencyRepositoryInterface $repository */ /** @var CurrencyRepositoryInterface $repository */
$repository = app(CurrencyRepositoryInterface::class); $repository = app(CurrencyRepositoryInterface::class);
@ -259,61 +145,9 @@ class AutoCompleteController extends Controller
return response()->json($return); return response()->json($return);
} }
/**
* List of journals with their ID.
*
* @param Request $request
* @param TransactionJournal $except
*
* @return JsonResponse
*/
public function journalsWithId(Request $request, TransactionJournal $except): JsonResponse
{
$search = (string)$request->get('search');
$cache = new CacheProperties;
$cache->addProperty('ac-expense-accounts');
// very unlikely a user will actually search for this string.
$key = '' === $search ? 'skjf0893j89fj2398hd89dh289h2398hr7isd8900828u209ujnxs88929282u' : $search;
$cache->addProperty($key);
if ($cache->has()) {
return response()->json($cache->get()); // @codeCoverageIgnore
}
// find everything:
/** @var GroupCollectorInterface $collector */
$collector = app(GroupCollectorInterface::class);
$collector->setLimit(400)->setPage(1);
$set = $collector->getExtractedJournals();
$return = [];
foreach ($set as $journal) {
$id = (int)$journal['transaction_journal_id'];
if ($id !== $except->id) {
$return[] = [
'id' => $id,
'name' => $id . ': ' . $journal['description'],
];
}
}
sort($return);
if ('' !== $search) {
$return = array_filter(
$return, function (array $array) use ($search) {
$haystack = $array['name'];
$result = stripos($haystack, $search);
return !(false === $result);
}
);
}
$cache->store($return);
return response()->json($return);
}
/** /**
* @return JsonResponse * @return JsonResponse
* @codeCoverageIgnore
*/ */
public function piggyBanks(): JsonResponse public function piggyBanks(): JsonResponse
{ {
@ -324,7 +158,9 @@ class AutoCompleteController extends Controller
} }
/** /**
* @param Request $request
* @return JsonResponse * @return JsonResponse
* @codeCoverageIgnore
*/ */
public function tags(Request $request): JsonResponse public function tags(Request $request): JsonResponse
{ {
@ -337,53 +173,4 @@ class AutoCompleteController extends Controller
return response()->json($result->toArray()); return response()->json($result->toArray());
} }
/**
* List of journals by type.
*
* @param Request $request
* @param string $what
*
* @return JsonResponse
*/
public function transactionJournals(Request $request, string $what): JsonResponse
{
$search = (string)$request->get('search');
$cache = new CacheProperties;
$cache->addProperty('ac-journals');
// very unlikely a user will actually search for this string.
$key = '' === $search ? 'skjf0893j89fj2398hd89dh289h2398hr7isd8900828u209ujnxs88929282u' : $search;
$cache->addProperty($key);
if ($cache->has()) {
return response()->json($cache->get()); // @codeCoverageIgnore
}
// find everything:
$type = config('firefly.transactionTypesByWhat.' . $what);
$types = [$type];
/** @var GroupCollectorInterface $collector */
$collector = app(GroupCollectorInterface::class);
$collector->setTypes($types)->setLimit(250)->setPage(1);
$result = $collector->getExtractedJournals();
$return = [];
foreach ($result as $journal) {
$return[] = $journal['description'];
}
$return = array_unique($return);
sort($return);
if ('' !== $search) {
$return = array_values(
array_unique(
array_filter(
$return, function (string $value) use ($search) {
return !(false === stripos($value, $search));
}, ARRAY_FILTER_USE_BOTH
)
)
);
}
$cache->store($return);
return response()->json($return);
}
} }

9
app/Http/Controllers/Json/ReconcileController.php
View File

@ -145,7 +145,7 @@ class ReconcileController extends Controller
// @codeCoverageIgnoreStart // @codeCoverageIgnoreStart
} catch (Throwable $e) { } catch (Throwable $e) {
Log::debug(sprintf('View error: %s', $e->getMessage())); Log::debug(sprintf('View error: %s', $e->getMessage()));
$view = 'Could not render accounts.reconcile.overview'; $view = sprintf('Could not render accounts.reconcile.overview: %s', $e->getMessage());
} }
// @codeCoverageIgnoreEnd // @codeCoverageIgnoreEnd
@ -196,6 +196,7 @@ class ReconcileController extends Controller
/** @var array $journal */ /** @var array $journal */
foreach ($array as $journal) { foreach ($array as $journal) {
$inverse = false; $inverse = false;
// @codeCoverageIgnoreStart
if (TransactionType::DEPOSIT === $journal['transaction_type_type']) { if (TransactionType::DEPOSIT === $journal['transaction_type_type']) {
$inverse = true; $inverse = true;
} }
@ -211,6 +212,7 @@ class ReconcileController extends Controller
$journal['foreign_amount'] = app('steam')->positive($journal['foreign_amount']); $journal['foreign_amount'] = app('steam')->positive($journal['foreign_amount']);
} }
} }
// @codeCoverageIgnoreEnd
$journals[] = $journal; $journals[] = $journal;
} }
@ -240,6 +242,9 @@ class ReconcileController extends Controller
{ {
$toAdd = '0'; $toAdd = '0';
Log::debug(sprintf('User submitted %s #%d: "%s"', $journal['transaction_type_type'], $journal['transaction_journal_id'], $journal['description'])); Log::debug(sprintf('User submitted %s #%d: "%s"', $journal['transaction_type_type'], $journal['transaction_journal_id'], $journal['description']));
// not much magic below we need to cover using tests.
// @codeCoverageIgnoreStart
if ($account->id === $journal['source_account_id']) { if ($account->id === $journal['source_account_id']) {
if ($currency->id === $journal['currency_id']) { if ($currency->id === $journal['currency_id']) {
$toAdd = $journal['amount']; $toAdd = $journal['amount'];
@ -256,6 +261,8 @@ class ReconcileController extends Controller
$toAdd = bcmul($journal['foreign_amount'], '-1'); $toAdd = bcmul($journal['foreign_amount'], '-1');
} }
} }
// @codeCoverageIgnoreEnd
Log::debug(sprintf('Going to add %s to %s', $toAdd, $amount)); Log::debug(sprintf('Going to add %s to %s', $toAdd, $amount));
$amount = bcadd($amount, $toAdd); $amount = bcadd($amount, $toAdd);
Log::debug(sprintf('Result is %s', $amount)); Log::debug(sprintf('Result is %s', $amount));

1
app/Http/Controllers/Json/RecurrenceController.php
View File

@ -42,6 +42,7 @@ class RecurrenceController extends Controller
/** /**
* RecurrenceController constructor. * RecurrenceController constructor.
* @codeCoverageIgnore
*/ */
public function __construct() public function __construct()
{ {

155
app/Support/Http/Controllers/AutoCompleteCollector.php
View File

@ -1,155 +0,0 @@
<?php
/**
* AutoCompleteCollector.php
* Copyright (c) 2018 thegrumpydictator@gmail.com
*
* This file is part of Firefly III.
*
* Firefly III is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Firefly III is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Support\Http\Controllers;
use FireflyIII\Models\Account;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\Bill\BillRepositoryInterface;
use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
use FireflyIII\Repositories\Tag\TagRepositoryInterface;
use Illuminate\Support\Collection;
/**
* Trait AutoCompleteCollector
*/
trait AutoCompleteCollector
{
/**
* @param array $unfiltered
* @param string $query
*
* @return array|null
*/
protected function filterResult(?array $unfiltered, string $query): ?array
{
if (null === $unfiltered) {
return null; // @codeCoverageIgnore
}
if ('' === $query) {
sort($unfiltered);
return $unfiltered;
}
$return = [];
if ('' !== $query) {
$return = array_values(
array_filter(
$unfiltered, function (string $value) use ($query) {
return !(false === stripos($value, $query));
}, ARRAY_FILTER_USE_BOTH
)
);
}
sort($return);
return $return;
}
/**
* @param array $types
*
* @return array
*/
protected function getAccounts(array $types): array
{
$repository = app(AccountRepositoryInterface::class);
// find everything:
/** @var Collection $collection */
$collection = $repository->getAccountsByType($types);
$filtered = $collection->filter(
function (Account $account) {
return true === $account->active;
}
);
return array_values(array_unique($filtered->pluck('name')->toArray()));
}
/**
* @return array
*/
protected function getBills(): array
{
$repository = app(BillRepositoryInterface::class);
return array_unique($repository->getActiveBills()->pluck('name')->toArray());
}
/**
* @return array
*/
protected function getBudgets(): array
{
$repository = app(BudgetRepositoryInterface::class);
return array_unique($repository->getBudgets()->pluck('name')->toArray());
}
/**
* @return array
*/
protected function getCategories(): array
{
$repository = app(CategoryRepositoryInterface::class);
return array_unique($repository->getCategories()->pluck('name')->toArray());
}
/**
* @return array
*/
protected function getCurrencyNames(): array
{
/** @var CurrencyRepositoryInterface $repository */
$repository = app(CurrencyRepositoryInterface::class);
return $repository->get()->pluck('name')->toArray();
}
/**
* @return array
*/
protected function getTags(): array
{
/** @var TagRepositoryInterface $repository */
$repository = app(TagRepositoryInterface::class);
return array_unique($repository->get()->pluck('tag')->toArray());
}
/**
* @return array
*/
protected function getTransactionTypes(): array
{
$repository = app(JournalRepositoryInterface::class);
return array_unique($repository->getTransactionTypes()->pluck('type')->toArray());
}
}

16
app/Support/Twig/AmountFormat.php
View File

@ -25,7 +25,6 @@ namespace FireflyIII\Support\Twig;
use FireflyIII\Models\Account as AccountModel; use FireflyIII\Models\Account as AccountModel;
use FireflyIII\Models\TransactionCurrency; use FireflyIII\Models\TransactionCurrency;
use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
use Log; use Log;
use Twig_Extension; use Twig_Extension;
use Twig_SimpleFilter; use Twig_SimpleFilter;
@ -87,23 +86,14 @@ class AmountFormat extends Twig_Extension
static function (AccountModel $account, string $amount, bool $coloured = null): string { static function (AccountModel $account, string $amount, bool $coloured = null): string {
if ('testing' === config('app.env')) { if ('testing' === config('app.env')) {
Log::warning('AmountFormat::formatAmountByAccount should NOT be called in the TEST environment!'); Log::warning('Twig AmountFormat::formatAmountByAccount should NOT be called in the TEST environment!');
Log::warning('Make sure AccountRepos and Amount::getDefaultCurrency are mocked.');
} }
$coloured = $coloured ?? true; $coloured = $coloured ?? true;
/** @var AccountRepositoryInterface $accountRepos */ /** @var AccountRepositoryInterface $accountRepos */
$accountRepos = app(AccountRepositoryInterface::class); $accountRepos = app(AccountRepositoryInterface::class);
/** @var CurrencyRepositoryInterface $currencyRepos */ $currency = $accountRepos->getAccountCurrency($account) ?? app('amount')->getDefaultCurrency();
$currencyRepos = app(CurrencyRepositoryInterface::class);
$currency = app('amount')->getDefaultCurrency();
$currencyId = (int)$accountRepos->getMetaValue($account, 'currency_id');
$accountCurrency = null;
if (0 !== $currencyId) {
$accountCurrency = $currencyRepos->findNull($currencyId);
}
if (null !== $accountCurrency) {
$currency = $accountCurrency;
}
return app('amount')->formatAnything($currency, $amount, $coloured); return app('amount')->formatAnything($currency, $amount, $coloured);
}, },

1
app/Validation/AccountValidator.php
View File

@ -554,6 +554,7 @@ class AccountValidator
} }
// don't expect to end up here: // don't expect to end up here:
return false; return false;
} }

2
phpunit.coverage.specific.xml
View File

@ -51,6 +51,8 @@
<directory suffix="Test.php">./tests/Feature/Controllers/Category</directory> <directory suffix="Test.php">./tests/Feature/Controllers/Category</directory>
<directory suffix="Test.php">./tests/Feature/Controllers/Chart</directory> <directory suffix="Test.php">./tests/Feature/Controllers/Chart</directory>
<directory suffix="Test.php">./tests/Feature/Controllers/Import</directory> <directory suffix="Test.php">./tests/Feature/Controllers/Import</directory>
<directory suffix="Test.php">./tests/Feature/Controllers/Json</directory>
<directory suffix="Test.php">./tests/Feature/Controllers/Popup</directory>
</testsuite> </testsuite>

2
phpunit.coverage.xml
View File

@ -51,6 +51,8 @@
<directory suffix="Test.php">./tests/Feature/Controllers/Category</directory> <directory suffix="Test.php">./tests/Feature/Controllers/Category</directory>
<directory suffix="Test.php">./tests/Feature/Controllers/Chart</directory> <directory suffix="Test.php">./tests/Feature/Controllers/Chart</directory>
<directory suffix="Test.php">./tests/Feature/Controllers/Import</directory> <directory suffix="Test.php">./tests/Feature/Controllers/Import</directory>
<directory suffix="Test.php">./tests/Feature/Controllers/Json</directory>
<directory suffix="Test.php">./tests/Feature/Controllers/Popup</directory>
</testsuite> </testsuite>

2
phpunit.xml
View File

@ -51,6 +51,8 @@
<directory suffix="Test.php">./tests/Feature/Controllers/Category</directory> <directory suffix="Test.php">./tests/Feature/Controllers/Category</directory>
<directory suffix="Test.php">./tests/Feature/Controllers/Chart</directory> <directory suffix="Test.php">./tests/Feature/Controllers/Chart</directory>
<directory suffix="Test.php">./tests/Feature/Controllers/Import</directory> <directory suffix="Test.php">./tests/Feature/Controllers/Import</directory>
<directory suffix="Test.php">./tests/Feature/Controllers/Json</directory>
<directory suffix="Test.php">./tests/Feature/Controllers/Popup</directory>
</testsuite> </testsuite>
<!-- <!--

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

@ -24,7 +24,7 @@ declare(strict_types=1);
namespace Tests\Api\V1\Controllers; namespace Tests\Api\V1\Controllers;
use FireflyIII\Helpers\Collector\TransactionCollectorInterface;
use FireflyIII\Models\Budget; use FireflyIII\Models\Budget;
use FireflyIII\Models\BudgetLimit; use FireflyIII\Models\BudgetLimit;
use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;

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

@ -24,7 +24,7 @@ declare(strict_types=1);
namespace Tests\Api\V1\Controllers; namespace Tests\Api\V1\Controllers;
use FireflyIII\Helpers\Collector\TransactionCollectorInterface;
use FireflyIII\Models\BudgetLimit; use FireflyIII\Models\BudgetLimit;
use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
use FireflyIII\Transformers\BudgetLimitTransformer; use FireflyIII\Transformers\BudgetLimitTransformer;

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

@ -24,7 +24,7 @@ declare(strict_types=1);
namespace Tests\Api\V1\Controllers; namespace Tests\Api\V1\Controllers;
use FireflyIII\Helpers\Collector\TransactionCollectorInterface;
use FireflyIII\Models\Category; use FireflyIII\Models\Category;
use FireflyIII\Repositories\Category\CategoryRepositoryInterface; use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
use FireflyIII\Transformers\CategoryTransformer; use FireflyIII\Transformers\CategoryTransformer;

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

@ -24,7 +24,7 @@ declare(strict_types=1);
namespace Tests\Api\V1\Controllers; namespace Tests\Api\V1\Controllers;
use FireflyIII\Helpers\Collector\TransactionCollectorInterface;
use FireflyIII\Models\Preference; use FireflyIII\Models\Preference;
use FireflyIII\Models\TransactionCurrency; use FireflyIII\Models\TransactionCurrency;
use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;

2
tests/Api/V1/Controllers/TransactionLinkControllerTest.php
View File

@ -25,7 +25,7 @@ namespace Tests\Api\V1\Controllers;
use Carbon\Carbon; use Carbon\Carbon;
use FireflyIII\Helpers\Collector\TransactionCollectorInterface;
use FireflyIII\Models\Transaction; use FireflyIII\Models\Transaction;
use FireflyIII\Models\TransactionJournalLink; use FireflyIII\Models\TransactionJournalLink;
use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use FireflyIII\Repositories\Journal\JournalRepositoryInterface;

5
tests/Feature/Controllers/Account/IndexControllerTest.php
View File

@ -65,17 +65,16 @@ class IndexControllerTest extends TestCase
public function testIndex(string $range): void public function testIndex(string $range): void
{ {
// mock stuff // mock stuff
$this->mock(CurrencyRepositoryInterface::class);
$account = $this->getRandomAsset(); $account = $this->getRandomAsset();
$repository = $this->mock(AccountRepositoryInterface::class); $repository = $this->mock(AccountRepositoryInterface::class);
$currencyRepos = $this->mock(CurrencyRepositoryInterface::class);
$userRepos = $this->mock(UserRepositoryInterface::class); $userRepos = $this->mock(UserRepositoryInterface::class);
$euro = $this->getEuro(); $euro = $this->getEuro();
// mock hasRole for user repository: // mock hasRole for user repository:
$userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'owner'])->andReturn(true)->atLeast()->once(); $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'owner'])->andReturn(true)->atLeast()->once();
$repository->shouldReceive('getAccountsByType')->andReturn(new Collection([$account])); $repository->shouldReceive('getAccountsByType')->andReturn(new Collection([$account]));
$repository->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'currency_id'])->andReturn('1'); $repository->shouldReceive('getAccountCurrency')->atLeast()->once()->andReturn($euro);
$currencyRepos->shouldReceive('findNull')->withArgs([1])->andReturn($euro);
Steam::shouldReceive('balancesByAccounts')->andReturn([$account->id => '100']); Steam::shouldReceive('balancesByAccounts')->andReturn([$account->id => '100']);
Steam::shouldReceive('getLastActivities')->andReturn([]); Steam::shouldReceive('getLastActivities')->andReturn([]);

2
tests/Feature/Controllers/BillControllerTest.php
View File

@ -23,7 +23,7 @@ declare(strict_types=1);
namespace Tests\Feature\Controllers; namespace Tests\Feature\Controllers;
use FireflyIII\Helpers\Attachments\AttachmentHelperInterface; use FireflyIII\Helpers\Attachments\AttachmentHelperInterface;
use FireflyIII\Helpers\Collector\TransactionCollectorInterface;
use FireflyIII\Models\Bill; use FireflyIII\Models\Bill;
use FireflyIII\Models\Rule; use FireflyIII\Models\Rule;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;

4
tests/Feature/Controllers/Category/NoCategoryControllerTest.php
View File

@ -26,8 +26,8 @@ namespace Tests\Feature\Controllers\Category;
use Carbon\Carbon; use Carbon\Carbon;
use FireflyIII\Helpers\Collector\GroupCollectorInterface; use FireflyIII\Helpers\Collector\GroupCollectorInterface;
use FireflyIII\Helpers\Collector\TransactionCollectorInterface;
use FireflyIII\Helpers\Filter\InternalTransferFilter;
use FireflyIII\Helpers\Fiscal\FiscalHelperInterface; use FireflyIII\Helpers\Fiscal\FiscalHelperInterface;
use FireflyIII\Models\Preference; use FireflyIII\Models\Preference;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;

4
tests/Feature/Controllers/Category/ShowControllerTest.php
View File

@ -26,8 +26,8 @@ namespace Tests\Feature\Controllers\Category;
use Carbon\Carbon; use Carbon\Carbon;
use FireflyIII\Helpers\Collector\GroupCollectorInterface; use FireflyIII\Helpers\Collector\GroupCollectorInterface;
use FireflyIII\Helpers\Collector\TransactionCollectorInterface;
use FireflyIII\Helpers\Filter\InternalTransferFilter;
use FireflyIII\Helpers\Fiscal\FiscalHelperInterface; use FireflyIII\Helpers\Fiscal\FiscalHelperInterface;
use FireflyIII\Models\Preference; use FireflyIII\Models\Preference;
use FireflyIII\Models\Transaction; use FireflyIII\Models\Transaction;

2
tests/Feature/Controllers/Chart/AccountControllerTest.php
View File

@ -25,7 +25,7 @@ namespace Tests\Feature\Controllers\Chart;
use Carbon\Carbon; use Carbon\Carbon;
use FireflyIII\Generator\Chart\Basic\GeneratorInterface; use FireflyIII\Generator\Chart\Basic\GeneratorInterface;
use FireflyIII\Helpers\Collector\GroupCollectorInterface; use FireflyIII\Helpers\Collector\GroupCollectorInterface;
use FireflyIII\Helpers\Collector\TransactionCollectorInterface;
use FireflyIII\Helpers\Fiscal\FiscalHelperInterface; use FireflyIII\Helpers\Fiscal\FiscalHelperInterface;
use FireflyIII\Models\Account; use FireflyIII\Models\Account;
use FireflyIII\Models\AccountType; use FireflyIII\Models\AccountType;

8
tests/Feature/Controllers/Chart/BudgetReportControllerTest.php
View File

@ -26,10 +26,10 @@ use Carbon\Carbon;
use FireflyIII\Generator\Chart\Basic\GeneratorInterface; use FireflyIII\Generator\Chart\Basic\GeneratorInterface;
use FireflyIII\Helpers\Chart\MetaPieChartInterface; use FireflyIII\Helpers\Chart\MetaPieChartInterface;
use FireflyIII\Helpers\Collector\GroupCollectorInterface; use FireflyIII\Helpers\Collector\GroupCollectorInterface;
use FireflyIII\Helpers\Collector\TransactionCollectorInterface;
use FireflyIII\Helpers\Filter\OpposingAccountFilter;
use FireflyIII\Helpers\Filter\PositiveAmountFilter;
use FireflyIII\Helpers\Filter\TransferFilter;
use FireflyIII\Helpers\Fiscal\FiscalHelperInterface; use FireflyIII\Helpers\Fiscal\FiscalHelperInterface;
use FireflyIII\Models\BudgetLimit; use FireflyIII\Models\BudgetLimit;
use FireflyIII\Models\TransactionType; use FireflyIII\Models\TransactionType;

10
tests/Feature/Controllers/Chart/CategoryReportControllerTest.php
View File

@ -26,11 +26,11 @@ use Carbon\Carbon;
use FireflyIII\Generator\Chart\Basic\GeneratorInterface; use FireflyIII\Generator\Chart\Basic\GeneratorInterface;
use FireflyIII\Helpers\Chart\MetaPieChartInterface; use FireflyIII\Helpers\Chart\MetaPieChartInterface;
use FireflyIII\Helpers\Collector\GroupCollectorInterface; use FireflyIII\Helpers\Collector\GroupCollectorInterface;
use FireflyIII\Helpers\Collector\TransactionCollectorInterface;
use FireflyIII\Helpers\Filter\NegativeAmountFilter;
use FireflyIII\Helpers\Filter\OpposingAccountFilter;
use FireflyIII\Helpers\Filter\PositiveAmountFilter;
use FireflyIII\Helpers\Filter\TransferFilter;
use FireflyIII\Helpers\Fiscal\FiscalHelperInterface; use FireflyIII\Helpers\Fiscal\FiscalHelperInterface;
use FireflyIII\Models\Transaction; use FireflyIII\Models\Transaction;
use FireflyIII\Models\TransactionType; use FireflyIII\Models\TransactionType;

2
tests/Feature/Controllers/Chart/ExpenseReportControllerTest.php
View File

@ -25,7 +25,7 @@ namespace Tests\Feature\Controllers\Chart;
use Carbon\Carbon; use Carbon\Carbon;
use FireflyIII\Generator\Chart\Basic\GeneratorInterface; use FireflyIII\Generator\Chart\Basic\GeneratorInterface;
use FireflyIII\Helpers\Collector\GroupCollectorInterface; use FireflyIII\Helpers\Collector\GroupCollectorInterface;
use FireflyIII\Helpers\Collector\TransactionCollectorInterface;
use FireflyIII\Helpers\Fiscal\FiscalHelperInterface; use FireflyIII\Helpers\Fiscal\FiscalHelperInterface;
use FireflyIII\Models\TransactionType; use FireflyIII\Models\TransactionType;
use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Account\AccountRepositoryInterface;

2
tests/Feature/Controllers/HomeControllerTest.php
View File

@ -22,7 +22,7 @@ declare(strict_types=1);
namespace Tests\Feature\Controllers; namespace Tests\Feature\Controllers;
use FireflyIII\Helpers\Collector\TransactionCollectorInterface;
use FireflyIII\Models\Account; use FireflyIII\Models\Account;
use FireflyIII\Models\AccountType; use FireflyIII\Models\AccountType;
use FireflyIII\Models\TransactionCurrency; use FireflyIII\Models\TransactionCurrency;

346
tests/Feature/Controllers/Json/AutoCompleteControllerTest.php
View File

@ -22,7 +22,7 @@ declare(strict_types=1);
namespace Tests\Feature\Controllers\Json; namespace Tests\Feature\Controllers\Json;
use FireflyIII\Helpers\Collector\TransactionCollectorInterface;
use FireflyIII\Models\Account; use FireflyIII\Models\Account;
use FireflyIII\Models\AccountType; use FireflyIII\Models\AccountType;
use FireflyIII\Models\Bill; use FireflyIII\Models\Bill;
@ -58,344 +58,28 @@ class AutoCompleteControllerTest extends TestCase
} }
/** /**
* Request a list of asset accounts
*
* @covers \FireflyIII\Http\Controllers\Json\AutoCompleteController * @covers \FireflyIII\Http\Controllers\Json\AutoCompleteController
*/ */
public function testAllAccounts(): void public function testAccounts(): void
{ {
// mock stuff
$accountA = factory(Account::class)->make();
$collection = new Collection([$accountA]);
$accountRepos = $this->mock(AccountRepositoryInterface::class); $accountRepos = $this->mock(AccountRepositoryInterface::class);
$accountRepos->shouldReceive('getAccountsByType') $account = $this->getRandomAsset();
->withArgs( $euro = $this->getEuro();
[[AccountType::REVENUE, AccountType::EXPENSE, AccountType::BENEFICIARY, AccountType::DEFAULT, AccountType::ASSET, AccountType::LOAN,
AccountType::DEBT, AccountType::MORTGAGE]]
)
->andReturn($collection); $accountRepos->shouldReceive('searchAccount')->atLeast()->once()->andReturn(new Collection([$account]));
$accountRepos->shouldReceive('getAccountCurrency')->atLeast()->once()->andReturn($euro);
$this->mockDefaultSession();
$this->be($this->user()); $this->be($this->user());
$response = $this->get(route('json.autocomplete', ['all-accounts'])); $httpQuery = http_build_query(['types' => AccountType::ASSET]);
$response = $this->get(route('json.autocomplete.accounts') . '?' . $httpQuery);
$response->assertStatus(200); $response->assertStatus(200);
$response->assertExactJson([$accountA->name]); $response->assertSee($account->name);
} }
/**
* @covers \FireflyIII\Http\Controllers\Json\AutoCompleteController
*/
public function testAllTransactionJournals(): void
{
$this->markTestIncomplete('Needs to be rewritten for v4.8.0');
return;
$transaction = new Transaction();
$transaction->description = 'hi there';
$collection = new Collection([$transaction]);
$collector = $this->mock(TransactionCollectorInterface::class);
$collector->shouldReceive('setLimit')->withArgs([250])->andReturnSelf();
$collector->shouldReceive('setPage')->withArgs([1])->andReturnSelf();
$collector->shouldReceive('getTransactions')->andReturn($collection);
$this->be($this->user());
$response = $this->get(route('json.all-transaction-journals'));
$response->assertStatus(200);
}
/**
* @covers \FireflyIII\Http\Controllers\Json\AutoCompleteController
*/
public function testAllTransactionJournalsSearch(): void
{
$this->markTestIncomplete('Needs to be rewritten for v4.8.0');
return;
$transaction = new Transaction();
$transaction->description = 'hi there';
$collection = new Collection([$transaction]);
$collector = $this->mock(TransactionCollectorInterface::class);
$collector->shouldReceive('setLimit')->withArgs([250])->andReturnSelf();
$collector->shouldReceive('setPage')->withArgs([1])->andReturnSelf();
$collector->shouldReceive('getTransactions')->andReturn($collection);
$this->be($this->user());
$response = $this->get(route('json.all-transaction-journals') . '?search=hi');
$response->assertStatus(200);
}
/**
* @covers \FireflyIII\Http\Controllers\Json\AutoCompleteController
*/
public function testAssetAccounts(): void
{
// mock stuff
$accountA = factory(Account::class)->make();
$collection = new Collection([$accountA]);
$accountRepos = $this->mock(AccountRepositoryInterface::class);
$accountRepos->shouldReceive('getAccountsByType')
->withArgs([[AccountType::ASSET, AccountType::DEFAULT]])->andReturn($collection);
$this->be($this->user());
$response = $this->get(route('json.autocomplete', ['asset-accounts']));
$response->assertStatus(200);
$response->assertExactJson([$accountA->name]);
}
/**
* @covers \FireflyIII\Http\Controllers\Json\AutoCompleteController
*/
public function testBills(): void
{
$repository = $this->mock(BillRepositoryInterface::class);
$bills = factory(Bill::class, 10)->make();
$repository->shouldReceive('getActiveBills')->andReturn($bills);
$this->be($this->user());
$response = $this->get(route('json.autocomplete', ['bills']));
$response->assertStatus(200);
}
/**
* @covers \FireflyIII\Http\Controllers\Json\AutoCompleteController
*/
public function testBillsSearch(): void
{
$repository = $this->mock(BillRepositoryInterface::class);
$bills = factory(Bill::class, 10)->make();
$repository->shouldReceive('getActiveBills')->andReturn($bills);
$this->be($this->user());
$response = $this->get(route('json.autocomplete', ['bills']) . '?search=1234');
$response->assertStatus(200);
}
/**
* @covers \FireflyIII\Http\Controllers\Json\AutoCompleteController
*/
public function testBudgets(): void
{
// mock stuff
$budget = factory(Budget::class)->make();
$categoryRepos = $this->mock(BudgetRepositoryInterface::class);
$journalRepos = $this->mock(JournalRepositoryInterface::class);
$journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal);
$categoryRepos->shouldReceive('getBudgets')->andReturn(new Collection([$budget]));
$this->be($this->user());
$response = $this->get(route('json.autocomplete', ['budgets']));
$response->assertStatus(200);
$response->assertExactJson([$budget->name]);
}
/**
* @covers \FireflyIII\Http\Controllers\Json\AutoCompleteController
*/
public function testCategories(): void
{
// mock stuff
$category = factory(Category::class)->make();
$categoryRepos = $this->mock(CategoryRepositoryInterface::class);
$journalRepos = $this->mock(JournalRepositoryInterface::class);
$journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal);
$categoryRepos->shouldReceive('getCategories')->andReturn(new Collection([$category]));
$this->be($this->user());
$response = $this->get(route('json.autocomplete', ['categories']));
$response->assertStatus(200);
$response->assertExactJson([$category->name]);
}
/**
* @covers \FireflyIII\Http\Controllers\Json\AutoCompleteController
*/
public function testCurrencyNames(): void
{
$repository = $this->mock(CurrencyRepositoryInterface::class);
$currency = TransactionCurrency::find(1);
$repository->shouldReceive('get')->andReturn(new Collection([$currency]))->once();
$this->be($this->user());
$response = $this->get(route('json.autocomplete', ['currency-names']));
$response->assertStatus(200);
$response->assertExactJson(['Euro']);
}
/**
* @covers \FireflyIII\Http\Controllers\Json\AutoCompleteController
*/
public function testExpenseAccounts(): void
{
// mock stuff
$accountA = factory(Account::class)->make();
$accountB = factory(Account::class)->make();
$accountA->active = true;
$accountB->active = false;
$collection = new Collection([$accountA, $accountB]);
$accountRepos = $this->mock(AccountRepositoryInterface::class);
$journalRepos = $this->mock(JournalRepositoryInterface::class);
$journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal);
$accountRepos->shouldReceive('getAccountsByType')->withArgs([[AccountType::EXPENSE, AccountType::BENEFICIARY]])->once()->andReturn($collection);
$this->be($this->user());
$response = $this->get(route('json.autocomplete', ['expense-accounts']));
$response->assertStatus(200);
$response->assertExactJson([$accountA->name]);
}
/**
* @covers \FireflyIII\Http\Controllers\Json\AutoCompleteController
*/
public function testJournalsWithId(): void
{
$this->markTestIncomplete('Needs to be rewritten for v4.8.0');
return;
$journal = $this->user()->transactionJournals()->where('id', '!=', 1)->first();
$journal->journal_id = $journal->id;
$collection = new Collection([$journal]);
$collector = $this->mock(TransactionCollectorInterface::class);
$collector->shouldReceive('setLimit')->withArgs([400])->andReturnSelf();
$collector->shouldReceive('setPage')->withArgs([1])->andReturnSelf();
$collector->shouldReceive('getTransactions')->andReturn($collection);
$this->be($this->user());
$response = $this->get(route('json.journals-with-id', [1]));
$response->assertStatus(200);
$response->assertExactJson([['id' => $journal->id, 'name' => $journal->id . ': ' . $journal->description]]);
}
/**
* @covers \FireflyIII\Http\Controllers\Json\AutoCompleteController
*/
public function testJournalsWithIdSearch(): void
{
$this->markTestIncomplete('Needs to be rewritten for v4.8.0');
return;
$journal = $this->user()->transactionJournals()->where('id', '!=', 1)->first();
$journal->journal_id = $journal->id;
$collection = new Collection([$journal]);
$collector = $this->mock(TransactionCollectorInterface::class);
$collector->shouldReceive('setLimit')->withArgs([400])->andReturnSelf();
$collector->shouldReceive('setPage')->withArgs([1])->andReturnSelf();
$collector->shouldReceive('getTransactions')->andReturn($collection);
$this->be($this->user());
$response = $this->get(route('json.journals-with-id', [1]) . '?search=a');
$response->assertStatus(200);
$response->assertExactJson([['id' => $journal->id, 'name' => $journal->id . ': ' . $journal->description]]);
}
/**
* @covers \FireflyIII\Http\Controllers\Json\AutoCompleteController
*/
public function testRevenueAccounts(): void
{
// mock stuff
$accountA = factory(Account::class)->make();
$accountB = factory(Account::class)->make();
$accountA->active = true;
$accountB->active = false;
$collection = new Collection([$accountA, $accountB]);
$accountRepos = $this->mock(AccountRepositoryInterface::class);
$journalRepos = $this->mock(JournalRepositoryInterface::class);
$journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal);
$accountRepos->shouldReceive('getAccountsByType')->withArgs([[AccountType::REVENUE]])->once()->andReturn($collection);
$this->be($this->user());
$response = $this->get(route('json.autocomplete', ['revenue-accounts']));
$response->assertStatus(200);
$response->assertExactJson([$accountA->name]);
}
/**
* @covers \FireflyIII\Http\Controllers\Json\AutoCompleteController
*/
public function testTags(): void
{
// mock stuff
$tag = factory(Tag::class)->make();
$tagRepos = $this->mock(TagRepositoryInterface::class);
$journalRepos = $this->mock(JournalRepositoryInterface::class);
$journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal);
$tagRepos->shouldReceive('get')->andReturn(new Collection([$tag]))->once();
$this->be($this->user());
$response = $this->get(route('json.autocomplete', ['tags']));
$response->assertStatus(200);
$response->assertExactJson([$tag->tag]);
}
/**
* @covers \FireflyIII\Http\Controllers\Json\AutoCompleteController
*/
public function testTransactionJournals(): void
{
$this->markTestIncomplete('Needs to be rewritten for v4.8.0');
return;
$transaction = new Transaction();
$transaction->description = 'hi there';
$collection = new Collection([$transaction]);
// mock stuff
$collector = $this->mock(TransactionCollectorInterface::class);
$journalRepos = $this->mock(JournalRepositoryInterface::class);
$journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal);
$collector->shouldReceive('setTypes')->andReturnSelf();
$collector->shouldReceive('setLimit')->andReturnSelf();
$collector->shouldReceive('setPage')->andReturnSelf();
$collector->shouldReceive('getTransactions')->andReturn($collection);
$this->be($this->user());
$response = $this->get(route('json.transaction-journals', ['deposit']));
$response->assertStatus(200);
$response->assertExactJson(['hi there']);
}
/**
* @covers \FireflyIII\Http\Controllers\Json\AutoCompleteController
*/
public function testTransactionJournalsSearch(): void
{
$this->markTestIncomplete('Needs to be rewritten for v4.8.0');
return;
$transaction = new Transaction();
$transaction->description = 'hi there';
$collection = new Collection([$transaction]);
// mock stuff
$collector = $this->mock(TransactionCollectorInterface::class);
$journalRepos = $this->mock(JournalRepositoryInterface::class);
$journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal);
$collector->shouldReceive('setTypes')->andReturnSelf();
$collector->shouldReceive('setLimit')->andReturnSelf();
$collector->shouldReceive('setPage')->andReturnSelf();
$collector->shouldReceive('getTransactions')->andReturn($collection);
$this->be($this->user());
$response = $this->get(route('json.transaction-journals', ['deposit']) . '?search=hi');
$response->assertStatus(200);
$response->assertExactJson(['hi there']);
}
/**
* @covers \FireflyIII\Http\Controllers\Json\AutoCompleteController
*/
public function testTransactionTypes(): void
{
// mock stuff
$journalRepos = $this->mock(JournalRepositoryInterface::class);
$journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal);
$journalRepos->shouldReceive('getTransactionTypes')->once()->andReturn(new Collection);
$this->be($this->user());
$response = $this->get(route('json.autocomplete', ['transaction_types']));
$response->assertStatus(200);
$response->assertExactJson([]);
}
} }

61
tests/Feature/Controllers/Json/BoxControllerTest.php
View File

@ -22,8 +22,10 @@ declare(strict_types=1);
namespace Tests\Feature\Controllers\Json; namespace Tests\Feature\Controllers\Json;
use Amount;
use Carbon\Carbon; use Carbon\Carbon;
use FireflyIII\Helpers\Collector\TransactionCollectorInterface; use FireflyIII\Helpers\Collector\GroupCollectorInterface;
use FireflyIII\Helpers\Report\NetWorthInterface; use FireflyIII\Helpers\Report\NetWorthInterface;
use FireflyIII\Models\Transaction; use FireflyIII\Models\Transaction;
use FireflyIII\Models\TransactionCurrency; use FireflyIII\Models\TransactionCurrency;
@ -34,6 +36,7 @@ use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use Log; use Log;
use Mockery; use Mockery;
use Preferences;
use Tests\TestCase; use Tests\TestCase;
/** /**
@ -63,6 +66,10 @@ class BoxControllerTest extends TestCase
$repository = $this->mock(BudgetRepositoryInterface::class); $repository = $this->mock(BudgetRepositoryInterface::class);
$currencyRepos = $this->mock(CurrencyRepositoryInterface::class); $currencyRepos = $this->mock(CurrencyRepositoryInterface::class);
$this->mockDefaultSession();
Preferences::shouldReceive('lastActivity')->atLeast()->once()->andReturn('md512345');
Amount::shouldReceive('formatAnything')->atLeast()->once()->andReturn('-100');
$repository->shouldReceive('getAvailableBudget')->andReturn('1000'); $repository->shouldReceive('getAvailableBudget')->andReturn('1000');
$repository->shouldReceive('getActiveBudgets')->andReturn(new Collection); $repository->shouldReceive('getActiveBudgets')->andReturn(new Collection);
$repository->shouldReceive('collectBudgetInformation')->andReturn($return); $repository->shouldReceive('collectBudgetInformation')->andReturn($return);
@ -86,6 +93,11 @@ class BoxControllerTest extends TestCase
$repository = $this->mock(BudgetRepositoryInterface::class); $repository = $this->mock(BudgetRepositoryInterface::class);
$currencyRepos = $this->mock(CurrencyRepositoryInterface::class); $currencyRepos = $this->mock(CurrencyRepositoryInterface::class);
$this->mockDefaultSession();
Preferences::shouldReceive('lastActivity')->atLeast()->once()->andReturn('md512345');
Amount::shouldReceive('formatAnything')->atLeast()->once()->andReturn('-100');
$repository->shouldReceive('getAvailableBudget')->andReturn('1000'); $repository->shouldReceive('getAvailableBudget')->andReturn('1000');
$repository->shouldReceive('getActiveBudgets')->andReturn(new Collection); $repository->shouldReceive('getActiveBudgets')->andReturn(new Collection);
$repository->shouldReceive('collectBudgetInformation')->andReturn($return); $repository->shouldReceive('collectBudgetInformation')->andReturn($return);
@ -101,21 +113,21 @@ class BoxControllerTest extends TestCase
*/ */
public function testBalance(): void public function testBalance(): void
{ {
$this->markTestIncomplete('Needs to be rewritten for v4.8.0');
return;
$accountRepos = $this->mock(AccountRepositoryInterface::class); $accountRepos = $this->mock(AccountRepositoryInterface::class);
$collector = $this->mock(TransactionCollectorInterface::class); $collector = $this->mock(GroupCollectorInterface::class);
$currencyRepos = $this->mock(CurrencyRepositoryInterface::class); $currencyRepos = $this->mock(CurrencyRepositoryInterface::class);
$this->mockDefaultSession();
Preferences::shouldReceive('lastActivity')->atLeast()->once()->andReturn('md512345');
Amount::shouldReceive('formatAnything')->atLeast()->once()->andReturn('-100');
// try a collector for income: // try a collector for income:
$collector->shouldReceive('setAllAssetAccounts')->andReturnSelf(); //$collector->shouldReceive('setAllAssetAccounts')->andReturnSelf()->atLeast()->once();
$collector->shouldReceive('setRange')->andReturnSelf(); $collector->shouldReceive('setRange')->andReturnSelf()->atLeast()->once();
$collector->shouldReceive('setTypes')->andReturnSelf(); $collector->shouldReceive('setTypes')->andReturnSelf()->atLeast()->once();
$collector->shouldReceive('withOpposingAccount')->andReturnSelf(); //$collector->shouldReceive('withOpposingAccount')->andReturnSelf()->atLeast()->once();
$collector->shouldReceive('getTransactions')->andReturn(new Collection); $collector->shouldReceive('getExtractedJournals')->andReturn([])->atLeast()->once();
$this->be($this->user()); $this->be($this->user());
$response = $this->get(route('json.box.balance')); $response = $this->get(route('json.box.balance'));
@ -127,26 +139,25 @@ class BoxControllerTest extends TestCase
*/ */
public function testBalanceTransactions(): void public function testBalanceTransactions(): void
{ {
$this->markTestIncomplete('Needs to be rewritten for v4.8.0'); $withdrawal = $this->getRandomWithdrawalAsArray();
return;
$transaction = new Transaction;
$transaction->transaction_currency_id = 1;
$transaction->transaction_amount = '5';
$accountRepos = $this->mock(AccountRepositoryInterface::class); $accountRepos = $this->mock(AccountRepositoryInterface::class);
$collector = $this->mock(TransactionCollectorInterface::class); $collector = $this->mock(GroupCollectorInterface::class);
$currencyRepos = $this->mock(CurrencyRepositoryInterface::class); $currencyRepos = $this->mock(CurrencyRepositoryInterface::class);
$euro =$this->getEuro();
$currencyRepos->shouldReceive('findNull')->withArgs([1])->andReturn(TransactionCurrency::find(1))->atLeast()->once(); $this->mockDefaultSession();
Preferences::shouldReceive('lastActivity')->atLeast()->once()->andReturn('md512345');
Amount::shouldReceive('formatAnything')->atLeast()->once()->andReturn('-100');
// try a collector for income: // try a collector for income:
$collector->shouldReceive('setAllAssetAccounts')->andReturnSelf();
$collector->shouldReceive('setRange')->andReturnSelf(); //$collector->shouldReceive('setAllAssetAccounts')->andReturnSelf()->atLeast()->once();
$collector->shouldReceive('setTypes')->andReturnSelf(); $collector->shouldReceive('setRange')->andReturnSelf()->atLeast()->once();
$collector->shouldReceive('withOpposingAccount')->andReturnSelf(); $collector->shouldReceive('setTypes')->andReturnSelf()->atLeast()->once();
$collector->shouldReceive('getTransactions')->andReturn(new Collection([$transaction])); //$collector->shouldReceive('withOpposingAccount')->andReturnSelf()->atLeast()->once();
$collector->shouldReceive('getExtractedJournals')->andReturn([$withdrawal])->atLeast()->once();
$currencyRepos->shouldReceive('findNull')->atLeast()->once()->andReturn($euro);
$this->be($this->user()); $this->be($this->user());
$response = $this->get(route('json.box.balance')); $response = $this->get(route('json.box.balance'));

3
tests/Feature/Controllers/Json/ExchangeControllerTest.php
View File

@ -55,6 +55,9 @@ class ExchangeControllerTest extends TestCase
{ {
$repository = $this->mock(CurrencyRepositoryInterface::class); $repository = $this->mock(CurrencyRepositoryInterface::class);
$fiscalHelper = $this->mock(FiscalHelperInterface::class); $fiscalHelper = $this->mock(FiscalHelperInterface::class);
$this->mockDefaultSession();
$date = new Carbon; $date = new Carbon;
$fiscalHelper->shouldReceive('endOfFiscalYear')->atLeast()->once()->andReturn($date); $fiscalHelper->shouldReceive('endOfFiscalYear')->atLeast()->once()->andReturn($date);
$fiscalHelper->shouldReceive('startOfFiscalYear')->atLeast()->once()->andReturn($date); $fiscalHelper->shouldReceive('startOfFiscalYear')->atLeast()->once()->andReturn($date);

2
tests/Feature/Controllers/Json/FrontpageControllerTest.php
View File

@ -50,6 +50,8 @@ class FrontpageControllerTest extends TestCase
*/ */
public function testPiggyBanks(): void public function testPiggyBanks(): void
{ {
$this->mockDefaultSession();
$piggy = $this->user()->piggyBanks()->first(); $piggy = $this->user()->piggyBanks()->first();
$repository = $this->mock(PiggyBankRepositoryInterface::class); $repository = $this->mock(PiggyBankRepositoryInterface::class);
$repository->shouldReceive('getPiggyBanks')->andReturn(new Collection([$piggy])); $repository->shouldReceive('getPiggyBanks')->andReturn(new Collection([$piggy]));

12
tests/Feature/Controllers/Json/IntroControllerTest.php
View File

@ -24,6 +24,7 @@ namespace Tests\Feature\Controllers\Json;
use Log; use Log;
use Tests\TestCase; use Tests\TestCase;
use Preferences;
/** /**
* Class IntroControllerTest * Class IntroControllerTest
@ -48,6 +49,7 @@ class IntroControllerTest extends TestCase
*/ */
public function testGetIntroSteps(): void public function testGetIntroSteps(): void
{ {
$this->mockDefaultSession();
$this->be($this->user()); $this->be($this->user());
$response = $this->get(route('json.intro', ['index'])); $response = $this->get(route('json.intro', ['index']));
$response->assertStatus(200); $response->assertStatus(200);
@ -58,6 +60,7 @@ class IntroControllerTest extends TestCase
*/ */
public function testGetIntroStepsAsset(): void public function testGetIntroStepsAsset(): void
{ {
$this->mockDefaultSession();
$this->be($this->user()); $this->be($this->user());
$response = $this->get(route('json.intro', ['accounts_create', 'asset'])); $response = $this->get(route('json.intro', ['accounts_create', 'asset']));
$response->assertStatus(200); $response->assertStatus(200);
@ -68,6 +71,7 @@ class IntroControllerTest extends TestCase
*/ */
public function testGetIntroStepsOutro(): void public function testGetIntroStepsOutro(): void
{ {
$this->mockDefaultSession();
$this->be($this->user()); $this->be($this->user());
$response = $this->get(route('json.intro', ['reports_report', 'category'])); $response = $this->get(route('json.intro', ['reports_report', 'category']));
$response->assertStatus(200); $response->assertStatus(200);
@ -78,6 +82,10 @@ class IntroControllerTest extends TestCase
*/ */
public function testPostEnable(): void public function testPostEnable(): void
{ {
$this->mockDefaultSession();
Preferences::shouldReceive('set')->withArgs(['shown_demo_accounts_create_asset', false])->atLeast()->once();
$this->be($this->user()); $this->be($this->user());
$response = $this->post(route('json.intro.enable', ['accounts_create', 'asset'])); $response = $this->post(route('json.intro.enable', ['accounts_create', 'asset']));
$response->assertStatus(200); $response->assertStatus(200);
@ -88,6 +96,10 @@ class IntroControllerTest extends TestCase
*/ */
public function testPostFinished(): void public function testPostFinished(): void
{ {
$this->mockDefaultSession();
Preferences::shouldReceive('set')->withArgs(['shown_demo_accounts_create_asset', true])->atLeast()->once();
$this->be($this->user()); $this->be($this->user());
$response = $this->post(route('json.intro.finished', ['accounts_create', 'asset'])); $response = $this->post(route('json.intro.finished', ['accounts_create', 'asset']));
$response->assertStatus(200); $response->assertStatus(200);

132
tests/Feature/Controllers/Json/ReconcileControllerTest.php
View File

@ -24,19 +24,20 @@ declare(strict_types=1);
namespace Tests\Feature\Controllers\Json; namespace Tests\Feature\Controllers\Json;
use Amount;
use Carbon\Carbon; use Carbon\Carbon;
use FireflyIII\Helpers\Collector\TransactionCollectorInterface; use FireflyIII\Helpers\Collector\GroupCollectorInterface;
use FireflyIII\Helpers\Fiscal\FiscalHelperInterface; use FireflyIII\Helpers\Fiscal\FiscalHelperInterface;
use FireflyIII\Models\Transaction; use FireflyIII\Models\Transaction;
use FireflyIII\Models\TransactionCurrency; use FireflyIII\Models\TransactionCurrency;
use FireflyIII\Models\TransactionJournal;
use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
use FireflyIII\Repositories\Recurring\RecurringRepositoryInterface; use FireflyIII\Repositories\Recurring\RecurringRepositoryInterface;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use Log; use Log;
use Mockery; use Mockery;
use Preferences;
use Tests\TestCase; use Tests\TestCase;
/** /**
@ -61,73 +62,44 @@ class ReconcileControllerTest extends TestCase
*/ */
public function testOverview(): void public function testOverview(): void
{ {
$this->markTestIncomplete('Needs to be rewritten for v4.8.0'); $this->mock(CurrencyRepositoryInterface::class);
$this->mock(RecurringRepositoryInterface::class);
return; $this->mockDefaultSession();
$accountRepos = $this->mock(AccountRepositoryInterface::class); $accountRepos = $this->mock(AccountRepositoryInterface::class);
$currencyRepos = $this->mock(CurrencyRepositoryInterface::class); $collector = $this->mock(GroupCollectorInterface::class);
$recurringRepos = $this->mock(RecurringRepositoryInterface::class);
$collector = $this->mock(TransactionCollectorInterface::class);
$transactions = $this->user()->transactions()->inRandomOrder()->take(3)->get();
$transactions = $transactions->each(
function (Transaction $transaction) {
$transaction->transaction_amount = '5';
}
);
$repository = $this->mock(JournalRepositoryInterface::class);
$repository->shouldReceive('firstNull')->andReturn(new TransactionJournal);
$repository->shouldReceive('getTransactionsById')->andReturn($transactions)->twice();
$fiscalHelper = $this->mock(FiscalHelperInterface::class); $fiscalHelper = $this->mock(FiscalHelperInterface::class);
$euro = $this->getEuro();
$withdrawal = $this->getRandomWithdrawalAsArray();
$date = new Carbon; $date = new Carbon;
$account = $this->user()->accounts()->where('id', $withdrawal['source_account_id'])->first();
// make sure it falls into the current range
$withdrawal['date'] = new Carbon('2017-01-30');
$accountRepos->shouldReceive('getAccountCurrency')->atLeast()->once()->andReturn($euro);
$collector->shouldReceive('setJournalIds')->atLeast()->once()->andReturnSelf();
$collector->shouldReceive('getExtractedJournals')->atLeast()->once()->andReturn([$withdrawal]);
Amount::shouldReceive('formatAnything')->andReturn('-100');
Amount::shouldReceive('getDefaultCurrency')->andReturn($euro);
$fiscalHelper->shouldReceive('endOfFiscalYear')->atLeast()->once()->andReturn($date); $fiscalHelper->shouldReceive('endOfFiscalYear')->atLeast()->once()->andReturn($date);
$fiscalHelper->shouldReceive('startOfFiscalYear')->atLeast()->once()->andReturn($date); $fiscalHelper->shouldReceive('startOfFiscalYear')->atLeast()->once()->andReturn($date);
$accountRepos->shouldReceive('findNull')->andReturn($this->getRandomAsset())->atLeast()->once();
$accountRepos->shouldReceive('getMetaValue')->atLeast()->once()->andReturn(1);
$parameters = [ $parameters = [
'startBalance' => '0', 'startBalance' => '0',
'endBalance' => '10', 'endBalance' => '10',
'transactions' => [1, 2, 3], 'journals' => [1, 2, 3],
'cleared' => [4, 5, 6],
];
$this->be($this->user());
$response = $this->get(route('accounts.reconcile.overview', [1, '20170101', '20170131']) . '?' . http_build_query($parameters));
$response->assertStatus(200);
}
/**
* Test overview when it's not an asset.
*
* @covers \FireflyIII\Http\Controllers\Json\ReconcileController
*/
public function testOverviewNotAsset(): void
{
$this->markTestIncomplete('Needs to be rewritten for v4.8.0');
return;
$accountRepos = $this->mock(AccountRepositoryInterface::class);
$currencyRepos = $this->mock(CurrencyRepositoryInterface::class);
$recurringRepos = $this->mock(RecurringRepositoryInterface::class);
$fiscalHelper = $this->mock(FiscalHelperInterface::class);
$collector = $this->mock(TransactionCollectorInterface::class);
$date = new Carbon;
$fiscalHelper->shouldReceive('endOfFiscalYear')->atLeast()->once()->andReturn($date);
$fiscalHelper->shouldReceive('startOfFiscalYear')->atLeast()->once()->andReturn($date);
$account = $this->user()->accounts()->where('account_type_id', '!=', 3)->first();
$parameters = [
'startBalance' => '0',
'endBalance' => '10',
'transactions' => [1, 2, 3],
'cleared' => [4, 5, 6], 'cleared' => [4, 5, 6],
]; ];
$this->be($this->user()); $this->be($this->user());
$response = $this->get(route('accounts.reconcile.overview', [$account->id, '20170101', '20170131']) . '?' . http_build_query($parameters)); $response = $this->get(route('accounts.reconcile.overview', [$account->id, '20170101', '20170131']) . '?' . http_build_query($parameters));
$response->assertStatus(500); $response->assertStatus(200);
$response->assertSee('-100');
} }
/** /**
* List transactions for reconciliation view. * List transactions for reconciliation view.
* *
@ -135,56 +107,38 @@ class ReconcileControllerTest extends TestCase
*/ */
public function testTransactions(): void public function testTransactions(): void
{ {
$this->markTestIncomplete('Needs to be rewritten for v4.8.0'); $this->mock(RecurringRepositoryInterface::class);
$this->mockDefaultSession();
return;
$repository = $this->mock(CurrencyRepositoryInterface::class); $repository = $this->mock(CurrencyRepositoryInterface::class);
$accountRepos = $this->mock(AccountRepositoryInterface::class); $accountRepos = $this->mock(AccountRepositoryInterface::class);
$recurringRepos = $this->mock(RecurringRepositoryInterface::class);
$fiscalHelper = $this->mock(FiscalHelperInterface::class); $fiscalHelper = $this->mock(FiscalHelperInterface::class);
$collector = $this->mock(TransactionCollectorInterface::class); $collector = $this->mock(GroupCollectorInterface::class);
$date = new Carbon; $date = new Carbon;
$euro =$this->getEuro();
$withdrawal = $this->getRandomWithdrawalAsArray();
$accountRepos->shouldReceive('getAccountCurrency')->atLeast()->once()->andReturn($euro);
Preferences::shouldReceive('lastActivity')->atLeast()->once()->andReturn('md512345');
Amount::shouldReceive('formatAnything')->andReturn('-100');
$fiscalHelper->shouldReceive('endOfFiscalYear')->atLeast()->once()->andReturn($date); $fiscalHelper->shouldReceive('endOfFiscalYear')->atLeast()->once()->andReturn($date);
$fiscalHelper->shouldReceive('startOfFiscalYear')->atLeast()->once()->andReturn($date); $fiscalHelper->shouldReceive('startOfFiscalYear')->atLeast()->once()->andReturn($date);
$accountRepos->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'currency_id'])->andReturn('1')->atLeast()->once(); $accountRepos->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'currency_id'])->andReturn('1')->atLeast()->once();
$repository->shouldReceive('findNull')->once()->andReturn(TransactionCurrency::find(1));
$collector->shouldReceive('setAccounts')->atLeast()->once()->andReturnSelf(); $collector->shouldReceive('setAccounts')->atLeast()->once()->andReturnSelf();
$collector->shouldReceive('setRange')->atLeast()->once()->andReturnSelf(); $collector->shouldReceive('setRange')->atLeast()->once()->andReturnSelf();
$collector->shouldReceive('withBudgetInformation')->atLeast()->once()->andReturnSelf(); $collector->shouldReceive('withBudgetInformation')->atLeast()->once()->andReturnSelf();
$collector->shouldReceive('withOpposingAccount')->atLeast()->once()->andReturnSelf(); $collector->shouldReceive('withAccountInformation')->atLeast()->once()->andReturnSelf();
$collector->shouldReceive('withCategoryInformation')->atLeast()->once()->andReturnSelf(); $collector->shouldReceive('withCategoryInformation')->atLeast()->once()->andReturnSelf();
$collector->shouldReceive('getTransactions')->atLeast()->once()->andReturn(new Collection); $collector->shouldReceive('getExtractedJournals')->atLeast()->once()->andReturn([$withdrawal]);
$this->be($this->user()); $this->be($this->user());
$response = $this->get(route('accounts.reconcile.transactions', [1, '20170101', '20170131'])); $response = $this->get(route('accounts.reconcile.transactions', [1, '20170101', '20170131']));
$response->assertStatus(200); $response->assertStatus(200);
$response->assertSee('-100');
} }
/**
* @covers \FireflyIII\Http\Controllers\Json\ReconcileController
*/
public function testTransactionsInitialBalance(): void
{
$this->markTestIncomplete('Needs to be rewritten for v4.8.0');
return;
$accountRepos = $this->mock(AccountRepositoryInterface::class);
$currencyRepos = $this->mock(CurrencyRepositoryInterface::class);
$recurringRepos = $this->mock(RecurringRepositoryInterface::class);
$fiscalHelper = $this->mock(FiscalHelperInterface::class);
$collector = $this->mock(TransactionCollectorInterface::class);
$date = new Carbon;
$fiscalHelper->shouldReceive('endOfFiscalYear')->atLeast()->once()->andReturn($date);
$fiscalHelper->shouldReceive('startOfFiscalYear')->atLeast()->once()->andReturn($date);
$transaction = Transaction::leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id')
->where('accounts.user_id', $this->user()->id)->where('accounts.account_type_id', 6)->first(['account_id']);
$this->be($this->user());
$response = $this->get(route('accounts.reconcile.transactions', [$transaction->account_id, '20170101', '20170131']));
$response->assertStatus(302);
}
} }

12
tests/Feature/Controllers/Json/RecurrenceControllerTest.php
View File

@ -53,7 +53,7 @@ class RecurrenceControllerTest extends TestCase
public function testEventsNdom(): void public function testEventsNdom(): void
{ {
$repository = $this->mock(RecurringRepositoryInterface::class); $repository = $this->mock(RecurringRepositoryInterface::class);
$this->mockDefaultSession();
// collection of dates: // collection of dates:
$dates = [new Carbon('2018-01-01'), new Carbon('2018-01-07')]; $dates = [new Carbon('2018-01-01'), new Carbon('2018-01-07')];
$repository->shouldReceive('getOccurrencesInRange')->withAnyArgs()->once() $repository->shouldReceive('getOccurrencesInRange')->withAnyArgs()->once()
@ -106,6 +106,7 @@ class RecurrenceControllerTest extends TestCase
public function testEventsNumberOfEvents(): void public function testEventsNumberOfEvents(): void
{ {
$repository = $this->mock(RecurringRepositoryInterface::class); $repository = $this->mock(RecurringRepositoryInterface::class);
$this->mockDefaultSession();
// collection of dates: // collection of dates:
$dates = [new Carbon('2018-01-01'), new Carbon('2018-01-07')]; $dates = [new Carbon('2018-01-01'), new Carbon('2018-01-07')];
@ -158,7 +159,8 @@ class RecurrenceControllerTest extends TestCase
*/ */
public function testEventsStartAfterEnd(): void public function testEventsStartAfterEnd(): void
{ {
$repository = $this->mock(RecurringRepositoryInterface::class); $this->mock(RecurringRepositoryInterface::class);
$this->mockDefaultSession();
$parameters = [ $parameters = [
'start' => '2018-01-01', 'start' => '2018-01-01',
@ -182,6 +184,7 @@ class RecurrenceControllerTest extends TestCase
public function testEventsUntilDate(): void public function testEventsUntilDate(): void
{ {
$repository = $this->mock(RecurringRepositoryInterface::class); $repository = $this->mock(RecurringRepositoryInterface::class);
$this->mockDefaultSession();
// collection of dates: // collection of dates:
$dates = [new Carbon('2018-01-01'), new Carbon('2018-01-07')]; $dates = [new Carbon('2018-01-01'), new Carbon('2018-01-07')];
@ -235,6 +238,7 @@ class RecurrenceControllerTest extends TestCase
public function testEventsWeeklyMonday(): void public function testEventsWeeklyMonday(): void
{ {
$repository = $this->mock(RecurringRepositoryInterface::class); $repository = $this->mock(RecurringRepositoryInterface::class);
$this->mockDefaultSession();
// collection of dates: // collection of dates:
$dates = [new Carbon('2018-01-01'), new Carbon('2018-01-07')]; $dates = [new Carbon('2018-01-01'), new Carbon('2018-01-07')];
@ -288,6 +292,7 @@ class RecurrenceControllerTest extends TestCase
public function testEventsYearly(): void public function testEventsYearly(): void
{ {
$repository = $this->mock(RecurringRepositoryInterface::class); $repository = $this->mock(RecurringRepositoryInterface::class);
$this->mockDefaultSession();
// collection of dates: // collection of dates:
$dates = [new Carbon('2018-01-01'), new Carbon('2018-01-07')]; $dates = [new Carbon('2018-01-01'), new Carbon('2018-01-07')];
@ -338,7 +343,8 @@ class RecurrenceControllerTest extends TestCase
*/ */
public function testSuggest(): void public function testSuggest(): void
{ {
$repository = $this->mock(RecurringRepositoryInterface::class); $this->mock(RecurringRepositoryInterface::class);
$this->mockDefaultSession();
$this->be($this->user()); $this->be($this->user());

84
tests/Feature/Controllers/Popup/ReportControllerTest.php
View File

@ -22,6 +22,7 @@ declare(strict_types=1);
namespace Tests\Feature\Controllers\Popup; namespace Tests\Feature\Controllers\Popup;
use Amount;
use Carbon\Carbon; use Carbon\Carbon;
use FireflyIII\Helpers\Report\PopupReportInterface; use FireflyIII\Helpers\Report\PopupReportInterface;
use FireflyIII\Models\Account; use FireflyIII\Models\Account;
@ -53,11 +54,15 @@ class ReportControllerTest extends TestCase
} }
/** /**
* @covers \FireflyIII\Http\Controllers\Popup\ReportController * @covers \FireflyIII\Http\Controllers\Popup\ReportController
*/ */
public function testBadEndDate(): void public function testBadEndDate(): void
{ {
$popupReport = $this->mock(PopupReportInterface::class); $this->mock(PopupReportInterface::class);
$this->mockDefaultSession();
$this->be($this->user()); $this->be($this->user());
$arguments = [ $arguments = [
'attributes' => [ 'attributes' => [
@ -73,17 +78,19 @@ class ReportControllerTest extends TestCase
$uri = route('popup.general') . '?' . http_build_query($arguments); $uri = route('popup.general') . '?' . http_build_query($arguments);
$response = $this->get($uri); $response = $this->get($uri);
$response->assertStatus(200); $response->assertStatus(200);
$response->assertSee('Firefly III cannot handle');
} }
/** /**
* @covers \FireflyIII\Http\Controllers\Popup\ReportController * @covers \FireflyIII\Http\Controllers\Popup\ReportController
* @expectedExceptionMessage Could not parse start date
*/ */
public function testBadStartDate(): void public function testBadStartDate(): void
{ {
$popupReport = $this->mock(PopupReportInterface::class); $this->mock(PopupReportInterface::class);
$this->be($this->user()); $this->be($this->user());
$this->mockDefaultSession();
$arguments = [ $arguments = [
'attributes' => [ 'attributes' => [
'location' => 'bla-bla', 'location' => 'bla-bla',
@ -98,6 +105,7 @@ class ReportControllerTest extends TestCase
$uri = route('popup.general') . '?' . http_build_query($arguments); $uri = route('popup.general') . '?' . http_build_query($arguments);
$response = $this->get($uri); $response = $this->get($uri);
$response->assertStatus(200); $response->assertStatus(200);
$response->assertSee('Firefly III cannot handle');
} }
/** /**
@ -105,15 +113,20 @@ class ReportControllerTest extends TestCase
*/ */
public function testBalanceAmountDefaultNoBudget(): void public function testBalanceAmountDefaultNoBudget(): void
{ {
$categoryRepos = $this->mock(CategoryRepositoryInterface::class); $this->mock(CategoryRepositoryInterface::class);
$accountRepos = $this->mock(AccountRepositoryInterface::class); $accountRepos = $this->mock(AccountRepositoryInterface::class);
$budgetRepos = $this->mock(BudgetRepositoryInterface::class); $budgetRepos = $this->mock(BudgetRepositoryInterface::class);
$popupHelper = $this->mock(PopupReportInterface::class); $popupHelper = $this->mock(PopupReportInterface::class);
$account = factory(Account::class)->make(); $account = $this->getRandomAsset();
$popupHelper->shouldReceive('balanceForNoBudget')->andReturn(new Collection);
$this->mockDefaultSession();
$popupHelper->shouldReceive('balanceForNoBudget')->andReturn([]);
$budgetRepos->shouldReceive('findNull')->andReturn(new Budget)->once()->withArgs([0]); $budgetRepos->shouldReceive('findNull')->andReturn(new Budget)->once()->withArgs([0]);
$accountRepos->shouldReceive('findNull')->andReturn($account)->once()->withArgs([1]); $accountRepos->shouldReceive('findNull')->andReturn($account)->once()->withArgs([1]);
$popupHelper->shouldReceive('balanceForBudget')->once()->andReturn(new Collection); $popupHelper->shouldReceive('balanceForBudget')->once()->andReturn([]);
Amount::shouldReceive('formatAnything')->andReturn('-100');
$this->be($this->user()); $this->be($this->user());
$arguments = [ $arguments = [
@ -131,6 +144,7 @@ class ReportControllerTest extends TestCase
$uri = route('popup.general') . '?' . http_build_query($arguments); $uri = route('popup.general') . '?' . http_build_query($arguments);
$response = $this->get($uri); $response = $this->get($uri);
$response->assertStatus(200); $response->assertStatus(200);
$response->assertSee($account->name);
} }
/** /**
@ -138,16 +152,18 @@ class ReportControllerTest extends TestCase
*/ */
public function testBalanceAmountDefaultRole(): void public function testBalanceAmountDefaultRole(): void
{ {
$categoryRepos = $this->mock(CategoryRepositoryInterface::class); $this->mock(CategoryRepositoryInterface::class);
$accountRepos = $this->mock(AccountRepositoryInterface::class); $accountRepos = $this->mock(AccountRepositoryInterface::class);
$budgetRepos = $this->mock(BudgetRepositoryInterface::class); $budgetRepos = $this->mock(BudgetRepositoryInterface::class);
$popupHelper = $this->mock(PopupReportInterface::class); $popupHelper = $this->mock(PopupReportInterface::class);
$budget = factory(Budget::class)->make(); $account = $this->getRandomAsset();
$account = factory(Account::class)->make(); $budget = $this->getRandomBudget();
$this->mockDefaultSession();
$budgetRepos->shouldReceive('findNull')->andReturn($budget)->once()->withArgs([1]); $budgetRepos->shouldReceive('findNull')->andReturn($budget)->once()->withArgs([1]);
$accountRepos->shouldReceive('findNull')->andReturn($account)->once()->withArgs([1]); $accountRepos->shouldReceive('findNull')->andReturn($account)->once()->withArgs([1]);
$popupHelper->shouldReceive('balanceForBudget')->once()->andReturn(new Collection); $popupHelper->shouldReceive('balanceForBudget')->once()->andReturn([]);
$this->be($this->user()); $this->be($this->user());
$arguments = [ $arguments = [
@ -176,9 +192,10 @@ class ReportControllerTest extends TestCase
$accountRepos = $this->mock(AccountRepositoryInterface::class); $accountRepos = $this->mock(AccountRepositoryInterface::class);
$budgetRepos = $this->mock(BudgetRepositoryInterface::class); $budgetRepos = $this->mock(BudgetRepositoryInterface::class);
$popupReport = $this->mock(PopupReportInterface::class); $popupReport = $this->mock(PopupReportInterface::class);
$budget = factory(Budget::class)->make(); $account = $this->getRandomAsset();
$account = factory(Account::class)->make(); $budget = $this->getRandomBudget();
$this->mockDefaultSession();
$budgetRepos->shouldReceive('findNull')->andReturn($budget)->once()->withArgs([1]); $budgetRepos->shouldReceive('findNull')->andReturn($budget)->once()->withArgs([1]);
$accountRepos->shouldReceive('findNull')->andReturn($account)->once()->withArgs([1]); $accountRepos->shouldReceive('findNull')->andReturn($account)->once()->withArgs([1]);
@ -210,10 +227,11 @@ class ReportControllerTest extends TestCase
$categoryRepos = $this->mock(CategoryRepositoryInterface::class); $categoryRepos = $this->mock(CategoryRepositoryInterface::class);
$budgetRepos = $this->mock(BudgetRepositoryInterface::class); $budgetRepos = $this->mock(BudgetRepositoryInterface::class);
$popupHelper = $this->mock(PopupReportInterface::class); $popupHelper = $this->mock(PopupReportInterface::class);
$budget = factory(Budget::class)->make(); $budget = $this->getRandomBudget();
$this->mockDefaultSession();
$budgetRepos->shouldReceive('findNull')->andReturn($budget)->once()->withArgs([1]); $budgetRepos->shouldReceive('findNull')->andReturn($budget)->once()->withArgs([1]);
$popupHelper->shouldReceive('byBudget')->andReturn(new Collection); $popupHelper->shouldReceive('byBudget')->andReturn([]);
$this->be($this->user()); $this->be($this->user());
$arguments = [ $arguments = [
@ -237,14 +255,15 @@ class ReportControllerTest extends TestCase
*/ */
public function testCategoryEntry(): void public function testCategoryEntry(): void
{ {
$budgetRepos = $this->mock(BudgetRepositoryInterface::class); $this->mock(BudgetRepositoryInterface::class);
$accountRepos = $this->mock(AccountRepositoryInterface::class); $this->mock(AccountRepositoryInterface::class);
$categoryRepos = $this->mock(CategoryRepositoryInterface::class); $categoryRepos = $this->mock(CategoryRepositoryInterface::class);
$popupHelper = $this->mock(PopupReportInterface::class); $popupHelper = $this->mock(PopupReportInterface::class);
$category = factory(Category::class)->make(); $category = $this->getRandomCategory();
$this->mockDefaultSession();
$categoryRepos->shouldReceive('findNull')->andReturn($category)->once()->withArgs([1]); $categoryRepos->shouldReceive('findNull')->andReturn($category)->once()->withArgs([1]);
$popupHelper->shouldReceive('byCategory')->andReturn(new Collection); $popupHelper->shouldReceive('byCategory')->andReturn([]);
$this->be($this->user()); $this->be($this->user());
$arguments = [ $arguments = [
@ -273,10 +292,11 @@ class ReportControllerTest extends TestCase
$categoryRepos = $this->mock(CategoryRepositoryInterface::class); $categoryRepos = $this->mock(CategoryRepositoryInterface::class);
$popupHelper = $this->mock(PopupReportInterface::class); $popupHelper = $this->mock(PopupReportInterface::class);
$accountRepos = $this->mock(AccountRepositoryInterface::class); $accountRepos = $this->mock(AccountRepositoryInterface::class);
$account = factory(Account::class)->make(); $account = $this->getRandomAsset();
$this->mockDefaultSession();
$accountRepos->shouldReceive('findNull')->withArgs([1])->andReturn($account)->once(); $accountRepos->shouldReceive('findNull')->withArgs([1])->andReturn($account)->once();
$popupHelper->shouldReceive('byExpenses')->andReturn(new Collection); $popupHelper->shouldReceive('byExpenses')->andReturn([]);
$this->be($this->user()); $this->be($this->user());
$arguments = [ $arguments = [
@ -305,10 +325,11 @@ class ReportControllerTest extends TestCase
$categoryRepos = $this->mock(CategoryRepositoryInterface::class); $categoryRepos = $this->mock(CategoryRepositoryInterface::class);
$popupHelper = $this->mock(PopupReportInterface::class); $popupHelper = $this->mock(PopupReportInterface::class);
$accountRepos = $this->mock(AccountRepositoryInterface::class); $accountRepos = $this->mock(AccountRepositoryInterface::class);
$account = factory(Account::class)->make(); $account = $this->getRandomAsset();
$this->mockDefaultSession();
$accountRepos->shouldReceive('findNull')->withArgs([1])->andReturn($account)->once(); $accountRepos->shouldReceive('findNull')->withArgs([1])->andReturn($account)->once();
$popupHelper->shouldReceive('byIncome')->andReturn(new Collection); $popupHelper->shouldReceive('byIncome')->andReturn([]);
$this->be($this->user()); $this->be($this->user());
$arguments = [ $arguments = [
@ -335,6 +356,7 @@ class ReportControllerTest extends TestCase
{ {
$popupReport = $this->mock(PopupReportInterface::class); $popupReport = $this->mock(PopupReportInterface::class);
$this->mockDefaultSession();
$this->be($this->user()); $this->be($this->user());
$arguments = [ $arguments = [
'attributes' => [ 'attributes' => [

2
tests/Feature/Controllers/Report/ExpenseControllerTest.php
View File

@ -23,7 +23,7 @@ declare(strict_types=1);
namespace Tests\Feature\Controllers\Report; namespace Tests\Feature\Controllers\Report;
use Carbon\Carbon; use Carbon\Carbon;
use FireflyIII\Helpers\Collector\TransactionCollectorInterface;
use FireflyIII\Helpers\Fiscal\FiscalHelperInterface; use FireflyIII\Helpers\Fiscal\FiscalHelperInterface;
use FireflyIII\Models\AccountType; use FireflyIII\Models\AccountType;
use FireflyIII\Models\Transaction; use FireflyIII\Models\Transaction;

2
tests/Feature/Controllers/TagControllerTest.php
View File

@ -23,7 +23,7 @@ declare(strict_types=1);
namespace Tests\Feature\Controllers; namespace Tests\Feature\Controllers;
use Carbon\Carbon; use Carbon\Carbon;
use FireflyIII\Helpers\Collector\TransactionCollectorInterface;
use FireflyIII\Helpers\Fiscal\FiscalHelperInterface; use FireflyIII\Helpers\Fiscal\FiscalHelperInterface;
use FireflyIII\Models\Tag; use FireflyIII\Models\Tag;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;

2
tests/Feature/Controllers/Transaction/MassControllerTest.php
View File

@ -22,7 +22,7 @@ declare(strict_types=1);
namespace Tests\Feature\Controllers\Transaction; namespace Tests\Feature\Controllers\Transaction;
use FireflyIII\Helpers\Collector\TransactionCollectorInterface;
use FireflyIII\Models\AccountType; use FireflyIII\Models\AccountType;
use FireflyIII\Models\Transaction; use FireflyIII\Models\Transaction;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;

2
tests/Feature/Controllers/Transaction/SingleControllerTest.php
View File

@ -28,7 +28,7 @@ use Exception;
use FireflyIII\Events\StoredTransactionJournal; use FireflyIII\Events\StoredTransactionJournal;
use FireflyIII\Events\UpdatedTransactionJournal; use FireflyIII\Events\UpdatedTransactionJournal;
use FireflyIII\Helpers\Attachments\AttachmentHelperInterface; use FireflyIII\Helpers\Attachments\AttachmentHelperInterface;
use FireflyIII\Helpers\Collector\TransactionCollectorInterface;
use FireflyIII\Models\AccountType; use FireflyIII\Models\AccountType;
use FireflyIII\Models\Transaction; use FireflyIII\Models\Transaction;
use FireflyIII\Models\TransactionCurrency; use FireflyIII\Models\TransactionCurrency;

2
tests/Feature/Controllers/Transaction/SplitControllerTest.php
View File

@ -23,7 +23,7 @@ declare(strict_types=1);
namespace Tests\Feature\Controllers\Transaction; namespace Tests\Feature\Controllers\Transaction;
use FireflyIII\Helpers\Attachments\AttachmentHelperInterface; use FireflyIII\Helpers\Attachments\AttachmentHelperInterface;
use FireflyIII\Helpers\Collector\TransactionCollectorInterface;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\Bill\BillRepositoryInterface; use FireflyIII\Repositories\Bill\BillRepositoryInterface;

4
tests/Feature/Controllers/TransactionControllerTest.php
View File

@ -23,8 +23,8 @@ declare(strict_types=1);
namespace Tests\Feature\Controllers; namespace Tests\Feature\Controllers;
use Carbon\Carbon; use Carbon\Carbon;
use FireflyIII\Helpers\Collector\TransactionCollectorInterface;
use FireflyIII\Helpers\Filter\InternalTransferFilter;
use FireflyIII\Helpers\Fiscal\FiscalHelperInterface; use FireflyIII\Helpers\Fiscal\FiscalHelperInterface;
use FireflyIII\Models\Attachment; use FireflyIII\Models\Attachment;
use FireflyIII\Models\Transaction; use FireflyIII\Models\Transaction;

5
tests/TestCase.php
View File

@ -30,7 +30,7 @@ use DB;
use Exception; use Exception;
use FireflyConfig; use FireflyConfig;
use FireflyIII\Exceptions\FireflyException; use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Helpers\Collector\TransactionCollectorInterface;
use FireflyIII\Models\Account; use FireflyIII\Models\Account;
use FireflyIII\Models\AccountType; use FireflyIII\Models\AccountType;
use FireflyIII\Models\Budget; use FireflyIII\Models\Budget;
@ -131,7 +131,7 @@ abstract class TestCase extends BaseTestCase
$falseConfig = new Configuration; $falseConfig = new Configuration;
$falseConfig->data = false; $falseConfig->data = false;
FireflyConfig::shouldReceive('get')->withArgs(['is_demo_site', false])->once()->andReturn($falseConfig); FireflyConfig::shouldReceive('get')->withArgs(['is_demo_site', false])->andReturn($falseConfig);
} }
/** /**
@ -156,6 +156,7 @@ abstract class TestCase extends BaseTestCase
'currency_id' => $euro->id, 'currency_id' => $euro->id,
'foreign_currency_id' => null, 'foreign_currency_id' => null,
'date' => $date, 'date' => $date,
'description' => sprintf('I am descr #%d', $this->randomInt()),
'source_account_id' => 1, 'source_account_id' => 1,
'destination_account_id' => $expense->id, 'destination_account_id' => $expense->id,
'destination_account_name' => $expense->name, 'destination_account_name' => $expense->name,

6
tests/Unit/Import/Storage/ImportArrayStorageTest.php
View File

@ -26,9 +26,9 @@ namespace Tests\Unit\Import\Storage;
use Carbon\Carbon; use Carbon\Carbon;
use Exception; use Exception;
use FireflyIII\Exceptions\FireflyException; use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Helpers\Collector\TransactionCollector;
use FireflyIII\Helpers\Collector\TransactionCollectorInterface;
use FireflyIII\Helpers\Filter\InternalTransferFilter;
use FireflyIII\Import\Storage\ImportArrayStorage; use FireflyIII\Import\Storage\ImportArrayStorage;
use FireflyIII\Models\ImportJob; use FireflyIII\Models\ImportJob;
use FireflyIII\Models\Rule; use FireflyIII\Models\Rule;