From dafddfa39abbf87e102f38644819838de56005b4 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 24 Mar 2018 06:08:50 +0100 Subject: [PATCH] Fix all tests. --- test.sh | 2 +- .../V1/Controllers/AboutControllerTest.php | 2 +- .../V1/Controllers/AccountControllerTest.php | 42 +++++- .../Api/V1/Controllers/BillControllerTest.php | 2 +- .../Controllers/TransactionControllerTest.php | 5 +- .../Api/V1/Controllers/UserControllerTest.php | 2 +- .../Account/ReconcileControllerTest.php | 12 +- .../Controllers/AccountControllerTest.php | 11 ++ .../Admin/ConfigurationControllerTest.php | 2 +- .../Controllers/Admin/HomeControllerTest.php | 2 +- .../Controllers/Admin/LinkControllerTest.php | 14 +- .../Admin/UpdateControllerTest.php | 2 +- .../Controllers/Admin/UserControllerTest.php | 2 +- .../Controllers/AttachmentControllerTest.php | 11 ++ .../Auth/ForgotPasswordControllerTest.php | 2 +- .../Auth/TwoFactorControllerTest.php | 2 +- .../Controllers/BillControllerTest.php | 11 ++ .../Controllers/BudgetControllerTest.php | 10 ++ .../Controllers/CategoryControllerTest.php | 12 +- .../Chart/AccountControllerTest.php | 9 ++ .../Controllers/Chart/BillControllerTest.php | 10 ++ .../Chart/BudgetControllerTest.php | 10 ++ .../Chart/BudgetReportControllerTest.php | 10 ++ .../Chart/CategoryControllerTest.php | 10 ++ .../Chart/CategoryReportControllerTest.php | 10 ++ .../Chart/ExpenseReportControllerTest.php | 9 ++ .../Chart/PiggyBankControllerTest.php | 10 ++ .../Chart/ReportControllerTest.php | 10 ++ .../Chart/TagReportControllerTest.php | 10 ++ .../Controllers/CurrencyControllerTest.php | 11 ++ .../Controllers/DebugControllerTest.php | 10 ++ .../Controllers/ExportControllerTest.php | 12 +- .../Controllers/HelpControllerTest.php | 10 ++ .../Controllers/HomeControllerTest.php | 11 ++ .../Import/ConfigurationControllerTest.php | 10 ++ .../Import/IndexControllerTest.php | 10 ++ .../Import/PrerequisitesControllerTest.php | 10 ++ .../Import/StatusControllerTest.php | 10 ++ .../Controllers/JavascriptControllerTest.php | 11 ++ .../Json/AutoCompleteControllerTest.php | 10 ++ .../Controllers/Json/BoxControllerTest.php | 10 ++ .../Json/ExchangeControllerTest.php | 10 ++ .../Json/FrontpageControllerTest.php | 10 ++ .../Controllers/Json/IntroControllerTest.php | 10 ++ .../Controllers/JsonControllerTest.php | 10 ++ .../Controllers/NewUserControllerTest.php | 11 ++ .../Controllers/PiggyBankControllerTest.php | 11 ++ .../Popup/ReportControllerTest.php | 10 ++ .../Controllers/PreferencesControllerTest.php | 13 +- .../Controllers/ProfileControllerTest.php | 128 +++++++++--------- .../Report/AccountControllerTest.php | 10 ++ .../Report/BalanceControllerTest.php | 11 ++ .../Report/BudgetControllerTest.php | 11 ++ .../Report/CategoryControllerTest.php | 11 ++ .../Report/ExpenseControllerTest.php | 11 ++ .../Report/OperationsControllerTest.php | 25 +++- .../Controllers/ReportControllerTest.php | 33 +++-- .../Controllers/RuleControllerTest.php | 16 ++- .../Controllers/RuleGroupControllerTest.php | 11 ++ .../Controllers/SearchControllerTest.php | 11 ++ .../Feature/Controllers/TagControllerTest.php | 11 ++ .../Transaction/BulkControllerTest.php | 11 ++ .../Transaction/ConvertControllerTest.php | 11 ++ .../Transaction/LinkControllerTest.php | 18 ++- .../Transaction/MassControllerTest.php | 13 +- .../Transaction/SingleControllerTest.php | 12 +- .../Transaction/SplitControllerTest.php | 11 ++ .../Controllers/TransactionControllerTest.php | 10 ++ .../Triggers/HasAnyCategoryTest.php | 8 ++ .../Triggers/HasNoCategoryTest.php | 9 ++ .../Transformers/AccountTransformerTest.php | 2 + .../TransactionTransformerTest.php | 15 ++ 72 files changed, 746 insertions(+), 119 deletions(-) diff --git a/test.sh b/test.sh index 4370270db4..fd76d7e758 100755 --- a/test.sh +++ b/test.sh @@ -24,7 +24,7 @@ verbalflag='' testsuite='' configfile='phpunit.xml'; -while getopts 'vcratf:u:s:' flag; do +while getopts 'vcrtf:u:s:a:' flag; do case "${flag}" in r) resetTestFlag='true' diff --git a/tests/Api/V1/Controllers/AboutControllerTest.php b/tests/Api/V1/Controllers/AboutControllerTest.php index 451fc83767..f6300fe573 100644 --- a/tests/Api/V1/Controllers/AboutControllerTest.php +++ b/tests/Api/V1/Controllers/AboutControllerTest.php @@ -39,7 +39,7 @@ class AboutControllerTest extends TestCase { parent::setUp(); Passport::actingAs($this->user()); - Log::debug('Now in Api/AboutControllerTest.'); + Log::debug(sprintf('Now in %s.', get_class($this))); } /** diff --git a/tests/Api/V1/Controllers/AccountControllerTest.php b/tests/Api/V1/Controllers/AccountControllerTest.php index e1988b63cc..3d8bf7e88d 100644 --- a/tests/Api/V1/Controllers/AccountControllerTest.php +++ b/tests/Api/V1/Controllers/AccountControllerTest.php @@ -29,6 +29,7 @@ use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; use Laravel\Passport\Passport; use Log; +use Mockery; use Tests\TestCase; /** @@ -43,7 +44,7 @@ class AccountControllerTest extends TestCase { parent::setUp(); Passport::actingAs($this->user()); - Log::debug('Now in Api/AccountControllerTest.'); + Log::debug(sprintf('Now in %s.', get_class($this))); } /** @@ -85,9 +86,14 @@ class AccountControllerTest extends TestCase $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); // mock calls: - $repository->shouldReceive('setUser')->once(); + $repository->shouldReceive('setUser'); $repository->shouldReceive('getAccountsByType')->withAnyArgs()->andReturn($accounts)->once(); - $currencyRepos->shouldReceive('setUser')->once(); + $currencyRepos->shouldReceive('setUser'); + $repository->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'accountRole'])->andReturn('defaultAsset'); + $repository->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'currency_id'])->andReturn('1'); + $repository->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'accountNumber'])->andReturn('1'); + $repository->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'BIC'])->andReturn('BIC'); + $repository->shouldReceive('getNoteText')->withArgs([Mockery::any()])->andReturn('Hello'); // test API $response = $this->get('/api/v1/accounts'); @@ -244,6 +250,12 @@ class AccountControllerTest extends TestCase $currencyRepos->shouldReceive('setUser')->once(); $repository->shouldReceive('getOpeningBalanceAmount')->andReturn('10')->once(); $repository->shouldReceive('getOpeningBalanceDate')->andReturn('2018-01-01')->once(); + $repository->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'accountRole'])->andReturn('defaultAsset'); + $repository->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'currency_id'])->andReturn('1'); + $repository->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'accountNumber'])->andReturn('1'); + $repository->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'BIC'])->andReturn('BIC'); + $repository->shouldReceive('getNoteText')->withArgs([Mockery::any()])->andReturn('Hello'); + // test API $response = $this->get('/api/v1/accounts/' . $account->id); @@ -316,6 +328,12 @@ class AccountControllerTest extends TestCase $repository->shouldReceive('getOpeningBalanceDate')->andReturn('2018-01-01'); $currencyRepos->shouldReceive('setUser')->once(); + $repository->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'accountRole'])->andReturn('defaultAsset'); + $repository->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'currency_id'])->andReturn('1'); + $repository->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'accountNumber'])->andReturn('1'); + $repository->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'BIC'])->andReturn('BIC'); + $repository->shouldReceive('getNoteText')->withArgs([Mockery::any()])->andReturn('Hello'); + // data to submit $data = [ 'name' => 'Some new asset account #' . rand(1, 10000), @@ -356,6 +374,12 @@ class AccountControllerTest extends TestCase $repository->shouldReceive('getOpeningBalanceDate')->andReturn('2018-01-01'); $currencyRepos->shouldReceive('findByCodeNull')->andReturn(TransactionCurrency::find(1)); + $repository->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'accountRole'])->andReturn('defaultAsset'); + $repository->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'currency_id'])->andReturn('1'); + $repository->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'accountNumber'])->andReturn('1'); + $repository->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'BIC'])->andReturn('BIC'); + $repository->shouldReceive('getNoteText')->withArgs([Mockery::any()])->andReturn('Hello'); + // functions to expect: // data to submit @@ -394,6 +418,12 @@ class AccountControllerTest extends TestCase $repository->shouldReceive('getOpeningBalanceAmount')->andReturn('10'); $repository->shouldReceive('getOpeningBalanceDate')->andReturn('2018-01-01'); + $repository->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'accountRole'])->andReturn('defaultAsset'); + $repository->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'currency_id'])->andReturn('1'); + $repository->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'accountNumber'])->andReturn('1'); + $repository->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'BIC'])->andReturn('BIC'); + $repository->shouldReceive('getNoteText')->withArgs([Mockery::any()])->andReturn('Hello'); + $account = $this->user()->accounts()->first(); // data to submit $data = [ @@ -432,6 +462,12 @@ class AccountControllerTest extends TestCase $repository->shouldReceive('getOpeningBalanceDate')->andReturn('2018-01-01'); $currencyRepos->shouldReceive('findByCodeNull')->andReturn(TransactionCurrency::find(1)); + $repository->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'accountRole'])->andReturn('defaultAsset'); + $repository->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'currency_id'])->andReturn('1'); + $repository->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'accountNumber'])->andReturn('1'); + $repository->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'BIC'])->andReturn('BIC'); + $repository->shouldReceive('getNoteText')->withArgs([Mockery::any()])->andReturn('Hello'); + $account = $this->user()->accounts()->first(); // data to submit $data = [ diff --git a/tests/Api/V1/Controllers/BillControllerTest.php b/tests/Api/V1/Controllers/BillControllerTest.php index 623fbfba66..ffce0c30d6 100644 --- a/tests/Api/V1/Controllers/BillControllerTest.php +++ b/tests/Api/V1/Controllers/BillControllerTest.php @@ -43,7 +43,7 @@ class BillControllerTest extends TestCase { parent::setUp(); Passport::actingAs($this->user()); - Log::debug('Now in Api/BillControllerTest.'); + Log::debug(sprintf('Now in %s.', get_class($this))); } diff --git a/tests/Api/V1/Controllers/TransactionControllerTest.php b/tests/Api/V1/Controllers/TransactionControllerTest.php index 076a35bb2c..7a307699aa 100644 --- a/tests/Api/V1/Controllers/TransactionControllerTest.php +++ b/tests/Api/V1/Controllers/TransactionControllerTest.php @@ -48,7 +48,7 @@ class TransactionControllerTest extends TestCase { parent::setUp(); Passport::actingAs($this->user()); - Log::debug('Now in Api/TransactionControllerTest.'); + Log::debug(sprintf('Now in %s.', get_class($this))); } /** @@ -1136,6 +1136,9 @@ class TransactionControllerTest extends TestCase 'transactions.0.destination_id' => [ 'All accounts in this field must be equal.', ], + 'transactions.1.destination_id' => [ + 'The source account equals the destination account' + ], ], ] ); diff --git a/tests/Api/V1/Controllers/UserControllerTest.php b/tests/Api/V1/Controllers/UserControllerTest.php index 24955cd525..90b5166189 100644 --- a/tests/Api/V1/Controllers/UserControllerTest.php +++ b/tests/Api/V1/Controllers/UserControllerTest.php @@ -43,7 +43,7 @@ class UserControllerTest extends TestCase { parent::setUp(); Passport::actingAs($this->user()); - Log::debug('Now in Api/UserControllerTest.'); + Log::debug(sprintf('Now in %s.', get_class($this))); } diff --git a/tests/Feature/Controllers/Account/ReconcileControllerTest.php b/tests/Feature/Controllers/Account/ReconcileControllerTest.php index 0d5c2dbcdc..0931402d71 100644 --- a/tests/Feature/Controllers/Account/ReconcileControllerTest.php +++ b/tests/Feature/Controllers/Account/ReconcileControllerTest.php @@ -49,7 +49,7 @@ class ReconcileControllerTest extends TestCase public function setUp() { parent::setUp(); - Log::debug('Now in Feature/Controllers::ReconcileControllerTest.'); + Log::debug(sprintf('Now in %s.', get_class($this))); } /** @@ -92,7 +92,7 @@ class ReconcileControllerTest extends TestCase public function testOverview() { $transactions = $this->user()->transactions()->inRandomOrder()->take(3)->get(); - $repository = $this->mock(JournalRepositoryInterface::class); + $repository = $this->mock(JournalRepositoryInterface::class); $repository->shouldReceive('first')->andReturn(new TransactionJournal); $repository->shouldReceive('getTransactionsById')->andReturn($transactions)->twice(); @@ -236,7 +236,7 @@ class ReconcileControllerTest extends TestCase } /** - * @covers \FireflyIII\Http\Controllers\Account\ReconcileController::submit() + * @covers \FireflyIII\Http\Controllers\Account\ReconcileController::submit() * @covers \FireflyIII\Http\Requests\ReconciliationStoreRequest */ public function testSubmit() @@ -288,7 +288,7 @@ class ReconcileControllerTest extends TestCase } /** - * @covers \FireflyIII\Http\Controllers\Account\ReconcileController::update + * @covers \FireflyIII\Http\Controllers\Account\ReconcileController::update * @covers \FireflyIII\Http\Requests\ReconciliationUpdateRequest */ public function testUpdate() @@ -311,7 +311,7 @@ class ReconcileControllerTest extends TestCase } /** - * @covers \FireflyIII\Http\Controllers\Account\ReconcileController::update + * @covers \FireflyIII\Http\Controllers\Account\ReconcileController::update * @covers \FireflyIII\Http\Requests\ReconciliationUpdateRequest */ public function testUpdateNotReconcile() @@ -328,7 +328,7 @@ class ReconcileControllerTest extends TestCase } /** - * @covers \FireflyIII\Http\Controllers\Account\ReconcileController::update + * @covers \FireflyIII\Http\Controllers\Account\ReconcileController::update * @covers \FireflyIII\Http\Requests\ReconciliationUpdateRequest */ public function testUpdateZero() diff --git a/tests/Feature/Controllers/AccountControllerTest.php b/tests/Feature/Controllers/AccountControllerTest.php index a286d6390b..7d331a01e6 100644 --- a/tests/Feature/Controllers/AccountControllerTest.php +++ b/tests/Feature/Controllers/AccountControllerTest.php @@ -36,6 +36,7 @@ use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use Illuminate\Pagination\LengthAwarePaginator; use Illuminate\Support\Collection; +use Log; use Preferences; use Steam; use Tests\TestCase; @@ -49,6 +50,16 @@ use Tests\TestCase; */ class AccountControllerTest extends TestCase { + /** + * + */ + public function setUp() + { + parent::setUp(); + Log::debug(sprintf('Now in %s.', get_class($this))); + } + + /** * @covers \FireflyIII\Http\Controllers\AccountController::create */ diff --git a/tests/Feature/Controllers/Admin/ConfigurationControllerTest.php b/tests/Feature/Controllers/Admin/ConfigurationControllerTest.php index 4e58afb31a..dcb18db954 100644 --- a/tests/Feature/Controllers/Admin/ConfigurationControllerTest.php +++ b/tests/Feature/Controllers/Admin/ConfigurationControllerTest.php @@ -42,7 +42,7 @@ class ConfigurationControllerTest extends TestCase public function setUp() { parent::setUp(); - Log::debug('Now in Feature/Controllers/Admin/ConfigurationControllerTest.'); + Log::debug(sprintf('Now in %s.', get_class($this))); } /** diff --git a/tests/Feature/Controllers/Admin/HomeControllerTest.php b/tests/Feature/Controllers/Admin/HomeControllerTest.php index 53a7448b23..12487ba3e5 100644 --- a/tests/Feature/Controllers/Admin/HomeControllerTest.php +++ b/tests/Feature/Controllers/Admin/HomeControllerTest.php @@ -42,7 +42,7 @@ class HomeControllerTest extends TestCase public function setUp() { parent::setUp(); - Log::debug('Now in Feature/Controllers/Admin/HomeControllerTest.'); + Log::debug(sprintf('Now in %s.', get_class($this))); } /** diff --git a/tests/Feature/Controllers/Admin/LinkControllerTest.php b/tests/Feature/Controllers/Admin/LinkControllerTest.php index bf3a68b126..feec43fe8b 100644 --- a/tests/Feature/Controllers/Admin/LinkControllerTest.php +++ b/tests/Feature/Controllers/Admin/LinkControllerTest.php @@ -43,7 +43,7 @@ class LinkControllerTest extends TestCase public function setUp() { parent::setUp(); - Log::debug('Now in Feature/Controllers/Admin/LinkControllerTest.'); + Log::debug(sprintf('Now in %s.', get_class($this))); } /** @@ -139,7 +139,7 @@ class LinkControllerTest extends TestCase */ public function testIndex() { - $linkTypes = LinkType::inRandomOrder()->take(3)->get(); + $linkTypes = LinkType::inRandomOrder()->take(3)->get(); $repository = $this->mock(LinkTypeRepositoryInterface::class); $repository->shouldReceive('get')->andReturn($linkTypes); $repository->shouldReceive('countJournals')->andReturn(3); @@ -160,7 +160,7 @@ class LinkControllerTest extends TestCase } /** - * @covers \FireflyIII\Http\Controllers\Admin\LinkController::store + * @covers \FireflyIII\Http\Controllers\Admin\LinkController::store * @covers \FireflyIII\Http\Requests\LinkTypeFormRequest */ public function testStore() @@ -182,7 +182,7 @@ class LinkControllerTest extends TestCase } /** - * @covers \FireflyIII\Http\Controllers\Admin\LinkController::store + * @covers \FireflyIII\Http\Controllers\Admin\LinkController::store * @covers \FireflyIII\Http\Requests\LinkTypeFormRequest */ public function testStoreRedirect() @@ -203,7 +203,7 @@ class LinkControllerTest extends TestCase } /** - * @covers \FireflyIII\Http\Controllers\Admin\LinkController::update + * @covers \FireflyIII\Http\Controllers\Admin\LinkController::update * @covers \FireflyIII\Http\Requests\LinkTypeFormRequest */ public function testUpdate() @@ -227,7 +227,7 @@ class LinkControllerTest extends TestCase } /** - * @covers \FireflyIII\Http\Controllers\Admin\LinkController::update + * @covers \FireflyIII\Http\Controllers\Admin\LinkController::update * @covers \FireflyIII\Http\Requests\LinkTypeFormRequest */ public function testUpdateNonEditable() @@ -249,7 +249,7 @@ class LinkControllerTest extends TestCase } /** - * @covers \FireflyIII\Http\Controllers\Admin\LinkController::update + * @covers \FireflyIII\Http\Controllers\Admin\LinkController::update * @covers \FireflyIII\Http\Requests\LinkTypeFormRequest */ public function testUpdateRedirect() diff --git a/tests/Feature/Controllers/Admin/UpdateControllerTest.php b/tests/Feature/Controllers/Admin/UpdateControllerTest.php index db791f2520..db8f6883c7 100644 --- a/tests/Feature/Controllers/Admin/UpdateControllerTest.php +++ b/tests/Feature/Controllers/Admin/UpdateControllerTest.php @@ -47,7 +47,7 @@ class UpdateControllerTest extends TestCase public function setUp() { parent::setUp(); - Log::debug('Now in Feature/Controllers/Admin/UpdateControllerTest.'); + Log::debug(sprintf('Now in %s.', get_class($this))); } /** diff --git a/tests/Feature/Controllers/Admin/UserControllerTest.php b/tests/Feature/Controllers/Admin/UserControllerTest.php index c6ed1b9257..a793ecc3c5 100644 --- a/tests/Feature/Controllers/Admin/UserControllerTest.php +++ b/tests/Feature/Controllers/Admin/UserControllerTest.php @@ -42,7 +42,7 @@ class UserControllerTest extends TestCase public function setUp() { parent::setUp(); - Log::debug('Now in Feature/Controllers/Admin/UserControllerTest.'); + Log::debug(sprintf('Now in %s.', get_class($this))); } /** diff --git a/tests/Feature/Controllers/AttachmentControllerTest.php b/tests/Feature/Controllers/AttachmentControllerTest.php index d5f57e4ab7..11653ed821 100644 --- a/tests/Feature/Controllers/AttachmentControllerTest.php +++ b/tests/Feature/Controllers/AttachmentControllerTest.php @@ -25,6 +25,7 @@ namespace Tests\Feature\Controllers; use FireflyIII\Models\TransactionJournal; use FireflyIII\Repositories\Attachment\AttachmentRepositoryInterface; use FireflyIII\Repositories\Journal\JournalRepositoryInterface; +use Log; use Tests\TestCase; /** @@ -36,6 +37,16 @@ use Tests\TestCase; */ class AttachmentControllerTest extends TestCase { + /** + * + */ + public function setUp() + { + parent::setUp(); + Log::debug(sprintf('Now in %s.', get_class($this))); + } + + /** * @covers \FireflyIII\Http\Controllers\AttachmentController::delete */ diff --git a/tests/Feature/Controllers/Auth/ForgotPasswordControllerTest.php b/tests/Feature/Controllers/Auth/ForgotPasswordControllerTest.php index 262f2410b6..a2a5be96af 100644 --- a/tests/Feature/Controllers/Auth/ForgotPasswordControllerTest.php +++ b/tests/Feature/Controllers/Auth/ForgotPasswordControllerTest.php @@ -41,7 +41,7 @@ class ForgotPasswordControllerTest extends TestCase public function setUp() { parent::setUp(); - Log::debug('Now in Feature/Controllers/Auth/ForgotPasswordControllerTest.'); + Log::debug(sprintf('Now in %s.', get_class($this))); } /** diff --git a/tests/Feature/Controllers/Auth/TwoFactorControllerTest.php b/tests/Feature/Controllers/Auth/TwoFactorControllerTest.php index 5792d1cdb8..dd347ecdca 100644 --- a/tests/Feature/Controllers/Auth/TwoFactorControllerTest.php +++ b/tests/Feature/Controllers/Auth/TwoFactorControllerTest.php @@ -43,7 +43,7 @@ class TwoFactorControllerTest extends TestCase public function setUp() { parent::setUp(); - Log::debug('Now in Feature/Controllers/Auth/TwoFactorControllerTest.'); + Log::debug(sprintf('Now in %s.', get_class($this))); } /** diff --git a/tests/Feature/Controllers/BillControllerTest.php b/tests/Feature/Controllers/BillControllerTest.php index d2d678379d..ff02b86b63 100644 --- a/tests/Feature/Controllers/BillControllerTest.php +++ b/tests/Feature/Controllers/BillControllerTest.php @@ -32,6 +32,7 @@ use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use Illuminate\Pagination\LengthAwarePaginator; use Illuminate\Support\Collection; use Illuminate\Support\MessageBag; +use Log; use Tests\TestCase; /** @@ -43,6 +44,16 @@ use Tests\TestCase; */ class BillControllerTest extends TestCase { + /** + * + */ + public function setUp() + { + parent::setUp(); + Log::debug(sprintf('Now in %s.', get_class($this))); + } + + /** * @covers \FireflyIII\Http\Controllers\BillController::create */ diff --git a/tests/Feature/Controllers/BudgetControllerTest.php b/tests/Feature/Controllers/BudgetControllerTest.php index bb942aa02f..d4249dc101 100644 --- a/tests/Feature/Controllers/BudgetControllerTest.php +++ b/tests/Feature/Controllers/BudgetControllerTest.php @@ -32,6 +32,7 @@ use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use Illuminate\Pagination\LengthAwarePaginator; use Illuminate\Support\Collection; +use Log; use Tests\TestCase; /** @@ -43,6 +44,15 @@ use Tests\TestCase; */ class BudgetControllerTest extends TestCase { + /** + * + */ + public function setUp() + { + parent::setUp(); + Log::debug(sprintf('Now in %s.', get_class($this))); + } + /** * @covers \FireflyIII\Http\Controllers\BudgetController::amount diff --git a/tests/Feature/Controllers/CategoryControllerTest.php b/tests/Feature/Controllers/CategoryControllerTest.php index f3e94b50b6..862a9d6594 100644 --- a/tests/Feature/Controllers/CategoryControllerTest.php +++ b/tests/Feature/Controllers/CategoryControllerTest.php @@ -33,6 +33,7 @@ use FireflyIII\Repositories\Category\CategoryRepositoryInterface; use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use Illuminate\Pagination\LengthAwarePaginator; use Illuminate\Support\Collection; +use Log; use Navigation; use Tests\TestCase; @@ -45,6 +46,15 @@ use Tests\TestCase; */ class CategoryControllerTest extends TestCase { + /** + * + */ + public function setUp() + { + parent::setUp(); + Log::debug(sprintf('Now in %s.', get_class($this))); + } + /** * @covers \FireflyIII\Http\Controllers\CategoryController::create */ @@ -460,7 +470,7 @@ class CategoryControllerTest extends TestCase */ public function testUpdate() { - $category = Category::first(); + $category = Category::first(); $repository = $this->mock(CategoryRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); $accountRepos = $this->mock(AccountRepositoryInterface::class); diff --git a/tests/Feature/Controllers/Chart/AccountControllerTest.php b/tests/Feature/Controllers/Chart/AccountControllerTest.php index dd58a5fc30..9b920120fc 100644 --- a/tests/Feature/Controllers/Chart/AccountControllerTest.php +++ b/tests/Feature/Controllers/Chart/AccountControllerTest.php @@ -36,6 +36,7 @@ use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; use FireflyIII\Repositories\Category\CategoryRepositoryInterface; use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; use Illuminate\Support\Collection; +use Log; use Preferences; use Steam; use Tests\TestCase; @@ -49,6 +50,14 @@ use Tests\TestCase; */ class AccountControllerTest extends TestCase { + /** + * + */ + public function setUp() + { + parent::setUp(); + Log::debug(sprintf('Now in %s.', get_class($this))); + } /** * @covers \FireflyIII\Http\Controllers\Chart\AccountController::expenseAccounts diff --git a/tests/Feature/Controllers/Chart/BillControllerTest.php b/tests/Feature/Controllers/Chart/BillControllerTest.php index 2593b9758e..bc36781b77 100644 --- a/tests/Feature/Controllers/Chart/BillControllerTest.php +++ b/tests/Feature/Controllers/Chart/BillControllerTest.php @@ -27,6 +27,7 @@ use FireflyIII\Helpers\Collector\JournalCollectorInterface; use FireflyIII\Models\Transaction; use FireflyIII\Repositories\Bill\BillRepositoryInterface; use Illuminate\Support\Collection; +use Log; use Tests\TestCase; /** @@ -38,6 +39,15 @@ use Tests\TestCase; */ class BillControllerTest extends TestCase { + /** + * + */ + public function setUp() + { + parent::setUp(); + Log::debug('Now in Feature/Controllers/Chart/Test.'); + } + /** * @covers \FireflyIII\Http\Controllers\Chart\BillController::frontpage * @covers \FireflyIII\Http\Controllers\Chart\BillController::__construct diff --git a/tests/Feature/Controllers/Chart/BudgetControllerTest.php b/tests/Feature/Controllers/Chart/BudgetControllerTest.php index c15058e09d..99bb3c15fa 100644 --- a/tests/Feature/Controllers/Chart/BudgetControllerTest.php +++ b/tests/Feature/Controllers/Chart/BudgetControllerTest.php @@ -35,6 +35,7 @@ use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; use FireflyIII\Repositories\Category\CategoryRepositoryInterface; use Illuminate\Support\Collection; +use Log; use Tests\TestCase; /** @@ -46,6 +47,15 @@ use Tests\TestCase; */ class BudgetControllerTest extends TestCase { + /** + * + */ + public function setUp() + { + parent::setUp(); + Log::debug('Now in Feature/Controllers/Chart/Test.'); + } + /** * @covers \FireflyIII\Http\Controllers\Chart\BudgetController::budget * @covers \FireflyIII\Http\Controllers\Chart\BudgetController::__construct diff --git a/tests/Feature/Controllers/Chart/BudgetReportControllerTest.php b/tests/Feature/Controllers/Chart/BudgetReportControllerTest.php index 69151a3bb8..4c3cbd6bb7 100644 --- a/tests/Feature/Controllers/Chart/BudgetReportControllerTest.php +++ b/tests/Feature/Controllers/Chart/BudgetReportControllerTest.php @@ -34,6 +34,7 @@ use FireflyIII\Models\Transaction; use FireflyIII\Models\TransactionType; use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; use Illuminate\Support\Collection; +use Log; use Tests\TestCase; /** @@ -45,6 +46,15 @@ use Tests\TestCase; */ class BudgetReportControllerTest extends TestCase { + /** + * + */ + public function setUp() + { + parent::setUp(); + Log::debug(sprintf('Now in %s.', get_class($this))); + } + /** * @covers \FireflyIII\Http\Controllers\Chart\BudgetReportController::accountExpense * @covers \FireflyIII\Http\Controllers\Chart\BudgetReportController::__construct diff --git a/tests/Feature/Controllers/Chart/CategoryControllerTest.php b/tests/Feature/Controllers/Chart/CategoryControllerTest.php index b939d38186..9b8ddf9730 100644 --- a/tests/Feature/Controllers/Chart/CategoryControllerTest.php +++ b/tests/Feature/Controllers/Chart/CategoryControllerTest.php @@ -30,6 +30,7 @@ use FireflyIII\Models\Category; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Category\CategoryRepositoryInterface; use Illuminate\Support\Collection; +use Log; use Tests\TestCase; /** @@ -41,6 +42,15 @@ use Tests\TestCase; */ class CategoryControllerTest extends TestCase { + /** + * + */ + public function setUp() + { + parent::setUp(); + Log::debug(sprintf('Now in %s.', get_class($this))); + } + /** * @covers \FireflyIII\Http\Controllers\Chart\CategoryController::all * @covers \FireflyIII\Http\Controllers\Chart\CategoryController::__construct diff --git a/tests/Feature/Controllers/Chart/CategoryReportControllerTest.php b/tests/Feature/Controllers/Chart/CategoryReportControllerTest.php index c7b56f2408..7e72e4d472 100644 --- a/tests/Feature/Controllers/Chart/CategoryReportControllerTest.php +++ b/tests/Feature/Controllers/Chart/CategoryReportControllerTest.php @@ -31,6 +31,7 @@ use FireflyIII\Helpers\Filter\PositiveAmountFilter; use FireflyIII\Helpers\Filter\TransferFilter; use FireflyIII\Models\Transaction; use FireflyIII\Models\TransactionType; +use Log; use Tests\TestCase; /** @@ -42,6 +43,15 @@ use Tests\TestCase; */ class CategoryReportControllerTest extends TestCase { + /** + * + */ + public function setUp() + { + parent::setUp(); + Log::debug(sprintf('Now in %s.', get_class($this))); + } + /** * @covers \FireflyIII\Http\Controllers\Chart\CategoryReportController::accountExpense * @covers \FireflyIII\Http\Controllers\Chart\CategoryReportController::__construct diff --git a/tests/Feature/Controllers/Chart/ExpenseReportControllerTest.php b/tests/Feature/Controllers/Chart/ExpenseReportControllerTest.php index 2608351a4b..7f8f6543e9 100644 --- a/tests/Feature/Controllers/Chart/ExpenseReportControllerTest.php +++ b/tests/Feature/Controllers/Chart/ExpenseReportControllerTest.php @@ -28,6 +28,7 @@ use FireflyIII\Models\Transaction; use FireflyIII\Models\TransactionType; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use Illuminate\Support\Collection; +use Log; use Tests\TestCase; /** @@ -39,6 +40,14 @@ use Tests\TestCase; */ class ExpenseReportControllerTest extends TestCase { + /** + * + */ + public function setUp() + { + parent::setUp(); + Log::debug(sprintf('Now in %s.', get_class($this))); + } /** diff --git a/tests/Feature/Controllers/Chart/PiggyBankControllerTest.php b/tests/Feature/Controllers/Chart/PiggyBankControllerTest.php index 70b92a2ea6..9f00fcc287 100644 --- a/tests/Feature/Controllers/Chart/PiggyBankControllerTest.php +++ b/tests/Feature/Controllers/Chart/PiggyBankControllerTest.php @@ -26,6 +26,7 @@ use FireflyIII\Generator\Chart\Basic\GeneratorInterface; use FireflyIII\Models\PiggyBankEvent; use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface; use Illuminate\Support\Collection; +use Log; use Tests\TestCase; /** @@ -37,6 +38,15 @@ use Tests\TestCase; */ class PiggyBankControllerTest extends TestCase { + /** + * + */ + public function setUp() + { + parent::setUp(); + Log::debug(sprintf('Now in %s.', get_class($this))); + } + /** * @covers \FireflyIII\Http\Controllers\Chart\PiggyBankController::history * @covers \FireflyIII\Http\Controllers\Chart\PiggyBankController::__construct diff --git a/tests/Feature/Controllers/Chart/ReportControllerTest.php b/tests/Feature/Controllers/Chart/ReportControllerTest.php index 57c5e64bce..d5c1f058e6 100644 --- a/tests/Feature/Controllers/Chart/ReportControllerTest.php +++ b/tests/Feature/Controllers/Chart/ReportControllerTest.php @@ -24,6 +24,7 @@ namespace Tests\Feature\Controllers\Chart; use FireflyIII\Generator\Chart\Basic\GeneratorInterface; use FireflyIII\Repositories\Account\AccountTaskerInterface; +use Log; use Steam; use Tests\TestCase; @@ -36,6 +37,15 @@ use Tests\TestCase; */ class ReportControllerTest extends TestCase { + /** + * + */ + public function setUp() + { + parent::setUp(); + Log::debug(sprintf('Now in %s.', get_class($this))); + } + /** * @covers \FireflyIII\Http\Controllers\Chart\ReportController::netWorth * @covers \FireflyIII\Http\Controllers\Chart\ReportController::arraySum diff --git a/tests/Feature/Controllers/Chart/TagReportControllerTest.php b/tests/Feature/Controllers/Chart/TagReportControllerTest.php index 5609b4dd05..4d6e6b3fad 100644 --- a/tests/Feature/Controllers/Chart/TagReportControllerTest.php +++ b/tests/Feature/Controllers/Chart/TagReportControllerTest.php @@ -35,6 +35,7 @@ use FireflyIII\Models\TransactionType; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Tag\TagRepositoryInterface; use Illuminate\Support\Collection; +use Log; use Tests\TestCase; /** @@ -46,6 +47,15 @@ use Tests\TestCase; */ class TagReportControllerTest extends TestCase { + /** + * + */ + public function setUp() + { + parent::setUp(); + Log::debug(sprintf('Now in %s.', get_class($this))); + } + /** * @covers \FireflyIII\Http\Controllers\Chart\TagReportController::accountExpense * @covers \FireflyIII\Http\Controllers\Chart\TagReportController::__construct diff --git a/tests/Feature/Controllers/CurrencyControllerTest.php b/tests/Feature/Controllers/CurrencyControllerTest.php index d893613068..24ec646520 100644 --- a/tests/Feature/Controllers/CurrencyControllerTest.php +++ b/tests/Feature/Controllers/CurrencyControllerTest.php @@ -28,6 +28,7 @@ use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use FireflyIII\Repositories\User\UserRepositoryInterface; use Illuminate\Support\Collection; +use Log; use Tests\TestCase; /** @@ -39,6 +40,16 @@ use Tests\TestCase; */ class CurrencyControllerTest extends TestCase { + + /** + * + */ + public function setUp() + { + parent::setUp(); + Log::debug(sprintf('Now in %s.', get_class($this))); + } + /** * @covers \FireflyIII\Http\Controllers\CurrencyController::create */ diff --git a/tests/Feature/Controllers/DebugControllerTest.php b/tests/Feature/Controllers/DebugControllerTest.php index 4c66eebdf9..978bb52f86 100644 --- a/tests/Feature/Controllers/DebugControllerTest.php +++ b/tests/Feature/Controllers/DebugControllerTest.php @@ -22,6 +22,7 @@ declare(strict_types=1); namespace Tests\Feature\Controllers; +use Log; use Tests\TestCase; /** @@ -33,6 +34,15 @@ use Tests\TestCase; */ class DebugControllerTest extends TestCase { + /** + * + */ + public function setUp() + { + parent::setUp(); + Log::debug(sprintf('Now in %s.', get_class($this))); + } + /** * @covers \FireflyIII\Http\Controllers\DebugController::index * @covers \FireflyIII\Http\Controllers\DebugController::__construct diff --git a/tests/Feature/Controllers/ExportControllerTest.php b/tests/Feature/Controllers/ExportControllerTest.php index 0fae59774e..48ca1e6d90 100644 --- a/tests/Feature/Controllers/ExportControllerTest.php +++ b/tests/Feature/Controllers/ExportControllerTest.php @@ -31,6 +31,7 @@ use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\ExportJob\ExportJobRepositoryInterface; use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use Illuminate\Support\Collection; +use Log; use Tests\TestCase; /** @@ -42,6 +43,15 @@ use Tests\TestCase; */ class ExportControllerTest extends TestCase { + /** + * + */ + public function setUp() + { + parent::setUp(); + Log::debug(sprintf('Now in %s.', get_class($this))); + } + /** * @covers \FireflyIII\Http\Controllers\ExportController::download */ @@ -102,7 +112,7 @@ class ExportControllerTest extends TestCase $repository = $this->mock(ExportJobRepositoryInterface::class); $accountRepos = $this->mock(AccountRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); - $job = ExportJob::first(); + $job = ExportJob::first(); $journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal); $repository->shouldReceive('create')->andReturn($job); $repository->shouldReceive('cleanup'); diff --git a/tests/Feature/Controllers/HelpControllerTest.php b/tests/Feature/Controllers/HelpControllerTest.php index 8dcccfc976..8ebc5a1d66 100644 --- a/tests/Feature/Controllers/HelpControllerTest.php +++ b/tests/Feature/Controllers/HelpControllerTest.php @@ -24,6 +24,7 @@ namespace Tests\Feature\Controllers; use FireflyIII\Helpers\Help\HelpInterface; use FireflyIII\Models\Preference; +use Log; use Tests\TestCase; /** @@ -35,6 +36,15 @@ use Tests\TestCase; */ class HelpControllerTest extends TestCase { + /** + * + */ + public function setUp() + { + parent::setUp(); + Log::debug(sprintf('Now in %s.', get_class($this))); + } + /** * @covers \FireflyIII\Http\Controllers\HelpController::show * @covers \FireflyIII\Http\Controllers\HelpController::getHelpText diff --git a/tests/Feature/Controllers/HomeControllerTest.php b/tests/Feature/Controllers/HomeControllerTest.php index c933215939..5b7fd374f4 100644 --- a/tests/Feature/Controllers/HomeControllerTest.php +++ b/tests/Feature/Controllers/HomeControllerTest.php @@ -30,6 +30,7 @@ use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Bill\BillRepositoryInterface; use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use Illuminate\Support\Collection; +use Log; use Tests\TestCase; /** @@ -41,6 +42,16 @@ use Tests\TestCase; */ class HomeControllerTest extends TestCase { + /** + * + */ + public function setUp() + { + parent::setUp(); + Log::debug(sprintf('Now in %s.', get_class($this))); + } + + /** * @covers \FireflyIII\Http\Controllers\HomeController::dateRange * @covers \FireflyIII\Http\Controllers\HomeController::__construct diff --git a/tests/Feature/Controllers/Import/ConfigurationControllerTest.php b/tests/Feature/Controllers/Import/ConfigurationControllerTest.php index 002345e67b..a32a57354e 100644 --- a/tests/Feature/Controllers/Import/ConfigurationControllerTest.php +++ b/tests/Feature/Controllers/Import/ConfigurationControllerTest.php @@ -25,6 +25,7 @@ namespace Tests\Feature\Controllers\Import; use FireflyIII\Import\Configuration\FileConfigurator; use FireflyIII\Models\ImportJob; use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface; +use Log; use Tests\TestCase; /** @@ -36,6 +37,15 @@ use Tests\TestCase; */ class ConfigurationControllerTest extends TestCase { + /** + * + */ + public function setUp() + { + parent::setUp(); + Log::debug(sprintf('Now in %s.', get_class($this))); + } + /** * @covers \FireflyIII\Http\Controllers\Import\ConfigurationController::__construct * @covers \FireflyIII\Http\Controllers\Import\ConfigurationController::index diff --git a/tests/Feature/Controllers/Import/IndexControllerTest.php b/tests/Feature/Controllers/Import/IndexControllerTest.php index 9d05a54d1f..563035d227 100644 --- a/tests/Feature/Controllers/Import/IndexControllerTest.php +++ b/tests/Feature/Controllers/Import/IndexControllerTest.php @@ -24,6 +24,7 @@ namespace Tests\Feature\Controllers\Import; use FireflyIII\Import\Routine\FileRoutine; use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface; +use Log; use Tests\TestCase; /** @@ -35,6 +36,15 @@ use Tests\TestCase; */ class IndexControllerTest extends TestCase { + /** + * + */ + public function setUp() + { + parent::setUp(); + Log::debug(sprintf('Now in %s.', get_class($this))); + } + /** * @covers \FireflyIII\Http\Controllers\Import\IndexController::create */ diff --git a/tests/Feature/Controllers/Import/PrerequisitesControllerTest.php b/tests/Feature/Controllers/Import/PrerequisitesControllerTest.php index 1a68480a2f..37ceadf258 100644 --- a/tests/Feature/Controllers/Import/PrerequisitesControllerTest.php +++ b/tests/Feature/Controllers/Import/PrerequisitesControllerTest.php @@ -24,6 +24,7 @@ namespace Tests\Feature\Controllers\Import; use FireflyIII\Import\Prerequisites\FilePrerequisites; use Illuminate\Support\MessageBag; +use Log; use Tests\TestCase; /** @@ -35,6 +36,15 @@ use Tests\TestCase; */ class PrerequisitesControllerTest extends TestCase { + /** + * + */ + public function setUp() + { + parent::setUp(); + Log::debug(sprintf('Now in %s.', get_class($this))); + } + /** * @covers \FireflyIII\Http\Controllers\Import\PrerequisitesController::__construct * @covers \FireflyIII\Http\Controllers\Import\PrerequisitesController::index diff --git a/tests/Feature/Controllers/Import/StatusControllerTest.php b/tests/Feature/Controllers/Import/StatusControllerTest.php index 45f5112e1d..49533fe6d9 100644 --- a/tests/Feature/Controllers/Import/StatusControllerTest.php +++ b/tests/Feature/Controllers/Import/StatusControllerTest.php @@ -23,6 +23,7 @@ declare(strict_types=1); namespace Tests\Feature\Controllers\Import; use FireflyIII\Repositories\Tag\TagRepositoryInterface; +use Log; use Tests\TestCase; /** @@ -34,6 +35,15 @@ use Tests\TestCase; */ class StatusControllerTest extends TestCase { + /** + * + */ + public function setUp() + { + parent::setUp(); + Log::debug(sprintf('Now in %s.', get_class($this))); + } + /** * @covers \FireflyIII\Http\Controllers\Import\StatusController::__construct * @covers \FireflyIII\Http\Controllers\Import\StatusController::index diff --git a/tests/Feature/Controllers/JavascriptControllerTest.php b/tests/Feature/Controllers/JavascriptControllerTest.php index 227c847e0e..15cef60f44 100644 --- a/tests/Feature/Controllers/JavascriptControllerTest.php +++ b/tests/Feature/Controllers/JavascriptControllerTest.php @@ -28,6 +28,7 @@ use FireflyIII\Models\TransactionCurrency; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; use Illuminate\Support\Collection; +use Log; use Tests\TestCase; /** @@ -39,6 +40,16 @@ use Tests\TestCase; */ class JavascriptControllerTest extends TestCase { + /** + * + */ + public function setUp() + { + parent::setUp(); + Log::debug(sprintf('Now in %s.', get_class($this))); + } + + /** * @covers \FireflyIII\Http\Controllers\JavascriptController::accounts */ diff --git a/tests/Feature/Controllers/Json/AutoCompleteControllerTest.php b/tests/Feature/Controllers/Json/AutoCompleteControllerTest.php index 40fc577877..9bca378ba4 100644 --- a/tests/Feature/Controllers/Json/AutoCompleteControllerTest.php +++ b/tests/Feature/Controllers/Json/AutoCompleteControllerTest.php @@ -29,6 +29,7 @@ use FireflyIII\Models\TransactionJournal; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use Illuminate\Support\Collection; +use Log; use Tests\TestCase; /** @@ -36,6 +37,15 @@ use Tests\TestCase; */ class AutoCompleteControllerTest extends TestCase { + /** + * + */ + public function setUp() + { + parent::setUp(); + Log::debug(sprintf('Now in %s.', get_class($this))); + } + /** * @covers \FireflyIII\Http\Controllers\Json\AutoCompleteController::allAccounts */ diff --git a/tests/Feature/Controllers/Json/BoxControllerTest.php b/tests/Feature/Controllers/Json/BoxControllerTest.php index 40ce31cea0..27e3995c2d 100644 --- a/tests/Feature/Controllers/Json/BoxControllerTest.php +++ b/tests/Feature/Controllers/Json/BoxControllerTest.php @@ -30,6 +30,7 @@ use FireflyIII\Repositories\Bill\BillRepositoryInterface; use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; use Illuminate\Support\Collection; +use Log; use Tests\TestCase; /** @@ -37,6 +38,15 @@ use Tests\TestCase; */ class BoxControllerTest extends TestCase { + /** + * + */ + public function setUp() + { + parent::setUp(); + Log::debug(sprintf('Now in %s.', get_class($this))); + } + /** * @covers \FireflyIII\Http\Controllers\Json\BoxController::available */ diff --git a/tests/Feature/Controllers/Json/ExchangeControllerTest.php b/tests/Feature/Controllers/Json/ExchangeControllerTest.php index c936cd695b..dffb103fe8 100644 --- a/tests/Feature/Controllers/Json/ExchangeControllerTest.php +++ b/tests/Feature/Controllers/Json/ExchangeControllerTest.php @@ -24,6 +24,7 @@ namespace Tests\Feature\Controllers\Json; use FireflyIII\Models\CurrencyExchangeRate; use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; +use Log; use Tests\TestCase; /** @@ -35,6 +36,15 @@ use Tests\TestCase; */ class ExchangeControllerTest extends TestCase { + /** + * + */ + public function setUp() + { + parent::setUp(); + Log::debug(sprintf('Now in %s.', get_class($this))); + } + /** * @covers \FireflyIII\Http\Controllers\Json\ExchangeController::getRate */ diff --git a/tests/Feature/Controllers/Json/FrontpageControllerTest.php b/tests/Feature/Controllers/Json/FrontpageControllerTest.php index a5666e79ca..939a5a0497 100644 --- a/tests/Feature/Controllers/Json/FrontpageControllerTest.php +++ b/tests/Feature/Controllers/Json/FrontpageControllerTest.php @@ -24,6 +24,7 @@ namespace Tests\Feature\Controllers\Json; use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface; use Illuminate\Support\Collection; +use Log; use Tests\TestCase; /** @@ -35,6 +36,15 @@ use Tests\TestCase; */ class FrontpageControllerTest extends TestCase { + /** + * + */ + public function setUp() + { + parent::setUp(); + Log::debug(sprintf('Now in %s.', get_class($this))); + } + /** * @covers \FireflyIII\Http\Controllers\Json\FrontpageController::piggyBanks */ diff --git a/tests/Feature/Controllers/Json/IntroControllerTest.php b/tests/Feature/Controllers/Json/IntroControllerTest.php index 56a179d4e2..2de5f1b9c0 100644 --- a/tests/Feature/Controllers/Json/IntroControllerTest.php +++ b/tests/Feature/Controllers/Json/IntroControllerTest.php @@ -22,6 +22,7 @@ declare(strict_types=1); namespace Tests\Feature\Controllers\Json; +use Log; use Tests\TestCase; /** @@ -33,6 +34,15 @@ use Tests\TestCase; */ class IntroControllerTest extends TestCase { + /** + * + */ + public function setUp() + { + parent::setUp(); + Log::debug(sprintf('Now in %s.', get_class($this))); + } + /** * @covers \FireflyIII\Http\Controllers\Json\IntroController::getIntroSteps * @covers \FireflyIII\Http\Controllers\Json\IntroController::getBasicSteps diff --git a/tests/Feature/Controllers/JsonControllerTest.php b/tests/Feature/Controllers/JsonControllerTest.php index 924e1c6e88..37b01eb501 100644 --- a/tests/Feature/Controllers/JsonControllerTest.php +++ b/tests/Feature/Controllers/JsonControllerTest.php @@ -31,6 +31,7 @@ use FireflyIII\Repositories\Category\CategoryRepositoryInterface; use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use FireflyIII\Repositories\Tag\TagRepositoryInterface; use Illuminate\Support\Collection; +use Log; use Tests\TestCase; /** @@ -42,6 +43,15 @@ use Tests\TestCase; */ class JsonControllerTest extends TestCase { + /** + * + */ + public function setUp() + { + parent::setUp(); + Log::debug(sprintf('Now in %s.', get_class($this))); + } + /** * @covers \FireflyIII\Http\Controllers\JsonController::action * @covers \FireflyIII\Http\Controllers\JsonController::__construct diff --git a/tests/Feature/Controllers/NewUserControllerTest.php b/tests/Feature/Controllers/NewUserControllerTest.php index 4ec830e110..1752a5ad52 100644 --- a/tests/Feature/Controllers/NewUserControllerTest.php +++ b/tests/Feature/Controllers/NewUserControllerTest.php @@ -27,6 +27,7 @@ use FireflyIII\Models\TransactionJournal; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; use FireflyIII\Repositories\Journal\JournalRepositoryInterface; +use Log; use Tests\TestCase; /** @@ -38,6 +39,16 @@ use Tests\TestCase; */ class NewUserControllerTest extends TestCase { + /** + * + */ + public function setUp() + { + parent::setUp(); + Log::debug(sprintf('Now in %s.', get_class($this))); + } + + /** * @covers \FireflyIII\Http\Controllers\NewUserController::index * @covers \FireflyIII\Http\Controllers\NewUserController::__construct diff --git a/tests/Feature/Controllers/PiggyBankControllerTest.php b/tests/Feature/Controllers/PiggyBankControllerTest.php index 61b8294b02..31a8043c5c 100644 --- a/tests/Feature/Controllers/PiggyBankControllerTest.php +++ b/tests/Feature/Controllers/PiggyBankControllerTest.php @@ -33,6 +33,7 @@ use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface; use Illuminate\Support\Collection; +use Log; use Steam; use Tests\TestCase; @@ -45,6 +46,16 @@ use Tests\TestCase; */ class PiggyBankControllerTest extends TestCase { + /** + * + */ + public function setUp() + { + parent::setUp(); + Log::debug(sprintf('Now in %s.', get_class($this))); + } + + /** * @covers \FireflyIII\Http\Controllers\PiggyBankController::add */ diff --git a/tests/Feature/Controllers/Popup/ReportControllerTest.php b/tests/Feature/Controllers/Popup/ReportControllerTest.php index 2b18e037d0..3f80005cfe 100644 --- a/tests/Feature/Controllers/Popup/ReportControllerTest.php +++ b/tests/Feature/Controllers/Popup/ReportControllerTest.php @@ -31,6 +31,7 @@ use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; use FireflyIII\Repositories\Category\CategoryRepositoryInterface; use Illuminate\Support\Collection; +use Log; use Tests\TestCase; /** @@ -42,6 +43,15 @@ use Tests\TestCase; */ class ReportControllerTest extends TestCase { + /** + * + */ + public function setUp() + { + parent::setUp(); + Log::debug(sprintf('Now in %s.', get_class($this))); + } + /** * @covers \FireflyIII\Http\Controllers\Popup\ReportController::__construct * @covers \FireflyIII\Http\Controllers\Popup\ReportController::general diff --git a/tests/Feature/Controllers/PreferencesControllerTest.php b/tests/Feature/Controllers/PreferencesControllerTest.php index fe15974bf6..341d69d1f5 100644 --- a/tests/Feature/Controllers/PreferencesControllerTest.php +++ b/tests/Feature/Controllers/PreferencesControllerTest.php @@ -27,9 +27,8 @@ use FireflyIII\Models\TransactionJournal; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use FireflyIII\Repositories\User\UserRepositoryInterface; - use Illuminate\Support\Collection; - +use Log; use Tests\TestCase; /** @@ -41,6 +40,16 @@ use Tests\TestCase; */ class PreferencesControllerTest extends TestCase { + /** + * + */ + public function setUp() + { + parent::setUp(); + Log::debug(sprintf('Now in %s.', get_class($this))); + } + + /** * @covers \FireflyIII\Http\Controllers\PreferencesController::index * @covers \FireflyIII\Http\Controllers\PreferencesController::__construct diff --git a/tests/Feature/Controllers/ProfileControllerTest.php b/tests/Feature/Controllers/ProfileControllerTest.php index 4bd6b25435..796d2657b9 100644 --- a/tests/Feature/Controllers/ProfileControllerTest.php +++ b/tests/Feature/Controllers/ProfileControllerTest.php @@ -29,6 +29,7 @@ use FireflyIII\Repositories\User\UserRepositoryInterface; use FireflyIII\User; use Google2FA; use Illuminate\Support\Collection; +use Log; use Preferences; use Tests\TestCase; @@ -42,71 +43,14 @@ use Tests\TestCase; class ProfileControllerTest extends TestCase { /** - * @covers \FireflyIII\Http\Controllers\ProfileController::code - * @covers \FireflyIII\Http\Controllers\ProfileController::getDomain + * */ - public function testCode() + public function setUp() { - // mock stuff - $journalRepos = $this->mock(JournalRepositoryInterface::class); - $journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal); - Google2FA::shouldReceive('generateSecretKey')->andReturn('secret'); - Google2FA::shouldReceive('getQRCodeInline')->andReturn('long-data-url'); - - $this->be($this->user()); - $response = $this->get(route('profile.code')); - $response->assertStatus(200); - $response->assertSee('
    '); + parent::setUp(); + Log::debug(sprintf('Now in %s.', get_class($this))); } - - - /** - * @covers \FireflyIII\Http\Controllers\ProfileController::deleteCode - */ - public function testDeleteCode() - { - // mock stuff - $journalRepos = $this->mock(JournalRepositoryInterface::class); - $journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal); - - $this->be($this->user()); - $response = $this->get(route('profile.delete-code')); - $response->assertStatus(302); - $response->assertSessionHas('success'); - $response->assertSessionHas('info'); - $response->assertRedirect(route('profile.index')); - } - - /** - * @covers \FireflyIII\Http\Controllers\ProfileController::postCode - */ - public function testPostCode() - { - $secret = '0123456789abcde'; - $key = '123456'; - - $this->withoutMiddleware(); - $this->session(['two-factor-secret' => $secret]); - - Preferences::shouldReceive('set')->withArgs(['twoFactorAuthEnabled', 1])->once(); - Preferences::shouldReceive('set')->withArgs(['twoFactorAuthSecret', $secret])->once(); - Preferences::shouldReceive('mark')->once(); - - Google2FA::shouldReceive('verifyKey')->withArgs([$secret, $key])->andReturn(true); - - $data = [ - 'code' => $key, - ]; - - $this->be($this->user()); - $response = $this->post(route('profile.code.store'), $data); - $response->assertStatus(302); - $response->assertSessionHas('success'); - } - - - /** * @covers \FireflyIII\Http\Controllers\ProfileController::changeEmail() */ @@ -133,6 +77,24 @@ class ProfileControllerTest extends TestCase $response->assertSee('
      '); } + /** + * @covers \FireflyIII\Http\Controllers\ProfileController::code + * @covers \FireflyIII\Http\Controllers\ProfileController::getDomain + */ + public function testCode() + { + // mock stuff + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal); + Google2FA::shouldReceive('generateSecretKey')->andReturn('secret'); + Google2FA::shouldReceive('getQRCodeInline')->andReturn('long-data-url'); + + $this->be($this->user()); + $response = $this->get(route('profile.code')); + $response->assertStatus(200); + $response->assertSee('
        '); + } + /** * @covers \FireflyIII\Http\Controllers\ProfileController::confirmEmailChange() * @expectedExceptionMessage Invalid token @@ -178,6 +140,23 @@ class ProfileControllerTest extends TestCase $response->assertSee('
          '); } + /** + * @covers \FireflyIII\Http\Controllers\ProfileController::deleteCode + */ + public function testDeleteCode() + { + // mock stuff + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal); + + $this->be($this->user()); + $response = $this->get(route('profile.delete-code')); + $response->assertStatus(302); + $response->assertSessionHas('success'); + $response->assertSessionHas('info'); + $response->assertRedirect(route('profile.index')); + } + /** * @covers \FireflyIII\Http\Controllers\ProfileController::index * @covers \FireflyIII\Http\Controllers\ProfileController::__construct @@ -319,6 +298,33 @@ class ProfileControllerTest extends TestCase $response->assertSessionHas('error'); } + /** + * @covers \FireflyIII\Http\Controllers\ProfileController::postCode + */ + public function testPostCode() + { + $secret = '0123456789abcde'; + $key = '123456'; + + $this->withoutMiddleware(); + $this->session(['two-factor-secret' => $secret]); + + Preferences::shouldReceive('set')->withArgs(['twoFactorAuthEnabled', 1])->once(); + Preferences::shouldReceive('set')->withArgs(['twoFactorAuthSecret', $secret])->once(); + Preferences::shouldReceive('mark')->once(); + + Google2FA::shouldReceive('verifyKey')->withArgs([$secret, $key])->andReturn(true); + + $data = [ + 'code' => $key, + ]; + + $this->be($this->user()); + $response = $this->post(route('profile.code.store'), $data); + $response->assertStatus(302); + $response->assertSessionHas('success'); + } + /** * @covers \FireflyIII\Http\Controllers\ProfileController::postDeleteAccount */ diff --git a/tests/Feature/Controllers/Report/AccountControllerTest.php b/tests/Feature/Controllers/Report/AccountControllerTest.php index 3efd35b494..dd6a814516 100644 --- a/tests/Feature/Controllers/Report/AccountControllerTest.php +++ b/tests/Feature/Controllers/Report/AccountControllerTest.php @@ -23,6 +23,7 @@ declare(strict_types=1); namespace Tests\Feature\Controllers\Report; use FireflyIII\Repositories\Account\AccountTaskerInterface; +use Log; use Tests\TestCase; /** @@ -34,6 +35,15 @@ use Tests\TestCase; */ class AccountControllerTest extends TestCase { + /** + * + */ + public function setUp() + { + parent::setUp(); + Log::debug(sprintf('Now in %s.', get_class($this))); + } + /** * @covers \FireflyIII\Http\Controllers\Report\AccountController::general */ diff --git a/tests/Feature/Controllers/Report/BalanceControllerTest.php b/tests/Feature/Controllers/Report/BalanceControllerTest.php index fb7e239905..d42afd07fa 100644 --- a/tests/Feature/Controllers/Report/BalanceControllerTest.php +++ b/tests/Feature/Controllers/Report/BalanceControllerTest.php @@ -24,6 +24,7 @@ namespace Tests\Feature\Controllers\Report; use FireflyIII\Helpers\Collection\Balance; use FireflyIII\Helpers\Report\BalanceReportHelperInterface; +use Log; use Tests\TestCase; /** @@ -35,6 +36,16 @@ use Tests\TestCase; */ class BalanceControllerTest extends TestCase { + /** + * + */ + public function setUp() + { + parent::setUp(); + Log::debug(sprintf('Now in %s.', get_class($this))); + } + + /** * @covers \FireflyIII\Http\Controllers\Report\BalanceController::general */ diff --git a/tests/Feature/Controllers/Report/BudgetControllerTest.php b/tests/Feature/Controllers/Report/BudgetControllerTest.php index 4d3a661849..7db901fb01 100644 --- a/tests/Feature/Controllers/Report/BudgetControllerTest.php +++ b/tests/Feature/Controllers/Report/BudgetControllerTest.php @@ -25,6 +25,7 @@ namespace Tests\Feature\Controllers\Report; use FireflyIII\Helpers\Report\BudgetReportHelperInterface; use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; use Illuminate\Support\Collection; +use Log; use Tests\TestCase; /** @@ -36,6 +37,16 @@ use Tests\TestCase; */ class BudgetControllerTest extends TestCase { + /** + * + */ + public function setUp() + { + parent::setUp(); + Log::debug(sprintf('Now in %s.', get_class($this))); + } + + /** * @covers \FireflyIII\Http\Controllers\Report\BudgetController::general */ diff --git a/tests/Feature/Controllers/Report/CategoryControllerTest.php b/tests/Feature/Controllers/Report/CategoryControllerTest.php index e452cbf0dd..9670ad458f 100644 --- a/tests/Feature/Controllers/Report/CategoryControllerTest.php +++ b/tests/Feature/Controllers/Report/CategoryControllerTest.php @@ -25,6 +25,7 @@ namespace Tests\Feature\Controllers\Report; use FireflyIII\Models\Category; use FireflyIII\Repositories\Category\CategoryRepositoryInterface; use Illuminate\Support\Collection; +use Log; use Tests\TestCase; /** @@ -36,6 +37,16 @@ use Tests\TestCase; */ class CategoryControllerTest extends TestCase { + /** + * + */ + public function setUp() + { + parent::setUp(); + Log::debug(sprintf('Now in %s.', get_class($this))); + } + + /** * @covers \FireflyIII\Http\Controllers\Report\CategoryController::expenses * @covers \FireflyIII\Http\Controllers\Report\CategoryController::filterReport diff --git a/tests/Feature/Controllers/Report/ExpenseControllerTest.php b/tests/Feature/Controllers/Report/ExpenseControllerTest.php index 02b3b6bf76..47a51c0bef 100644 --- a/tests/Feature/Controllers/Report/ExpenseControllerTest.php +++ b/tests/Feature/Controllers/Report/ExpenseControllerTest.php @@ -27,6 +27,7 @@ use FireflyIII\Models\AccountType; use FireflyIII\Models\Transaction; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use Illuminate\Support\Collection; +use Log; use Tests\TestCase; /** @@ -38,6 +39,16 @@ use Tests\TestCase; */ class ExpenseControllerTest extends TestCase { + /** + * + */ + public function setUp() + { + parent::setUp(); + Log::debug(sprintf('Now in %s.', get_class($this))); + } + + /** * @covers \FireflyIII\Http\Controllers\Report\ExpenseController::__construct * @covers \FireflyIII\Http\Controllers\Report\ExpenseController::budget diff --git a/tests/Feature/Controllers/Report/OperationsControllerTest.php b/tests/Feature/Controllers/Report/OperationsControllerTest.php index e6753546fe..3ebce274d8 100644 --- a/tests/Feature/Controllers/Report/OperationsControllerTest.php +++ b/tests/Feature/Controllers/Report/OperationsControllerTest.php @@ -23,6 +23,7 @@ declare(strict_types=1); namespace Tests\Feature\Controllers\Report; use FireflyIII\Repositories\Account\AccountTaskerInterface; +use Log; use Tests\TestCase; /** @@ -34,6 +35,16 @@ use Tests\TestCase; */ class OperationsControllerTest extends TestCase { + /** + * + */ + public function setUp() + { + parent::setUp(); + Log::debug(sprintf('Now in %s.', get_class($this))); + } + + /** * @covers \FireflyIII\Http\Controllers\Report\OperationsController::expenses */ @@ -41,12 +52,12 @@ class OperationsControllerTest extends TestCase { $return = [ 1 => [ - 'id' => 1, - 'name' => 'Some name', - 'sum' => '5', - 'average' => '5', - 'count' => 1, - ] + 'id' => 1, + 'name' => 'Some name', + 'sum' => '5', + 'average' => '5', + 'count' => 1, + ], ]; $tasker = $this->mock(AccountTaskerInterface::class); $tasker->shouldReceive('getExpenseReport')->andReturn($return); @@ -81,7 +92,7 @@ class OperationsControllerTest extends TestCase 'sum' => '5', 'average' => '5', 'count' => 1, - ] + ], ]; $tasker = $this->mock(AccountTaskerInterface::class); diff --git a/tests/Feature/Controllers/ReportControllerTest.php b/tests/Feature/Controllers/ReportControllerTest.php index 94039de247..5d8d2b2163 100644 --- a/tests/Feature/Controllers/ReportControllerTest.php +++ b/tests/Feature/Controllers/ReportControllerTest.php @@ -41,6 +41,7 @@ use FireflyIII\Repositories\Category\CategoryRepositoryInterface; use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use FireflyIII\Repositories\Tag\TagRepositoryInterface; use Illuminate\Support\Collection; +use Log; use Tests\TestCase; /** @@ -52,6 +53,16 @@ use Tests\TestCase; */ class ReportControllerTest extends TestCase { + /** + * + */ + public function setUp() + { + parent::setUp(); + Log::debug(sprintf('Now in %s.', get_class($this))); + } + + /** * @covers \FireflyIII\Http\Controllers\ReportController::accountReport() */ @@ -301,7 +312,7 @@ class ReportControllerTest extends TestCase } /** - * @covers \FireflyIII\Http\Controllers\ReportController::postIndex + * @covers \FireflyIII\Http\Controllers\ReportController::postIndex * @covers \FireflyIII\Http\Requests\ReportFormRequest */ public function testPostIndexAccountOK() @@ -328,7 +339,7 @@ class ReportControllerTest extends TestCase } /** - * @covers \FireflyIII\Http\Controllers\ReportController::postIndex + * @covers \FireflyIII\Http\Controllers\ReportController::postIndex * @covers \FireflyIII\Http\Requests\ReportFormRequest */ public function testPostIndexAuditOK() @@ -354,7 +365,7 @@ class ReportControllerTest extends TestCase } /** - * @covers \FireflyIII\Http\Controllers\ReportController::postIndex + * @covers \FireflyIII\Http\Controllers\ReportController::postIndex * @covers \FireflyIII\Http\Requests\ReportFormRequest */ public function testPostIndexBudgetError() @@ -383,7 +394,7 @@ class ReportControllerTest extends TestCase } /** - * @covers \FireflyIII\Http\Controllers\ReportController::postIndex + * @covers \FireflyIII\Http\Controllers\ReportController::postIndex * @covers \FireflyIII\Http\Requests\ReportFormRequest */ public function testPostIndexBudgetOK() @@ -412,7 +423,7 @@ class ReportControllerTest extends TestCase } /** - * @covers \FireflyIII\Http\Controllers\ReportController::postIndex + * @covers \FireflyIII\Http\Controllers\ReportController::postIndex * @covers \FireflyIII\Http\Requests\ReportFormRequest */ public function testPostIndexCategoryError() @@ -441,7 +452,7 @@ class ReportControllerTest extends TestCase } /** - * @covers \FireflyIII\Http\Controllers\ReportController::postIndex + * @covers \FireflyIII\Http\Controllers\ReportController::postIndex * @covers \FireflyIII\Http\Requests\ReportFormRequest */ public function testPostIndexCategoryOK() @@ -469,7 +480,7 @@ class ReportControllerTest extends TestCase } /** - * @covers \FireflyIII\Http\Controllers\ReportController::postIndex + * @covers \FireflyIII\Http\Controllers\ReportController::postIndex * @covers \FireflyIII\Http\Requests\ReportFormRequest */ public function testPostIndexDefaultOK() @@ -495,7 +506,7 @@ class ReportControllerTest extends TestCase } /** - * @covers \FireflyIII\Http\Controllers\ReportController::postIndex + * @covers \FireflyIII\Http\Controllers\ReportController::postIndex * @covers \FireflyIII\Http\Requests\ReportFormRequest */ public function testPostIndexDefaultStartEnd() @@ -521,7 +532,7 @@ class ReportControllerTest extends TestCase } /** - * @covers \FireflyIII\Http\Controllers\ReportController::postIndex + * @covers \FireflyIII\Http\Controllers\ReportController::postIndex * @covers \FireflyIII\Http\Requests\ReportFormRequest */ public function testPostIndexTagError() @@ -549,7 +560,7 @@ class ReportControllerTest extends TestCase } /** - * @covers \FireflyIII\Http\Controllers\ReportController::postIndex + * @covers \FireflyIII\Http\Controllers\ReportController::postIndex * @covers \FireflyIII\Http\Requests\ReportFormRequest */ public function testPostIndexTagOK() @@ -578,7 +589,7 @@ class ReportControllerTest extends TestCase } /** - * @covers \FireflyIII\Http\Controllers\ReportController::postIndex + * @covers \FireflyIII\Http\Controllers\ReportController::postIndex * @covers \FireflyIII\Http\Requests\ReportFormRequest */ public function testPostIndexZeroAccounts() diff --git a/tests/Feature/Controllers/RuleControllerTest.php b/tests/Feature/Controllers/RuleControllerTest.php index 6b0be466da..8d828e1f13 100644 --- a/tests/Feature/Controllers/RuleControllerTest.php +++ b/tests/Feature/Controllers/RuleControllerTest.php @@ -37,7 +37,7 @@ use FireflyIII\TransactionRules\TransactionMatcher; use Illuminate\Support\Collection; use Queue; use Tests\TestCase; - +use Log; /** * Class RuleControllerTest * @@ -47,6 +47,16 @@ use Tests\TestCase; */ class RuleControllerTest extends TestCase { + /** + * + */ + public function setUp() + { + parent::setUp(); + Log::debug(sprintf('Now in %s.', get_class($this))); + } + + /** * @covers \FireflyIII\Http\Controllers\RuleController::create */ @@ -299,7 +309,7 @@ class RuleControllerTest extends TestCase } /** - * @covers \FireflyIII\Http\Controllers\RuleController::store + * @covers \FireflyIII\Http\Controllers\RuleController::store * @covers \FireflyIII\Http\Requests\RuleFormRequest */ public function testStore() @@ -449,7 +459,7 @@ class RuleControllerTest extends TestCase } /** - * @covers \FireflyIII\Http\Controllers\RuleController::update + * @covers \FireflyIII\Http\Controllers\RuleController::update * @covers \FireflyIII\Http\Requests\RuleFormRequest */ public function testUpdate() diff --git a/tests/Feature/Controllers/RuleGroupControllerTest.php b/tests/Feature/Controllers/RuleGroupControllerTest.php index 60fe2595be..6001b417a2 100644 --- a/tests/Feature/Controllers/RuleGroupControllerTest.php +++ b/tests/Feature/Controllers/RuleGroupControllerTest.php @@ -30,6 +30,7 @@ use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface; use Illuminate\Support\Collection; +use Log; use Tests\TestCase; /** @@ -41,6 +42,16 @@ use Tests\TestCase; */ class RuleGroupControllerTest extends TestCase { + /** + * + */ + public function setUp() + { + parent::setUp(); + Log::debug(sprintf('Now in %s.', get_class($this))); + } + + /** * @covers \FireflyIII\Http\Controllers\RuleGroupController::create * @covers \FireflyIII\Http\Controllers\RuleGroupController::__construct diff --git a/tests/Feature/Controllers/SearchControllerTest.php b/tests/Feature/Controllers/SearchControllerTest.php index 7d6de89fcc..fba92fe61e 100644 --- a/tests/Feature/Controllers/SearchControllerTest.php +++ b/tests/Feature/Controllers/SearchControllerTest.php @@ -24,6 +24,7 @@ namespace Tests\Feature\Controllers; use FireflyIII\Support\Search\SearchInterface; use Illuminate\Support\Collection; +use Log; use Tests\TestCase; /** @@ -35,6 +36,16 @@ use Tests\TestCase; */ class SearchControllerTest extends TestCase { + /** + * + */ + public function setUp() + { + parent::setUp(); + Log::debug(sprintf('Now in %s.', get_class($this))); + } + + /** * @covers \FireflyIII\Http\Controllers\SearchController::index * @covers \FireflyIII\Http\Controllers\SearchController::__construct diff --git a/tests/Feature/Controllers/TagControllerTest.php b/tests/Feature/Controllers/TagControllerTest.php index ba49750159..8d0b07287f 100644 --- a/tests/Feature/Controllers/TagControllerTest.php +++ b/tests/Feature/Controllers/TagControllerTest.php @@ -30,6 +30,7 @@ use FireflyIII\Models\TransactionType; use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use FireflyIII\Repositories\Tag\TagRepositoryInterface; use Illuminate\Pagination\LengthAwarePaginator; +use Log; use Tests\TestCase; /** @@ -41,6 +42,16 @@ use Tests\TestCase; */ class TagControllerTest extends TestCase { + /** + * + */ + public function setUp() + { + parent::setUp(); + Log::debug(sprintf('Now in %s.', get_class($this))); + } + + /** * @covers \FireflyIII\Http\Controllers\TagController::create */ diff --git a/tests/Feature/Controllers/Transaction/BulkControllerTest.php b/tests/Feature/Controllers/Transaction/BulkControllerTest.php index 89eb24a146..a5bff5aa42 100644 --- a/tests/Feature/Controllers/Transaction/BulkControllerTest.php +++ b/tests/Feature/Controllers/Transaction/BulkControllerTest.php @@ -26,6 +26,7 @@ use FireflyIII\Models\TransactionJournal; use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use Illuminate\Support\Collection; +use Log; use Mockery; use Tests\TestCase; @@ -38,6 +39,16 @@ use Tests\TestCase; */ class BulkControllerTest extends TestCase { + /** + * + */ + public function setUp() + { + parent::setUp(); + Log::debug(sprintf('Now in %s.', get_class($this))); + } + + /** * @covers \FireflyIII\Http\Controllers\Transaction\BulkController::edit * @covers \FireflyIII\Http\Controllers\Transaction\BulkController::__construct diff --git a/tests/Feature/Controllers/Transaction/ConvertControllerTest.php b/tests/Feature/Controllers/Transaction/ConvertControllerTest.php index 0f54809a2a..05f4c19f2f 100644 --- a/tests/Feature/Controllers/Transaction/ConvertControllerTest.php +++ b/tests/Feature/Controllers/Transaction/ConvertControllerTest.php @@ -33,6 +33,7 @@ use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use Illuminate\Support\Collection; use Illuminate\Support\MessageBag; +use Log; use Tests\TestCase; /** @@ -44,6 +45,16 @@ use Tests\TestCase; */ class ConvertControllerTest extends TestCase { + /** + * + */ + public function setUp() + { + parent::setUp(); + Log::debug(sprintf('Now in %s.', get_class($this))); + } + + /** * @covers \FireflyIII\Http\Controllers\Transaction\ConvertController::index * @covers \FireflyIII\Http\Controllers\Transaction\ConvertController::__construct diff --git a/tests/Feature/Controllers/Transaction/LinkControllerTest.php b/tests/Feature/Controllers/Transaction/LinkControllerTest.php index 4da57b511d..d597dc8c1d 100644 --- a/tests/Feature/Controllers/Transaction/LinkControllerTest.php +++ b/tests/Feature/Controllers/Transaction/LinkControllerTest.php @@ -27,14 +27,24 @@ use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournalLink; use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use FireflyIII\Repositories\LinkType\LinkTypeRepositoryInterface; +use Log; use Tests\TestCase; - /** * Class LinkControllerTest */ class LinkControllerTest extends TestCase { + /** + * + */ + public function setUp() + { + parent::setUp(); + Log::debug(sprintf('Now in %s.', get_class($this))); + } + + /** * @covers \FireflyIII\Http\Controllers\Transaction\LinkController::__construct * @covers \FireflyIII\Http\Controllers\Transaction\LinkController::delete @@ -72,7 +82,7 @@ class LinkControllerTest extends TestCase } /** - * @covers \FireflyIII\Http\Controllers\Transaction\LinkController::store + * @covers \FireflyIII\Http\Controllers\Transaction\LinkController::store * @covers \FireflyIII\Http\Requests\JournalLinkRequest */ public function testStore() @@ -98,7 +108,7 @@ class LinkControllerTest extends TestCase } /** - * @covers \FireflyIII\Http\Controllers\Transaction\LinkController::store + * @covers \FireflyIII\Http\Controllers\Transaction\LinkController::store * @covers \FireflyIII\Http\Requests\JournalLinkRequest */ public function testStoreAlreadyLinked() @@ -123,7 +133,7 @@ class LinkControllerTest extends TestCase } /** - * @covers \FireflyIII\Http\Controllers\Transaction\LinkController::store + * @covers \FireflyIII\Http\Controllers\Transaction\LinkController::store * @covers \FireflyIII\Http\Requests\JournalLinkRequest */ public function testStoreInvalid() diff --git a/tests/Feature/Controllers/Transaction/MassControllerTest.php b/tests/Feature/Controllers/Transaction/MassControllerTest.php index c74c5d6fd0..eb1f66957c 100644 --- a/tests/Feature/Controllers/Transaction/MassControllerTest.php +++ b/tests/Feature/Controllers/Transaction/MassControllerTest.php @@ -28,6 +28,7 @@ use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use Illuminate\Support\Collection; +use Log; use Tests\TestCase; /** @@ -39,6 +40,16 @@ use Tests\TestCase; */ class MassControllerTest extends TestCase { + /** + * + */ + public function setUp() + { + parent::setUp(); + Log::debug(sprintf('Now in %s.', get_class($this))); + } + + /** * @covers \FireflyIII\Http\Controllers\Transaction\MassController::delete * @covers \FireflyIII\Http\Controllers\Transaction\MassController::__construct @@ -93,7 +104,7 @@ class MassControllerTest extends TestCase $transfers = TransactionJournal::where('transaction_type_id', 3)->where('user_id', $this->user()->id)->take(2)->get(); $transfersArray = $transfers->pluck('id')->toArray(); - $source = $this->user()->accounts()->first(); + $source = $this->user()->accounts()->first(); $journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal); // mock data for edit page: diff --git a/tests/Feature/Controllers/Transaction/SingleControllerTest.php b/tests/Feature/Controllers/Transaction/SingleControllerTest.php index d7b30326ce..c03cf27e5d 100644 --- a/tests/Feature/Controllers/Transaction/SingleControllerTest.php +++ b/tests/Feature/Controllers/Transaction/SingleControllerTest.php @@ -43,6 +43,7 @@ use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface; use Illuminate\Database\Query\JoinClause; use Illuminate\Support\Collection; use Illuminate\Support\MessageBag; +use Log; use Steam; use Tests\TestCase; @@ -55,6 +56,16 @@ use Tests\TestCase; */ class SingleControllerTest extends TestCase { + /** + * + */ + public function setUp() + { + parent::setUp(); + Log::debug(sprintf('Now in %s.', get_class($this))); + } + + /** * @covers \FireflyIII\Http\Controllers\Transaction\SingleController::cloneTransaction */ @@ -289,7 +300,6 @@ class SingleControllerTest extends TestCase ->where('transaction_journals.user_id', $this->user()->id)->first(['transactions.*']); - $response = $this->get(route('transactions.edit', [$deposit->transaction_journal_id])); $response->assertStatus(200); // has bread crumb diff --git a/tests/Feature/Controllers/Transaction/SplitControllerTest.php b/tests/Feature/Controllers/Transaction/SplitControllerTest.php index 8ffbcdc7dc..b28328766f 100644 --- a/tests/Feature/Controllers/Transaction/SplitControllerTest.php +++ b/tests/Feature/Controllers/Transaction/SplitControllerTest.php @@ -34,6 +34,7 @@ use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface; use Illuminate\Support\Collection; use Illuminate\Support\MessageBag; +use Log; use Tests\TestCase; /** @@ -45,6 +46,16 @@ use Tests\TestCase; */ class SplitControllerTest extends TestCase { + /** + * + */ + public function setUp() + { + parent::setUp(); + Log::debug(sprintf('Now in %s.', get_class($this))); + } + + /** * @covers \FireflyIII\Http\Controllers\Transaction\SplitController::edit * @covers \FireflyIII\Http\Controllers\Transaction\SplitController::__construct diff --git a/tests/Feature/Controllers/TransactionControllerTest.php b/tests/Feature/Controllers/TransactionControllerTest.php index c358722098..7e41431863 100644 --- a/tests/Feature/Controllers/TransactionControllerTest.php +++ b/tests/Feature/Controllers/TransactionControllerTest.php @@ -31,6 +31,7 @@ use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use FireflyIII\Repositories\LinkType\LinkTypeRepositoryInterface; use Illuminate\Pagination\LengthAwarePaginator; use Illuminate\Support\Collection; +use Log; use Tests\TestCase; /** @@ -42,6 +43,15 @@ use Tests\TestCase; */ class TransactionControllerTest extends TestCase { + /** + * + */ + public function setUp() + { + parent::setUp(); + Log::debug(sprintf('Now in %s.', get_class($this))); + } + /** * @covers \FireflyIII\Http\Controllers\TransactionController::index diff --git a/tests/Unit/TransactionRules/Triggers/HasAnyCategoryTest.php b/tests/Unit/TransactionRules/Triggers/HasAnyCategoryTest.php index 79a5969938..a902217e79 100644 --- a/tests/Unit/TransactionRules/Triggers/HasAnyCategoryTest.php +++ b/tests/Unit/TransactionRules/Triggers/HasAnyCategoryTest.php @@ -22,6 +22,7 @@ declare(strict_types=1); namespace Tests\Unit\TransactionRules\Triggers; +use FireflyIII\Models\Transaction; use FireflyIII\Models\TransactionJournal; use FireflyIII\TransactionRules\Triggers\HasAnyCategory; use Tests\TestCase; @@ -54,6 +55,13 @@ class HasAnyCategoryTest extends TestCase { $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); $journal->categories()->detach(); + + // also detach transactions: + /** @var Transaction $transaction */ + foreach($journal->transactions as $transaction) { + $transaction->categories()->detach(); + } + $this->assertEquals(0, $journal->categories()->count()); $trigger = HasAnyCategory::makeFromStrings('', false); $result = $trigger->triggered($journal); diff --git a/tests/Unit/TransactionRules/Triggers/HasNoCategoryTest.php b/tests/Unit/TransactionRules/Triggers/HasNoCategoryTest.php index 1d54060af2..18875e841c 100644 --- a/tests/Unit/TransactionRules/Triggers/HasNoCategoryTest.php +++ b/tests/Unit/TransactionRules/Triggers/HasNoCategoryTest.php @@ -22,6 +22,7 @@ declare(strict_types=1); namespace Tests\Unit\TransactionRules\Triggers; +use FireflyIII\Models\Transaction; use FireflyIII\Models\TransactionJournal; use FireflyIII\TransactionRules\Triggers\HasNoCategory; use Tests\TestCase; @@ -54,6 +55,14 @@ class HasNoCategoryTest extends TestCase { $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); $journal->categories()->detach(); + + // also detach transactions: + /** @var Transaction $transaction */ + foreach ($journal->transactions as $transaction) { + $transaction->categories()->detach(); + $this->assertEquals(0, $transaction->categories()->count()); + } + $this->assertEquals(0, $journal->categories()->count()); $trigger = HasNoCategory::makeFromStrings('', false); diff --git a/tests/Unit/Transformers/AccountTransformerTest.php b/tests/Unit/Transformers/AccountTransformerTest.php index d87b6778be..3a3557c16e 100644 --- a/tests/Unit/Transformers/AccountTransformerTest.php +++ b/tests/Unit/Transformers/AccountTransformerTest.php @@ -153,6 +153,7 @@ class AccountTransformerTest extends TestCase $accountRepos->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'currency_id'])->andReturn('1'); $accountRepos->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'ccType'])->andReturn('monthlyFull'); $accountRepos->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'accountNumber'])->andReturn('123'); + $accountRepos->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'BIC'])->andReturn('123'); $accountRepos->shouldReceive('getNoteText')->andReturn($note->text); $accountRepos->shouldReceive('getOpeningBalanceAmount')->andReturn(null); $accountRepos->shouldReceive('getOpeningBalanceDate')->andReturn(null); @@ -362,6 +363,7 @@ class AccountTransformerTest extends TestCase $accountRepos->shouldReceive('getOpeningBalanceDate')->andReturn(null); $accountRepos->shouldReceive('getMetaValue')->andReturn('1'); $accountRepos->shouldReceive('getNote')->andReturn(''); + $accountRepos->shouldReceive('getNoteText')->withArgs([Mockery::any()])->andReturn(''); // make new account: $account = Account::create( [ diff --git a/tests/Unit/Transformers/TransactionTransformerTest.php b/tests/Unit/Transformers/TransactionTransformerTest.php index d04f9694df..44688369c3 100644 --- a/tests/Unit/Transformers/TransactionTransformerTest.php +++ b/tests/Unit/Transformers/TransactionTransformerTest.php @@ -89,6 +89,7 @@ class TransactionTransformerTest extends TestCase 'description' => 'Some journal', 'date' => '2018-01-01', 'completed' => 1, + 'tag_count' => 0, ] ); // basic transactions @@ -172,6 +173,7 @@ class TransactionTransformerTest extends TestCase 'description' => 'Some journal', 'date' => '2018-01-01', 'completed' => 1, + 'tag_count' => 0, ] ); // basic transactions @@ -255,6 +257,7 @@ class TransactionTransformerTest extends TestCase 'description' => 'Some journal', 'date' => '2018-01-01', 'completed' => 1, + 'tag_count' => 0, ] ); // basic transactions @@ -347,6 +350,7 @@ class TransactionTransformerTest extends TestCase 'description' => 'Some journal', 'date' => '2018-01-01', 'completed' => 1, + 'tag_count' => 0, ] ); // basic transactions @@ -438,6 +442,7 @@ class TransactionTransformerTest extends TestCase 'description' => 'Some journal', 'date' => '2018-01-01', 'completed' => 1, + 'tag_count' => 0, ] ); @@ -535,6 +540,7 @@ class TransactionTransformerTest extends TestCase 'description' => 'Some journal', 'date' => '2018-01-01', 'completed' => 1, + 'tag_count' => 0, ] ); @@ -631,6 +637,7 @@ class TransactionTransformerTest extends TestCase 'description' => 'Some journal', 'date' => '2018-01-01', 'completed' => 1, + 'tag_count' => 0, ] ); // basic transactions (negative opening balance). @@ -715,6 +722,7 @@ class TransactionTransformerTest extends TestCase 'description' => 'Some journal', 'date' => '2018-01-01', 'completed' => 1, + 'tag_count' => 0, ] ); // basic transactions (positive opening balance). @@ -799,6 +807,7 @@ class TransactionTransformerTest extends TestCase 'description' => 'Some journal', 'date' => '2018-01-01', 'completed' => 1, + 'tag_count' => 0, ] ); // basic transactions (negative reconciliation). @@ -883,6 +892,7 @@ class TransactionTransformerTest extends TestCase 'description' => 'Some journal', 'date' => '2018-01-01', 'completed' => 1, + 'tag_count' => 0, ] ); // basic transactions (positive reconciliation). @@ -968,6 +978,7 @@ class TransactionTransformerTest extends TestCase 'description' => 'Some journal', 'date' => '2018-01-01', 'completed' => 1, + 'tag_count' => 0, ] ); @@ -1067,6 +1078,7 @@ class TransactionTransformerTest extends TestCase 'description' => 'Some journal', 'date' => '2018-01-01', 'completed' => 1, + 'tag_count' => 0, ] ); @@ -1165,6 +1177,7 @@ class TransactionTransformerTest extends TestCase 'description' => 'Some journal', 'date' => '2018-01-01', 'completed' => 1, + 'tag_count' => 0, ] ); // basic transactions @@ -1248,6 +1261,7 @@ class TransactionTransformerTest extends TestCase 'description' => 'Some journal', 'date' => '2018-01-01', 'completed' => 1, + 'tag_count' => 0, ] ); // basic transactions @@ -1331,6 +1345,7 @@ class TransactionTransformerTest extends TestCase 'description' => 'Some journal', 'date' => '2018-01-01', 'completed' => 1, + 'tag_count' => 0, ] ); // basic transactions