diff --git a/app/Http/Controllers/Json/AutoCompleteController.php b/app/Http/Controllers/Json/AutoCompleteController.php index 40d7b0ddb9..2bce8f12c9 100644 --- a/app/Http/Controllers/Json/AutoCompleteController.php +++ b/app/Http/Controllers/Json/AutoCompleteController.php @@ -221,6 +221,7 @@ class AutoCompleteController extends Controller /** * @param Request $request * @return JsonResponse + * @codeCoverageIgnore */ public function budgets(Request $request): JsonResponse { @@ -251,6 +252,7 @@ class AutoCompleteController extends Controller /** * @param Request $request * @return JsonResponse + * @codeCoverageIgnore */ public function currencyNames(Request $request): JsonResponse { diff --git a/app/Http/Controllers/Report/CategoryController.php b/app/Http/Controllers/Report/CategoryController.php index d41d859e76..ca0dd5fe89 100644 --- a/app/Http/Controllers/Report/CategoryController.php +++ b/app/Http/Controllers/Report/CategoryController.php @@ -161,10 +161,10 @@ class CategoryController extends Controller $sum[$categoryId] = (float)$row['spent']; } array_multisort($sum, SORT_ASC, $report); + // @codeCoverageIgnoreStart try { $result = view('reports.partials.categories', compact('report'))->render(); $cache->store($result); - // @codeCoverageIgnoreStart } catch (Throwable $e) { Log::error(sprintf('Could not render category::expenses: %s', $e->getMessage())); $result = sprintf('An error prevented Firefly III from rendering: %s. Apologies.', $e->getMessage()); diff --git a/app/Http/Controllers/Transaction/SingleController.php b/app/Http/Controllers/Transaction/SingleController.php deleted file mode 100644 index 2d1cb6e6f4..0000000000 --- a/app/Http/Controllers/Transaction/SingleController.php +++ /dev/null @@ -1,90 +0,0 @@ -. - */ -declare(strict_types=1); - -namespace FireflyIII\Http\Controllers\Transaction; - -use Carbon\Carbon; -use FireflyIII\Events\StoredTransactionGroup; -use FireflyIII\Events\UpdatedTransactionGroup; -use FireflyIII\Exceptions\FireflyException; -use FireflyIII\Helpers\Attachments\AttachmentHelperInterface; -use FireflyIII\Http\Controllers\Controller; -use FireflyIII\Http\Requests\JournalFormRequest; -use FireflyIII\Models\Transaction; -use FireflyIII\Models\TransactionJournal; -use FireflyIII\Models\TransactionJournalMeta; -use FireflyIII\Models\TransactionType; -use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; -use FireflyIII\Repositories\Journal\JournalRepositoryInterface; -use FireflyIII\Support\Http\Controllers\ModelInformation; -use Illuminate\Http\JsonResponse; -use Illuminate\Http\RedirectResponse; -use Illuminate\Http\Request; -use Log; -use View; - -/** - * Class SingleController. - * - * @SuppressWarnings(PHPMD.CouplingBetweenObjects) - */ -class SingleController extends Controller -{ - - use ModelInformation; - - /** @var AttachmentHelperInterface The attachment helper. */ - private $attachments; - /** @var BudgetRepositoryInterface The budget repository */ - private $budgets; - /** @var JournalRepositoryInterface Journals and transactions overview */ - private $repository; - - /** - * SingleController constructor. - */ - public function __construct() - { - throw new FireflyException('Do not use me.'); - parent::__construct(); - - $maxFileSize = app('steam')->phpBytes(ini_get('upload_max_filesize')); - $maxPostSize = app('steam')->phpBytes(ini_get('post_max_size')); - $uploadSize = min($maxFileSize, $maxPostSize); - app('view')->share('uploadSize', $uploadSize); - - // some useful repositories: - $this->middleware( - function ($request, $next) { - $this->budgets = app(BudgetRepositoryInterface::class); - $this->attachments = app(AttachmentHelperInterface::class); - $this->repository = app(JournalRepositoryInterface::class); - - app('view')->share('title', (string)trans('firefly.transactions')); - app('view')->share('mainTitleIcon', 'fa-repeat'); - - return $next($request); - } - ); - } - -} diff --git a/app/Support/Http/Controllers/BasicDataSupport.php b/app/Support/Http/Controllers/BasicDataSupport.php index ac13cba8c7..5779774352 100644 --- a/app/Support/Http/Controllers/BasicDataSupport.php +++ b/app/Support/Http/Controllers/BasicDataSupport.php @@ -30,23 +30,6 @@ namespace FireflyIII\Support\Http\Controllers; trait BasicDataSupport { - /** - * Sum up an array. - * - * @param array $array - * - * @return string - */ - protected function arraySum(array $array): string // filter + group data - { - $sum = '0'; - foreach ($array as $entry) { - $sum = bcadd($sum, $entry); - } - - return $sum; - } - /** * Filters empty results from getBudgetPeriodReport. * diff --git a/app/Support/Http/Controllers/ChartGeneration.php b/app/Support/Http/Controllers/ChartGeneration.php index efdcc4198c..516f7a330d 100644 --- a/app/Support/Http/Controllers/ChartGeneration.php +++ b/app/Support/Http/Controllers/ChartGeneration.php @@ -236,6 +236,7 @@ trait ChartGeneration $chartData[1]['entries'][$label] = round($earned, 12); $chartData[2]['entries'][$label] = round($sum, 12); + // @codeCoverageIgnoreStart switch ($step) { default: case '1D': @@ -251,6 +252,7 @@ trait ChartGeneration $start->addYear(); break; } + // @codeCoverageIgnoreEnd } $data = $generator->multiSet($chartData); diff --git a/app/Support/Http/Controllers/UserNavigation.php b/app/Support/Http/Controllers/UserNavigation.php index 2152c8d4d7..043194e375 100644 --- a/app/Support/Http/Controllers/UserNavigation.php +++ b/app/Support/Http/Controllers/UserNavigation.php @@ -155,8 +155,7 @@ trait UserNavigation $url = app('url')->previous(); session()->put($identifier, $url); //Log::debug(sprintf('Will put previous URI in cache under key %s: %s', $identifier, $url)); - - return; + //return; } //Log::debug(sprintf('The users session contains errors somehow so we will not remember the URI!: %s', var_export($errors, true))); } diff --git a/tests/Feature/Controllers/Account/ShowControllerTest.php b/tests/Feature/Controllers/Account/ShowControllerTest.php index 37d3d73ec8..b3f1b5dd99 100644 --- a/tests/Feature/Controllers/Account/ShowControllerTest.php +++ b/tests/Feature/Controllers/Account/ShowControllerTest.php @@ -125,15 +125,15 @@ class ShowControllerTest extends TestCase $this->session(['start' => $date, 'end' => clone $date]); // mock stuff: $this->mock(AccountTaskerInterface::class); - $userRepos = $this->mock(UserRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); $this->mock(CurrencyRepositoryInterface::class); $this->mock(AccountRepositoryInterface::class); - $collector = $this->mock(GroupCollectorInterface::class); - $repository = $this->mock(AccountRepositoryInterface::class); - $journal = $this->getRandomWithdrawalAsArray(); - $group = $this->getRandomWithdrawalGroup(); - $euro = $this->getEuro(); - $asset = $this->getRandomAsset(); + $collector = $this->mock(GroupCollectorInterface::class); + $repository = $this->mock(AccountRepositoryInterface::class); + $journal = $this->getRandomWithdrawalAsArray(); + $group = $this->getRandomWithdrawalGroup(); + $euro = $this->getEuro(); + $asset = $this->getRandomAsset(); $this->mockDefaultSession(); diff --git a/tests/Feature/Controllers/Admin/ConfigurationControllerTest.php b/tests/Feature/Controllers/Admin/ConfigurationControllerTest.php index 991fdf6ce1..bc863e633a 100644 --- a/tests/Feature/Controllers/Admin/ConfigurationControllerTest.php +++ b/tests/Feature/Controllers/Admin/ConfigurationControllerTest.php @@ -50,7 +50,7 @@ class ConfigurationControllerTest extends TestCase public function testIndex(): void { $this->mockDefaultSession(); - $userRepos = $this->mock(UserRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); // for session diff --git a/tests/Feature/Controllers/Admin/LinkControllerTest.php b/tests/Feature/Controllers/Admin/LinkControllerTest.php index e3d13462f4..2968e3e437 100644 --- a/tests/Feature/Controllers/Admin/LinkControllerTest.php +++ b/tests/Feature/Controllers/Admin/LinkControllerTest.php @@ -28,8 +28,8 @@ use FireflyIII\Repositories\User\UserRepositoryInterface; use Illuminate\Support\Collection; use Log; use Mockery; -use Tests\TestCase; use Preferences; +use Tests\TestCase; /** * Class LinkControllerTest @@ -85,7 +85,7 @@ class LinkControllerTest extends TestCase $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'demo'])->andReturn(false)->atLeast()->once(); $linkType = LinkType::where('editable', 1)->first(); - $another= LinkType::where('editable', 0)->first(); + $another = LinkType::where('editable', 0)->first(); $repository->shouldReceive('get')->once()->andReturn(new Collection([$linkType, $another])); $repository->shouldReceive('countJournals')->andReturn(2); $this->be($this->user()); @@ -100,9 +100,9 @@ class LinkControllerTest extends TestCase */ public function testDeleteNonEditable(): void { - $userRepos = $this->mock(UserRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); $this->mock(LinkTypeRepositoryInterface::class); - $linkType = LinkType::where('editable', 0)->first(); + $linkType = LinkType::where('editable', 0)->first(); // mock default session stuff $this->mockDefaultSession(); @@ -216,7 +216,7 @@ class LinkControllerTest extends TestCase */ public function testShow(): void { - $userRepos = $this->mock(UserRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); $repository = $this->mock(LinkTypeRepositoryInterface::class); $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'owner'])->andReturn(true)->atLeast()->once(); @@ -327,7 +327,7 @@ class LinkControllerTest extends TestCase */ public function testUpdateNonEditable(): void { - $userRepos = $this->mock(UserRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); $this->mock(LinkTypeRepositoryInterface::class); $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'owner'])->andReturn(true)->atLeast()->once(); diff --git a/tests/Feature/Controllers/Admin/UpdateControllerTest.php b/tests/Feature/Controllers/Admin/UpdateControllerTest.php index 3c9518490c..dbb3df9a8f 100644 --- a/tests/Feature/Controllers/Admin/UpdateControllerTest.php +++ b/tests/Feature/Controllers/Admin/UpdateControllerTest.php @@ -60,8 +60,8 @@ class UpdateControllerTest extends TestCase $this->mockDefaultSession(); // mock update calls. - $config = new Configuration; - $config->data = -1; + $config = new Configuration; + $config->data = -1; FireflyConfig::shouldReceive('get')->withArgs(['permission_update_check', -1])->once()->andReturn($config); // call service diff --git a/tests/Feature/Controllers/Auth/TwoFactorControllerTest.php b/tests/Feature/Controllers/Auth/TwoFactorControllerTest.php index c44427afe3..6967e08f4b 100644 --- a/tests/Feature/Controllers/Auth/TwoFactorControllerTest.php +++ b/tests/Feature/Controllers/Auth/TwoFactorControllerTest.php @@ -51,7 +51,6 @@ class TwoFactorControllerTest extends TestCase $this->be($this->user()); - $truePref = new Preference; $truePref->data = true; $secretPreference = new Preference; diff --git a/tests/Feature/Controllers/BillControllerTest.php b/tests/Feature/Controllers/BillControllerTest.php index 5534d57a0a..a460ed98ee 100644 --- a/tests/Feature/Controllers/BillControllerTest.php +++ b/tests/Feature/Controllers/BillControllerTest.php @@ -27,11 +27,8 @@ use FireflyIII\Helpers\Attachments\AttachmentHelperInterface; use FireflyIII\Helpers\Collector\GroupCollectorInterface; use FireflyIII\Models\Bill; use FireflyIII\Models\Preference; -use FireflyIII\Models\TransactionJournal; use FireflyIII\Repositories\Bill\BillRepositoryInterface; use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; -use FireflyIII\Repositories\Journal\JournalRepositoryInterface; -use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface; use FireflyIII\Repositories\User\UserRepositoryInterface; use FireflyIII\TransactionRules\TransactionMatcher; use FireflyIII\Transformers\BillTransformer; @@ -175,7 +172,9 @@ class BillControllerTest extends TestCase $transformer->shouldReceive('setParameters')->atLeast()->once(); $transformer->shouldReceive('transform')->atLeast()->once()->andReturn( - ['id' => 5, 'active' => true, 'name' => 'x', 'next_expected_match' => '2018-01-01'] + ['id' => 5, 'active' => true, 'name' => 'x', 'next_expected_match' => '2018-01-01', + 'currency' => $this->getEuro(), + ] ); $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'owner'])->andReturn(true)->atLeast()->once(); diff --git a/tests/Feature/Controllers/Budget/AmountControllerTest.php b/tests/Feature/Controllers/Budget/AmountControllerTest.php index b42d9aaaf7..671b5930f5 100644 --- a/tests/Feature/Controllers/Budget/AmountControllerTest.php +++ b/tests/Feature/Controllers/Budget/AmountControllerTest.php @@ -28,9 +28,7 @@ use Amount; use Carbon\Carbon; use FireflyIII\Helpers\Fiscal\FiscalHelperInterface; use FireflyIII\Models\BudgetLimit; -use FireflyIII\Models\TransactionJournal; use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; -use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use Log; use Preferences; use Tests\TestCase; diff --git a/tests/Feature/Controllers/Budget/CreateControllerTest.php b/tests/Feature/Controllers/Budget/CreateControllerTest.php index a2a204d4bd..d4753f2b2c 100644 --- a/tests/Feature/Controllers/Budget/CreateControllerTest.php +++ b/tests/Feature/Controllers/Budget/CreateControllerTest.php @@ -24,7 +24,6 @@ declare(strict_types=1); namespace Tests\Feature\Controllers\Budget; -use FireflyIII\Models\Budget; use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; use FireflyIII\Repositories\User\UserRepositoryInterface; use Log; diff --git a/tests/Feature/Controllers/Budget/EditControllerTest.php b/tests/Feature/Controllers/Budget/EditControllerTest.php index f6173d4d2d..9cdfb28f5b 100644 --- a/tests/Feature/Controllers/Budget/EditControllerTest.php +++ b/tests/Feature/Controllers/Budget/EditControllerTest.php @@ -23,10 +23,7 @@ declare(strict_types=1); namespace Tests\Feature\Controllers\Budget; -use FireflyIII\Models\Budget; -use FireflyIII\Models\TransactionJournal; use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; -use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use FireflyIII\Repositories\User\UserRepositoryInterface; use Log; use Mockery; diff --git a/tests/Feature/Controllers/Budget/IndexControllerTest.php b/tests/Feature/Controllers/Budget/IndexControllerTest.php index 718a836ebb..ea01a0100e 100644 --- a/tests/Feature/Controllers/Budget/IndexControllerTest.php +++ b/tests/Feature/Controllers/Budget/IndexControllerTest.php @@ -23,25 +23,27 @@ declare(strict_types=1); namespace Tests\Feature\Controllers\Budget; +use Amount; use Carbon\Carbon; +use Exception; use FireflyIII\Helpers\Fiscal\FiscalHelperInterface; use FireflyIII\Models\Budget; use FireflyIII\Models\Preference; -use FireflyIII\Models\TransactionJournal; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; -use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use FireflyIII\Repositories\User\UserRepositoryInterface; use Illuminate\Support\Collection; use Log; use Mockery; use Preferences; -use Amount; use Tests\TestCase; /** * * Class IndexControllerTest + * @SuppressWarnings(PHPMD.TooManyPublicMethods) + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) + * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ class IndexControllerTest extends TestCase { @@ -63,7 +65,7 @@ class IndexControllerTest extends TestCase public function testIndex(string $range): void { // mock stuff - $budget = $this->getRandomBudget(); + $budget = $this->getRandomBudget(); $budgetLimit = $this->getRandomBudgetLimit(); $budgetLimit->start_date = Carbon::now()->startOfMonth(); $budgetLimit->end_date = Carbon::now()->endOfMonth(); @@ -100,7 +102,7 @@ class IndexControllerTest extends TestCase $this->be($this->user()); $this->changeDateRange($this->user(), $range); - $response = $this->get(route('budgets.index')); + $response = $this->get(route('budgets.index')); $response->assertStatus(200); // has bread crumb $response->assertSee('
    '); @@ -111,6 +113,7 @@ class IndexControllerTest extends TestCase * @dataProvider dateRangeProvider * * @param string $range + * @throws Exception */ public function testIndexOutOfRange(string $range): void { @@ -170,6 +173,7 @@ class IndexControllerTest extends TestCase * @dataProvider dateRangeProvider * * @param string $range + * @throws Exception */ public function testIndexWithDate(string $range): void { @@ -225,6 +229,7 @@ class IndexControllerTest extends TestCase * @dataProvider dateRangeProvider * * @param string $range + * @throws Exception */ public function testIndexWithInvalidDate(string $range): void { @@ -233,8 +238,8 @@ class IndexControllerTest extends TestCase // set budget limit to current month: $budgetLimit->start_date = Carbon::now()->startOfMonth(); $budgetLimit->end_date = Carbon::now()->endOfMonth(); - $accountRepos = $this->mock(AccountRepositoryInterface::class); - $repository = $this->mock(BudgetRepositoryInterface::class); + $accountRepos = $this->mock(AccountRepositoryInterface::class); + $repository = $this->mock(BudgetRepositoryInterface::class); $this->mock(UserRepositoryInterface::class); $fiscalHelper = $this->mock(FiscalHelperInterface::class); $date = new Carbon; diff --git a/tests/Feature/Controllers/Budget/ShowControllerTest.php b/tests/Feature/Controllers/Budget/ShowControllerTest.php index b08f4e0513..e67706b927 100644 --- a/tests/Feature/Controllers/Budget/ShowControllerTest.php +++ b/tests/Feature/Controllers/Budget/ShowControllerTest.php @@ -29,10 +29,8 @@ use Exception; use FireflyIII\Helpers\Collector\GroupCollectorInterface; use FireflyIII\Helpers\Fiscal\FiscalHelperInterface; use FireflyIII\Models\Preference; -use FireflyIII\Models\TransactionJournal; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; -use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use FireflyIII\Repositories\User\UserRepositoryInterface; use Illuminate\Pagination\LengthAwarePaginator; use Illuminate\Support\Collection; @@ -44,7 +42,9 @@ use Tests\TestCase; /** * * Class ShowControllerTest + * @SuppressWarnings(PHPMD.TooManyPublicMethods) * @SuppressWarnings(PHPMD.ExcessiveMethodLength) + * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ class ShowControllerTest extends TestCase { @@ -71,7 +71,9 @@ class ShowControllerTest extends TestCase $collector = $this->mock(GroupCollectorInterface::class); $userRepos = $this->mock(UserRepositoryInterface::class); $fiscalHelper = $this->mock(FiscalHelperInterface::class); + $date = null; $this->mockDefaultSession(); + try { $date = new Carbon; } catch (Exception $e) { @@ -118,6 +120,7 @@ class ShowControllerTest extends TestCase $this->mock(BudgetRepositoryInterface::class); $collector = $this->mock(GroupCollectorInterface::class); $userRepos = $this->mock(UserRepositoryInterface::class); + $date = null; $this->mockDefaultSession(); try { $date = new Carbon; diff --git a/tests/Feature/Controllers/Category/CreateControllerTest.php b/tests/Feature/Controllers/Category/CreateControllerTest.php index bae2ad0541..b5b20bd77b 100644 --- a/tests/Feature/Controllers/Category/CreateControllerTest.php +++ b/tests/Feature/Controllers/Category/CreateControllerTest.php @@ -23,10 +23,7 @@ namespace Tests\Feature\Controllers\Category; use FireflyIII\Models\Category; -use FireflyIII\Models\TransactionJournal; -use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Category\CategoryRepositoryInterface; -use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use FireflyIII\Repositories\User\UserRepositoryInterface; use Log; use Mockery; @@ -75,7 +72,7 @@ class CreateControllerTest extends TestCase { Log::debug('Test store()'); $repository = $this->mock(CategoryRepositoryInterface::class); - $userRepos = $this->mock(UserRepositoryInterface::class); + $this->mock(UserRepositoryInterface::class); $this->mockDefaultSession(); $repository->shouldReceive('findNull')->andReturn(new Category); $repository->shouldReceive('store')->andReturn(new Category); diff --git a/tests/Feature/Controllers/Category/DeleteControllerTest.php b/tests/Feature/Controllers/Category/DeleteControllerTest.php index 69d5543959..76d24db190 100644 --- a/tests/Feature/Controllers/Category/DeleteControllerTest.php +++ b/tests/Feature/Controllers/Category/DeleteControllerTest.php @@ -51,8 +51,8 @@ class DeleteControllerTest extends TestCase { Log::debug('Test Delete()'); // mock stuff - $categoryRepos = $this->mock(CategoryRepositoryInterface::class); - $accountRepos = $this->mock(AccountRepositoryInterface::class); + $this->mock(CategoryRepositoryInterface::class); + $this->mock(AccountRepositoryInterface::class); $userRepos = $this->mock(UserRepositoryInterface::class); $this->mockDefaultSession(); @@ -74,7 +74,7 @@ class DeleteControllerTest extends TestCase Log::debug('Test destroy()'); // mock stuff $categoryRepos = $this->mock(CategoryRepositoryInterface::class); - $accountRepos = $this->mock(AccountRepositoryInterface::class); + $this->mock(AccountRepositoryInterface::class); $this->mockDefaultSession(); Preferences::shouldReceive('mark')->atLeast()->once()->withNoArgs(); $categoryRepos->shouldReceive('destroy')->andReturn(true); diff --git a/tests/Feature/Controllers/Category/EditControllerTest.php b/tests/Feature/Controllers/Category/EditControllerTest.php index 3f76f6c5be..0f4c99a3b3 100644 --- a/tests/Feature/Controllers/Category/EditControllerTest.php +++ b/tests/Feature/Controllers/Category/EditControllerTest.php @@ -23,10 +23,8 @@ namespace Tests\Feature\Controllers\Category; use FireflyIII\Models\Category; -use FireflyIII\Models\TransactionJournal; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Category\CategoryRepositoryInterface; -use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use FireflyIII\Repositories\User\UserRepositoryInterface; use Log; use Mockery; @@ -79,8 +77,8 @@ class EditControllerTest extends TestCase Log::debug('Test update()'); $category = Category::first(); $repository = $this->mock(CategoryRepositoryInterface::class); - $accountRepos = $this->mock(AccountRepositoryInterface::class); - $userRepos = $this->mock(UserRepositoryInterface::class); + $this->mock(AccountRepositoryInterface::class); + $this->mock(UserRepositoryInterface::class); $this->mockDefaultSession(); Preferences::shouldReceive('mark')->atLeast()->once()->withNoArgs(); diff --git a/tests/Feature/Controllers/Category/IndexControllerTest.php b/tests/Feature/Controllers/Category/IndexControllerTest.php index c43db37f9f..9f47e52a24 100644 --- a/tests/Feature/Controllers/Category/IndexControllerTest.php +++ b/tests/Feature/Controllers/Category/IndexControllerTest.php @@ -23,7 +23,6 @@ namespace Tests\Feature\Controllers\Category; use Carbon\Carbon; -use FireflyIII\Models\Category; use FireflyIII\Models\Preference; use FireflyIII\Repositories\Category\CategoryRepositoryInterface; use FireflyIII\Repositories\User\UserRepositoryInterface; diff --git a/tests/Feature/Controllers/Category/NoCategoryControllerTest.php b/tests/Feature/Controllers/Category/NoCategoryControllerTest.php index f614eee5bf..916cfaa293 100644 --- a/tests/Feature/Controllers/Category/NoCategoryControllerTest.php +++ b/tests/Feature/Controllers/Category/NoCategoryControllerTest.php @@ -25,27 +25,27 @@ namespace Tests\Feature\Controllers\Category; use Carbon\Carbon; +use Exception; use FireflyIII\Helpers\Collector\GroupCollectorInterface; - - use FireflyIII\Helpers\Fiscal\FiscalHelperInterface; use FireflyIII\Models\Preference; -use FireflyIII\Models\TransactionJournal; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Category\CategoryRepositoryInterface; -use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use FireflyIII\Repositories\User\UserRepositoryInterface; use Illuminate\Pagination\LengthAwarePaginator; -use Illuminate\Support\Collection; use Log; use Mockery; use Navigation; use Preferences; use Tests\TestCase; + /** * * Class NoCategoryControllerTest + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) + * @SuppressWarnings(PHPMD.CouplingBetweenObjects) + * @SuppressWarnings(PHPMD.TooManyPublicMethods) */ class NoCategoryControllerTest extends TestCase { @@ -68,8 +68,8 @@ class NoCategoryControllerTest extends TestCase public function testNoCategory(string $range): void { $collector = $this->mock(GroupCollectorInterface::class); - $categoryRepos = $this->mock(CategoryRepositoryInterface::class); - $accountRepos = $this->mock(AccountRepositoryInterface::class); + $this->mock(CategoryRepositoryInterface::class); + $this->mock(AccountRepositoryInterface::class); $userRepos = $this->mock(UserRepositoryInterface::class); $this->mockDefaultSession(); @@ -104,13 +104,13 @@ class NoCategoryControllerTest extends TestCase * @dataProvider dateRangeProvider * * @param string $range - * + * @throws Exception */ public function testNoCategoryAll(string $range): void { $collector = $this->mock(GroupCollectorInterface::class); - $categoryRepos = $this->mock(CategoryRepositoryInterface::class); - $accountRepos = $this->mock(AccountRepositoryInterface::class); + $this->mock(CategoryRepositoryInterface::class); + $this->mock(AccountRepositoryInterface::class); $userRepos = $this->mock(UserRepositoryInterface::class); $fiscalHelper = $this->mock(FiscalHelperInterface::class); @@ -146,12 +146,13 @@ class NoCategoryControllerTest extends TestCase * @dataProvider dateRangeProvider * * @param string $range + * @throws Exception */ public function testNoCategoryDate(string $range): void { $collector = $this->mock(GroupCollectorInterface::class); - $categoryRepos = $this->mock(CategoryRepositoryInterface::class); - $accountRepos = $this->mock(AccountRepositoryInterface::class); + $this->mock(CategoryRepositoryInterface::class); + $this->mock(AccountRepositoryInterface::class); $userRepos = $this->mock(UserRepositoryInterface::class); $fiscalHelper = $this->mock(FiscalHelperInterface::class); $date = new Carbon; diff --git a/tests/Feature/Controllers/Category/ShowControllerTest.php b/tests/Feature/Controllers/Category/ShowControllerTest.php index 4fd5fe754f..032cec1983 100644 --- a/tests/Feature/Controllers/Category/ShowControllerTest.php +++ b/tests/Feature/Controllers/Category/ShowControllerTest.php @@ -25,16 +25,10 @@ namespace Tests\Feature\Controllers\Category; use Carbon\Carbon; +use Exception; use FireflyIII\Helpers\Collector\GroupCollectorInterface; - - -use FireflyIII\Helpers\Fiscal\FiscalHelperInterface; use FireflyIII\Models\Preference; -use FireflyIII\Models\Transaction; -use FireflyIII\Models\TransactionJournal; -use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Category\CategoryRepositoryInterface; -use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use FireflyIII\Repositories\User\UserRepositoryInterface; use Illuminate\Pagination\LengthAwarePaginator; use Illuminate\Support\Collection; @@ -44,9 +38,13 @@ use Navigation; use Preferences; use Tests\TestCase; + /** * * Class ShowControllerTest + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) + * @SuppressWarnings(PHPMD.CouplingBetweenObjects) + * @SuppressWarnings(PHPMD.TooManyPublicMethods) */ class ShowControllerTest extends TestCase { @@ -65,6 +63,7 @@ class ShowControllerTest extends TestCase * @dataProvider dateRangeProvider * * @param string $range + * @throws Exception */ public function testShow(string $range): void { @@ -91,14 +90,14 @@ class ShowControllerTest extends TestCase $collector->shouldReceive('setPage')->andReturnSelf()->once(); $collector->shouldReceive('setLimit')->andReturnSelf()->once(); - $collector->shouldReceive('setRange')->andReturnSelf()->atLeast(2); + $collector->shouldReceive('setRange')->andReturnSelf()->atLeast()->times(2); $collector->shouldReceive('withBudgetInformation')->andReturnSelf()->once(); $collector->shouldReceive('withCategoryInformation')->andReturnSelf()->once(); $collector->shouldReceive('withAccountInformation')->andReturnSelf()->once(); - $collector->shouldReceive('setCategory')->andReturnSelf()->atLeast(2); + $collector->shouldReceive('setCategory')->andReturnSelf()->atLeast()->times(2); $collector->shouldReceive('getPaginatedGroups')->andReturn(new LengthAwarePaginator([$withdrawal], 0, 10))->once(); - $collector->shouldReceive('setTypes')->andReturnSelf()->atLeast(1); + $collector->shouldReceive('setTypes')->andReturnSelf()->atLeast()->once(); $collector->shouldReceive('getExtractedJournals')->andReturn([])->atLeast()->once(); Navigation::shouldReceive('updateStartDate')->andReturn(new Carbon); @@ -120,6 +119,7 @@ class ShowControllerTest extends TestCase * @dataProvider dateRangeProvider * * @param string $range + * @throws Exception */ public function testShowAll(string $range): void { @@ -142,7 +142,7 @@ class ShowControllerTest extends TestCase $collector->shouldReceive('withBudgetInformation')->andReturnSelf()->once(); $collector->shouldReceive('withCategoryInformation')->andReturnSelf()->once(); $collector->shouldReceive('withAccountInformation')->andReturnSelf()->once(); - $collector->shouldReceive('setCategory')->andReturnSelf()->atLeast(2); + $collector->shouldReceive('setCategory')->andReturnSelf()->atLeast()->once(); $collector->shouldReceive('getPaginatedGroups')->andReturn(new LengthAwarePaginator([$withdrawal], 0, 10))->once(); $repository->shouldReceive('firstUseDate')->andReturn(new Carbon); diff --git a/tests/Feature/Controllers/Chart/AccountControllerTest.php b/tests/Feature/Controllers/Chart/AccountControllerTest.php index 32165a1b3b..cbf106d1f9 100644 --- a/tests/Feature/Controllers/Chart/AccountControllerTest.php +++ b/tests/Feature/Controllers/Chart/AccountControllerTest.php @@ -23,6 +23,7 @@ declare(strict_types=1); namespace Tests\Feature\Controllers\Chart; use Carbon\Carbon; +use Exception; use FireflyIII\Generator\Chart\Basic\GeneratorInterface; use FireflyIII\Helpers\Collector\GroupCollectorInterface; @@ -46,6 +47,9 @@ use Tests\TestCase; /** * Class AccountControllerTest + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) + * @SuppressWarnings(PHPMD.CouplingBetweenObjects) + * @SuppressWarnings(PHPMD.TooManyPublicMethods) */ class AccountControllerTest extends TestCase { @@ -110,14 +114,15 @@ class AccountControllerTest extends TestCase * @dataProvider dateRangeProvider * * @param string $range + * @throws Exception */ public function testExpenseBudget(string $range): void { $generator = $this->mock(GeneratorInterface::class); $collector = $this->mock(GroupCollectorInterface::class); $budgetRepos = $this->mock(BudgetRepositoryInterface::class); - $accountRepos = $this->mock(AccountRepositoryInterface::class); - $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); + $this->mock(AccountRepositoryInterface::class); + $this->mock(CurrencyRepositoryInterface::class); $fiscalHelper = $this->mock(FiscalHelperInterface::class); $withdrawal = $this->getRandomWithdrawalAsArray(); $budget = $this->user()->budgets()->find($withdrawal['budget_id']); @@ -157,8 +162,8 @@ class AccountControllerTest extends TestCase $collector = $this->mock(GroupCollectorInterface::class); $budgetRepos = $this->mock(BudgetRepositoryInterface::class); $accountRepos = $this->mock(AccountRepositoryInterface::class); - $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); - $fiscalHelper = $this->mock(FiscalHelperInterface::class); + $this->mock(CurrencyRepositoryInterface::class); + $this->mock(FiscalHelperInterface::class); $withdrawal = $this->getRandomWithdrawalAsArray(); $budget = $this->user()->budgets()->find($withdrawal['budget_id']); @@ -188,14 +193,15 @@ class AccountControllerTest extends TestCase * @dataProvider dateRangeProvider * * @param string $range + * @throws Exception */ public function testExpenseCategory(string $range): void { $generator = $this->mock(GeneratorInterface::class); $collector = $this->mock(GroupCollectorInterface::class); $categoryRepos = $this->mock(CategoryRepositoryInterface::class); - $accountRepos = $this->mock(AccountRepositoryInterface::class); - $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); + $this->mock(AccountRepositoryInterface::class); + $this->mock(CurrencyRepositoryInterface::class); $fiscalHelper = $this->mock(FiscalHelperInterface::class); $withdrawal = $this->getRandomWithdrawalAsArray(); $category = $this->user()->categories()->find($withdrawal['category_id']); @@ -238,7 +244,7 @@ class AccountControllerTest extends TestCase $collector = $this->mock(GroupCollectorInterface::class); $categoryRepos = $this->mock(CategoryRepositoryInterface::class); $accountRepos = $this->mock(AccountRepositoryInterface::class); - $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); + $this->mock(CurrencyRepositoryInterface::class); $withdrawal = $this->getRandomWithdrawalAsArray(); $category = $this->user()->categories()->find($withdrawal['category_id']); @@ -267,6 +273,7 @@ class AccountControllerTest extends TestCase * @dataProvider dateRangeProvider * * @param string $range + * @throws Exception */ public function testFrontpage(string $range): void { @@ -304,6 +311,7 @@ class AccountControllerTest extends TestCase * @dataProvider dateRangeProvider * * @param string $range + * @throws Exception */ public function testIncomeCategory(string $range): void { @@ -382,6 +390,7 @@ class AccountControllerTest extends TestCase * @dataProvider dateRangeProvider * * @param string $range + * @throws Exception */ public function testPeriod(string $range): void { @@ -444,6 +453,7 @@ class AccountControllerTest extends TestCase * @dataProvider dateRangeProvider * * @param string $range + * @throws Exception */ public function testRevenueAccounts(string $range): void { diff --git a/tests/Feature/Controllers/Chart/CategoryControllerTest.php b/tests/Feature/Controllers/Chart/CategoryControllerTest.php index a36c18da3c..ff4ff7e9a1 100644 --- a/tests/Feature/Controllers/Chart/CategoryControllerTest.php +++ b/tests/Feature/Controllers/Chart/CategoryControllerTest.php @@ -23,6 +23,7 @@ declare(strict_types=1); namespace Tests\Feature\Controllers\Chart; use Carbon\Carbon; +use Exception; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Generator\Chart\Basic\GeneratorInterface; use FireflyIII\Helpers\Fiscal\FiscalHelperInterface; @@ -38,6 +39,9 @@ use Tests\TestCase; /** * Class CategoryControllerTest + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) + * @SuppressWarnings(PHPMD.CouplingBetweenObjects) + * @SuppressWarnings(PHPMD.TooManyPublicMethods) */ class CategoryControllerTest extends TestCase { @@ -55,6 +59,7 @@ class CategoryControllerTest extends TestCase * @dataProvider dateRangeProvider * * @param string $range + * @throws FireflyException */ public function testAll(string $range): void { @@ -221,6 +226,7 @@ class CategoryControllerTest extends TestCase * @dataProvider dateRangeProvider * * @param string $range + * @throws Exception */ public function testSpecificPeriod(string $range): void { diff --git a/tests/Feature/Controllers/Chart/ExpenseReportControllerTest.php b/tests/Feature/Controllers/Chart/ExpenseReportControllerTest.php index 1a3d7590a1..8809be65f8 100644 --- a/tests/Feature/Controllers/Chart/ExpenseReportControllerTest.php +++ b/tests/Feature/Controllers/Chart/ExpenseReportControllerTest.php @@ -25,7 +25,6 @@ namespace Tests\Feature\Controllers\Chart; use Carbon\Carbon; use FireflyIII\Generator\Chart\Basic\GeneratorInterface; use FireflyIII\Helpers\Collector\GroupCollectorInterface; - use FireflyIII\Helpers\Fiscal\FiscalHelperInterface; use FireflyIII\Models\TransactionType; use FireflyIII\Repositories\Account\AccountRepositoryInterface; @@ -82,4 +81,40 @@ class ExpenseReportControllerTest extends TestCase $response->assertStatus(200); } + + /** + * Same test, but with a deposit + * @covers \FireflyIII\Http\Controllers\Chart\ExpenseReportController + */ + public function testMainChartDeposit(): void + { + $generator = $this->mock(GeneratorInterface::class); + $collector = $this->mock(GroupCollectorInterface::class); + $accountRepository = $this->mock(AccountRepositoryInterface::class); + $fiscalHelper = $this->mock(FiscalHelperInterface::class); + $expense = $this->getRandomExpense(); + $date = new Carbon; + $deposit = $this->getRandomDepositAsArray(); + + $accountRepository->shouldReceive('findByName')->once()->andReturn($expense); + + $this->mockDefaultSession(); + Preferences::shouldReceive('lastActivity')->atLeast()->once()->andReturn('md512345'); + + $fiscalHelper->shouldReceive('endOfFiscalYear')->atLeast()->once()->andReturn($date); + $fiscalHelper->shouldReceive('startOfFiscalYear')->atLeast()->once()->andReturn($date); + + $collector->shouldReceive('setAccounts')->andReturnSelf()->atLeast()->once(); + $collector->shouldReceive('setRange')->andReturnSelf()->atLeast()->once(); + $collector->shouldReceive('withAccountInformation')->andReturnSelf()->atLeast()->once(); + $collector->shouldReceive('setTypes')->withArgs([[TransactionType::WITHDRAWAL]])->andReturnSelf()->atLeast()->once(); + $collector->shouldReceive('setTypes')->withArgs([[TransactionType::DEPOSIT]])->andReturnSelf()->atLeast()->once(); + $collector->shouldReceive('getExtractedJournals')->andReturn([$deposit])->atLeast()->once(); + $generator->shouldReceive('multiSet')->andReturn([])->once(); + + $this->be($this->user()); + $response = $this->get(route('chart.expense.main', ['1', $expense->id, '20120101', '20120131'])); + $response->assertStatus(200); + } + } diff --git a/tests/Feature/Controllers/Chart/TagReportControllerTest.php b/tests/Feature/Controllers/Chart/TagReportControllerTest.php index 7b176476eb..ea1fb5b54f 100644 --- a/tests/Feature/Controllers/Chart/TagReportControllerTest.php +++ b/tests/Feature/Controllers/Chart/TagReportControllerTest.php @@ -200,7 +200,7 @@ class TagReportControllerTest extends TestCase $fiscalHelper = $this->mock(FiscalHelperInterface::class); $withdrawal = $this->getRandomWithdrawalAsArray(); - $tag = $this->user()->tags()->where('tag','Expensive')->first(); + $tag = $this->user()->tags()->where('tag', 'Expensive')->first(); $date = new Carbon; $false = new Preference; $false->data = false; @@ -237,7 +237,7 @@ class TagReportControllerTest extends TestCase $generator = $this->mock(GeneratorInterface::class); $pieChart = $this->mock(MetaPieChartInterface::class); $tagRepos = $this->mock(TagRepositoryInterface::class); - $accountRepos = $this->mock(AccountRepositoryInterface::class); + $this->mock(AccountRepositoryInterface::class); $tag = $this->user()->tags()->first(); $tagRepos->shouldReceive('setUser'); $tagRepos->shouldReceive('get')->andReturn(new Collection([$tag])); diff --git a/tests/Feature/Controllers/Import/PrerequisitesControllerTest.php b/tests/Feature/Controllers/Import/PrerequisitesControllerTest.php index ef7093edcf..81ae5164f4 100644 --- a/tests/Feature/Controllers/Import/PrerequisitesControllerTest.php +++ b/tests/Feature/Controllers/Import/PrerequisitesControllerTest.php @@ -31,6 +31,7 @@ use Log; use Mockery; use Tests\TestCase; +use Preferences; /** * Class AccountControllerTest * @@ -57,7 +58,7 @@ class PrerequisitesControllerTest extends TestCase $this->mockDefaultSession(); $userRepos = $this->mock(UserRepositoryInterface::class); $prereq = $this->mock(FakePrerequisites::class); - $repository = $this->mock(ImportJobRepositoryInterface::class); + $this->mock(ImportJobRepositoryInterface::class); $job = new ImportJob; $job->user_id = $this->user()->id; @@ -68,6 +69,12 @@ class PrerequisitesControllerTest extends TestCase $job->file_type = ''; $job->save(); + Preferences::shouldReceive('getForUser')->atLeast()->once()->withArgs([Mockery::any(),'bunq_api_key',null])->andReturnNull(); + Preferences::shouldReceive('getForUser')->atLeast()->once()->withArgs([Mockery::any(),'spectre_app_id',null])->andReturnNull(); + Preferences::shouldReceive('getForUser')->atLeast()->once()->withArgs([Mockery::any(),'ynab_client_id',null])->andReturnNull(); + + + $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'owner'])->atLeast()->once()->andReturn(true); $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'demo'])->atLeast()->once()->andReturn(false); @@ -91,7 +98,8 @@ class PrerequisitesControllerTest extends TestCase { $this->mockDefaultSession(); $userRepos = $this->mock(UserRepositoryInterface::class); - $repository = $this->mock(ImportJobRepositoryInterface::class); + $this->mock(ImportJobRepositoryInterface::class); + $job = new ImportJob; $job->user_id = $this->user()->id; @@ -102,6 +110,10 @@ class PrerequisitesControllerTest extends TestCase $job->file_type = ''; $job->save(); + Preferences::shouldReceive('getForUser')->atLeast()->once()->withArgs([Mockery::any(),'bunq_api_key',null])->andReturnNull(); + Preferences::shouldReceive('getForUser')->atLeast()->once()->withArgs([Mockery::any(),'spectre_app_id',null])->andReturnNull(); + Preferences::shouldReceive('getForUser')->atLeast()->once()->withArgs([Mockery::any(),'ynab_client_id',null])->andReturnNull(); + Preferences::shouldReceive('getForUser')->atLeast()->once()->withArgs([Mockery::any(),'fake_api_key',null])->andReturnNull(); $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'demo'])->atLeast()->once()->andReturn(false); @@ -122,6 +134,10 @@ class PrerequisitesControllerTest extends TestCase $prereq = $this->mock(FakePrerequisites::class); $repository = $this->mock(ImportJobRepositoryInterface::class); + Preferences::shouldReceive('getForUser')->atLeast()->once()->withArgs([Mockery::any(),'bunq_api_key',null])->andReturnNull(); + Preferences::shouldReceive('getForUser')->atLeast()->once()->withArgs([Mockery::any(),'spectre_app_id',null])->andReturnNull(); + Preferences::shouldReceive('getForUser')->atLeast()->once()->withArgs([Mockery::any(),'ynab_client_id',null])->andReturnNull(); + $job = new ImportJob; $job->user_id = $this->user()->id; $job->key = 'C_pre_job_' . $this->randomInt(); @@ -155,6 +171,12 @@ class PrerequisitesControllerTest extends TestCase $prereq = $this->mock(FakePrerequisites::class); $repository = $this->mock(ImportJobRepositoryInterface::class); + Preferences::shouldReceive('getForUser')->atLeast()->once()->withArgs([Mockery::any(),'bunq_api_key',null])->andReturnNull(); + Preferences::shouldReceive('getForUser')->atLeast()->once()->withArgs([Mockery::any(),'spectre_app_id',null])->andReturnNull(); + Preferences::shouldReceive('getForUser')->atLeast()->once()->withArgs([Mockery::any(),'ynab_client_id',null])->andReturnNull(); + //Preferences::shouldReceive('getForUser')->atLeast()->once()->withArgs([Mockery::any(),'fake_api_key',null])->andReturnNull(); + + $job = new ImportJob; $job->user_id = $this->user()->id; $job->key = 'D_pre_job_' . $this->randomInt(); @@ -186,7 +208,11 @@ class PrerequisitesControllerTest extends TestCase $this->mockDefaultSession(); $userRepos = $this->mock(UserRepositoryInterface::class); $prereq = $this->mock(FakePrerequisites::class); - $repository = $this->mock(ImportJobRepositoryInterface::class); + $this->mock(ImportJobRepositoryInterface::class); + + Preferences::shouldReceive('getForUser')->atLeast()->once()->withArgs([Mockery::any(),'bunq_api_key',null])->andReturnNull(); + Preferences::shouldReceive('getForUser')->atLeast()->once()->withArgs([Mockery::any(),'spectre_app_id',null])->andReturnNull(); + Preferences::shouldReceive('getForUser')->atLeast()->once()->withArgs([Mockery::any(),'ynab_client_id',null])->andReturnNull(); $job = new ImportJob; $job->user_id = $this->user()->id; @@ -218,7 +244,11 @@ class PrerequisitesControllerTest extends TestCase $this->mockDefaultSession(); $userRepos = $this->mock(UserRepositoryInterface::class); $prereq = $this->mock(FakePrerequisites::class); - $repository = $this->mock(ImportJobRepositoryInterface::class); + $this->mock(ImportJobRepositoryInterface::class); + + Preferences::shouldReceive('getForUser')->atLeast()->once()->withArgs([Mockery::any(),'bunq_api_key',null])->andReturnNull(); + Preferences::shouldReceive('getForUser')->atLeast()->once()->withArgs([Mockery::any(),'spectre_app_id',null])->andReturnNull(); + Preferences::shouldReceive('getForUser')->atLeast()->once()->withArgs([Mockery::any(),'ynab_client_id',null])->andReturnNull(); $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'demo'])->atLeast()->once()->andReturn(false); @@ -244,7 +274,12 @@ class PrerequisitesControllerTest extends TestCase $this->mockDefaultSession(); $userRepos = $this->mock(UserRepositoryInterface::class); $prereq = $this->mock(FakePrerequisites::class); - $repository = $this->mock(ImportJobRepositoryInterface::class); + $this->mock(ImportJobRepositoryInterface::class); + + Preferences::shouldReceive('getForUser')->atLeast()->once()->withArgs([Mockery::any(),'bunq_api_key',null])->andReturnNull(); + Preferences::shouldReceive('getForUser')->atLeast()->once()->withArgs([Mockery::any(),'spectre_app_id',null])->andReturnNull(); + Preferences::shouldReceive('getForUser')->atLeast()->once()->withArgs([Mockery::any(),'ynab_client_id',null])->andReturnNull(); + //Preferences::shouldReceive('getForUser')->atLeast()->once()->withArgs([Mockery::any(),'fake_api_key',null])->andReturnNull(); $job = new ImportJob; $job->user_id = $this->user()->id; diff --git a/tests/Feature/Controllers/Json/AutoCompleteControllerTest.php b/tests/Feature/Controllers/Json/AutoCompleteControllerTest.php index dda3b1e7c9..320810a307 100644 --- a/tests/Feature/Controllers/Json/AutoCompleteControllerTest.php +++ b/tests/Feature/Controllers/Json/AutoCompleteControllerTest.php @@ -23,22 +23,8 @@ declare(strict_types=1); namespace Tests\Feature\Controllers\Json; -use FireflyIII\Models\Account; use FireflyIII\Models\AccountType; -use FireflyIII\Models\Bill; -use FireflyIII\Models\Budget; -use FireflyIII\Models\Category; -use FireflyIII\Models\Tag; -use FireflyIII\Models\Transaction; -use FireflyIII\Models\TransactionCurrency; -use FireflyIII\Models\TransactionJournal; 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; use Log; use Tests\TestCase; @@ -68,8 +54,6 @@ class AutoCompleteControllerTest extends TestCase $account = $this->getRandomAsset(); $euro = $this->getEuro(); - - $accountRepos->shouldReceive('searchAccount')->atLeast()->once()->andReturn(new Collection([$account])); $accountRepos->shouldReceive('getAccountCurrency')->atLeast()->once()->andReturn($euro); $this->mockDefaultSession(); @@ -82,4 +66,106 @@ class AutoCompleteControllerTest extends TestCase } + /** + * Request a list of revenue accounts + * + * @covers \FireflyIII\Http\Controllers\Json\AutoCompleteController + */ + public function testRevenueAccounts(): void + { + $accountRepos = $this->mock(AccountRepositoryInterface::class); + $account = $this->getRandomAsset(); + + $accountRepos->shouldReceive('searchAccount')->atLeast()->once()->andReturn(new Collection([$account])); + $this->mockDefaultSession(); + + $this->be($this->user()); + $response = $this->get(route('json.autocomplete.revenue-accounts')); + $response->assertStatus(200); + $response->assertSee($account->name); + } + + /** + * Request a list of expense accounts + * + * @covers \FireflyIII\Http\Controllers\Json\AutoCompleteController + */ + public function testExpenseAccounts(): void + { + $accountRepos = $this->mock(AccountRepositoryInterface::class); + $account = $this->getRandomAsset(); + + $accountRepos->shouldReceive('searchAccount')->atLeast()->once()->andReturn(new Collection([$account])); + $this->mockDefaultSession(); + + $this->be($this->user()); + $response = $this->get(route('json.autocomplete.expense-accounts')); + $response->assertStatus(200); + $response->assertSee($account->name); + } + + + /** + * Request a list of expense accounts + * + * @covers \FireflyIII\Http\Controllers\Json\AutoCompleteController + */ + public function testAllJournals(): void + { + $journalRepos = $this->mockDefaultSession(); + $journal = $this->getRandomWithdrawalAsArray(); + + $journalRepos->shouldReceive('searchJournalDescriptions')->atLeast()->once()->andReturn(new Collection([$journal])); + + + $this->be($this->user()); + $response = $this->get(route('json.autocomplete.all-journals')); + $response->assertStatus(200); + $response->assertSee($journal['description']); + } + + /** + * Request a list of expense accounts + * + * @covers \FireflyIII\Http\Controllers\Json\AutoCompleteController + */ + public function testAllJournalsWithId(): void + { + $journalRepos = $this->mockDefaultSession(); + $journal = $this->getRandomWithdrawalAsArray(); + + $journalRepos->shouldReceive('searchJournalDescriptions')->atLeast()->once()->andReturn(new Collection([$journal])); + + + $this->be($this->user()); + $response = $this->get(route('json.autocomplete.all-journals-with-id')); + $response->assertStatus(200); + $response->assertSee($journal['description']); + $response->assertSee($journal['id']); + } + + + /** + * Request a list of expense accounts + * + * @covers \FireflyIII\Http\Controllers\Json\AutoCompleteController + */ + public function testAllJournalsWithIdNumeric(): void + { + $journalRepos = $this->mockDefaultSession(); + $journal = $this->getRandomWithdrawalAsArray(); + $journalObject = $this->getRandomWithdrawal(); + + $journalRepos->shouldReceive('searchJournalDescriptions')->atLeast()->once()->andReturn(new Collection([$journal])); + $journalRepos->shouldReceive('findNull')->atLeast()->once()->andReturn($journalObject); + + + $this->be($this->user()); + $response = $this->get(route('json.autocomplete.all-journals-with-id') . '?search=' . $journal['id']); + $response->assertStatus(200); + $response->assertSee($journal['description']); + $response->assertSee($journal['id']); + } + + } diff --git a/tests/Feature/Controllers/Json/BoxControllerTest.php b/tests/Feature/Controllers/Json/BoxControllerTest.php index 905a798aa5..a563c7fc11 100644 --- a/tests/Feature/Controllers/Json/BoxControllerTest.php +++ b/tests/Feature/Controllers/Json/BoxControllerTest.php @@ -25,9 +25,7 @@ namespace Tests\Feature\Controllers\Json; use Amount; use Carbon\Carbon; use FireflyIII\Helpers\Collector\GroupCollectorInterface; - use FireflyIII\Helpers\Report\NetWorthInterface; -use FireflyIII\Models\Transaction; use FireflyIII\Models\TransactionCurrency; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Bill\BillRepositoryInterface; @@ -58,6 +56,7 @@ class BoxControllerTest extends TestCase */ public function testAvailable(): void { + $this->mockDefaultSession(); $return = [ 0 => [ 'spent' => '-1200', // more than budgeted. @@ -66,7 +65,7 @@ class BoxControllerTest extends TestCase $repository = $this->mock(BudgetRepositoryInterface::class); $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); - $this->mockDefaultSession(); + Preferences::shouldReceive('lastActivity')->atLeast()->once()->andReturn('md512345'); Amount::shouldReceive('formatAnything')->atLeast()->once()->andReturn('-100'); @@ -85,6 +84,7 @@ class BoxControllerTest extends TestCase */ public function testAvailableDays(): void { + $this->mockDefaultSession(); $return = [ 0 => [ 'spent' => '-800', // more than budgeted. @@ -93,7 +93,6 @@ class BoxControllerTest extends TestCase $repository = $this->mock(BudgetRepositoryInterface::class); $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); - $this->mockDefaultSession(); Preferences::shouldReceive('lastActivity')->atLeast()->once()->andReturn('md512345'); Amount::shouldReceive('formatAnything')->atLeast()->once()->andReturn('-100'); @@ -112,12 +111,12 @@ class BoxControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\Json\BoxController */ public function testBalance(): void - { + { $this->mockDefaultSession(); + $accountRepos = $this->mock(AccountRepositoryInterface::class); $collector = $this->mock(GroupCollectorInterface::class); $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); - $this->mockDefaultSession(); Preferences::shouldReceive('lastActivity')->atLeast()->once()->andReturn('md512345'); Amount::shouldReceive('formatAnything')->atLeast()->once()->andReturn('-100'); @@ -169,9 +168,12 @@ class BoxControllerTest extends TestCase */ public function testBills(): void { + $this->mockDefaultSession(); $billRepos = $this->mock(BillRepositoryInterface::class); $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); + Preferences::shouldReceive('lastActivity')->atLeast()->once()->andReturn('md512345'); + Amount::shouldReceive('formatAnything')->andReturn('-100'); $billRepos->shouldReceive('getBillsPaidInRange')->andReturn('0'); $billRepos->shouldReceive('getBillsUnpaidInRange')->andReturn('0'); @@ -195,7 +197,7 @@ class BoxControllerTest extends TestCase $netWorthHelper = $this->mock(NetWorthInterface::class); - + Amount::shouldReceive('formatAnything')->andReturn('-100'); $netWorthHelper->shouldReceive('setUser')->once(); $netWorthHelper->shouldReceive('getNetWorthByCurrency')->once()->andReturn($result); @@ -228,7 +230,7 @@ class BoxControllerTest extends TestCase $accountRepos = $this->mock(AccountRepositoryInterface::class); $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); - + Amount::shouldReceive('formatAnything')->andReturn('-100'); $netWorthHelper = $this->mock(NetWorthInterface::class); $netWorthHelper->shouldReceive('setUser')->once(); $netWorthHelper->shouldReceive('getNetWorthByCurrency')->once()->andReturn($result); @@ -264,7 +266,7 @@ class BoxControllerTest extends TestCase $accountRepos = $this->mock(AccountRepositoryInterface::class); $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); - + Amount::shouldReceive('formatAnything')->andReturn('-100'); $netWorthHelper = $this->mock(NetWorthInterface::class); $netWorthHelper->shouldReceive('setUser')->once(); $netWorthHelper->shouldReceive('getNetWorthByCurrency')->once()->andReturn($result); @@ -297,7 +299,7 @@ class BoxControllerTest extends TestCase $netWorthHelper = $this->mock(NetWorthInterface::class); $netWorthHelper->shouldReceive('setUser')->once(); $netWorthHelper->shouldReceive('getNetWorthByCurrency')->once()->andReturn($result); - + Amount::shouldReceive('formatAnything')->andReturn('-100'); $accountRepos = $this->mock(AccountRepositoryInterface::class); $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); $accountRepos->shouldReceive('getActiveAccountsByType')->andReturn(new Collection([$this->user()->accounts()->first()])); @@ -329,7 +331,7 @@ class BoxControllerTest extends TestCase $account->virtual_balance = '1000'; $accountRepos = $this->mock(AccountRepositoryInterface::class); $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); - + Amount::shouldReceive('formatAnything')->andReturn('-100'); $netWorthHelper = $this->mock(NetWorthInterface::class); $netWorthHelper->shouldReceive('setUser')->once(); $netWorthHelper->shouldReceive('getNetWorthByCurrency')->once()->andReturn($result); diff --git a/tests/Feature/Controllers/Report/AccountControllerTest.php b/tests/Feature/Controllers/Report/AccountControllerTest.php index 521977cca5..36b947d72d 100644 --- a/tests/Feature/Controllers/Report/AccountControllerTest.php +++ b/tests/Feature/Controllers/Report/AccountControllerTest.php @@ -26,6 +26,7 @@ use Carbon\Carbon; use FireflyIII\Helpers\Fiscal\FiscalHelperInterface; use FireflyIII\Repositories\Account\AccountTaskerInterface; use Log; +use Preferences; use Tests\TestCase; /** @@ -62,6 +63,8 @@ class AccountControllerTest extends TestCase $tasker = $this->mock(AccountTaskerInterface::class); $fiscalHelper = $this->mock(FiscalHelperInterface::class); $date = new Carbon; + + Preferences::shouldReceive('lastActivity')->atLeast()->once()->andReturn('md512345'); $fiscalHelper->shouldReceive('endOfFiscalYear')->atLeast()->once()->andReturn($date); $fiscalHelper->shouldReceive('startOfFiscalYear')->atLeast()->once()->andReturn($date); $tasker->shouldReceive('getAccountReport')->andReturn($return); diff --git a/tests/Feature/Controllers/Report/BalanceControllerTest.php b/tests/Feature/Controllers/Report/BalanceControllerTest.php index fdf1e31aa7..dd1d9f2bae 100644 --- a/tests/Feature/Controllers/Report/BalanceControllerTest.php +++ b/tests/Feature/Controllers/Report/BalanceControllerTest.php @@ -27,6 +27,7 @@ use FireflyIII\Helpers\Collection\Balance; use FireflyIII\Helpers\Fiscal\FiscalHelperInterface; use FireflyIII\Helpers\Report\BalanceReportHelperInterface; use Log; +use Preferences; use Tests\TestCase; /** @@ -57,6 +58,8 @@ class BalanceControllerTest extends TestCase $balance = $this->mock(BalanceReportHelperInterface::class); $fiscalHelper = $this->mock(FiscalHelperInterface::class); $date = new Carbon; + + Preferences::shouldReceive('lastActivity')->atLeast()->once()->andReturn('md512345'); $fiscalHelper->shouldReceive('endOfFiscalYear')->atLeast()->once()->andReturn($date); $fiscalHelper->shouldReceive('startOfFiscalYear')->atLeast()->once()->andReturn($date); $balance->shouldReceive('getBalanceReport')->andReturn(new Balance); diff --git a/tests/Feature/Controllers/Report/BudgetControllerTest.php b/tests/Feature/Controllers/Report/BudgetControllerTest.php index d8a66d015c..ac61d8d548 100644 --- a/tests/Feature/Controllers/Report/BudgetControllerTest.php +++ b/tests/Feature/Controllers/Report/BudgetControllerTest.php @@ -22,12 +22,14 @@ declare(strict_types=1); namespace Tests\Feature\Controllers\Report; +use Amount; use Carbon\Carbon; use FireflyIII\Helpers\Fiscal\FiscalHelperInterface; use FireflyIII\Helpers\Report\BudgetReportHelperInterface; use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; use Illuminate\Support\Collection; use Log; +use Preferences; use Tests\TestCase; /** @@ -59,6 +61,9 @@ class BudgetControllerTest extends TestCase $helper = $this->mock(BudgetReportHelperInterface::class); $fiscalHelper = $this->mock(FiscalHelperInterface::class); $date = new Carbon; + + Preferences::shouldReceive('lastActivity')->atLeast()->once()->andReturn('md512345'); + Amount::shouldReceive('formatAnything')->atLeast()->once()->andReturn('x'); $fiscalHelper->shouldReceive('endOfFiscalYear')->atLeast()->once()->andReturn($date); $fiscalHelper->shouldReceive('startOfFiscalYear')->atLeast()->once()->andReturn($date); $helper->shouldReceive('getBudgetReport')->andReturn($return); @@ -79,6 +84,9 @@ class BudgetControllerTest extends TestCase $repository = $this->mock(BudgetRepositoryInterface::class); $fiscalHelper = $this->mock(FiscalHelperInterface::class); $date = new Carbon; + + Preferences::shouldReceive('lastActivity')->atLeast()->once()->andReturn('md512345'); + Amount::shouldReceive('formatAnything')->atLeast()->once()->andReturn('x'); $fiscalHelper->shouldReceive('endOfFiscalYear')->atLeast()->once()->andReturn($date); $fiscalHelper->shouldReceive('startOfFiscalYear')->atLeast()->once()->andReturn($date); $repository->shouldReceive('getBudgets')->andReturn(new Collection); diff --git a/tests/Feature/Controllers/Report/CategoryControllerTest.php b/tests/Feature/Controllers/Report/CategoryControllerTest.php index ffdeba524a..99c78b0c96 100644 --- a/tests/Feature/Controllers/Report/CategoryControllerTest.php +++ b/tests/Feature/Controllers/Report/CategoryControllerTest.php @@ -22,12 +22,13 @@ declare(strict_types=1); namespace Tests\Feature\Controllers\Report; +use Amount; use Carbon\Carbon; use FireflyIII\Helpers\Fiscal\FiscalHelperInterface; -use FireflyIII\Models\Category; use FireflyIII\Repositories\Category\CategoryRepositoryInterface; use Illuminate\Support\Collection; use Log; +use Preferences; use Tests\TestCase; /** @@ -60,6 +61,9 @@ class CategoryControllerTest extends TestCase $repository = $this->mock(CategoryRepositoryInterface::class); $fiscalHelper = $this->mock(FiscalHelperInterface::class); $date = new Carbon; + + Preferences::shouldReceive('lastActivity')->atLeast()->once()->andReturn('md512345'); + Amount::shouldReceive('formatAnything')->atLeast()->once()->andReturn('x'); $fiscalHelper->shouldReceive('endOfFiscalYear')->atLeast()->once()->andReturn($date); $fiscalHelper->shouldReceive('startOfFiscalYear')->atLeast()->once()->andReturn($date); $repository->shouldReceive('getCategories')->andReturn(new Collection); @@ -77,11 +81,15 @@ class CategoryControllerTest extends TestCase public function testIncome(): void { $this->mockDefaultSession(); - $first = [1 => ['entries' => ['1', '1']]]; + $first = [ + 1 => ['entries' => ['1', '1']], + 2 => ['entries' => ['0']], + ]; $second = ['entries' => ['1', '1']]; $repository = $this->mock(CategoryRepositoryInterface::class); $fiscalHelper = $this->mock(FiscalHelperInterface::class); $date = new Carbon; + Preferences::shouldReceive('lastActivity')->atLeast()->once()->andReturn('md512345'); $fiscalHelper->shouldReceive('endOfFiscalYear')->atLeast()->once()->andReturn($date); $fiscalHelper->shouldReceive('startOfFiscalYear')->atLeast()->once()->andReturn($date); $repository->shouldReceive('getCategories')->andReturn(new Collection); @@ -103,6 +111,7 @@ class CategoryControllerTest extends TestCase $category = $this->getRandomCategory(); $fiscalHelper = $this->mock(FiscalHelperInterface::class); $date = new Carbon; + Preferences::shouldReceive('lastActivity')->atLeast()->once()->andReturn('md512345'); $fiscalHelper->shouldReceive('endOfFiscalYear')->atLeast()->once()->andReturn($date); $fiscalHelper->shouldReceive('startOfFiscalYear')->atLeast()->once()->andReturn($date); $repository->shouldReceive('getCategories')->andReturn(new Collection([$category])); @@ -113,5 +122,6 @@ class CategoryControllerTest extends TestCase $this->be($this->user()); $response = $this->get(route('report-data.category.operations', ['1', '20120101', '20120131'])); $response->assertStatus(200); + $response->assertDontSee('An error prevented Firefly III from rendering: %s. Apologies.'); } } diff --git a/tests/Feature/Controllers/Report/ExpenseControllerTest.php b/tests/Feature/Controllers/Report/ExpenseControllerTest.php index 4fac501a80..94b7c04660 100644 --- a/tests/Feature/Controllers/Report/ExpenseControllerTest.php +++ b/tests/Feature/Controllers/Report/ExpenseControllerTest.php @@ -66,9 +66,7 @@ class ExpenseControllerTest extends TestCase $transactions = [$this->getRandomWithdrawalAsArray()]; $this->mockDefaultSession(); - Preferences::shouldReceive('lastActivity')->atLeast()->once(); - - + Preferences::shouldReceive('lastActivity')->atLeast()->once()->andReturn('md512345'); $fiscalHelper->shouldReceive('endOfFiscalYear')->atLeast()->once()->andReturn($date); $fiscalHelper->shouldReceive('startOfFiscalYear')->atLeast()->once()->andReturn($date); $repository->shouldReceive('findByName')->once()->withArgs([$expense->name, [AccountType::REVENUE]])->andReturn($revenue); diff --git a/tests/Feature/Controllers/Report/OperationsControllerTest.php b/tests/Feature/Controllers/Report/OperationsControllerTest.php index e703e6206d..3240684fa7 100644 --- a/tests/Feature/Controllers/Report/OperationsControllerTest.php +++ b/tests/Feature/Controllers/Report/OperationsControllerTest.php @@ -26,6 +26,7 @@ use Carbon\Carbon; use FireflyIII\Helpers\Fiscal\FiscalHelperInterface; use FireflyIII\Repositories\Account\AccountTaskerInterface; use Log; +use Preferences; use Tests\TestCase; /** @@ -65,6 +66,8 @@ class OperationsControllerTest extends TestCase $tasker = $this->mock(AccountTaskerInterface::class); $fiscalHelper = $this->mock(FiscalHelperInterface::class); $date = new Carbon; + + Preferences::shouldReceive('lastActivity')->atLeast()->once()->andReturn('md512345'); $fiscalHelper->shouldReceive('endOfFiscalYear')->atLeast()->once()->andReturn($date); $fiscalHelper->shouldReceive('startOfFiscalYear')->atLeast()->once()->andReturn($date); $tasker->shouldReceive('getExpenseReport')->andReturn($return); @@ -83,6 +86,8 @@ class OperationsControllerTest extends TestCase $tasker = $this->mock(AccountTaskerInterface::class); $fiscalHelper = $this->mock(FiscalHelperInterface::class); $date = new Carbon; + + Preferences::shouldReceive('lastActivity')->atLeast()->once()->andReturn('md512345'); $fiscalHelper->shouldReceive('endOfFiscalYear')->atLeast()->once()->andReturn($date); $fiscalHelper->shouldReceive('startOfFiscalYear')->atLeast()->once()->andReturn($date); $tasker->shouldReceive('getIncomeReport')->andReturn([]); @@ -111,6 +116,8 @@ class OperationsControllerTest extends TestCase $tasker = $this->mock(AccountTaskerInterface::class); $fiscalHelper = $this->mock(FiscalHelperInterface::class); $date = new Carbon; + + Preferences::shouldReceive('lastActivity')->atLeast()->once()->andReturn('md512345'); $fiscalHelper->shouldReceive('endOfFiscalYear')->atLeast()->once()->andReturn($date); $fiscalHelper->shouldReceive('startOfFiscalYear')->atLeast()->once()->andReturn($date); $tasker->shouldReceive('getExpenseReport')->andReturn($return); diff --git a/tests/Feature/Controllers/Transaction/LinkControllerTest.php b/tests/Feature/Controllers/Transaction/LinkControllerTest.php index 441b67b5e4..a7ae5845be 100644 --- a/tests/Feature/Controllers/Transaction/LinkControllerTest.php +++ b/tests/Feature/Controllers/Transaction/LinkControllerTest.php @@ -54,11 +54,12 @@ class LinkControllerTest extends TestCase */ public function testDelete(): void { + $this->mockDefaultSession(); $this->mock(LinkTypeRepositoryInterface::class); $link = $this->getRandomLink(); $userRepos = $this->mock(UserRepositoryInterface::class); - $this->mockDefaultSession(); + $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'owner'])->atLeast()->once()->andReturn(true); @@ -74,10 +75,11 @@ class LinkControllerTest extends TestCase */ public function testModal(): void { + $this->mockDefaultSession(); $journal = $this->getRandomWithdrawal(); $linkRepos = $this->mock(LinkTypeRepositoryInterface::class); - $this->mockDefaultSession(); + $linkRepos->shouldReceive('get')->atLeast()->once()->andReturn(new Collection); @@ -91,11 +93,12 @@ class LinkControllerTest extends TestCase */ public function testDestroy(): void { + $this->mockDefaultSession(); $link = $this->getRandomLink(); $repository = $this->mock(LinkTypeRepositoryInterface::class); Preferences::shouldReceive('mark')->once(); - $this->mockDefaultSession(); + $repository->shouldReceive('destroyLink')->atLeast()->once(); $this->be($this->user()); @@ -113,6 +116,7 @@ class LinkControllerTest extends TestCase */ public function testStore(): void { + $this->mockDefaultSession(); $withdrawal = $this->getRandomWithdrawal(); $deposit = $this->getRandomDeposit(); $repository = $this->mock(LinkTypeRepositoryInterface::class); @@ -142,6 +146,7 @@ class LinkControllerTest extends TestCase */ public function testStoreAlreadyLinked(): void { + $this->mockDefaultSession(); $repository = $this->mock(LinkTypeRepositoryInterface::class); $journalRepos = $this->mockDefaultSession(); $link = $this->getRandomLink(); @@ -168,6 +173,7 @@ class LinkControllerTest extends TestCase */ public function testStoreInvalid(): void { + $this->mockDefaultSession(); $this->mock(LinkTypeRepositoryInterface::class); $journalRepos = $this->mockDefaultSession(); $withdrawal = $this->getRandomWithdrawal(); @@ -192,6 +198,7 @@ class LinkControllerTest extends TestCase */ public function testStoreSame(): void { + $this->mockDefaultSession(); $withdrawal = $this->getRandomWithdrawal(); $repository = $this->mock(LinkTypeRepositoryInterface::class); $journalRepos = $this->mockDefaultSession(); @@ -216,11 +223,10 @@ class LinkControllerTest extends TestCase */ public function testSwitchLink(): void { + $this->mockDefaultSession(); $link = $this->getRandomLink(); - $withdrawal = $this->getRandomWithdrawal(); - $journalRepos = $this->mock(JournalRepositoryInterface::class); $repository = $this->mock(LinkTypeRepositoryInterface::class); - $userRepos = $this->mock(UserRepositoryInterface::class); + $this->mock(UserRepositoryInterface::class); $repository->shouldReceive('switchLink')->andReturn(false); diff --git a/tests/TestCase.php b/tests/TestCase.php index efe4cc375e..2fcd5c00d9 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -222,6 +222,7 @@ abstract class TestCase extends BaseTestCase return [ 'transaction_group_id' => $withdrawal->transaction_group_id, 'transaction_journal_id' => $withdrawal->id, + 'id' => $withdrawal->id, 'transaction_type_type' => 'Withdrawal', 'currency_id' => $euro->id, 'foreign_currency_id' => null, @@ -241,6 +242,47 @@ abstract class TestCase extends BaseTestCase 'budget_name' => $budget->name, 'category_id' => $category->id, 'category_name' => $category->name, + 'tags' => ['a', 'b', 'c'], + ]; + } + + /** + * @return array + */ + public function getRandomDepositAsArray(): array + { + $deposit = $this->getRandomDeposit(); + $euro = $this->getEuro(); + $category = $this->getRandomCategory(); + $revenue = $this->getRandomRevenue(); + $asset = $this->getRandomAsset(); + try { + $date = new Carbon; + } catch (Exception $e) { + $e->getMessage(); + } + + return [ + 'transaction_group_id' => $deposit->transaction_group_id, + 'transaction_journal_id' => $deposit->id, + 'transaction_type_type' => 'Deposit', + 'currency_id' => $euro->id, + 'foreign_currency_id' => null, + 'date' => $date, + 'description' => sprintf('I am descr #%d', $this->randomInt()), + 'source_account_id' => $revenue->id, + 'source_account_name' => $revenue->name, + 'foreign_amount' => null, + 'destination_account_id' => $asset->id, + 'destination_account_name' => $asset->name, + 'currency_name' => $euro->name, + 'currency_code' => $euro->code, + 'currency_symbol' => $euro->symbol, + + 'currency_decimal_places' => $euro->decimal_places, + 'amount' => '-30', + 'category_id' => $category->id, + 'category_name' => $category->name, ]; } diff --git a/tests/Unit/Console/Commands/Upgrade/AccountCurrenciesTest.php b/tests/Unit/Console/Commands/Upgrade/AccountCurrenciesTest.php index f13424e16a..cec13c77a5 100644 --- a/tests/Unit/Console/Commands/Upgrade/AccountCurrenciesTest.php +++ b/tests/Unit/Console/Commands/Upgrade/AccountCurrenciesTest.php @@ -132,6 +132,8 @@ class AccountCurrenciesTest extends TestCase /** * Perfect run with opening balance. * + * TODO this method crashes some times but not sure why. + * * @covers \FireflyIII\Console\Commands\Upgrade\AccountCurrencies */ public function testHandleOpeningBalance(): void