diff --git a/tests/Feature/Controllers/Category/ShowControllerTest.php b/tests/Feature/Controllers/Category/ShowControllerTest.php index c436703309..3e2f2f1770 100644 --- a/tests/Feature/Controllers/Category/ShowControllerTest.php +++ b/tests/Feature/Controllers/Category/ShowControllerTest.php @@ -32,9 +32,11 @@ 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 Tests\TestCase; @@ -67,6 +69,11 @@ class ShowControllerTest extends TestCase $categoryRepos = $this->mock(CategoryRepositoryInterface::class); $accountRepos = $this->mock(AccountRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + + $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'owner'])->atLeast()->once()->andReturn(true); + + $journalRepos->shouldReceive('firstNull')->twice()->andReturn(TransactionJournal::first()); // mock stuff @@ -119,6 +126,9 @@ class ShowControllerTest extends TestCase $repository = $this->mock(CategoryRepositoryInterface::class); $collector = $this->mock(TransactionCollectorInterface::class); $accountRepos = $this->mock(AccountRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + + $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'owner'])->atLeast()->once()->andReturn(true); $collector->shouldReceive('setPage')->andReturnSelf()->once(); $collector->shouldReceive('setLimit')->andReturnSelf()->once(); @@ -157,7 +167,11 @@ class ShowControllerTest extends TestCase $accountRepos = $this->mock(AccountRepositoryInterface::class); $collector = $this->mock(TransactionCollectorInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); - $month = new Carbon(); + $userRepos = $this->mock(UserRepositoryInterface::class); + + $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'owner'])->atLeast()->once()->andReturn(true); + + $month = new Carbon(); $month->startOfMonth(); $journal = TransactionJournal::where('date', '>=', $month->format('Y-m-d') . ' 00:00:00')->first(); $journalRepos->shouldReceive('firstNull')->twice()->andReturn($journal); @@ -201,19 +215,20 @@ class ShowControllerTest extends TestCase $latestJournal = $this->user()->transactionJournals() ->orderBy('date', 'DESC')->first(); - Log::debug(sprintf('Test testShowEmpty(%s)', $range)); + $userRepos = $this->mock(UserRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); + $repository = $this->mock(CategoryRepositoryInterface::class); + $collector = $this->mock(TransactionCollectorInterface::class); + + $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'owner'])->atLeast()->once()->andReturn(true); + $journalRepos->shouldReceive('firstNull')->twice()->andReturn($latestJournal); // mock stuff - $repository = $this->mock(CategoryRepositoryInterface::class); $repository->shouldReceive('spentInPeriod')->andReturn('0'); $repository->shouldReceive('earnedInPeriod')->andReturn('0'); - $accountRepos = $this->mock(AccountRepositoryInterface::class); $accountRepos->shouldReceive('getAccountsByType')->once()->andReturn(new Collection); - - $collector = $this->mock(TransactionCollectorInterface::class); $collector->shouldReceive('setPage')->andReturnSelf()->once(); $collector->shouldReceive('setLimit')->andReturnSelf()->once(); $collector->shouldReceive('setAllAssetAccounts')->andReturnSelf()->atLeast(1); @@ -225,7 +240,6 @@ class ShowControllerTest extends TestCase $collector->shouldReceive('setCategory')->andReturnSelf()->atLeast(1); $collector->shouldReceive('setTypes')->andReturnSelf()->atLeast(1); $collector->shouldReceive('getTransactions')->andReturn(new Collection)->atLeast(1); - $collector->shouldReceive('getPaginatedTransactions')->andReturn(new LengthAwarePaginator([], 0, 10))->atLeast(1); $this->be($this->user()); diff --git a/tests/Feature/Controllers/CategoryControllerTest.php b/tests/Feature/Controllers/CategoryControllerTest.php index cd300b3675..489474e777 100644 --- a/tests/Feature/Controllers/CategoryControllerTest.php +++ b/tests/Feature/Controllers/CategoryControllerTest.php @@ -28,8 +28,10 @@ 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\Support\Collection; use Log; +use Mockery; use Tests\TestCase; /** @@ -60,7 +62,10 @@ class CategoryControllerTest extends TestCase $categoryRepos = $this->mock(CategoryRepositoryInterface::class); $accountRepos = $this->mock(AccountRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(TransactionJournal::first()); + $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'owner'])->atLeast()->once()->andReturn(true); $this->be($this->user()); $response = $this->get(route('categories.create')); @@ -79,7 +84,10 @@ class CategoryControllerTest extends TestCase $categoryRepos = $this->mock(CategoryRepositoryInterface::class); $accountRepos = $this->mock(AccountRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(TransactionJournal::first()); + $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'owner'])->atLeast()->once()->andReturn(true); $this->be($this->user()); $response = $this->get(route('categories.delete', [1])); @@ -98,8 +106,9 @@ class CategoryControllerTest extends TestCase $categoryRepos = $this->mock(CategoryRepositoryInterface::class); $accountRepos = $this->mock(AccountRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); - $journalRepos->shouldReceive('firstNull')->once()->andReturn(TransactionJournal::first()); + $userRepos = $this->mock(UserRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(TransactionJournal::first()); $categoryRepos->shouldReceive('destroy')->andReturn(true); $this->session(['categories.delete.uri' => 'http://localhost']); @@ -119,7 +128,10 @@ class CategoryControllerTest extends TestCase $categoryRepos = $this->mock(CategoryRepositoryInterface::class); $accountRepos = $this->mock(AccountRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(TransactionJournal::first()); + $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'owner'])->atLeast()->once()->andReturn(true); $this->be($this->user()); $response = $this->get(route('categories.edit', [1])); @@ -139,9 +151,12 @@ class CategoryControllerTest extends TestCase $categoryRepos = $this->mock(CategoryRepositoryInterface::class); $accountRepos = $this->mock(AccountRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(TransactionJournal::first()); $categoryRepos->shouldReceive('getCategories')->andReturn(new Collection([$category]))->once(); $categoryRepos->shouldReceive('lastUseDate')->andReturn(new Carbon)->once(); + $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'owner'])->atLeast()->once()->andReturn(true); $this->be($this->user()); $response = $this->get(route('categories.index')); @@ -160,6 +175,8 @@ class CategoryControllerTest extends TestCase $accountRepos = $this->mock(AccountRepositoryInterface::class); $repository = $this->mock(CategoryRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(TransactionJournal::first()); $repository->shouldReceive('findNull')->andReturn(new Category); $repository->shouldReceive('store')->andReturn(new Category); @@ -186,6 +203,8 @@ class CategoryControllerTest extends TestCase $repository = $this->mock(CategoryRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); $accountRepos = $this->mock(AccountRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(TransactionJournal::first()); $repository->shouldReceive('update'); $repository->shouldReceive('findNull')->andReturn($category); diff --git a/tests/Feature/Controllers/Chart/AccountControllerTest.php b/tests/Feature/Controllers/Chart/AccountControllerTest.php index db7c38faa8..85646105b0 100644 --- a/tests/Feature/Controllers/Chart/AccountControllerTest.php +++ b/tests/Feature/Controllers/Chart/AccountControllerTest.php @@ -37,6 +37,7 @@ use FireflyIII\Repositories\Category\CategoryRepositoryInterface; use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; use Illuminate\Support\Collection; use Log; +use Mockery; use Preferences; use Steam; use Tests\TestCase; @@ -67,6 +68,7 @@ class AccountControllerTest extends TestCase $accountRepos = $this->mock(AccountRepositoryInterface::class); $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); + // grab two expense accounts from the current user. $accounts = $this->user()->accounts()->where('account_type_id', 4)->take(2)->get(); @@ -103,9 +105,12 @@ class AccountControllerTest extends TestCase */ public function testExpenseBudget(string $range): void { - $generator = $this->mock(GeneratorInterface::class); - $collector = $this->mock(TransactionCollectorInterface::class); - $budgetRepos = $this->mock(BudgetRepositoryInterface::class); + $generator = $this->mock(GeneratorInterface::class); + $collector = $this->mock(TransactionCollectorInterface::class); + $budgetRepos = $this->mock(BudgetRepositoryInterface::class); + $accountRepos = $this->mock(AccountRepositoryInterface::class); + $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); + $transaction = factory(Transaction::class)->make(); $collector->shouldReceive('setAccounts')->andReturnSelf(); @@ -134,6 +139,7 @@ class AccountControllerTest extends TestCase $collector = $this->mock(TransactionCollectorInterface::class); $budgetRepos = $this->mock(BudgetRepositoryInterface::class); $accountRepos = $this->mock(AccountRepositoryInterface::class); + $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); $transaction = factory(Transaction::class)->make(); $collector->shouldReceive('setAccounts')->andReturnSelf(); @@ -164,6 +170,9 @@ class AccountControllerTest extends TestCase $generator = $this->mock(GeneratorInterface::class); $collector = $this->mock(TransactionCollectorInterface::class); $categoryRepos = $this->mock(CategoryRepositoryInterface::class); + $accountRepos = $this->mock(AccountRepositoryInterface::class); + $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); + $collector->shouldReceive('setAccounts')->andReturnSelf(); $collector->shouldReceive('setRange')->andReturnSelf(); @@ -193,6 +202,8 @@ class AccountControllerTest extends TestCase $collector = $this->mock(TransactionCollectorInterface::class); $categoryRepos = $this->mock(CategoryRepositoryInterface::class); $accountRepos = $this->mock(AccountRepositoryInterface::class); + $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); + $collector->shouldReceive('setAccounts')->andReturnSelf(); $collector->shouldReceive('setRange')->andReturnSelf(); @@ -249,6 +260,9 @@ class AccountControllerTest extends TestCase $generator = $this->mock(GeneratorInterface::class); $collector = $this->mock(TransactionCollectorInterface::class); $categoryRepos = $this->mock(CategoryRepositoryInterface::class); + $accountRepos = $this->mock(AccountRepositoryInterface::class); + $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); + $collector->shouldReceive('setAccounts')->andReturnSelf(); $collector->shouldReceive('setRange')->andReturnSelf(); @@ -278,6 +292,7 @@ class AccountControllerTest extends TestCase $collector = $this->mock(TransactionCollectorInterface::class); $categoryRepos = $this->mock(CategoryRepositoryInterface::class); $accountRepos = $this->mock(AccountRepositoryInterface::class); + $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); $collector->shouldReceive('setAccounts')->andReturnSelf(); $collector->shouldReceive('setRange')->andReturnSelf(); @@ -304,6 +319,7 @@ class AccountControllerTest extends TestCase { $generator = $this->mock(GeneratorInterface::class); $accountRepos = $this->mock(AccountRepositoryInterface::class); + $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); $accountRepos->shouldReceive('oldestJournalDate')->andReturn(new Carbon); Steam::shouldReceive('balanceInRange')->andReturn(['2012-01-01' => '0']); @@ -321,8 +337,14 @@ class AccountControllerTest extends TestCase public function testReport(): void { $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); - $currencyRepos->shouldReceive('findNull')->andReturn(TransactionCurrency::find(1), null); + $accountRepos = $this->mock(AccountRepositoryInterface::class); + $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); $generator = $this->mock(GeneratorInterface::class); + + $accountRepos->shouldReceive('getMetaValue')->withArgs([Mockery::any(),'currency_id'])->andReturn('1')->atLeast()->once(); + + $currencyRepos->shouldReceive('findNull')->andReturn(TransactionCurrency::find(1), null); + $generator->shouldReceive('multiSet')->andReturn([]); Steam::shouldReceive('balanceInRange')->andReturn(['2012-01-01' => '0']); diff --git a/tests/Feature/Controllers/Chart/ReportControllerTest.php b/tests/Feature/Controllers/Chart/ReportControllerTest.php index 557d14d9a4..a43e63b8dc 100644 --- a/tests/Feature/Controllers/Chart/ReportControllerTest.php +++ b/tests/Feature/Controllers/Chart/ReportControllerTest.php @@ -23,8 +23,10 @@ declare(strict_types=1); namespace Tests\Feature\Controllers\Chart; use FireflyIII\Generator\Chart\Basic\GeneratorInterface; +use FireflyIII\Models\TransactionCurrency; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Account\AccountTaskerInterface; +use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; use Log; use Mockery; use Steam; @@ -51,6 +53,10 @@ class ReportControllerTest extends TestCase { $generator = $this->mock(GeneratorInterface::class); $accountRepos = $this->mock(AccountRepositoryInterface::class); + $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); + + $currencyRepos->shouldReceive('setUser'); + $currencyRepos->shouldReceive('findNull')->withArgs([1])->andReturn(TransactionCurrency::find(1))->atLeast()->once(); // mock calls: $accountRepos->shouldReceive('setUser'); @@ -78,6 +84,8 @@ class ReportControllerTest extends TestCase { $generator = $this->mock(GeneratorInterface::class); $tasker = $this->mock(AccountTaskerInterface::class); + $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); + $income = [1 => ['sum' => '100']]; $expense = [2 => ['sum' => '-100']]; $tasker->shouldReceive('getIncomeReport')->once()->andReturn($income); @@ -96,6 +104,8 @@ class ReportControllerTest extends TestCase { $generator = $this->mock(GeneratorInterface::class); $tasker = $this->mock(AccountTaskerInterface::class); + $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); + $income = []; $expense = []; diff --git a/tests/Feature/Controllers/DebugControllerTest.php b/tests/Feature/Controllers/DebugControllerTest.php index 0bf188923b..a40adab24b 100644 --- a/tests/Feature/Controllers/DebugControllerTest.php +++ b/tests/Feature/Controllers/DebugControllerTest.php @@ -24,7 +24,9 @@ namespace Tests\Feature\Controllers; use FireflyIII\Models\TransactionJournal; use FireflyIII\Repositories\Journal\JournalRepositoryInterface; +use FireflyIII\Repositories\User\UserRepositoryInterface; use Log; +use Mockery; use Tests\TestCase; /** @@ -52,11 +54,14 @@ class DebugControllerTest extends TestCase { // mock stuff $journalRepos = $this->mock(JournalRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); $journalRepos->shouldReceive('firstNull')->andReturn(new TransactionJournal); + $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'demo'])->atLeast()->once()->andReturn(false); $this->be($this->user()); $response = $this->get(route('error')); $response->assertStatus(500); + $response->assertSee('A very simple test error'); } /** @@ -66,7 +71,10 @@ class DebugControllerTest extends TestCase { // mock stuff $journalRepos = $this->mock(JournalRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->andReturn(new TransactionJournal); + $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'demo'])->atLeast()->once()->andReturn(false); $this->be($this->user()); $response = $this->get(route('flush')); @@ -78,6 +86,9 @@ class DebugControllerTest extends TestCase */ public function testIndex(): void { + $userRepos = $this->mock(UserRepositoryInterface::class); + $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'demo'])->atLeast()->once()->andReturn(false); + $this->be($this->user()); $response = $this->get(route('debug')); $response->assertStatus(200); @@ -88,6 +99,9 @@ class DebugControllerTest extends TestCase */ public function testRoutes(): void { + $userRepos = $this->mock(UserRepositoryInterface::class); + $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'demo'])->atLeast()->once()->andReturn(false); + $this->be($this->user()); $response = $this->get(route('routes')); $response->assertStatus(200); @@ -100,6 +114,9 @@ class DebugControllerTest extends TestCase { // mock stuff $journalRepos = $this->mock(JournalRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + + $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'demo'])->atLeast()->once()->andReturn(false); $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); $this->be($this->user()); diff --git a/tests/Feature/Controllers/ExportControllerTest.php b/tests/Feature/Controllers/ExportControllerTest.php index 5aff7eaccd..9d82902929 100644 --- a/tests/Feature/Controllers/ExportControllerTest.php +++ b/tests/Feature/Controllers/ExportControllerTest.php @@ -30,8 +30,10 @@ use FireflyIII\Models\TransactionJournal; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\ExportJob\ExportJobRepositoryInterface; use FireflyIII\Repositories\Journal\JournalRepositoryInterface; +use FireflyIII\Repositories\User\UserRepositoryInterface; use Illuminate\Support\Collection; use Log; +use Mockery; use Tests\TestCase; /** @@ -60,6 +62,9 @@ class ExportControllerTest extends TestCase // mock stuff $repository = $this->mock(ExportJobRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + + $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'demo'])->atLeast()->once()->andReturn(false); $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); $repository->shouldReceive('changeStatus')->once(); @@ -80,9 +85,9 @@ class ExportControllerTest extends TestCase // mock stuff $repository = $this->mock(ExportJobRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); - $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); + $userRepos = $this->mock(UserRepositoryInterface::class); - $repository->shouldReceive('exists')->once()->andReturn(false); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); $this->be($this->user()); $response = $this->get(route('export.download', ['testExport'])); @@ -96,6 +101,10 @@ class ExportControllerTest extends TestCase { // mock stuff $journalRepos = $this->mock(JournalRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + + $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'demo'])->atLeast()->once()->andReturn(false); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); $this->be($this->user()); @@ -113,6 +122,11 @@ class ExportControllerTest extends TestCase $repository = $this->mock(ExportJobRepositoryInterface::class); $accountRepos = $this->mock(AccountRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + + $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'owner'])->atLeast()->once()->andReturn(true); + + $job = ExportJob::first(); $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); $repository->shouldReceive('create')->andReturn($job); @@ -138,7 +152,10 @@ class ExportControllerTest extends TestCase $processor = $this->mock(ProcessorInterface::class); $accountRepos = $this->mock(AccountRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->andReturn(new TransactionJournal); + $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'demo'])->atLeast()->once()->andReturn(false); $this->session( ['first' => new Carbon('2014-01-01')] diff --git a/tests/Feature/Controllers/HomeControllerTest.php b/tests/Feature/Controllers/HomeControllerTest.php index e449fcbbc2..8ddd5fe4a5 100644 --- a/tests/Feature/Controllers/HomeControllerTest.php +++ b/tests/Feature/Controllers/HomeControllerTest.php @@ -31,6 +31,7 @@ use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Bill\BillRepositoryInterface; use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; use FireflyIII\Repositories\Journal\JournalRepositoryInterface; +use FireflyIII\Repositories\User\UserRepositoryInterface; use Illuminate\Support\Collection; use Log; use Mockery; @@ -62,6 +63,8 @@ class HomeControllerTest extends TestCase { // mock stuff $journalRepos = $this->mock(JournalRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); $this->be($this->user()); @@ -83,6 +86,8 @@ class HomeControllerTest extends TestCase { // mock stuff $journalRepos = $this->mock(JournalRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); $this->be($this->user()); @@ -115,6 +120,10 @@ class HomeControllerTest extends TestCase $billRepos = $this->mock(BillRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + + $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'owner'])->atLeast()->once()->andReturn(true); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); $accountRepos->shouldReceive('count')->andReturn(1); $accountRepos->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'currency_id'])->andReturn('1'); @@ -148,6 +157,8 @@ class HomeControllerTest extends TestCase // mock stuff $accountRepos = $this->mock(AccountRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); $accountRepos->shouldReceive('count')->andReturn(0); diff --git a/tests/Feature/Controllers/Import/IndexControllerTest.php b/tests/Feature/Controllers/Import/IndexControllerTest.php index 21613fa1aa..8fc7b5fce7 100644 --- a/tests/Feature/Controllers/Import/IndexControllerTest.php +++ b/tests/Feature/Controllers/Import/IndexControllerTest.php @@ -323,6 +323,7 @@ class IndexControllerTest extends TestCase $spectrePrerequisites = $this->mock(SpectrePrerequisites::class); $filePrerequisites = $this->mock(FilePrerequisites::class); $ynabPrerequisites = $this->mock(YnabPrerequisites::class); + $repository = $this->mock(ImportJobRepositoryInterface::class); // call methods: $userRepository->shouldReceive('hasRole')->withArgs([Mockery::any(), 'demo'])->andReturn(false); @@ -357,6 +358,7 @@ class IndexControllerTest extends TestCase $filePrerequisites = $this->mock(FilePrerequisites::class); $userRepository = $this->mock(UserRepositoryInterface::class); $ynabPrerequisites = $this->mock(YnabPrerequisites::class); + $repository = $this->mock(ImportJobRepositoryInterface::class); // call methods: $fakePrerequisites->shouldReceive('setUser')->once(); diff --git a/tests/Feature/Controllers/Import/JobConfigurationControllerTest.php b/tests/Feature/Controllers/Import/JobConfigurationControllerTest.php index 858b245ccc..8e0f2d2016 100644 --- a/tests/Feature/Controllers/Import/JobConfigurationControllerTest.php +++ b/tests/Feature/Controllers/Import/JobConfigurationControllerTest.php @@ -26,6 +26,7 @@ namespace Tests\Feature\Controllers\Import; use FireflyIII\Import\JobConfiguration\FakeJobConfiguration; use FireflyIII\Models\ImportJob; use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface; +use FireflyIII\Repositories\User\UserRepositoryInterface; use Illuminate\Http\UploadedFile; use Illuminate\Support\MessageBag; use Log; @@ -62,6 +63,9 @@ class JobConfigurationControllerTest extends TestCase // mock repositories and configuration handling classes: $repository = $this->mock(ImportJobRepositoryInterface::class); $configurator = $this->mock(FakeJobConfiguration::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + + $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'owner'])->atLeast()->once()->andReturn(true); // mock calls: $configurator->shouldReceive('setImportJob')->once(); @@ -94,8 +98,10 @@ class JobConfigurationControllerTest extends TestCase // mock repositories and configuration handling classes: $repository = $this->mock(ImportJobRepositoryInterface::class); $configurator = $this->mock(FakeJobConfiguration::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + + - // mock calls: $this->be($this->user()); $response = $this->get(route('import.job.configuration.index', [$job->key])); @@ -120,6 +126,7 @@ class JobConfigurationControllerTest extends TestCase // mock repositories and configuration handling classes: $repository = $this->mock(ImportJobRepositoryInterface::class); $configurator = $this->mock(FakeJobConfiguration::class); + $userRepos = $this->mock(UserRepositoryInterface::class); // mock calls: $configurator->shouldReceive('setImportJob')->once(); @@ -152,6 +159,7 @@ class JobConfigurationControllerTest extends TestCase // mock repositories and configuration handling classes: $repository = $this->mock(ImportJobRepositoryInterface::class); $configurator = $this->mock(FakeJobConfiguration::class); + $userRepos = $this->mock(UserRepositoryInterface::class); // mock calls: $configurator->shouldReceive('setImportJob')->once(); @@ -186,6 +194,7 @@ class JobConfigurationControllerTest extends TestCase // mock repositories and configuration handling classes: $repository = $this->mock(ImportJobRepositoryInterface::class); $configurator = $this->mock(FakeJobConfiguration::class); + $userRepos = $this->mock(UserRepositoryInterface::class); // call thing. $this->be($this->user()); @@ -212,6 +221,8 @@ class JobConfigurationControllerTest extends TestCase // mock repositories and configuration handling classes: $repository = $this->mock(ImportJobRepositoryInterface::class); $configurator = $this->mock(FakeJobConfiguration::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + // mock calls: $configurator->shouldReceive('setImportJob')->once(); @@ -245,6 +256,7 @@ class JobConfigurationControllerTest extends TestCase // mock repositories and configuration handling classes: $repository = $this->mock(ImportJobRepositoryInterface::class); $configurator = $this->mock(FakeJobConfiguration::class); + $userRepos = $this->mock(UserRepositoryInterface::class); // mock calls: $configurator->shouldReceive('setImportJob')->once(); diff --git a/tests/Feature/Controllers/Import/JobStatusControllerTest.php b/tests/Feature/Controllers/Import/JobStatusControllerTest.php index 12ea9a7245..07ae4f8a0f 100644 --- a/tests/Feature/Controllers/Import/JobStatusControllerTest.php +++ b/tests/Feature/Controllers/Import/JobStatusControllerTest.php @@ -29,6 +29,7 @@ use FireflyIII\Import\Storage\ImportArrayStorage; use FireflyIII\Models\ImportJob; use FireflyIII\Models\Tag; use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface; +use FireflyIII\Repositories\User\UserRepositoryInterface; use Log; use Mockery; use Tests\TestCase; @@ -56,6 +57,8 @@ class JobStatusControllerTest extends TestCase */ public function testIndex(): void { + $importRepos = $this->mock(ImportJobRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); $job = new ImportJob; $job->user_id = $this->user()->id; $job->key = 'Afake_job_' . random_int(1, 10000); @@ -64,6 +67,8 @@ class JobStatusControllerTest extends TestCase $job->file_type = ''; $job->save(); + $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'owner'])->atLeast()->once()->andReturn(true); + // call thing. $this->be($this->user()); $response = $this->get(route('import.job.status.index', [$job->key])); @@ -76,6 +81,9 @@ class JobStatusControllerTest extends TestCase */ public function testJson(): void { + $importRepos = $this->mock(ImportJobRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $job = new ImportJob; $job->user_id = $this->user()->id; $job->key = 'Bfake_job_' . random_int(1, 10000); @@ -99,6 +107,8 @@ class JobStatusControllerTest extends TestCase */ public function testJsonWithTag(): void { + $importRepos = $this->mock(ImportJobRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); $tag = $this->user()->tags()->first(); $job = new ImportJob; $job->user_id = $this->user()->id; @@ -124,6 +134,9 @@ class JobStatusControllerTest extends TestCase */ public function testJsonWithTagManyJournals(): void { + $importRepos = $this->mock(ImportJobRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + /** @var Tag $tag */ $tag = $this->user()->tags()->first(); $journal = $this->user()->transactionJournals()->first(); @@ -154,6 +167,9 @@ class JobStatusControllerTest extends TestCase */ public function testJsonWithTagOneJournal(): void { + $importRepos = $this->mock(ImportJobRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + /** @var Tag $tag */ $tag = $this->user()->tags()->first(); $journal = $this->user()->transactionJournals()->first(); @@ -183,6 +199,8 @@ class JobStatusControllerTest extends TestCase */ public function testStart(): void { + $userRepos = $this->mock(UserRepositoryInterface::class); + $job = new ImportJob; $job->user_id = $this->user()->id; $job->key = 'Ffake_job_' . random_int(1, 10000); @@ -212,6 +230,8 @@ class JobStatusControllerTest extends TestCase */ public function testStartException(): void { + $userRepos = $this->mock(UserRepositoryInterface::class); + $job = new ImportJob; $job->user_id = $this->user()->id; $job->key = 'Gfake_job_' . random_int(1, 10000); @@ -242,6 +262,7 @@ class JobStatusControllerTest extends TestCase */ public function testStartFireflyException(): void { + $userRepos = $this->mock(UserRepositoryInterface::class); $job = new ImportJob; $job->user_id = $this->user()->id; $job->key = 'Hfake_job_' . random_int(1, 10000); @@ -272,6 +293,12 @@ class JobStatusControllerTest extends TestCase */ public function testStartInvalidState(): void { + $importRepos = $this->mock(ImportJobRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + // mock calls: + $importRepos->shouldReceive('setStatus')->withArgs([Mockery::any(), 'error']) + ->atLeast()->once(); + $job = new ImportJob; $job->user_id = $this->user()->id; $job->key = 'Ifake_job_' . random_int(1, 10000); @@ -285,7 +312,7 @@ class JobStatusControllerTest extends TestCase $this->be($this->user()); $response = $this->post(route('import.job.start', [$job->key])); $response->assertStatus(200); - $response->assertExactJson(['status' => 'NOK', 'message' => 'JobStatusController::start expects status "ready_to_run" instead of "error".']); + $response->assertExactJson(['status' => 'NOK', 'message' => 'JobStatusController::start expects status "ready_to_run" instead of "bad_state".']); } /** @@ -305,6 +332,7 @@ class JobStatusControllerTest extends TestCase // mock stuff $repository = $this->mock(ImportJobRepositoryInterface::class); $storage = $this->mock(ImportArrayStorage::class); + $userRepos = $this->mock(UserRepositoryInterface::class); // mock calls: $repository->shouldReceive('setStatus')->once()->withArgs([Mockery::any(), 'storing_data']); @@ -336,6 +364,7 @@ class JobStatusControllerTest extends TestCase // mock stuff $repository = $this->mock(ImportJobRepositoryInterface::class); $storage = $this->mock(ImportArrayStorage::class); + $userRepos = $this->mock(UserRepositoryInterface::class); // mock calls: $repository->shouldReceive('setStatus')->once()->withArgs([Mockery::any(), 'storing_data']); @@ -355,6 +384,7 @@ class JobStatusControllerTest extends TestCase */ public function testStoreInvalidState(): void { + $importRepos = $this->mock(ImportJobRepositoryInterface::class); $job = new ImportJob; $job->user_id = $this->user()->id; $job->key = 'Kfake_job_' . random_int(1, 10000); diff --git a/tests/Feature/Controllers/Import/PrerequisitesControllerTest.php b/tests/Feature/Controllers/Import/PrerequisitesControllerTest.php index 692b32719b..1a35eae5b7 100644 --- a/tests/Feature/Controllers/Import/PrerequisitesControllerTest.php +++ b/tests/Feature/Controllers/Import/PrerequisitesControllerTest.php @@ -25,6 +25,7 @@ namespace Tests\Feature\Controllers\Import; use FireflyIII\Import\Prerequisites\FakePrerequisites; use FireflyIII\Models\ImportJob; use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface; +use FireflyIII\Repositories\User\UserRepositoryInterface; use Illuminate\Support\MessageBag; use Log; use Mockery; @@ -53,6 +54,7 @@ class PrerequisitesControllerTest extends TestCase */ public function testIndex(): void { + $userRepos = $this->mock(UserRepositoryInterface::class); $job = new ImportJob; $job->user_id = $this->user()->id; $job->key = 'A_pre_job_' . random_int(1, 10000); @@ -66,6 +68,10 @@ class PrerequisitesControllerTest extends TestCase $prereq = $this->mock(FakePrerequisites::class); $repository = $this->mock(ImportJobRepositoryInterface::class); + $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'owner'])->atLeast()->once()->andReturn(true); + $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'demo'])->atLeast()->once()->andReturn(false); + + $prereq->shouldReceive('setUser')->times(2); $prereq->shouldReceive('isComplete')->times(2)->andReturn(false); $prereq->shouldReceive('getView')->once()->andReturn('import.fake.prerequisites'); @@ -83,6 +89,8 @@ class PrerequisitesControllerTest extends TestCase */ public function testIndexBadState(): void { + $userRepos = $this->mock(UserRepositoryInterface::class); + $job = new ImportJob; $job->user_id = $this->user()->id; $job->key = 'B_pre_job_' . random_int(1, 10000); @@ -92,6 +100,10 @@ class PrerequisitesControllerTest extends TestCase $job->file_type = ''; $job->save(); + + $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'demo'])->atLeast()->once()->andReturn(false); + + $this->be($this->user()); $response = $this->get(route('import.prerequisites.index', ['fake', $job->key])); $response->assertStatus(302); @@ -103,6 +115,8 @@ class PrerequisitesControllerTest extends TestCase */ public function testIndexComplete(): void { + $userRepos = $this->mock(UserRepositoryInterface::class); + $job = new ImportJob; $job->user_id = $this->user()->id; $job->key = 'C_pre_job_' . random_int(1, 10000); @@ -116,6 +130,8 @@ class PrerequisitesControllerTest extends TestCase $prereq = $this->mock(FakePrerequisites::class); $repository = $this->mock(ImportJobRepositoryInterface::class); + $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'demo'])->atLeast()->once()->andReturn(false); + $repository->shouldReceive('setStatus')->once()->withArgs([Mockery::any(), 'has_prereq']); $prereq->shouldReceive('setUser')->times(2); $prereq->shouldReceive('isComplete')->times(2)->andReturn(true); @@ -134,6 +150,8 @@ class PrerequisitesControllerTest extends TestCase */ public function testPost(): void { + $userRepos = $this->mock(UserRepositoryInterface::class); + $job = new ImportJob; $job->user_id = $this->user()->id; $job->key = 'D_pre_job_' . random_int(1, 10000); @@ -147,6 +165,9 @@ class PrerequisitesControllerTest extends TestCase $prereq = $this->mock(FakePrerequisites::class); $repository = $this->mock(ImportJobRepositoryInterface::class); + $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'demo'])->atLeast()->once()->andReturn(false); + + $prereq->shouldReceive('setUser')->times(2); $prereq->shouldReceive('storePrerequisites')->once()->andReturn(new MessageBag); $repository->shouldReceive('setStatus')->once()->withArgs([Mockery::any(), 'has_prereq']); @@ -165,6 +186,8 @@ class PrerequisitesControllerTest extends TestCase */ public function testPostBadState(): void { + $userRepos = $this->mock(UserRepositoryInterface::class); + $job = new ImportJob; $job->user_id = $this->user()->id; $job->key = 'D_pre_job_' . random_int(1, 10000); @@ -174,6 +197,8 @@ class PrerequisitesControllerTest extends TestCase $job->file_type = ''; $job->save(); + $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'demo'])->atLeast()->once()->andReturn(false); + // mock stuff $prereq = $this->mock(FakePrerequisites::class); $repository = $this->mock(ImportJobRepositoryInterface::class); @@ -195,10 +220,14 @@ class PrerequisitesControllerTest extends TestCase */ public function testPostNoJob(): void { + $userRepos = $this->mock(UserRepositoryInterface::class); + // mock stuff $prereq = $this->mock(FakePrerequisites::class); $repository = $this->mock(ImportJobRepositoryInterface::class); + $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'demo'])->atLeast()->once()->andReturn(false); + $prereq->shouldReceive('setUser')->once(); $prereq->shouldReceive('storePrerequisites')->once()->andReturn(new MessageBag); @@ -218,6 +247,8 @@ class PrerequisitesControllerTest extends TestCase */ public function testPostWithMessages(): void { + $userRepos = $this->mock(UserRepositoryInterface::class); + $job = new ImportJob; $job->user_id = $this->user()->id; $job->key = 'D_pre_job_' . random_int(1, 10000); @@ -234,6 +265,8 @@ class PrerequisitesControllerTest extends TestCase $prereq = $this->mock(FakePrerequisites::class); $repository = $this->mock(ImportJobRepositoryInterface::class); + $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'demo'])->atLeast()->once()->andReturn(false); + $prereq->shouldReceive('setUser')->times(1); $prereq->shouldReceive('isComplete')->times(1)->andReturn(false); diff --git a/tests/Feature/Controllers/Json/BoxControllerTest.php b/tests/Feature/Controllers/Json/BoxControllerTest.php index d4dbc119c0..63e7e07643 100644 --- a/tests/Feature/Controllers/Json/BoxControllerTest.php +++ b/tests/Feature/Controllers/Json/BoxControllerTest.php @@ -61,6 +61,8 @@ class BoxControllerTest extends TestCase ], ]; $repository = $this->mock(BudgetRepositoryInterface::class); + $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); + $repository->shouldReceive('getAvailableBudget')->andReturn('1000'); $repository->shouldReceive('getActiveBudgets')->andReturn(new Collection); $repository->shouldReceive('collectBudgetInformation')->andReturn($return); @@ -82,6 +84,8 @@ class BoxControllerTest extends TestCase ], ]; $repository = $this->mock(BudgetRepositoryInterface::class); + $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); + $repository->shouldReceive('getAvailableBudget')->andReturn('1000'); $repository->shouldReceive('getActiveBudgets')->andReturn(new Collection); $repository->shouldReceive('collectBudgetInformation')->andReturn($return); @@ -99,6 +103,8 @@ class BoxControllerTest extends TestCase { $accountRepos = $this->mock(AccountRepositoryInterface::class); $collector = $this->mock(TransactionCollectorInterface::class); + $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); + // try a collector for income: @@ -124,6 +130,10 @@ class BoxControllerTest extends TestCase $accountRepos = $this->mock(AccountRepositoryInterface::class); $collector = $this->mock(TransactionCollectorInterface::class); + $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); + + $currencyRepos->shouldReceive('findNull')->withArgs([1])->andReturn(TransactionCurrency::find(1))->atLeast()->once(); + // try a collector for income: $collector->shouldReceive('setAllAssetAccounts')->andReturnSelf(); @@ -143,6 +153,8 @@ class BoxControllerTest extends TestCase public function testBills(): void { $billRepos = $this->mock(BillRepositoryInterface::class); + $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); + $billRepos->shouldReceive('getBillsPaidInRange')->andReturn('0'); $billRepos->shouldReceive('getBillsUnpaidInRange')->andReturn('0'); @@ -165,6 +177,7 @@ class BoxControllerTest extends TestCase $netWorthHelper = $this->mock(NetWorthInterface::class); + $netWorthHelper->shouldReceive('setUser')->once(); $netWorthHelper->shouldReceive('getNetWorthByCurrency')->once()->andReturn($result); diff --git a/tests/Feature/Controllers/Json/ReconcileControllerTest.php b/tests/Feature/Controllers/Json/ReconcileControllerTest.php index 2104ac814c..e8dca4ece0 100644 --- a/tests/Feature/Controllers/Json/ReconcileControllerTest.php +++ b/tests/Feature/Controllers/Json/ReconcileControllerTest.php @@ -27,9 +27,12 @@ namespace Tests\Feature\Controllers\Json; use FireflyIII\Models\Transaction; use FireflyIII\Models\TransactionCurrency; use FireflyIII\Models\TransactionJournal; +use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; use FireflyIII\Repositories\Journal\JournalRepositoryInterface; +use FireflyIII\Repositories\Recurring\RecurringRepositoryInterface; use Log; +use Mockery; use Tests\TestCase; /** @@ -54,6 +57,9 @@ class ReconcileControllerTest extends TestCase */ public function testOverview(): void { + $accountRepos = $this->mock(AccountRepositoryInterface::class); + $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); + $recurringRepos = $this->mock(RecurringRepositoryInterface::class); $transactions = $this->user()->transactions()->inRandomOrder()->take(3)->get(); $repository = $this->mock(JournalRepositoryInterface::class); $repository->shouldReceive('firstNull')->andReturn(new TransactionJournal); @@ -77,6 +83,10 @@ class ReconcileControllerTest extends TestCase */ public function testOverviewNotAsset(): void { + $accountRepos = $this->mock(AccountRepositoryInterface::class); + $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); + $recurringRepos = $this->mock(RecurringRepositoryInterface::class); + $account = $this->user()->accounts()->where('account_type_id', '!=', 3)->first(); $parameters = [ 'startBalance' => '0', @@ -98,6 +108,11 @@ class ReconcileControllerTest extends TestCase public function testTransactions(): void { $repository = $this->mock(CurrencyRepositoryInterface::class); + $accountRepos = $this->mock(AccountRepositoryInterface::class); + $recurringRepos = $this->mock(RecurringRepositoryInterface::class); + + $accountRepos->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'currency_id'])->andReturn('1')->atLeast()->once(); + $repository->shouldReceive('findNull')->once()->andReturn(TransactionCurrency::find(1)); $this->be($this->user()); @@ -110,6 +125,11 @@ class ReconcileControllerTest extends TestCase */ public function testTransactionsInitialBalance(): void { + $accountRepos = $this->mock(AccountRepositoryInterface::class); + $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); + $recurringRepos = $this->mock(RecurringRepositoryInterface::class); + + $transaction = Transaction::leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id') ->where('accounts.user_id', $this->user()->id)->where('accounts.account_type_id', 6)->first(['account_id']); $this->be($this->user()); diff --git a/tests/Feature/Controllers/NewUserControllerTest.php b/tests/Feature/Controllers/NewUserControllerTest.php index c6ab76855d..b5fc071a91 100644 --- a/tests/Feature/Controllers/NewUserControllerTest.php +++ b/tests/Feature/Controllers/NewUserControllerTest.php @@ -27,7 +27,9 @@ use FireflyIII\Models\TransactionJournal; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; use FireflyIII\Repositories\Journal\JournalRepositoryInterface; +use FireflyIII\Repositories\User\UserRepositoryInterface; use Log; +use Mockery; use Tests\TestCase; /** @@ -57,8 +59,11 @@ class NewUserControllerTest extends TestCase // mock stuff $accountRepos = $this->mock(AccountRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); $accountRepos->shouldReceive('count')->andReturn(0); + $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'owner'])->atLeast()->once()->andReturn(true); + $this->be($this->emptyUser()); $response = $this->get(route('new-user.index')); @@ -74,6 +79,8 @@ class NewUserControllerTest extends TestCase // mock stuff $accountRepos = $this->mock(AccountRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); $accountRepos->shouldReceive('count')->andReturn(1); @@ -92,6 +99,8 @@ class NewUserControllerTest extends TestCase $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); $accountRepos = $this->mock(AccountRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); $accountRepos->shouldReceive('store')->times(3); $currencyRepos->shouldReceive('findNull')->andReturn(TransactionCurrency::find(1)); @@ -118,6 +127,8 @@ class NewUserControllerTest extends TestCase $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); $accountRepos = $this->mock(AccountRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); $accountRepos->shouldReceive('store')->times(3); $currencyRepos->shouldReceive('findNull')->andReturn(null); @@ -145,6 +156,8 @@ class NewUserControllerTest extends TestCase $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); $accountRepos = $this->mock(AccountRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); $accountRepos->shouldReceive('store')->times(3); $currencyRepos->shouldReceive('findNull')->andReturn(TransactionCurrency::find(1)); diff --git a/tests/Feature/Controllers/PiggyBankControllerTest.php b/tests/Feature/Controllers/PiggyBankControllerTest.php index de7cf3f59b..0dc3213337 100644 --- a/tests/Feature/Controllers/PiggyBankControllerTest.php +++ b/tests/Feature/Controllers/PiggyBankControllerTest.php @@ -23,6 +23,7 @@ declare(strict_types=1); namespace Tests\Feature\Controllers; use Amount; +use Carbon\Carbon; use FireflyIII\Models\Account; use FireflyIII\Models\AccountType; use FireflyIII\Models\PiggyBank; @@ -63,8 +64,14 @@ class PiggyBankControllerTest extends TestCase public function testAdd(): void { // mock stuff - $piggyRepos = $this->mock(PiggyBankRepositoryInterface::class); - $journalRepos = $this->mock(JournalRepositoryInterface::class); + $piggyRepos = $this->mock(PiggyBankRepositoryInterface::class); + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); + $accountRepos = $this->mock(AccountRepositoryInterface::class); + + $accountRepos->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'currency_id'])->andReturn('1')->atLeast()->once(); + $currencyRepos->shouldReceive('findNull')->withArgs([1])->andReturn(TransactionCurrency::find(1))->atLeast()->once(); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); $piggyRepos->shouldReceive('getCurrentAmount')->andReturn('0'); $piggyRepos->shouldReceive('leftOnAccount')->andReturn('0'); @@ -80,8 +87,14 @@ class PiggyBankControllerTest extends TestCase public function testAddMobile(): void { // mock stuff - $piggyRepos = $this->mock(PiggyBankRepositoryInterface::class); - $journalRepos = $this->mock(JournalRepositoryInterface::class); + $piggyRepos = $this->mock(PiggyBankRepositoryInterface::class); + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); + $accountRepos = $this->mock(AccountRepositoryInterface::class); + + $accountRepos->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'currency_id'])->andReturn('1')->atLeast()->once(); + $currencyRepos->shouldReceive('findNull')->withArgs([1])->andReturn(TransactionCurrency::find(1))->atLeast()->once(); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); $piggyRepos->shouldReceive('getCurrentAmount')->andReturn('0'); $piggyRepos->shouldReceive('leftOnAccount')->andReturn('0'); @@ -100,7 +113,10 @@ class PiggyBankControllerTest extends TestCase // mock stuff - $journalRepos = $this->mock(JournalRepositoryInterface::class); + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); + $accountRepos = $this->mock(AccountRepositoryInterface::class); + // new account list thing. $currency = TransactionCurrency::first(); @@ -128,7 +144,10 @@ class PiggyBankControllerTest extends TestCase public function testDelete(): void { // mock stuff - $journalRepos = $this->mock(JournalRepositoryInterface::class); + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); + $accountRepos = $this->mock(AccountRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); $this->be($this->user()); @@ -143,8 +162,11 @@ class PiggyBankControllerTest extends TestCase public function testDestroy(): void { // mock stuff - $repository = $this->mock(PiggyBankRepositoryInterface::class); - $journalRepos = $this->mock(JournalRepositoryInterface::class); + $repository = $this->mock(PiggyBankRepositoryInterface::class); + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); + $accountRepos = $this->mock(AccountRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); $repository->shouldReceive('destroy')->andReturn(true); @@ -162,18 +184,22 @@ class PiggyBankControllerTest extends TestCase */ public function testEdit(): void { + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $accountRepos = $this->mock(AccountRepositoryInterface::class); + $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); + // mock stuff - $account = factory(Account::class)->make(); - $journalRepos = $this->mock(JournalRepositoryInterface::class); + $account = factory(Account::class)->make(); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); // mock stuff for new account list thing. - $currency = TransactionCurrency::first(); - $account = factory(Account::class)->make(); - $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); + $currency = TransactionCurrency::first(); + $account = factory(Account::class)->make(); + $currencyRepos->shouldReceive('findNull')->andReturn($currency); - $accountRepos = $this->mock(AccountRepositoryInterface::class); + $accountRepos->shouldReceive('getAccountsByType') ->withArgs([[AccountType::ASSET, AccountType::DEFAULT]])->andReturn(new Collection([$account]))->once(); @@ -194,10 +220,26 @@ class PiggyBankControllerTest extends TestCase public function testIndex(): void { // mock stuff - $first = $this->user()->transactionJournals()->inRandomOrder()->first(); - $repository = $this->mock(PiggyBankRepositoryInterface::class); - $journalRepos = $this->mock(JournalRepositoryInterface::class); - $piggies = $this->user()->piggyBanks()->take(2)->get(); + $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); + $accountRepos = $this->mock(AccountRepositoryInterface::class); + $repository = $this->mock(PiggyBankRepositoryInterface::class); + $journalRepos = $this->mock(JournalRepositoryInterface::class); + + $accountRepos->shouldReceive('setUser'); + $currencyRepos->shouldReceive('setUser'); + $accountRepos->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'currency_id'])->andReturn('1')->atLeast()->once(); + $accountRepos->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'accountRole'])->andReturn('defaultAsset')->atLeast()->once(); + $accountRepos->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'accountNumber'])->andReturn('1234')->atLeast()->once(); + $accountRepos->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'BIC'])->andReturn('1234')->atLeast()->once(); + + $currencyRepos->shouldReceive('findNull')->withArgs([1])->andReturn(TransactionCurrency::find(1))->atLeast()->once(); + $accountRepos->shouldReceive('getOpeningBalanceAmount')->withAnyArgs()->andReturn('10')->atLeast()->once(); + $accountRepos->shouldReceive('getOpeningBalanceDate')->withAnyArgs()->andReturn(new Carbon())->atLeast()->once(); + $accountRepos->shouldReceive('getNoteText')->withAnyArgs()->andReturn('Hello')->atLeast()->once(); + + + $first = $this->user()->transactionJournals()->inRandomOrder()->first(); + $piggies = $this->user()->piggyBanks()->take(2)->get(); $journalRepos->shouldReceive('firstNull')->once()->andReturn($first); $repository->shouldReceive('getPiggyBanks')->andReturn($piggies); $repository->shouldReceive('getCurrentAmount')->andReturn('10'); @@ -220,8 +262,14 @@ class PiggyBankControllerTest extends TestCase public function testPostAdd(): void { // mock stuff - $repository = $this->mock(PiggyBankRepositoryInterface::class); - $journalRepos = $this->mock(JournalRepositoryInterface::class); + $repository = $this->mock(PiggyBankRepositoryInterface::class); + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); + $accountRepos = $this->mock(AccountRepositoryInterface::class); + + $accountRepos->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'currency_id'])->andReturn('1')->atLeast()->once(); + $currencyRepos->shouldReceive('findNull')->withArgs([1])->andReturn(TransactionCurrency::find(1))->atLeast()->once(); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); $repository->shouldReceive('canAddAmount')->once()->andReturn(true); $repository->shouldReceive('addAmount')->once()->andReturn(true); @@ -242,8 +290,14 @@ class PiggyBankControllerTest extends TestCase public function testPostAddTooMuch(): void { // mock stuff - $repository = $this->mock(PiggyBankRepositoryInterface::class); - $journalRepos = $this->mock(JournalRepositoryInterface::class); + $repository = $this->mock(PiggyBankRepositoryInterface::class); + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); + $accountRepos = $this->mock(AccountRepositoryInterface::class); + + $accountRepos->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'currency_id'])->andReturn('1')->atLeast()->once(); + $currencyRepos->shouldReceive('findNull')->withArgs([1])->andReturn(TransactionCurrency::find(1))->atLeast()->once(); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); $repository->shouldReceive('canAddAmount')->once()->andReturn(false); @@ -261,8 +315,14 @@ class PiggyBankControllerTest extends TestCase public function testPostRemove(): void { // mock stuff - $repository = $this->mock(PiggyBankRepositoryInterface::class); - $journalRepos = $this->mock(JournalRepositoryInterface::class); + $repository = $this->mock(PiggyBankRepositoryInterface::class); + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); + $accountRepos = $this->mock(AccountRepositoryInterface::class); + + $accountRepos->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'currency_id'])->andReturn('1')->atLeast()->once(); + $currencyRepos->shouldReceive('findNull')->withArgs([1])->andReturn(TransactionCurrency::find(1))->atLeast()->once(); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); $repository->shouldReceive('canRemoveAmount')->once()->andReturn(true); $repository->shouldReceive('removeAmount')->once()->andReturn(true); @@ -281,8 +341,14 @@ class PiggyBankControllerTest extends TestCase public function testPostRemoveTooMuch(): void { // mock stuff - $repository = $this->mock(PiggyBankRepositoryInterface::class); - $journalRepos = $this->mock(JournalRepositoryInterface::class); + $repository = $this->mock(PiggyBankRepositoryInterface::class); + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); + $accountRepos = $this->mock(AccountRepositoryInterface::class); + + $accountRepos->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'currency_id'])->andReturn('1')->atLeast()->once(); + $currencyRepos->shouldReceive('findNull')->withArgs([1])->andReturn(TransactionCurrency::find(1))->atLeast()->once(); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); $repository->shouldReceive('canRemoveAmount')->once()->andReturn(false); @@ -300,7 +366,13 @@ class PiggyBankControllerTest extends TestCase public function testRemove(): void { // mock stuff - $journalRepos = $this->mock(JournalRepositoryInterface::class); + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); + $accountRepos = $this->mock(AccountRepositoryInterface::class); + + $accountRepos->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'currency_id'])->andReturn('1')->atLeast()->once(); + $currencyRepos->shouldReceive('findNull')->withArgs([1])->andReturn(TransactionCurrency::find(1))->atLeast()->once(); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); $this->be($this->user()); @@ -314,7 +386,13 @@ class PiggyBankControllerTest extends TestCase public function testRemoveMobile(): void { // mock stuff - $journalRepos = $this->mock(JournalRepositoryInterface::class); + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); + $accountRepos = $this->mock(AccountRepositoryInterface::class); + + $accountRepos->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'currency_id'])->andReturn('1')->atLeast()->once(); + $currencyRepos->shouldReceive('findNull')->withArgs([1])->andReturn(TransactionCurrency::find(1))->atLeast()->once(); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); $this->be($this->user()); @@ -331,7 +409,10 @@ class PiggyBankControllerTest extends TestCase public function testSetOrder(): void { // mock stuff - $repository = $this->mock(PiggyBankRepositoryInterface::class); + $repository = $this->mock(PiggyBankRepositoryInterface::class); + $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); + $accountRepos = $this->mock(AccountRepositoryInterface::class); + $repository->shouldReceive('setOrder')->once()->withArgs([Mockery::any(), 3])->andReturn(false); $data = ['order' => '3']; @@ -347,9 +428,17 @@ class PiggyBankControllerTest extends TestCase public function testShow(): void { // mock stuff - $first = $this->user()->transactionJournals()->inRandomOrder()->first(); - $repository = $this->mock(PiggyBankRepositoryInterface::class); - $journalRepos = $this->mock(JournalRepositoryInterface::class); + $first = $this->user()->transactionJournals()->inRandomOrder()->first(); + $repository = $this->mock(PiggyBankRepositoryInterface::class); + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); + $accountRepos = $this->mock(AccountRepositoryInterface::class); + + $accountRepos->shouldReceive('setUser'); + $accountRepos->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'currency_id'])->andReturn('1')->atLeast()->once(); + $currencyRepos->shouldReceive('findNull')->withArgs([1])->andReturn(TransactionCurrency::find(1))->atLeast()->once(); + + $currencyRepos->shouldReceive('setUser'); $repository->shouldReceive('setUser')->once(); $journalRepos->shouldReceive('firstNull')->once()->andReturn($first); $repository->shouldReceive('getEvents')->andReturn(new Collection); @@ -370,8 +459,11 @@ class PiggyBankControllerTest extends TestCase public function testStore(): void { // mock stuff - $repository = $this->mock(PiggyBankRepositoryInterface::class); - $journalRepos = $this->mock(JournalRepositoryInterface::class); + $repository = $this->mock(PiggyBankRepositoryInterface::class); + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); + $accountRepos = $this->mock(AccountRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); $repository->shouldReceive('store')->andReturn(new PiggyBank); @@ -396,8 +488,11 @@ class PiggyBankControllerTest extends TestCase public function testUpdate(): void { // mock stuff - $repository = $this->mock(PiggyBankRepositoryInterface::class); - $journalRepos = $this->mock(JournalRepositoryInterface::class); + $repository = $this->mock(PiggyBankRepositoryInterface::class); + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); + $accountRepos = $this->mock(AccountRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); $repository->shouldReceive('update')->andReturn(new PiggyBank); diff --git a/tests/Feature/Controllers/PreferencesControllerTest.php b/tests/Feature/Controllers/PreferencesControllerTest.php index 269003b476..daac19057b 100644 --- a/tests/Feature/Controllers/PreferencesControllerTest.php +++ b/tests/Feature/Controllers/PreferencesControllerTest.php @@ -29,6 +29,7 @@ use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use FireflyIII\Repositories\User\UserRepositoryInterface; use Illuminate\Support\Collection; use Log; +use Mockery; use Tests\TestCase; /** @@ -59,6 +60,10 @@ class PreferencesControllerTest extends TestCase // mock stuff $accountRepos = $this->mock(AccountRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + + + $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'owner'])->atLeast()->once()->andReturn(true); $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); $accountRepos->shouldReceive('getAccountsByType')->withArgs([[AccountType::DEFAULT, AccountType::ASSET]])->andReturn(new Collection)->once(); diff --git a/tests/Feature/Controllers/ProfileControllerTest.php b/tests/Feature/Controllers/ProfileControllerTest.php index 1fd7826b23..d75851822b 100644 --- a/tests/Feature/Controllers/ProfileControllerTest.php +++ b/tests/Feature/Controllers/ProfileControllerTest.php @@ -57,6 +57,10 @@ class ProfileControllerTest extends TestCase */ public function testChangeEmail(): void { + $userRepos = $this->mock(UserRepositoryInterface::class); + $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'owner'])->atLeast()->once()->andReturn(true); + $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'demo'])->atLeast()->once()->andReturn(false); + $this->be($this->user()); $response = $this->get(route('profile.change-email')); $response->assertStatus(200); @@ -70,7 +74,10 @@ class ProfileControllerTest extends TestCase { // mock stuff $journalRepos = $this->mock(JournalRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); + $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'demo'])->atLeast()->once()->andReturn(false); + $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'owner'])->atLeast()->once()->andReturn(true); $this->be($this->user()); $response = $this->get(route('profile.change-password')); @@ -85,6 +92,10 @@ class ProfileControllerTest extends TestCase { // mock stuff $journalRepos = $this->mock(JournalRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'owner'])->atLeast()->once()->andReturn(true); + $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'demo'])->atLeast()->once()->andReturn(false); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); Google2FA::shouldReceive('generateSecretKey')->andReturn('secret'); Google2FA::shouldReceive('getQRCodeInline')->andReturn('long-data-url'); @@ -100,6 +111,10 @@ class ProfileControllerTest extends TestCase */ public function testConfirmEmailChangeNoToken(): void { + $userRepos = $this->mock(UserRepositoryInterface::class); + + + Preferences::shouldReceive('findByName')->withArgs(['email_change_confirm_token'])->andReturn(new Collection()); // email_change_confirm_token $response = $this->get(route('profile.confirm-email-change', ['some-fake-token'])); @@ -112,6 +127,7 @@ class ProfileControllerTest extends TestCase public function testConfirmEmailWithToken(): void { $repository = $this->mock(UserRepositoryInterface::class); + $repository->shouldReceive('unblockUser'); $preference = new Preference; $preference->data = 'existing-token'; @@ -131,6 +147,11 @@ class ProfileControllerTest extends TestCase { // mock stuff $journalRepos = $this->mock(JournalRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + + $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'owner'])->atLeast()->once()->andReturn(true); + $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'demo'])->atLeast()->once()->andReturn(false); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); $this->be($this->user()); @@ -146,6 +167,10 @@ class ProfileControllerTest extends TestCase { // mock stuff $journalRepos = $this->mock(JournalRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + + $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'demo'])->atLeast()->once()->andReturn(false); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); $this->be($this->user()); @@ -256,6 +281,11 @@ class ProfileControllerTest extends TestCase Preference::where('user_id', $this->user()->id)->where('name', 'access_token')->delete(); // mock stuff $journalRepos = $this->mock(JournalRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + + $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'owner'])->atLeast()->once()->andReturn(true); + $userRepos->shouldReceive('findNull')->atLeast()->once()->andReturn($this->user()); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); $this->be($this->user()); @@ -273,6 +303,7 @@ class ProfileControllerTest extends TestCase 'email' => 'new@example.com', ]; $repository = $this->mock(UserRepositoryInterface::class); + $repository->shouldReceive('findByEmail')->once()->andReturn(null); $repository->shouldReceive('changeEmail')->once()->andReturn(true); $repository->shouldReceive('hasRole')->withArgs([Mockery::any(), 'demo'])->once()->andReturn(false); @@ -395,6 +426,8 @@ class ProfileControllerTest extends TestCase */ public function testPostCode(): void { + $userRepos = $this->mock(UserRepositoryInterface::class); + $secret = '0123456789abcde'; $key = '123456'; diff --git a/tests/Feature/Controllers/Recurring/CreateControllerTest.php b/tests/Feature/Controllers/Recurring/CreateControllerTest.php index 0604b5b394..fd0d4aec4e 100644 --- a/tests/Feature/Controllers/Recurring/CreateControllerTest.php +++ b/tests/Feature/Controllers/Recurring/CreateControllerTest.php @@ -26,12 +26,16 @@ namespace Tests\Feature\Controllers\Recurring; use Carbon\Carbon; use FireflyIII\Models\TransactionCurrency; +use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; use FireflyIII\Repositories\Category\CategoryRepositoryInterface; use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; +use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface; use FireflyIII\Repositories\Recurring\RecurringRepositoryInterface; +use FireflyIII\Repositories\User\UserRepositoryInterface; use Illuminate\Support\Collection; use Log; +use Mockery; use Tests\TestCase; /** @@ -56,6 +60,13 @@ class CreateControllerTest extends TestCase { $recurringRepos = $this->mock(RecurringRepositoryInterface::class); $budgetRepos = $this->mock(BudgetRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); + $accountRepos = $this->mock(AccountRepositoryInterface::class); + $piggyRepos = $this->mock(PiggyBankRepositoryInterface::class); + + $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'owner'])->atLeast()->once()->andReturn(true); + $budgetRepos->shouldReceive('getActiveBudgets')->andReturn(new Collection)->once(); \Amount::shouldReceive('getDefaultCurrency')->andReturn(TransactionCurrency::find(1)); @@ -76,6 +87,11 @@ class CreateControllerTest extends TestCase $budgetRepos = $this->mock(BudgetRepositoryInterface::class); $categoryRepos = $this->mock(CategoryRepositoryInterface::class); $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); + $recurringRepos = $this->mock(RecurringRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $accountRepos = $this->mock(AccountRepositoryInterface::class); + $piggyRepos = $this->mock(PiggyBankRepositoryInterface::class); + $tomorrow = Carbon::create()->addDays(2); $recurrence = $this->user()->recurrences()->first(); $data = [ @@ -125,6 +141,13 @@ class CreateControllerTest extends TestCase $recurringRepos = $this->mock(RecurringRepositoryInterface::class); $budgetRepos = $this->mock(BudgetRepositoryInterface::class); $categoryRepos = $this->mock(CategoryRepositoryInterface::class); + $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); + $recurringRepos = $this->mock(RecurringRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $accountRepos = $this->mock(AccountRepositoryInterface::class); + $piggyRepos = $this->mock(PiggyBankRepositoryInterface::class); + + $tomorrow = Carbon::create()->addDays(2); $recurrence = $this->user()->recurrences()->first(); $data = [ @@ -176,6 +199,13 @@ class CreateControllerTest extends TestCase $recurringRepos = $this->mock(RecurringRepositoryInterface::class); $budgetRepos = $this->mock(BudgetRepositoryInterface::class); $categoryRepos = $this->mock(CategoryRepositoryInterface::class); + $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); + $recurringRepos = $this->mock(RecurringRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $accountRepos = $this->mock(AccountRepositoryInterface::class); + $piggyRepos = $this->mock(PiggyBankRepositoryInterface::class); + + $tomorrow = Carbon::create()->addDays(2); $recurrence = $this->user()->recurrences()->first(); $data = [ @@ -228,6 +258,12 @@ class CreateControllerTest extends TestCase $budgetRepos = $this->mock(BudgetRepositoryInterface::class); $categoryRepos = $this->mock(CategoryRepositoryInterface::class); $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); + $recurringRepos = $this->mock(RecurringRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $accountRepos = $this->mock(AccountRepositoryInterface::class); + $piggyRepos = $this->mock(PiggyBankRepositoryInterface::class); + + $tomorrow = Carbon::create()->addDays(2); $recurrence = $this->user()->recurrences()->first(); $data = [ diff --git a/tests/Feature/Controllers/Recurring/IndexControllerTest.php b/tests/Feature/Controllers/Recurring/IndexControllerTest.php index 60cc6b1ff5..201fa86538 100644 --- a/tests/Feature/Controllers/Recurring/IndexControllerTest.php +++ b/tests/Feature/Controllers/Recurring/IndexControllerTest.php @@ -24,9 +24,12 @@ declare(strict_types=1); namespace Tests\Feature\Controllers\Recurring; use FireflyIII\Models\Configuration; +use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; use FireflyIII\Repositories\Recurring\RecurringRepositoryInterface; +use FireflyIII\Repositories\User\UserRepositoryInterface; use Illuminate\Support\Collection; use Log; +use Mockery; use Tests\TestCase; /** @@ -50,7 +53,13 @@ class IndexControllerTest extends TestCase public function testIndex(): void { - $repository = $this->mock(RecurringRepositoryInterface::class); + $repository = $this->mock(RecurringRepositoryInterface::class); + $budgetRepos = $this->mock(BudgetRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + + $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'owner'])->atLeast()->once()->andReturn(true); + + $budgetRepos->shouldReceive('findNull')->withAnyArgs()->andReturn($this->user()->budgets()->first())->atLeast()->once(); $config = new Configuration; $config->data = 0; @@ -79,7 +88,14 @@ class IndexControllerTest extends TestCase public function testShow(): void { - $repository = $this->mock(RecurringRepositoryInterface::class); + $repository = $this->mock(RecurringRepositoryInterface::class); + $budgetRepos = $this->mock(BudgetRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + + $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'owner'])->atLeast()->once()->andReturn(true); + $budgetRepos->shouldReceive('findNull')->withAnyArgs()->andReturn($this->user()->budgets()->first())->atLeast()->once(); + + $recurrence = $this->user()->recurrences()->first(); $repository->shouldReceive('setUser'); $repository->shouldReceive('getNoteText')->andReturn('Notes'); diff --git a/tests/Feature/Controllers/ReportControllerTest.php b/tests/Feature/Controllers/ReportControllerTest.php index a6cebb5bf4..f2bb7b0151 100644 --- a/tests/Feature/Controllers/ReportControllerTest.php +++ b/tests/Feature/Controllers/ReportControllerTest.php @@ -40,8 +40,10 @@ use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; use FireflyIII\Repositories\Category\CategoryRepositoryInterface; use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use FireflyIII\Repositories\Tag\TagRepositoryInterface; +use FireflyIII\Repositories\User\UserRepositoryInterface; use Illuminate\Support\Collection; use Log; +use Mockery; use Tests\TestCase; /** @@ -69,6 +71,7 @@ class ReportControllerTest extends TestCase public function testAccountReport(): void { $budgetRepository = $this->mock(BudgetRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); $budgetRepository->shouldReceive('cleanupBudgets'); $generator = $this->mock(AcYRG::class); @@ -93,6 +96,7 @@ class ReportControllerTest extends TestCase public function testAuditReport(): void { $budgetRepository = $this->mock(BudgetRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); $budgetRepository->shouldReceive('cleanupBudgets'); $generator = $this->mock(AYRG::class); @@ -115,6 +119,7 @@ class ReportControllerTest extends TestCase public function testBudgetReport(): void { $budgetRepository = $this->mock(BudgetRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); $budgetRepository->shouldReceive('cleanupBudgets'); $generator = $this->mock(BYRG::class); @@ -137,6 +142,8 @@ class ReportControllerTest extends TestCase public function testCategoryReport(): void { $budgetRepository = $this->mock(BudgetRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $budgetRepository->shouldReceive('cleanupBudgets'); $generator = $this->mock(CYRG::class); @@ -159,6 +166,8 @@ class ReportControllerTest extends TestCase public function testDefaultReport(): void { $budgetRepository = $this->mock(BudgetRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $budgetRepository->shouldReceive('cleanupBudgets'); $generator = $this->mock(SYRG::class); @@ -180,6 +189,8 @@ class ReportControllerTest extends TestCase public function testDefaultReportBadDate(): void { $budgetRepository = $this->mock(BudgetRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $budgetRepository->shouldReceive('cleanupBudgets'); $journalRepos = $this->mock(JournalRepositoryInterface::class); @@ -197,7 +208,10 @@ class ReportControllerTest extends TestCase public function testIndex(): void { $budgetRepository = $this->mock(BudgetRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $budgetRepository->shouldReceive('cleanupBudgets'); + $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'owner'])->atLeast()->once()->andReturn(true); $helper = $this->mock(ReportHelperInterface::class); $accountRepos = $this->mock(AccountRepositoryInterface::class); @@ -218,6 +232,8 @@ class ReportControllerTest extends TestCase public function testOptions(): void { $budgetRepository = $this->mock(BudgetRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $journalRepos = $this->mock(JournalRepositoryInterface::class); $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); @@ -233,6 +249,8 @@ class ReportControllerTest extends TestCase public function testOptionsAccount(): void { $budgetRepository = $this->mock(BudgetRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $account = new Account(); $account->name = 'Something'; @@ -256,6 +274,8 @@ class ReportControllerTest extends TestCase public function testOptionsBudget(): void { $budgetRepository = $this->mock(BudgetRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $journalRepos = $this->mock(JournalRepositoryInterface::class); $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); @@ -275,6 +295,8 @@ class ReportControllerTest extends TestCase public function testOptionsCategory(): void { $budgetRepository = $this->mock(BudgetRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $journalRepos = $this->mock(JournalRepositoryInterface::class); $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); @@ -293,6 +315,8 @@ class ReportControllerTest extends TestCase public function testOptionsTag(): void { $budgetRepository = $this->mock(BudgetRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $journalRepos = $this->mock(JournalRepositoryInterface::class); $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); @@ -316,6 +340,8 @@ class ReportControllerTest extends TestCase $journalRepos = $this->mock(JournalRepositoryInterface::class); $categoryRepos = $this->mock(CategoryRepositoryInterface::class); $tagRepos = $this->mock(TagRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $accountRepos->shouldReceive('findNull')->andReturn($this->user()->accounts()->find(1))->times(3); $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); @@ -343,6 +369,8 @@ class ReportControllerTest extends TestCase $journalRepos = $this->mock(JournalRepositoryInterface::class); $categoryRepos = $this->mock(CategoryRepositoryInterface::class); $tagRepos = $this->mock(TagRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); $accountRepos->shouldReceive('findNull')->andReturn($this->user()->accounts()->find(1))->twice(); @@ -369,6 +397,8 @@ class ReportControllerTest extends TestCase $journalRepos = $this->mock(JournalRepositoryInterface::class); $categoryRepos = $this->mock(CategoryRepositoryInterface::class); $tagRepos = $this->mock(TagRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); $accountRepos->shouldReceive('findNull')->andReturn($this->user()->accounts()->find(1))->twice(); @@ -398,6 +428,7 @@ class ReportControllerTest extends TestCase $journalRepos = $this->mock(JournalRepositoryInterface::class); $categoryRepos = $this->mock(CategoryRepositoryInterface::class); $tagRepos = $this->mock(TagRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); $accountRepos->shouldReceive('findNull')->andReturn($this->user()->accounts()->find(1))->twice(); @@ -427,6 +458,8 @@ class ReportControllerTest extends TestCase $journalRepos = $this->mock(JournalRepositoryInterface::class); $categoryRepos = $this->mock(CategoryRepositoryInterface::class); $tagRepos = $this->mock(TagRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); $accountRepos->shouldReceive('findNull')->andReturn($this->user()->accounts()->find(1))->twice(); @@ -456,6 +489,8 @@ class ReportControllerTest extends TestCase $journalRepos = $this->mock(JournalRepositoryInterface::class); $categoryRepos = $this->mock(CategoryRepositoryInterface::class); $tagRepos = $this->mock(TagRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); $categoryRepos->shouldReceive('findNull')->andReturn($this->user()->categories()->find(1))->twice(); $accountRepos->shouldReceive('findNull')->andReturn($this->user()->accounts()->find(1))->twice(); @@ -484,6 +519,8 @@ class ReportControllerTest extends TestCase $journalRepos = $this->mock(JournalRepositoryInterface::class); $categoryRepos = $this->mock(CategoryRepositoryInterface::class); $tagRepos = $this->mock(TagRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); $accountRepos->shouldReceive('findNull')->andReturn($this->user()->accounts()->find(1))->twice(); @@ -510,6 +547,8 @@ class ReportControllerTest extends TestCase $journalRepos = $this->mock(JournalRepositoryInterface::class); $categoryRepos = $this->mock(CategoryRepositoryInterface::class); $tagRepos = $this->mock(TagRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); $accountRepos->shouldReceive('findNull')->andReturn($this->user()->accounts()->find(1))->twice(); @@ -536,6 +575,8 @@ class ReportControllerTest extends TestCase $journalRepos = $this->mock(JournalRepositoryInterface::class); $categoryRepos = $this->mock(CategoryRepositoryInterface::class); $tagRepos = $this->mock(TagRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); $accountRepos->shouldReceive('findNull')->andReturn($this->user()->accounts()->find(1))->twice(); @@ -564,6 +605,8 @@ class ReportControllerTest extends TestCase $journalRepos = $this->mock(JournalRepositoryInterface::class); $categoryRepos = $this->mock(CategoryRepositoryInterface::class); $tagRepos = $this->mock(TagRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + /** @var Tag $tag */ $tag = $this->user()->tags()->find(1); $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); @@ -594,6 +637,8 @@ class ReportControllerTest extends TestCase $journalRepos = $this->mock(JournalRepositoryInterface::class); $categoryRepos = $this->mock(CategoryRepositoryInterface::class); $tagRepos = $this->mock(TagRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); $data = [ @@ -620,7 +665,9 @@ class ReportControllerTest extends TestCase $categoryRepos = $this->mock(CategoryRepositoryInterface::class); $tagRepos = $this->mock(TagRepositoryInterface::class); $generator = $this->mock(TYRG::class); - $tag = $this->user()->tags()->find(1); + $userRepos = $this->mock(UserRepositoryInterface::class); + + $tag = $this->user()->tags()->find(1); $tagRepos->shouldReceive('setUser'); $tagRepos->shouldReceive('get')->andReturn(new Collection([$tag])); diff --git a/tests/Feature/Controllers/Rule/CreateControllerTest.php b/tests/Feature/Controllers/Rule/CreateControllerTest.php index 231068962b..3ff9635131 100644 --- a/tests/Feature/Controllers/Rule/CreateControllerTest.php +++ b/tests/Feature/Controllers/Rule/CreateControllerTest.php @@ -29,7 +29,10 @@ use FireflyIII\Models\TransactionJournal; use FireflyIII\Repositories\Bill\BillRepositoryInterface; use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use FireflyIII\Repositories\Rule\RuleRepositoryInterface; +use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface; +use FireflyIII\Repositories\User\UserRepositoryInterface; use Log; +use Mockery; use Tests\TestCase; /** @@ -53,10 +56,17 @@ class CreateControllerTest extends TestCase public function testCreate(): void { // mock stuff - $journalRepos = $this->mock(JournalRepositoryInterface::class); - $billRepos = $this->mock(BillRepositoryInterface::class); + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $billRepos = $this->mock(BillRepositoryInterface::class); + $ruleRepos = $this->mock(RuleRepositoryInterface::class); + $ruleGroupRepos = $this->mock(RuleGroupRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); + $ruleGroupRepos->shouldReceive('count')->atLeast()->once()->andReturn(1); + $ruleRepos->shouldReceive('count')->atLeast()->once()->andReturn(1); + $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'owner'])->atLeast()->once()->andReturn(true); + $this->be($this->user()); $response = $this->get(route('rules.create', [1])); $response->assertStatus(200); @@ -72,6 +82,14 @@ class CreateControllerTest extends TestCase // mock stuff $journalRepos = $this->mock(JournalRepositoryInterface::class); $billRepos = $this->mock(BillRepositoryInterface::class); + $ruleRepos = $this->mock(RuleRepositoryInterface::class); + $ruleGroupRepos = $this->mock(RuleGroupRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + + $ruleGroupRepos->shouldReceive('count')->atLeast()->once()->andReturn(1); + $ruleRepos->shouldReceive('count')->atLeast()->once()->andReturn(1); + $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'owner'])->atLeast()->once()->andReturn(true); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); $this->be($this->user()); @@ -97,6 +115,14 @@ class CreateControllerTest extends TestCase // mock stuff $journalRepos = $this->mock(JournalRepositoryInterface::class); + $ruleRepos = $this->mock(RuleRepositoryInterface::class); + $ruleGroupRepos = $this->mock(RuleGroupRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + + $ruleGroupRepos->shouldReceive('count')->atLeast()->once()->andReturn(1); + $ruleRepos->shouldReceive('count')->atLeast()->once()->andReturn(1); + $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'owner'])->atLeast()->once()->andReturn(true); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); $this->be($this->user()); @@ -114,6 +140,9 @@ class CreateControllerTest extends TestCase // mock stuff $repository = $this->mock(RuleRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); + $ruleGroupRepos = $this->mock(RuleGroupRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); $repository->shouldReceive('store')->andReturn(new Rule); diff --git a/tests/Feature/Controllers/Rule/DeleteControllerTest.php b/tests/Feature/Controllers/Rule/DeleteControllerTest.php index aa43fe6ede..5eb8e146cf 100644 --- a/tests/Feature/Controllers/Rule/DeleteControllerTest.php +++ b/tests/Feature/Controllers/Rule/DeleteControllerTest.php @@ -27,9 +27,15 @@ namespace tests\Feature\Controllers\Rule; use FireflyIII\Models\TransactionJournal; use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use FireflyIII\Repositories\Rule\RuleRepositoryInterface; +use FireflyIII\Repositories\User\UserRepositoryInterface; use Log; +use Mockery; use Tests\TestCase; +/** + * + * Class DeleteControllerTest + */ class DeleteControllerTest extends TestCase { /** @@ -49,6 +55,11 @@ class DeleteControllerTest extends TestCase { // mock stuff $journalRepos = $this->mock(JournalRepositoryInterface::class); + $ruleRepos = $this->mock(RuleRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + + $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'owner'])->atLeast()->once()->andReturn(true); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); $this->be($this->user()); diff --git a/tests/Feature/Controllers/Rule/EditControllerTest.php b/tests/Feature/Controllers/Rule/EditControllerTest.php index aeda652d6d..2adadf80af 100644 --- a/tests/Feature/Controllers/Rule/EditControllerTest.php +++ b/tests/Feature/Controllers/Rule/EditControllerTest.php @@ -29,8 +29,10 @@ use FireflyIII\Models\TransactionJournal; use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use FireflyIII\Repositories\Rule\RuleRepositoryInterface; use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface; +use FireflyIII\Repositories\User\UserRepositoryInterface; use Illuminate\Support\Collection; use Log; +use Mockery; use Tests\TestCase; /** @@ -56,6 +58,10 @@ class EditControllerTest extends TestCase $groupRepos = $this->mock(RuleGroupRepositoryInterface::class); $repository = $this->mock(RuleRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + + $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'owner'])->atLeast()->once()->andReturn(true); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); $repository->shouldReceive('getPrimaryTrigger')->andReturn(new Rule); $groupRepos->shouldReceive('get')->andReturn(new Collection); @@ -85,6 +91,9 @@ class EditControllerTest extends TestCase $groupRepos = $this->mock(RuleGroupRepositoryInterface::class); $repository = $this->mock(RuleRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'owner'])->atLeast()->once()->andReturn(true); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); $repository->shouldReceive('getPrimaryTrigger')->andReturn(new Rule); $groupRepos->shouldReceive('get')->andReturn(new Collection); @@ -104,6 +113,8 @@ class EditControllerTest extends TestCase // mock stuff $repository = $this->mock(RuleRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $rule = Rule::find(1); $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); $repository->shouldReceive('update'); diff --git a/tests/Feature/Controllers/Rule/IndexControllerTest.php b/tests/Feature/Controllers/Rule/IndexControllerTest.php index 874845a788..412bc4c31f 100644 --- a/tests/Feature/Controllers/Rule/IndexControllerTest.php +++ b/tests/Feature/Controllers/Rule/IndexControllerTest.php @@ -56,11 +56,14 @@ class IndexControllerTest extends TestCase public function testDown(): void { // mock stuff - $repository = $this->mock(RuleRepositoryInterface::class); - $journalRepos = $this->mock(JournalRepositoryInterface::class); + $repository = $this->mock(RuleRepositoryInterface::class); + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $ruleGroupRepos = $this->mock(RuleGroupRepositoryInterface::class); $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); $repository->shouldReceive('moveDown'); + + $this->be($this->user()); $response = $this->get(route('rules.down', [1])); $response->assertStatus(302); @@ -97,8 +100,10 @@ class IndexControllerTest extends TestCase public function testReorderRuleActions(): void { // mock stuff - $repository = $this->mock(RuleRepositoryInterface::class); - $journalRepos = $this->mock(JournalRepositoryInterface::class); + $repository = $this->mock(RuleRepositoryInterface::class); + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $ruleGroupRepos = $this->mock(RuleGroupRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); $data = ['actions' => [1, 2, 3]]; @@ -115,8 +120,9 @@ class IndexControllerTest extends TestCase public function testReorderRuleTriggers(): void { // mock stuff - $repository = $this->mock(RuleRepositoryInterface::class); - $journalRepos = $this->mock(JournalRepositoryInterface::class); + $repository = $this->mock(RuleRepositoryInterface::class); + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $ruleGroupRepos = $this->mock(RuleGroupRepositoryInterface::class); $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); $data = ['triggers' => [1, 2, 3]]; @@ -134,8 +140,10 @@ class IndexControllerTest extends TestCase public function testUp(): void { // mock stuff - $repository = $this->mock(RuleRepositoryInterface::class); - $journalRepos = $this->mock(JournalRepositoryInterface::class); + $repository = $this->mock(RuleRepositoryInterface::class); + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $ruleGroupRepos = $this->mock(RuleGroupRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); $repository->shouldReceive('moveUp'); diff --git a/tests/Feature/Controllers/Rule/SelectControllerTest.php b/tests/Feature/Controllers/Rule/SelectControllerTest.php index 7ffbd07e21..69eee37d30 100644 --- a/tests/Feature/Controllers/Rule/SelectControllerTest.php +++ b/tests/Feature/Controllers/Rule/SelectControllerTest.php @@ -31,9 +31,11 @@ use FireflyIII\Models\TransactionJournal; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use FireflyIII\Repositories\Rule\RuleRepositoryInterface; +use FireflyIII\Repositories\User\UserRepositoryInterface; use FireflyIII\TransactionRules\TransactionMatcher; use Illuminate\Support\Collection; use Log; +use Mockery; use Queue; use Tests\TestCase; @@ -60,6 +62,8 @@ class SelectControllerTest extends TestCase $account = $this->user()->accounts()->find(1); $accountRepos = $this->mock(AccountRepositoryInterface::class); $repository = $this->mock(RuleRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $this->session(['first' => new Carbon('2010-01-01')]); $accountRepos->shouldReceive('getAccountsById')->andReturn(new Collection([$account])); Queue::fake(); @@ -88,6 +92,9 @@ class SelectControllerTest extends TestCase public function testSelectTransactions(): void { $accountRepos = $this->mock(AccountRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + + $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'owner'])->atLeast()->once()->andReturn(true); $accountRepos->shouldReceive('getAccountsByType')->andReturn(new Collection); $this->be($this->user()); @@ -113,6 +120,9 @@ class SelectControllerTest extends TestCase // mock stuff $matcher = $this->mock(TransactionMatcher::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $accountRepos = $this->mock(AccountRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); $matcher->shouldReceive('setStrict')->once()->withArgs([false]); @@ -132,8 +142,8 @@ class SelectControllerTest extends TestCase */ public function testTestTriggersByRule(): void { - $matcher = $this->mock(TransactionMatcher::class); + $accountRepos = $this->mock(AccountRepositoryInterface::class); $matcher->shouldReceive('setLimit')->withArgs([10])->andReturnSelf()->once(); $matcher->shouldReceive('setRange')->withArgs([200])->andReturnSelf()->once(); @@ -154,6 +164,9 @@ class SelectControllerTest extends TestCase public function testTestTriggersError(): void { $journalRepos = $this->mock(JournalRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $accountRepos = $this->mock(AccountRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); $this->be($this->user()); @@ -179,6 +192,9 @@ class SelectControllerTest extends TestCase // mock stuff $matcher = $this->mock(TransactionMatcher::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $accountRepos = $this->mock(AccountRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); $matcher->shouldReceive('setStrict')->once()->withArgs([false]); diff --git a/tests/Feature/Controllers/RuleGroupControllerTest.php b/tests/Feature/Controllers/RuleGroupControllerTest.php index f581c63b91..e2dcfe46d7 100644 --- a/tests/Feature/Controllers/RuleGroupControllerTest.php +++ b/tests/Feature/Controllers/RuleGroupControllerTest.php @@ -29,8 +29,10 @@ use FireflyIII\Models\TransactionJournal; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface; +use FireflyIII\Repositories\User\UserRepositoryInterface; use Illuminate\Support\Collection; use Log; +use Mockery; use Tests\TestCase; /** @@ -60,7 +62,9 @@ class RuleGroupControllerTest extends TestCase { // mock stuff $journalRepos = $this->mock(JournalRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); + $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'owner'])->atLeast()->once()->andReturn(true); $this->be($this->user()); $response = $this->get(route('rule-groups.create')); @@ -76,8 +80,10 @@ class RuleGroupControllerTest extends TestCase // mock stuff $journalRepos = $this->mock(JournalRepositoryInterface::class); $repository = $this->mock(RuleGroupRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); $repository->shouldReceive('get')->andReturn(new Collection); + $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'owner'])->atLeast()->once()->andReturn(true); $this->be($this->user()); $response = $this->get(route('rule-groups.delete', [1])); @@ -93,9 +99,11 @@ class RuleGroupControllerTest extends TestCase // mock stuff $journalRepos = $this->mock(JournalRepositoryInterface::class); $repository = $this->mock(RuleGroupRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); $repository->shouldReceive('destroy'); + $this->session(['rule-groups.delete.uri' => 'http://localhost']); $this->be($this->user()); $response = $this->post(route('rule-groups.destroy', [1])); @@ -112,6 +120,7 @@ class RuleGroupControllerTest extends TestCase // mock stuff $journalRepos = $this->mock(JournalRepositoryInterface::class); $repository = $this->mock(RuleGroupRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); $repository->shouldReceive('moveDown'); @@ -128,7 +137,9 @@ class RuleGroupControllerTest extends TestCase { // mock stuff $journalRepos = $this->mock(JournalRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); + $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'owner'])->atLeast()->once()->andReturn(true); /** @var RuleGroup $ruleGroup */ $ruleGroup = $this->user()->ruleGroups()->first(); @@ -150,6 +161,7 @@ class RuleGroupControllerTest extends TestCase // mock stuff $journalRepos = $this->mock(JournalRepositoryInterface::class); $accountRepos = $this->mock(AccountRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); $journalRepos->shouldReceive('firstNull')->andReturn(new TransactionJournal); $accountRepos->shouldReceive('getAccountsById')->andReturn(new Collection); @@ -177,8 +189,10 @@ class RuleGroupControllerTest extends TestCase // mock stuff $journalRepos = $this->mock(JournalRepositoryInterface::class); $accountRepos = $this->mock(AccountRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); $accountRepos->shouldReceive('getAccountsByType')->andReturn(new Collection); + $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'owner'])->atLeast()->once()->andReturn(true); $this->be($this->user()); $response = $this->get(route('rule-groups.select-transactions', [1])); @@ -195,6 +209,7 @@ class RuleGroupControllerTest extends TestCase // mock stuff $journalRepos = $this->mock(JournalRepositoryInterface::class); $repository = $this->mock(RuleGroupRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); $this->session(['rule-groups.create.uri' => 'http://localhost']); @@ -219,6 +234,8 @@ class RuleGroupControllerTest extends TestCase // mock stuff $journalRepos = $this->mock(JournalRepositoryInterface::class); $repository = $this->mock(RuleGroupRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); $repository->shouldReceive('moveUp'); @@ -237,6 +254,7 @@ class RuleGroupControllerTest extends TestCase // mock stuff $journalRepos = $this->mock(JournalRepositoryInterface::class); $repository = $this->mock(RuleGroupRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); $data = [ diff --git a/tests/Feature/Controllers/SearchControllerTest.php b/tests/Feature/Controllers/SearchControllerTest.php index 7a8342029e..a8444f388b 100644 --- a/tests/Feature/Controllers/SearchControllerTest.php +++ b/tests/Feature/Controllers/SearchControllerTest.php @@ -22,9 +22,11 @@ declare(strict_types=1); namespace Tests\Feature\Controllers; +use FireflyIII\Repositories\User\UserRepositoryInterface; use FireflyIII\Support\Search\SearchInterface; use Illuminate\Support\Collection; use Log; +use Mockery; use Tests\TestCase; /** @@ -53,6 +55,10 @@ class SearchControllerTest extends TestCase public function testIndex(): void { $search = $this->mock(SearchInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + + $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'owner'])->atLeast()->once()->andReturn(true); + $search->shouldReceive('parseQuery')->once(); $search->shouldReceive('getWordsAsString')->once()->andReturn('test'); $this->be($this->user()); @@ -68,6 +74,8 @@ class SearchControllerTest extends TestCase public function testSearch(): void { $search = $this->mock(SearchInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $search->shouldReceive('parseQuery')->once(); $search->shouldReceive('setLimit')->withArgs([50])->once(); $search->shouldReceive('searchTransactions')->once()->andReturn(new Collection); diff --git a/tests/Feature/Controllers/TagControllerTest.php b/tests/Feature/Controllers/TagControllerTest.php index 30ea3b3f45..f9a0d3848a 100644 --- a/tests/Feature/Controllers/TagControllerTest.php +++ b/tests/Feature/Controllers/TagControllerTest.php @@ -29,8 +29,10 @@ use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionType; use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use FireflyIII\Repositories\Tag\TagRepositoryInterface; +use FireflyIII\Repositories\User\UserRepositoryInterface; use Illuminate\Pagination\LengthAwarePaginator; use Log; +use Mockery; use Tests\TestCase; /** @@ -60,7 +62,9 @@ class TagControllerTest extends TestCase // mock stuff $tagRepos = $this->mock(TagRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); + $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'owner'])->atLeast()->once()->andReturn(true); $this->be($this->user()); $response = $this->get(route('tags.create')); @@ -76,7 +80,10 @@ class TagControllerTest extends TestCase // mock stuff $tagRepos = $this->mock(TagRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); + $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'owner'])->atLeast()->once()->andReturn(true); $this->be($this->user()); $response = $this->get(route('tags.delete', [1])); @@ -92,6 +99,8 @@ class TagControllerTest extends TestCase // mock stuff $repository = $this->mock(TagRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); $repository->shouldReceive('destroy'); @@ -109,7 +118,9 @@ class TagControllerTest extends TestCase // mock stuff $tagRepos = $this->mock(TagRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); + $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'owner'])->atLeast()->once()->andReturn(true); $this->be($this->user()); $response = $this->get(route('tags.edit', [1])); @@ -126,6 +137,9 @@ class TagControllerTest extends TestCase // mock stuff $repository = $this->mock(TagRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'owner'])->atLeast()->once()->andReturn(true); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); $repository->shouldReceive('count')->andReturn(0); $repository->shouldReceive('tagCloud')->andReturn([]); @@ -155,6 +169,9 @@ class TagControllerTest extends TestCase $repository = $this->mock(TagRepositoryInterface::class); $collector = $this->mock(TransactionCollectorInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'owner'])->atLeast()->once()->andReturn(true); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); $repository->shouldReceive('spentInPeriod')->andReturn('-1')->times(1); $repository->shouldReceive('firstUseDate')->andReturn(new Carbon)->once(); @@ -188,6 +205,9 @@ class TagControllerTest extends TestCase $repository = $this->mock(TagRepositoryInterface::class); $collector = $this->mock(TransactionCollectorInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'owner'])->atLeast()->once()->andReturn(true); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); $repository->shouldReceive('firstUseDate')->andReturn(new Carbon)->once(); @@ -224,6 +244,9 @@ class TagControllerTest extends TestCase $repository = $this->mock(TagRepositoryInterface::class); $collector = $this->mock(TransactionCollectorInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + + $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'owner'])->atLeast()->once()->andReturn(true); $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); $repository->shouldReceive('spentInPeriod')->andReturn('-1')->times(1); $repository->shouldReceive('firstUseDate')->andReturn(new Carbon)->once(); @@ -263,6 +286,8 @@ class TagControllerTest extends TestCase // mock stuff $repository = $this->mock(TagRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); $repository->shouldReceive('findNull')->andReturn(null); $repository->shouldReceive('store')->andReturn(new Tag); @@ -289,6 +314,7 @@ class TagControllerTest extends TestCase // mock stuff $repository = $this->mock(TagRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); $this->session(['tags.edit.uri' => 'http://localhost']); diff --git a/tests/Feature/Controllers/Transaction/BulkControllerTest.php b/tests/Feature/Controllers/Transaction/BulkControllerTest.php index a3daf6d36f..744c2fece2 100644 --- a/tests/Feature/Controllers/Transaction/BulkControllerTest.php +++ b/tests/Feature/Controllers/Transaction/BulkControllerTest.php @@ -25,6 +25,7 @@ namespace Tests\Feature\Controllers\Transaction; use FireflyIII\Models\TransactionJournal; use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; use FireflyIII\Repositories\Journal\JournalRepositoryInterface; +use FireflyIII\Repositories\User\UserRepositoryInterface; use Illuminate\Support\Collection; use Log; use Mockery; @@ -58,6 +59,9 @@ class BulkControllerTest extends TestCase // mock stuff: $journalRepos = $this->mock(JournalRepositoryInterface::class); $budgetRepos = $this->mock(BudgetRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + + $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'owner'])->atLeast()->once()->andReturn(true); $budgetRepos->shouldReceive('getActiveBudgets')->andReturn(new Collection); $journalRepos->shouldReceive('getJournalSourceAccounts')->andReturn(new Collection); $journalRepos->shouldReceive('getJournalDestinationAccounts')->andReturn(new Collection); @@ -83,6 +87,9 @@ class BulkControllerTest extends TestCase // mock stuff: $journalRepos = $this->mock(JournalRepositoryInterface::class); $budgetRepos = $this->mock(BudgetRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + + $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'owner'])->atLeast()->once()->andReturn(true); $budgetRepos->shouldReceive('getActiveBudgets')->andReturn(new Collection); $journalRepos->shouldReceive('firstNull')->andReturn(new TransactionJournal); $journalRepos->shouldReceive('getJournalSourceAccounts') @@ -119,6 +126,9 @@ class BulkControllerTest extends TestCase // mock stuff: $journalRepos = $this->mock(JournalRepositoryInterface::class); $budgetRepos = $this->mock(BudgetRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + + $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'owner'])->atLeast()->once()->andReturn(true); $budgetRepos->shouldReceive('getActiveBudgets')->andReturn(new Collection); $journalRepos->shouldReceive('getJournalSourceAccounts')->andReturn(new Collection); $journalRepos->shouldReceive('getJournalDestinationAccounts')->andReturn(new Collection); @@ -154,6 +164,8 @@ class BulkControllerTest extends TestCase ]; $repository = $this->mock(JournalRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $repository->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); $repository->shouldReceive('findNull')->times(4)->andReturn(new TransactionJournal); @@ -192,6 +204,8 @@ class BulkControllerTest extends TestCase ]; $repository = $this->mock(JournalRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $repository->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); $repository->shouldReceive('findNull')->times(4)->andReturn(new TransactionJournal, null); diff --git a/tests/Feature/Controllers/Transaction/ConvertControllerTest.php b/tests/Feature/Controllers/Transaction/ConvertControllerTest.php index 7ff1358dd7..58b107a9e9 100644 --- a/tests/Feature/Controllers/Transaction/ConvertControllerTest.php +++ b/tests/Feature/Controllers/Transaction/ConvertControllerTest.php @@ -30,9 +30,11 @@ use FireflyIII\Models\TransactionJournal; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; use FireflyIII\Repositories\Journal\JournalRepositoryInterface; +use FireflyIII\Repositories\User\UserRepositoryInterface; use Illuminate\Support\Collection; use Illuminate\Support\MessageBag; use Log; +use Mockery; use Tests\TestCase; /** @@ -61,6 +63,8 @@ class ConvertControllerTest extends TestCase { // mock stuff: $journalRepos = $this->mock(JournalRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'owner'])->atLeast()->once()->andReturn(true); // find deposit: $deposit = $this->getRandomDeposit(); @@ -93,6 +97,8 @@ class ConvertControllerTest extends TestCase { // mock stuff: $journalRepos = $this->mock(JournalRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'owner'])->atLeast()->once()->andReturn(true); // find deposit: $deposit = $this->getRandomDeposit(); @@ -124,6 +130,8 @@ class ConvertControllerTest extends TestCase // find deposit: $deposit = $this->getRandomDeposit(); $journalRepos = $this->mock(JournalRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->andReturn($deposit); $journalRepos->shouldReceive('getJournalTotal')->andReturn('1')->once(); @@ -141,6 +149,8 @@ class ConvertControllerTest extends TestCase { // mock stuff: $journalRepos = $this->mock(JournalRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->andReturn(new TransactionJournal); $journalRepos->shouldReceive('getJournalTotal')->andReturn('1')->once(); @@ -173,6 +183,9 @@ class ConvertControllerTest extends TestCase // find transfer: $transfer = $this->getRandomTransfer(); $journalRepos = $this->mock(JournalRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'owner'])->atLeast()->once()->andReturn(true); + $journalRepos->shouldReceive('firstNull')->andReturn($transfer); $journalRepos->shouldReceive('getJournalTotal')->andReturn('1')->once(); $journalRepos->shouldReceive('getJournalSourceAccounts')->andReturn(new Collection)->once(); @@ -193,6 +206,9 @@ class ConvertControllerTest extends TestCase $transfer = $this->getRandomTransfer(); // mock stuff: $journalRepos = $this->mock(JournalRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'owner'])->atLeast()->once()->andReturn(true); + $journalRepos->shouldReceive('firstNull')->andReturn(new TransactionJournal); $journalRepos->shouldReceive('getJournalTotal')->andReturn('1')->once(); $journalRepos->shouldReceive('getJournalSourceAccounts')->andReturn(new Collection)->once(); @@ -219,6 +235,9 @@ class ConvertControllerTest extends TestCase $withdrawal = $this->getRandomWithdrawal(); // mock stuff: $journalRepos = $this->mock(JournalRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'owner'])->atLeast()->once()->andReturn(true); + $journalRepos->shouldReceive('firstNull')->andReturn(new TransactionJournal); $journalRepos->shouldReceive('getJournalTotal')->andReturn('1')->once(); $journalRepos->shouldReceive('getJournalSourceAccounts')->andReturn(new Collection)->once(); @@ -244,6 +263,9 @@ class ConvertControllerTest extends TestCase $withdrawal = $this->getRandomWithdrawal(); // mock stuff: $journalRepos = $this->mock(JournalRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'owner'])->atLeast()->once()->andReturn(true); + $journalRepos->shouldReceive('firstNull')->andReturn(new TransactionJournal); $journalRepos->shouldReceive('getJournalTotal')->andReturn('1')->once(); $journalRepos->shouldReceive('getJournalSourceAccounts')->andReturn(new Collection)->once(); @@ -272,6 +294,7 @@ class ConvertControllerTest extends TestCase // mock stuff $repository = $this->mock(JournalRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); $repository->shouldReceive('convert')->andReturn(new MessageBag); $repository->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); @@ -293,6 +316,8 @@ class ConvertControllerTest extends TestCase // mock stuff $repository = $this->mock(JournalRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $repository->shouldReceive('convert')->andReturn(new MessageBag); $repository->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); @@ -315,6 +340,8 @@ class ConvertControllerTest extends TestCase { // mock stuff $repository = $this->mock(JournalRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $repository->shouldReceive('convert')->andReturn(new MessageBag); $repository->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); @@ -333,6 +360,8 @@ class ConvertControllerTest extends TestCase public function testPostIndexErrored(): void { $accountRepos = $this->mock(AccountRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $account = $this->user()->accounts()->first(); // find withdrawal: @@ -365,6 +394,8 @@ class ConvertControllerTest extends TestCase // mock stuff $accountRepos = $this->mock(AccountRepositoryInterface::class); $repository = $this->mock(JournalRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $repository->shouldReceive('convert')->andReturn(new MessageBag); $repository->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); @@ -386,6 +417,8 @@ class ConvertControllerTest extends TestCase // mock stuff $accountRepos = $this->mock(AccountRepositoryInterface::class); $repository = $this->mock(JournalRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $repository->shouldReceive('convert')->andReturn(new MessageBag); $repository->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); @@ -414,6 +447,8 @@ class ConvertControllerTest extends TestCase // mock stuff $repository = $this->mock(JournalRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $repository->shouldReceive('convert')->andReturn(new MessageBag); $repository->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); @@ -438,6 +473,8 @@ class ConvertControllerTest extends TestCase { // mock stuff $repository = $this->mock(JournalRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $repository->shouldReceive('convert')->andReturn(new MessageBag); $repository->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); @@ -456,6 +493,8 @@ class ConvertControllerTest extends TestCase { // mock stuff $repository = $this->mock(JournalRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $repository->shouldReceive('convert')->andReturn(new MessageBag); $repository->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); @@ -474,6 +513,8 @@ class ConvertControllerTest extends TestCase { // mock stuff $repository = $this->mock(JournalRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $repository->shouldReceive('convert')->andReturn(new MessageBag); $repository->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); diff --git a/tests/Feature/Controllers/Transaction/LinkControllerTest.php b/tests/Feature/Controllers/Transaction/LinkControllerTest.php index 0a8d35e2db..3706e0ff3d 100644 --- a/tests/Feature/Controllers/Transaction/LinkControllerTest.php +++ b/tests/Feature/Controllers/Transaction/LinkControllerTest.php @@ -27,7 +27,9 @@ use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournalLink; use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use FireflyIII\Repositories\LinkType\LinkTypeRepositoryInterface; +use FireflyIII\Repositories\User\UserRepositoryInterface; use Log; +use Mockery; use Tests\TestCase; /** @@ -53,6 +55,10 @@ class LinkControllerTest extends TestCase { $journalRepos = $this->mock(JournalRepositoryInterface::class); $linkRepos = $this->mock(LinkTypeRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'owner'])->atLeast()->once()->andReturn(true); + + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); $this->be($this->user()); @@ -67,6 +73,8 @@ class LinkControllerTest extends TestCase { $journalRepos = $this->mock(JournalRepositoryInterface::class); $repository = $this->mock(LinkTypeRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $repository->shouldReceive('destroyLink'); $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); @@ -89,6 +97,8 @@ class LinkControllerTest extends TestCase { $repository = $this->mock(LinkTypeRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $data = [ 'link_other' => 8, 'link_type' => '1_inward', @@ -115,6 +125,8 @@ class LinkControllerTest extends TestCase { $repository = $this->mock(LinkTypeRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $data = [ 'link_other' => 8, 'link_type' => '1_inward', @@ -144,6 +156,9 @@ class LinkControllerTest extends TestCase ]; $journalRepos = $this->mock(JournalRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $repository = $this->mock(LinkTypeRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->andReturn(null); $journalRepos->shouldReceive('findNull')->andReturn(null); @@ -162,6 +177,8 @@ class LinkControllerTest extends TestCase { $repository = $this->mock(LinkTypeRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $data = [ 'link_other' => 8, 'link_type' => '1_inward', @@ -188,6 +205,8 @@ class LinkControllerTest extends TestCase { $journalRepos = $this->mock(JournalRepositoryInterface::class); $repository = $this->mock(LinkTypeRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); $repository->shouldReceive('switchLink')->andReturn(false); $this->be($this->user()); diff --git a/tests/Feature/Controllers/Transaction/MassControllerTest.php b/tests/Feature/Controllers/Transaction/MassControllerTest.php index ca4c5ecc8b..28cbe57b9b 100644 --- a/tests/Feature/Controllers/Transaction/MassControllerTest.php +++ b/tests/Feature/Controllers/Transaction/MassControllerTest.php @@ -27,8 +27,10 @@ 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 Tests\TestCase; /** @@ -57,6 +59,9 @@ class MassControllerTest extends TestCase public function testDelete(): void { $journalRepos = $this->mock(JournalRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'owner'])->atLeast()->once()->andReturn(true); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); $journalRepos->shouldReceive('getJournalSourceAccounts')->andReturn(new Collection)->once(); $journalRepos->shouldReceive('getJournalDestinationAccounts')->andReturn(new Collection)->once(); @@ -82,6 +87,8 @@ class MassControllerTest extends TestCase // mock deletion: $repository = $this->mock(JournalRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $repository->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); $repository->shouldReceive('findNull')->andReturnValues([$deposits[0], $deposits[1]])->times(2); $repository->shouldReceive('destroy')->times(2); @@ -103,6 +110,8 @@ class MassControllerTest extends TestCase public function testEdit(): void { $journalRepos = $this->mock(JournalRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'owner'])->atLeast()->once()->andReturn(true); $transfers = TransactionJournal::where('transaction_type_id', 3)->where('user_id', $this->user()->id)->take(2)->get(); $transfersArray = $transfers->pluck('id')->toArray(); @@ -140,6 +149,9 @@ class MassControllerTest extends TestCase public function testEditMultiple(): void { $budgetRepos = $this->mock(BudgetRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'owner'])->atLeast()->once()->andReturn(true); + $budgetRepos->shouldReceive('getBudgets')->andReturn(new Collection); $journalRepos = $this->mock(JournalRepositoryInterface::class); @@ -188,6 +200,8 @@ class MassControllerTest extends TestCase // mock stuff $repository = $this->mock(JournalRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $repository->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); $repository->shouldReceive('update')->once(); $repository->shouldReceive('findNull')->once()->andReturn($deposit); diff --git a/tests/Feature/Controllers/Transaction/SingleControllerTest.php b/tests/Feature/Controllers/Transaction/SingleControllerTest.php index 8ac8ff5c47..5381a619fd 100644 --- a/tests/Feature/Controllers/Transaction/SingleControllerTest.php +++ b/tests/Feature/Controllers/Transaction/SingleControllerTest.php @@ -38,10 +38,12 @@ use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use FireflyIII\Repositories\LinkType\LinkTypeRepositoryInterface; use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface; +use FireflyIII\Repositories\User\UserRepositoryInterface; use Illuminate\Database\Query\JoinClause; use Illuminate\Support\Collection; use Illuminate\Support\MessageBag; use Log; +use Mockery; use Steam; use Tests\TestCase; @@ -75,6 +77,8 @@ class SingleControllerTest extends TestCase $attRepos = $this->mock(AttachmentHelperInterface::class); $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); $account = $this->user()->accounts()->first(); @@ -107,6 +111,9 @@ class SingleControllerTest extends TestCase $attRepos = $this->mock(AttachmentHelperInterface::class); $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'owner'])->atLeast()->once()->andReturn(true); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); Steam::shouldReceive('phpBytes')->andReturn(2048); @@ -133,6 +140,8 @@ class SingleControllerTest extends TestCase $attRepos = $this->mock(AttachmentHelperInterface::class); $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'owner'])->atLeast()->once()->andReturn(true); $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); Steam::shouldReceive('phpBytes')->andReturn(2048); @@ -158,6 +167,8 @@ class SingleControllerTest extends TestCase $attRepos = $this->mock(AttachmentHelperInterface::class); $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'owner'])->atLeast()->once()->andReturn(true); $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); Steam::shouldReceive('phpBytes')->andReturn(2048); @@ -182,6 +193,8 @@ class SingleControllerTest extends TestCase $attRepos = $this->mock(AttachmentHelperInterface::class); $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'owner'])->atLeast()->once()->andReturn(true); $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); $this->be($this->user()); @@ -203,6 +216,8 @@ class SingleControllerTest extends TestCase $attRepos = $this->mock(AttachmentHelperInterface::class); $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->andReturn(new TransactionJournal); $journalRepos->shouldReceive('destroy')->once(); @@ -228,6 +243,8 @@ class SingleControllerTest extends TestCase $attRepos = $this->mock(AttachmentHelperInterface::class); $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'owner'])->atLeast()->once()->andReturn(true); $journalRepos->shouldReceive('setUser')->once(); $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); $account = $this->user()->accounts()->first(); @@ -273,6 +290,8 @@ class SingleControllerTest extends TestCase $attRepos = $this->mock(AttachmentHelperInterface::class); $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'owner'])->atLeast()->once()->andReturn(true); $journalRepos->shouldReceive('firstNull')->andReturn(new TransactionJournal); $journalRepos->shouldReceive('setUser')->once(); @@ -320,6 +339,8 @@ class SingleControllerTest extends TestCase $attRepos = $this->mock(AttachmentHelperInterface::class); $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'owner'])->atLeast()->once()->andReturn(true); $journalRepos->shouldReceive('firstNull')->andReturn(new TransactionJournal); $journalRepos->shouldReceive('setUser')->once(); @@ -367,6 +388,8 @@ class SingleControllerTest extends TestCase $attRepos = $this->mock(AttachmentHelperInterface::class); $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $journalRepos->shouldReceive('getTransactionType')->andReturn('Reconciliation')->once(); $journalRepos->shouldReceive('firstNull')->andReturn(new TransactionJournal); @@ -393,6 +416,8 @@ class SingleControllerTest extends TestCase $attRepos = $this->mock(AttachmentHelperInterface::class); $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->andReturn(new TransactionJournal); $journalRepos->shouldReceive('setUser')->once(); @@ -423,6 +448,8 @@ class SingleControllerTest extends TestCase $attRepos = $this->mock(AttachmentHelperInterface::class); $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->andReturn(new TransactionJournal); $this->be($this->user()); @@ -443,6 +470,8 @@ class SingleControllerTest extends TestCase $attRepos = $this->mock(AttachmentHelperInterface::class); $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'owner'])->atLeast()->once()->andReturn(true); $journalRepos->shouldReceive('firstNull')->andReturn(new TransactionJournal); $journalRepos->shouldReceive('setUser')->once(); @@ -491,6 +520,8 @@ class SingleControllerTest extends TestCase $attRepos = $this->mock(AttachmentHelperInterface::class); $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'owner'])->atLeast()->once()->andReturn(true); $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); $journalRepos->shouldReceive('setUser')->once(); @@ -533,6 +564,8 @@ class SingleControllerTest extends TestCase $attRepos = $this->mock(AttachmentHelperInterface::class); $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'owner'])->atLeast()->once()->andReturn(true); $journalRepos->shouldReceive('firstNull')->andReturn(new TransactionJournal); $journalRepos->shouldReceive('setUser')->once(); @@ -583,6 +616,8 @@ class SingleControllerTest extends TestCase $attRepos = $this->mock(AttachmentHelperInterface::class); $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->andReturn(new TransactionJournal); // mock results: @@ -619,6 +654,8 @@ class SingleControllerTest extends TestCase $attRepos = $this->mock(AttachmentHelperInterface::class); $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->andReturn(new TransactionJournal); // mock results: @@ -674,6 +711,8 @@ class SingleControllerTest extends TestCase $attRepos = $this->mock(AttachmentHelperInterface::class); $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->andReturn(new TransactionJournal); // mock results: @@ -729,6 +768,8 @@ class SingleControllerTest extends TestCase $attRepos = $this->mock(AttachmentHelperInterface::class); $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->andReturn(new TransactionJournal); // mock results: @@ -785,6 +826,8 @@ class SingleControllerTest extends TestCase $attRepos = $this->mock(AttachmentHelperInterface::class); $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->andReturn(new TransactionJournal); // mock results: @@ -845,6 +888,8 @@ class SingleControllerTest extends TestCase $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); $linkRepos = $this->mock(LinkTypeRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'owner'])->atLeast()->once()->andReturn(true); $journalRepos->shouldReceive('firstNull')->andReturn(new TransactionJournal); $journalRepos->shouldReceive('getTransactionType')->andReturn('Withdrawal'); diff --git a/tests/Feature/Controllers/Transaction/SplitControllerTest.php b/tests/Feature/Controllers/Transaction/SplitControllerTest.php index 9aa9df666f..42d1b9f2af 100644 --- a/tests/Feature/Controllers/Transaction/SplitControllerTest.php +++ b/tests/Feature/Controllers/Transaction/SplitControllerTest.php @@ -32,6 +32,7 @@ use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface; +use FireflyIII\Repositories\User\UserRepositoryInterface; use Illuminate\Support\Collection; use Illuminate\Support\MessageBag; use Log; @@ -66,7 +67,10 @@ class SplitControllerTest extends TestCase $accountRepos = $this->mock(AccountRepositoryInterface::class); $budgetRepository = $this->mock(BudgetRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); $attHelper = $this->mock(AttachmentHelperInterface::class); + $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'owner'])->atLeast()->once()->andReturn(true); + $accountRepos->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'currency_id'])->andReturn('1'); $currencyRepository->shouldReceive('findNull')->withArgs([1])->andReturn(TransactionCurrency::find(1)); @@ -112,6 +116,10 @@ class SplitControllerTest extends TestCase $budgetRepository = $this->mock(BudgetRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); $attHelper = $this->mock(AttachmentHelperInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'owner'])->atLeast()->once()->andReturn(true); + + $deposit = TransactionJournal::where('transaction_type_id', 2)->where('user_id', $this->user()->id)->first(); $destination = $deposit->transactions()->where('amount', '>', 0)->first(); $account = $destination->account; @@ -207,6 +215,8 @@ class SplitControllerTest extends TestCase $budgetRepository = $this->mock(BudgetRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); $attHelper = $this->mock(AttachmentHelperInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $opening = TransactionJournal::where('transaction_type_id', 4)->where('user_id', $this->user()->id)->first(); $journalRepos->shouldReceive('firstNull')->once()->andReturn($opening); @@ -225,6 +235,9 @@ class SplitControllerTest extends TestCase $budgetRepository = $this->mock(BudgetRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); $attHelper = $this->mock(AttachmentHelperInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + + $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'owner'])->atLeast()->once()->andReturn(true); $transactions = factory(Transaction::class, 1)->make(); $deposit = TransactionJournal::where('transaction_type_id', 2)->where('user_id', $this->user()->id)->first(); @@ -269,6 +282,8 @@ class SplitControllerTest extends TestCase $attHelper = $this->mock(AttachmentHelperInterface::class); $ruleRepos = $this->mock(RuleGroupRepositoryInterface::class); $billRepos = $this->mock(BillRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $billRepos->shouldReceive('scan'); $ruleRepos->shouldReceive('setUser')->once(); @@ -323,6 +338,8 @@ class SplitControllerTest extends TestCase $budgetRepository = $this->mock(BudgetRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); $attHelper = $this->mock(AttachmentHelperInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $this->session(['transactions.edit-split.uri' => 'http://localhost']); $opening = TransactionJournal::where('transaction_type_id', 4)->where('user_id', $this->user()->id)->first(); @@ -367,6 +384,7 @@ class SplitControllerTest extends TestCase $attHelper = $this->mock(AttachmentHelperInterface::class); $ruleRepos = $this->mock(RuleGroupRepositoryInterface::class); $billRepos = $this->mock(BillRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); $billRepos->shouldReceive('scan'); $ruleRepos->shouldReceive('setUser')->once(); @@ -424,6 +442,8 @@ class SplitControllerTest extends TestCase $attHelper = $this->mock(AttachmentHelperInterface::class); $ruleRepos = $this->mock(RuleGroupRepositoryInterface::class); $billRepos = $this->mock(BillRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $billRepos->shouldReceive('scan'); $ruleRepos->shouldReceive('setUser')->once(); diff --git a/tests/Feature/Controllers/TransactionControllerTest.php b/tests/Feature/Controllers/TransactionControllerTest.php index e1837aa09c..8e383b104e 100644 --- a/tests/Feature/Controllers/TransactionControllerTest.php +++ b/tests/Feature/Controllers/TransactionControllerTest.php @@ -29,9 +29,11 @@ use FireflyIII\Models\Transaction; use FireflyIII\Models\TransactionJournal; use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use FireflyIII\Repositories\LinkType\LinkTypeRepositoryInterface; +use FireflyIII\Repositories\User\UserRepositoryInterface; use Illuminate\Pagination\LengthAwarePaginator; use Illuminate\Support\Collection; use Log; +use Mockery; use Tests\TestCase; /** @@ -68,8 +70,10 @@ class TransactionControllerTest extends TestCase $transfer = $this->user()->transactionJournals()->inRandomOrder()->where('transaction_type_id', 3)->first(); $repository = $this->mock(JournalRepositoryInterface::class); $collector = $this->mock(TransactionCollectorInterface::class); - $repository->shouldReceive('firstNull')->twice()->andReturn($transfer); + $userRepos = $this->mock(UserRepositoryInterface::class); + $repository->shouldReceive('firstNull')->twice()->andReturn($transfer); + $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'owner'])->atLeast()->once()->andReturn(true); $collector->shouldReceive('setTypes')->andReturnSelf(); $collector->shouldReceive('setLimit')->andReturnSelf(); $collector->shouldReceive('setPage')->andReturnSelf(); @@ -102,8 +106,10 @@ class TransactionControllerTest extends TestCase $transfer = $this->user()->transactionJournals()->inRandomOrder()->where('transaction_type_id', 3)->first(); $repository = $this->mock(JournalRepositoryInterface::class); $collector = $this->mock(TransactionCollectorInterface::class); - $repository->shouldReceive('firstNull')->twice()->andReturn($transfer); + $userRepos = $this->mock(UserRepositoryInterface::class); + $repository->shouldReceive('firstNull')->twice()->andReturn($transfer); + $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'owner'])->atLeast()->once()->andReturn(true); $collector->shouldReceive('setTypes')->andReturnSelf(); $collector->shouldReceive('setLimit')->andReturnSelf(); $collector->shouldReceive('setPage')->andReturnSelf(); @@ -143,6 +149,8 @@ class TransactionControllerTest extends TestCase // mock stuff $repository = $this->mock(JournalRepositoryInterface::class); $collector = $this->mock(TransactionCollectorInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'owner'])->atLeast()->once()->andReturn(true); $transfer = $this->user()->transactionJournals()->inRandomOrder()->where('transaction_type_id', 3)->first(); $repository->shouldReceive('firstNull')->once()->andReturn($transfer); $repository->shouldReceive('firstNull')->once()->andReturn($transfer); @@ -186,6 +194,8 @@ class TransactionControllerTest extends TestCase // mock stuff $repository = $this->mock(JournalRepositoryInterface::class); $collector = $this->mock(TransactionCollectorInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'owner'])->atLeast()->once()->andReturn(true); $transfer = $this->user()->transactionJournals()->inRandomOrder()->where('transaction_type_id', 3)->first(); $repository->shouldReceive('firstNull')->once()->andReturn($transfer); $repository->shouldReceive('firstNull')->once()->andReturn($transfer); @@ -229,6 +239,8 @@ class TransactionControllerTest extends TestCase // mock stuff $repository = $this->mock(JournalRepositoryInterface::class); $collector = $this->mock(TransactionCollectorInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'owner'])->atLeast()->once()->andReturn(true); $transfer = $this->user()->transactionJournals()->inRandomOrder()->where('transaction_type_id', 3)->first(); $repository->shouldReceive('firstNull')->once()->andReturn($transfer); $repository->shouldReceive('firstNull')->once()->andReturn($transfer); @@ -272,6 +284,8 @@ class TransactionControllerTest extends TestCase // mock stuff $repository = $this->mock(JournalRepositoryInterface::class); $collector = $this->mock(TransactionCollectorInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'owner'])->atLeast()->once()->andReturn(true); $transfer = $this->user()->transactionJournals()->inRandomOrder()->where('transaction_type_id', 3)->first(); $repository->shouldReceive('firstNull')->once()->andReturn($transfer); $repository->shouldReceive('firstNull')->once()->andReturn($transfer); @@ -303,8 +317,9 @@ class TransactionControllerTest extends TestCase { $data = ['transactions' => [1, 2]]; $repository = $this->mock(JournalRepositoryInterface::class); - $repository->shouldReceive('firstNull')->times(1)->andReturn(new TransactionJournal); + $userRepos = $this->mock(UserRepositoryInterface::class); + $repository->shouldReceive('firstNull')->times(1)->andReturn(new TransactionJournal); $repository->shouldReceive('findTransaction')->andReturn(new Transaction)->twice(); $repository->shouldReceive('reconcile')->twice(); @@ -322,6 +337,7 @@ class TransactionControllerTest extends TestCase $journal = factory(TransactionJournal::class)->make(); $journal->date = new Carbon('2016-01-01'); $repository = $this->mock(JournalRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); $repository->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); $repository->shouldReceive('findNull')->once()->andReturn($journal); $repository->shouldReceive('setOrder')->once()->andReturn(true); @@ -343,9 +359,11 @@ class TransactionControllerTest extends TestCase { // mock stuff $linkRepos = $this->mock(LinkTypeRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); + $linkRepos->shouldReceive('get')->andReturn(new Collection); $linkRepos->shouldReceive('getLinks')->andReturn(new Collection); - + $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'owner'])->atLeast()->once()->andReturn(true); $journalRepos = $this->mock(JournalRepositoryInterface::class); $journalRepos->shouldReceive('getPiggyBankEvents')->andReturn(new Collection); @@ -368,6 +386,7 @@ class TransactionControllerTest extends TestCase public function testShowOpeningBalance(): void { $linkRepos = $this->mock(LinkTypeRepositoryInterface::class); + $userRepos = $this->mock(UserRepositoryInterface::class); $linkRepos->shouldReceive('get')->andReturn(new Collection); $linkRepos->shouldReceive('getLinks')->andReturn(new Collection); diff --git a/tests/Unit/Helpers/Report/NetWorthTest.php b/tests/Unit/Helpers/Report/NetWorthTest.php index d1c58e8db8..ec1f37ab8a 100644 --- a/tests/Unit/Helpers/Report/NetWorthTest.php +++ b/tests/Unit/Helpers/Report/NetWorthTest.php @@ -30,6 +30,7 @@ use FireflyIII\Helpers\Report\NetWorth; use FireflyIII\Models\TransactionCurrency; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; +use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface; use Illuminate\Support\Collection; use Log; use Mockery; diff --git a/tests/Unit/Import/Converter/AmountCreditTest.php b/tests/Unit/Import/Converter/AmountCreditTest.php index 68db152e10..6695329811 100644 --- a/tests/Unit/Import/Converter/AmountCreditTest.php +++ b/tests/Unit/Import/Converter/AmountCreditTest.php @@ -23,6 +23,7 @@ declare(strict_types=1); namespace Tests\Unit\Import\Converter; use FireflyIII\Import\Converter\AmountCredit; +use Log; use Tests\TestCase; /** @@ -30,6 +31,16 @@ use Tests\TestCase; */ class AmountCreditTest extends TestCase { + /** + * + */ + public function setUp(): void + { + parent::setUp(); + Log::info(sprintf('Now in %s.', \get_class($this))); + } + + /** * @covers \FireflyIII\Import\Converter\AmountCredit */ diff --git a/tests/Unit/Import/Converter/AmountDebitTest.php b/tests/Unit/Import/Converter/AmountDebitTest.php index 48a36c55bf..ac6bc02a0e 100644 --- a/tests/Unit/Import/Converter/AmountDebitTest.php +++ b/tests/Unit/Import/Converter/AmountDebitTest.php @@ -23,6 +23,7 @@ declare(strict_types=1); namespace Tests\Unit\Import\Converter; use FireflyIII\Import\Converter\AmountDebit; +use Log; use Tests\TestCase; /** @@ -30,6 +31,16 @@ use Tests\TestCase; */ class AmountDebitTest extends TestCase { + /** + * + */ + public function setUp(): void + { + parent::setUp(); + Log::info(sprintf('Now in %s.', \get_class($this))); + } + + /** * @covers \FireflyIII\Import\Converter\AmountDebit */ diff --git a/tests/Unit/Import/Converter/AmountTest.php b/tests/Unit/Import/Converter/AmountTest.php index fff625c419..775f30a9a8 100644 --- a/tests/Unit/Import/Converter/AmountTest.php +++ b/tests/Unit/Import/Converter/AmountTest.php @@ -23,6 +23,7 @@ declare(strict_types=1); namespace Tests\Unit\Import\Converter; use FireflyIII\Import\Converter\Amount; +use Log; use Tests\TestCase; /** @@ -30,6 +31,16 @@ use Tests\TestCase; */ class AmountTest extends TestCase { + /** + * + */ + public function setUp(): void + { + parent::setUp(); + Log::info(sprintf('Now in %s.', \get_class($this))); + } + + /** * @covers \FireflyIII\Import\Converter\Amount */ diff --git a/tests/Unit/Import/Converter/INGDebitCreditTest.php b/tests/Unit/Import/Converter/INGDebitCreditTest.php index fdd6f9765c..846e05f727 100644 --- a/tests/Unit/Import/Converter/INGDebitCreditTest.php +++ b/tests/Unit/Import/Converter/INGDebitCreditTest.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace Tests\Unit\Import\Converter; use FireflyIII\Import\Converter\INGDebitCredit; +use Log; use Tests\TestCase; /** @@ -31,6 +32,16 @@ use Tests\TestCase; */ class INGDebitCreditTest extends TestCase { + /** + * + */ + public function setUp(): void + { + parent::setUp(); + Log::info(sprintf('Now in %s.', \get_class($this))); + } + + /** * @covers \FireflyIII\Import\Converter\INGDebitCredit */ diff --git a/tests/Unit/Import/Converter/RabobankDebitCreditTest.php b/tests/Unit/Import/Converter/RabobankDebitCreditTest.php index 0c216c1ec7..a9e101e8bd 100644 --- a/tests/Unit/Import/Converter/RabobankDebitCreditTest.php +++ b/tests/Unit/Import/Converter/RabobankDebitCreditTest.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace Tests\Unit\Import\Converter; use FireflyIII\Import\Converter\RabobankDebitCredit; +use Log; use Tests\TestCase; /** @@ -31,6 +32,16 @@ use Tests\TestCase; */ class RabobankDebitCreditTest extends TestCase { + /** + * + */ + public function setUp(): void + { + parent::setUp(); + Log::info(sprintf('Now in %s.', \get_class($this))); + } + + /** * @covers \FireflyIII\Import\Converter\RabobankDebitCredit */ diff --git a/tests/Unit/Import/JobConfiguration/FakeJobConfigurationTest.php b/tests/Unit/Import/JobConfiguration/FakeJobConfigurationTest.php index 61dc12ba5a..bac19227e0 100644 --- a/tests/Unit/Import/JobConfiguration/FakeJobConfigurationTest.php +++ b/tests/Unit/Import/JobConfiguration/FakeJobConfigurationTest.php @@ -28,12 +28,23 @@ use FireflyIII\Models\ImportJob; use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface; use Mockery; use Tests\TestCase; +use Log; /** * Class FakeJobConfigurationTest */ class FakeJobConfigurationTest extends TestCase { + /** + * + */ + public function setUp(): void + { + parent::setUp(); + Log::info(sprintf('Now in %s.', \get_class($this))); + } + + /** * No config, job is new. * diff --git a/tests/Unit/Import/JobConfiguration/FileJobConfigurationTest.php b/tests/Unit/Import/JobConfiguration/FileJobConfigurationTest.php index c927e5c229..3d56d545d0 100644 --- a/tests/Unit/Import/JobConfiguration/FileJobConfigurationTest.php +++ b/tests/Unit/Import/JobConfiguration/FileJobConfigurationTest.php @@ -34,12 +34,22 @@ use FireflyIII\Support\Import\JobConfiguration\File\NewFileJobHandler; use Illuminate\Support\MessageBag; use Mockery; use Tests\TestCase; - +use Log; /** * Class FileJobConfigurationTest */ class FileJobConfigurationTest extends TestCase { + /** + * + */ + public function setUp(): void + { + parent::setUp(); + Log::info(sprintf('Now in %s.', \get_class($this))); + } + + /** * No config, job is new. * diff --git a/tests/Unit/Import/JobConfiguration/SpectreJobConfigurationTest.php b/tests/Unit/Import/JobConfiguration/SpectreJobConfigurationTest.php index 3a1a08b4d4..afa4309fdd 100644 --- a/tests/Unit/Import/JobConfiguration/SpectreJobConfigurationTest.php +++ b/tests/Unit/Import/JobConfiguration/SpectreJobConfigurationTest.php @@ -33,12 +33,23 @@ use FireflyIII\Support\Import\JobConfiguration\Spectre\DoAuthenticateHandler; use FireflyIII\Support\Import\JobConfiguration\Spectre\NewSpectreJobHandler; use Illuminate\Support\MessageBag; use Tests\TestCase; +use Log; /** * Class SpectreJobConfigurationTest */ class SpectreJobConfigurationTest extends TestCase { + /** + * + */ + public function setUp(): void + { + parent::setUp(); + Log::info(sprintf('Now in %s.', \get_class($this))); + } + + /** * @covers \FireflyIII\Import\JobConfiguration\SpectreJobConfiguration */ diff --git a/tests/Unit/Import/Mapper/AssetAccountIbansTest.php b/tests/Unit/Import/Mapper/AssetAccountIbansTest.php index 0622bc5e23..f5775e28fa 100644 --- a/tests/Unit/Import/Mapper/AssetAccountIbansTest.php +++ b/tests/Unit/Import/Mapper/AssetAccountIbansTest.php @@ -29,12 +29,23 @@ use FireflyIII\Models\AccountType; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use Illuminate\Support\Collection; use Tests\TestCase; +use Log; /** * Class AssetAccountIbansTest */ class AssetAccountIbansTest extends TestCase { + /** + * + */ + public function setUp(): void + { + parent::setUp(); + Log::info(sprintf('Now in %s.', \get_class($this))); + } + + /** * @covers \FireflyIII\Import\Mapper\AssetAccountIbans */ diff --git a/tests/Unit/Import/Mapper/AssetAccountsTest.php b/tests/Unit/Import/Mapper/AssetAccountsTest.php index 357e3e9afd..abfdc6cea1 100644 --- a/tests/Unit/Import/Mapper/AssetAccountsTest.php +++ b/tests/Unit/Import/Mapper/AssetAccountsTest.php @@ -29,12 +29,23 @@ use FireflyIII\Models\AccountType; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use Illuminate\Support\Collection; use Tests\TestCase; +use Log; /** * Class AssetAccountsTest */ class AssetAccountsTest extends TestCase { + /** + * + */ + public function setUp(): void + { + parent::setUp(); + Log::info(sprintf('Now in %s.', \get_class($this))); + } + + /** * @covers \FireflyIII\Import\Mapper\AssetAccounts */ diff --git a/tests/Unit/Import/Mapper/BillsTest.php b/tests/Unit/Import/Mapper/BillsTest.php index f573db8fd0..205831d1aa 100644 --- a/tests/Unit/Import/Mapper/BillsTest.php +++ b/tests/Unit/Import/Mapper/BillsTest.php @@ -28,12 +28,23 @@ use FireflyIII\Models\Bill; use FireflyIII\Repositories\Bill\BillRepositoryInterface; use Illuminate\Support\Collection; use Tests\TestCase; +use Log; /** * Class BillsTest */ class BillsTest extends TestCase { + /** + * + */ + public function setUp(): void + { + parent::setUp(); + Log::info(sprintf('Now in %s.', \get_class($this))); + } + + /** * @covers \FireflyIII\Import\Mapper\Bills */ diff --git a/tests/Unit/Import/Mapper/BudgetsTest.php b/tests/Unit/Import/Mapper/BudgetsTest.php index 17cb4ed369..46c1575dbd 100644 --- a/tests/Unit/Import/Mapper/BudgetsTest.php +++ b/tests/Unit/Import/Mapper/BudgetsTest.php @@ -28,12 +28,22 @@ use FireflyIII\Models\Budget; use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; use Illuminate\Support\Collection; use Tests\TestCase; +use Log; /** * Class BudgetsTest */ class BudgetsTest extends TestCase { + /** + * + */ + public function setUp(): void + { + parent::setUp(); + Log::info(sprintf('Now in %s.', \get_class($this))); + } + /** * @covers \FireflyIII\Import\Mapper\Budgets */ diff --git a/tests/Unit/Import/Mapper/CategoriesTest.php b/tests/Unit/Import/Mapper/CategoriesTest.php index 24cb705ba1..a344c651ec 100644 --- a/tests/Unit/Import/Mapper/CategoriesTest.php +++ b/tests/Unit/Import/Mapper/CategoriesTest.php @@ -28,12 +28,23 @@ use FireflyIII\Models\Category; use FireflyIII\Repositories\Category\CategoryRepositoryInterface; use Illuminate\Support\Collection; use Tests\TestCase; +use Log; /** * Class CategoriesTest */ class CategoriesTest extends TestCase { + /** + * + */ + public function setUp(): void + { + parent::setUp(); + Log::info(sprintf('Now in %s.', \get_class($this))); + } + + /** * @covers \FireflyIII\Import\Mapper\Categories */ diff --git a/tests/Unit/Import/Mapper/OpposingAccountIbansTest.php b/tests/Unit/Import/Mapper/OpposingAccountIbansTest.php index 1516711237..da788d29b1 100644 --- a/tests/Unit/Import/Mapper/OpposingAccountIbansTest.php +++ b/tests/Unit/Import/Mapper/OpposingAccountIbansTest.php @@ -29,12 +29,23 @@ use FireflyIII\Models\AccountType; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use Illuminate\Support\Collection; use Tests\TestCase; +use Log; /** * Class OpposingAccountIbansTest */ class OpposingAccountIbansTest extends TestCase { + /** + * + */ + public function setUp(): void + { + parent::setUp(); + Log::info(sprintf('Now in %s.', \get_class($this))); + } + + /** * @covers \FireflyIII\Import\Mapper\OpposingAccountIbans */ diff --git a/tests/Unit/Import/Mapper/OpposingAccountsTest.php b/tests/Unit/Import/Mapper/OpposingAccountsTest.php index b8bac5e5b1..597953b1d3 100644 --- a/tests/Unit/Import/Mapper/OpposingAccountsTest.php +++ b/tests/Unit/Import/Mapper/OpposingAccountsTest.php @@ -29,12 +29,23 @@ use FireflyIII\Models\AccountType; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use Illuminate\Support\Collection; use Tests\TestCase; +use Log; /** * Class OpposingAccountsTest */ class OpposingAccountsTest extends TestCase { + /** + * + */ + public function setUp(): void + { + parent::setUp(); + Log::info(sprintf('Now in %s.', \get_class($this))); + } + + /** * @covers \FireflyIII\Import\Mapper\OpposingAccounts */ diff --git a/tests/Unit/Import/Mapper/TagsTest.php b/tests/Unit/Import/Mapper/TagsTest.php index d8ee694e7e..e1bac8af62 100644 --- a/tests/Unit/Import/Mapper/TagsTest.php +++ b/tests/Unit/Import/Mapper/TagsTest.php @@ -28,12 +28,22 @@ use FireflyIII\Models\Tag; use FireflyIII\Repositories\Tag\TagRepositoryInterface; use Illuminate\Support\Collection; use Tests\TestCase; - +use Log; /** * Class TagsTest */ class TagsTest extends TestCase { + /** + * + */ + public function setUp(): void + { + parent::setUp(); + Log::info(sprintf('Now in %s.', \get_class($this))); + } + + /** * @covers \FireflyIII\Import\Mapper\Tags */ diff --git a/tests/Unit/Import/Mapper/TransactionCurrenciesTest.php b/tests/Unit/Import/Mapper/TransactionCurrenciesTest.php index b30ac8bd03..ee97c8dcbf 100644 --- a/tests/Unit/Import/Mapper/TransactionCurrenciesTest.php +++ b/tests/Unit/Import/Mapper/TransactionCurrenciesTest.php @@ -28,12 +28,22 @@ use FireflyIII\Models\TransactionCurrency; use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; use Illuminate\Support\Collection; use Tests\TestCase; +use Log; /** * Class TransactionCurrenciesTest */ class TransactionCurrenciesTest extends TestCase { + /** + * + */ + public function setUp(): void + { + parent::setUp(); + Log::info(sprintf('Now in %s.', \get_class($this))); + } + /** * @covers \FireflyIII\Import\Mapper\TransactionCurrencies */ diff --git a/tests/Unit/Import/MapperPreProcess/TagsCommaTest.php b/tests/Unit/Import/MapperPreProcess/TagsCommaTest.php index 6a6fb226af..91caf61c78 100644 --- a/tests/Unit/Import/MapperPreProcess/TagsCommaTest.php +++ b/tests/Unit/Import/MapperPreProcess/TagsCommaTest.php @@ -25,12 +25,22 @@ namespace Tests\Unit\Import\MapperPreProcess; use FireflyIII\Import\MapperPreProcess\TagsComma; use Tests\TestCase; +use Log; /** * Class TagsCommaTest */ class TagsCommaTest extends TestCase { + /** + * + */ + public function setUp(): void + { + parent::setUp(); + Log::info(sprintf('Now in %s.', \get_class($this))); + } + /** * \FireflyIII\Import\MapperPreProcess\TagsComma diff --git a/tests/Unit/Import/MapperPreProcess/TagsSpaceTest.php b/tests/Unit/Import/MapperPreProcess/TagsSpaceTest.php index 3ae75d1268..ede246afc4 100644 --- a/tests/Unit/Import/MapperPreProcess/TagsSpaceTest.php +++ b/tests/Unit/Import/MapperPreProcess/TagsSpaceTest.php @@ -25,12 +25,22 @@ namespace Tests\Unit\Import\MapperPreProcess; use FireflyIII\Import\MapperPreProcess\TagsSpace; use Tests\TestCase; +use Log; /** * Class TagsSpaceTest */ class TagsSpaceTest extends TestCase { + /** + * + */ + public function setUp(): void + { + parent::setUp(); + Log::info(sprintf('Now in %s.', \get_class($this))); + } + /** * \FireflyIII\Import\MapperPreProcess\TagsSpace diff --git a/tests/Unit/Import/Prerequisites/BunqPrerequisitesTest.php b/tests/Unit/Import/Prerequisites/BunqPrerequisitesTest.php index b1d8e7344c..37907bb177 100644 --- a/tests/Unit/Import/Prerequisites/BunqPrerequisitesTest.php +++ b/tests/Unit/Import/Prerequisites/BunqPrerequisitesTest.php @@ -32,12 +32,23 @@ use Mockery; use Preferences; use Tests\Object\FakeApiContext; use Tests\TestCase; +use Log; /** * Class BunqPrerequisitesTest */ class BunqPrerequisitesTest extends TestCase { + /** + * + */ + public function setUp(): void + { + parent::setUp(); + Log::info(sprintf('Now in %s.', \get_class($this))); + } + + /** * Has no API key, has no external IP. * diff --git a/tests/Unit/Import/Prerequisites/FakePrerequisitesTest.php b/tests/Unit/Import/Prerequisites/FakePrerequisitesTest.php index 7aa2d9d289..6f9d04abc6 100644 --- a/tests/Unit/Import/Prerequisites/FakePrerequisitesTest.php +++ b/tests/Unit/Import/Prerequisites/FakePrerequisitesTest.php @@ -29,12 +29,22 @@ use FireflyIII\Models\Preference; use Mockery; use Preferences; use Tests\TestCase; +use Log; /** * Class FakePrerequisitesTest */ class FakePrerequisitesTest extends TestCase { + /** + * + */ + public function setUp(): void + { + parent::setUp(); + Log::info(sprintf('Now in %s.', \get_class($this))); + } + /** * Bad API key length in preferences * diff --git a/tests/Unit/Import/Prerequisites/SpectrePrerequisitesTest.php b/tests/Unit/Import/Prerequisites/SpectrePrerequisitesTest.php index e9ea09cc72..e9da6da9ed 100644 --- a/tests/Unit/Import/Prerequisites/SpectrePrerequisitesTest.php +++ b/tests/Unit/Import/Prerequisites/SpectrePrerequisitesTest.php @@ -29,12 +29,22 @@ use FireflyIII\Models\Preference; use Mockery; use Preferences; use Tests\TestCase; - +use Log; /** * Class SpectrePrerequisitesTest */ class SpectrePrerequisitesTest extends TestCase { + /** + * + */ + public function setUp(): void + { + parent::setUp(); + Log::info(sprintf('Now in %s.', \get_class($this))); + } + + /** * @covers \FireflyIII\Import\Prerequisites\SpectrePrerequisites */ diff --git a/tests/Unit/Import/Routine/BunqRoutineTest.php b/tests/Unit/Import/Routine/BunqRoutineTest.php index b384993c15..defe5916c0 100644 --- a/tests/Unit/Import/Routine/BunqRoutineTest.php +++ b/tests/Unit/Import/Routine/BunqRoutineTest.php @@ -32,12 +32,23 @@ use FireflyIII\Support\Import\Routine\Bunq\StageImportDataHandler; use FireflyIII\Support\Import\Routine\Bunq\StageNewHandler; use Mockery; use Tests\TestCase; +use Log; /** * Class BunqRoutineTest */ class BunqRoutineTest extends TestCase { + /** + * + */ + public function setUp(): void + { + parent::setUp(); + Log::info(sprintf('Now in %s.', \get_class($this))); + } + + /** * @covers \FireflyIII\Import\Routine\BunqRoutine */ diff --git a/tests/Unit/Import/Routine/FakeRoutineTest.php b/tests/Unit/Import/Routine/FakeRoutineTest.php index e1c87cb448..1249378d71 100644 --- a/tests/Unit/Import/Routine/FakeRoutineTest.php +++ b/tests/Unit/Import/Routine/FakeRoutineTest.php @@ -32,12 +32,22 @@ use FireflyIII\Support\Import\Routine\Fake\StageFinalHandler; use FireflyIII\Support\Import\Routine\Fake\StageNewHandler; use Mockery; use Tests\TestCase; +use Log; /** * Class FakeRoutineTest */ class FakeRoutineTest extends TestCase { + /** + * + */ + public function setUp(): void + { + parent::setUp(); + Log::info(sprintf('Now in %s.', \get_class($this))); + } + /** * @covers \FireflyIII\Import\Routine\FakeRoutine */ diff --git a/tests/Unit/Import/Routine/FileRoutineTest.php b/tests/Unit/Import/Routine/FileRoutineTest.php index 69e4dee94e..2bb001110a 100644 --- a/tests/Unit/Import/Routine/FileRoutineTest.php +++ b/tests/Unit/Import/Routine/FileRoutineTest.php @@ -31,12 +31,22 @@ use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface; use FireflyIII\Support\Import\Routine\File\CSVProcessor; use Mockery; use Tests\TestCase; +use Log; /** * Class FileRoutineTest */ class FileRoutineTest extends TestCase { + /** + * + */ + public function setUp(): void + { + parent::setUp(); + Log::info(sprintf('Now in %s.', \get_class($this))); + } + /** * @covers \FireflyIII\Import\Routine\FileRoutine diff --git a/tests/Unit/Import/Routine/SpectreRoutineTest.php b/tests/Unit/Import/Routine/SpectreRoutineTest.php index 722f704d3c..cc133cde6d 100644 --- a/tests/Unit/Import/Routine/SpectreRoutineTest.php +++ b/tests/Unit/Import/Routine/SpectreRoutineTest.php @@ -33,12 +33,23 @@ use FireflyIII\Support\Import\Routine\Spectre\StageImportDataHandler; use FireflyIII\Support\Import\Routine\Spectre\StageNewHandler; use Mockery; use Tests\TestCase; +use Log; /** * Class SpectreRoutineTest */ class SpectreRoutineTest extends TestCase { + /** + * + */ + public function setUp(): void + { + parent::setUp(); + Log::info(sprintf('Now in %s.', \get_class($this))); + } + + /** * @covers \FireflyIII\Import\Routine\SpectreRoutine */ diff --git a/tests/Unit/Import/Specifics/AbnAmroDescriptionTest.php b/tests/Unit/Import/Specifics/AbnAmroDescriptionTest.php index 6d5f6e2cd4..38c06fdd5a 100644 --- a/tests/Unit/Import/Specifics/AbnAmroDescriptionTest.php +++ b/tests/Unit/Import/Specifics/AbnAmroDescriptionTest.php @@ -26,12 +26,23 @@ namespace Tests\Unit\Import\Specifics; use FireflyIII\Import\Specifics\AbnAmroDescription; use Tests\TestCase; +use Log; /** * Class AbnAmroDescriptionTest */ class AbnAmroDescriptionTest extends TestCase { + /** + * + */ + public function setUp(): void + { + parent::setUp(); + Log::info(sprintf('Now in %s.', \get_class($this))); + } + + /** * Should return the exact same array. * diff --git a/tests/Unit/Import/Specifics/IngDescriptionTest.php b/tests/Unit/Import/Specifics/IngDescriptionTest.php index d068516ddf..9826ad8dc1 100644 --- a/tests/Unit/Import/Specifics/IngDescriptionTest.php +++ b/tests/Unit/Import/Specifics/IngDescriptionTest.php @@ -26,12 +26,23 @@ namespace Tests\Unit\Import\Specifics; use FireflyIII\Import\Specifics\IngDescription; use Tests\TestCase; +use Log; /** * Class IngDescriptionTest */ class IngDescriptionTest extends TestCase { + /** + * + */ + public function setUp(): void + { + parent::setUp(); + Log::info(sprintf('Now in %s.', \get_class($this))); + } + + /** * Test changes to BA row. * diff --git a/tests/Unit/Import/Specifics/PresidentsChoiceTest.php b/tests/Unit/Import/Specifics/PresidentsChoiceTest.php index 09bcb96393..af34730c71 100644 --- a/tests/Unit/Import/Specifics/PresidentsChoiceTest.php +++ b/tests/Unit/Import/Specifics/PresidentsChoiceTest.php @@ -26,12 +26,22 @@ namespace Tests\Unit\Import\Specifics; use FireflyIII\Import\Specifics\PresidentsChoice; use Tests\TestCase; +use Log; /** * Class PresidentsChoiceTest */ class PresidentsChoiceTest extends TestCase { + /** + * + */ + public function setUp(): void + { + parent::setUp(); + Log::info(sprintf('Now in %s.', \get_class($this))); + } + /** * @covers \FireflyIII\Import\Specifics\PresidentsChoice diff --git a/tests/Unit/Import/Specifics/SnsDescriptionTest.php b/tests/Unit/Import/Specifics/SnsDescriptionTest.php index 30b985a920..c69e0ab1d3 100644 --- a/tests/Unit/Import/Specifics/SnsDescriptionTest.php +++ b/tests/Unit/Import/Specifics/SnsDescriptionTest.php @@ -26,12 +26,22 @@ namespace Tests\Unit\Import\Specifics; use FireflyIII\Import\Specifics\SnsDescription; use Tests\TestCase; - +use Log; /** * Class SnsDescriptionTest */ class SnsDescriptionTest extends TestCase { + /** + * + */ + public function setUp(): void + { + parent::setUp(); + Log::info(sprintf('Now in %s.', \get_class($this))); + } + + /** * @covers \FireflyIII\Import\Specifics\SnsDescription */ diff --git a/tests/Unit/Import/Storage/ImportArrayStorageTest.php b/tests/Unit/Import/Storage/ImportArrayStorageTest.php index c60dbe1b01..309efaa526 100644 --- a/tests/Unit/Import/Storage/ImportArrayStorageTest.php +++ b/tests/Unit/Import/Storage/ImportArrayStorageTest.php @@ -41,12 +41,22 @@ use FireflyIII\Repositories\Tag\TagRepositoryInterface; use Illuminate\Support\Collection; use Mockery; use Tests\TestCase; - +use Log; /** * Class ImportArrayStorageTest */ class ImportArrayStorageTest extends TestCase { + /** + * + */ + public function setUp(): void + { + parent::setUp(); + Log::info(sprintf('Now in %s.', \get_class($this))); + } + + /** * Very basic storage routine. Doesn't call store() diff --git a/tests/Unit/Middleware/AuthenticateTest.php b/tests/Unit/Middleware/AuthenticateTest.php index 4a2c91fd38..d45412792b 100644 --- a/tests/Unit/Middleware/AuthenticateTest.php +++ b/tests/Unit/Middleware/AuthenticateTest.php @@ -39,7 +39,7 @@ class AuthenticateTest extends TestCase public function setUp(): void { parent::setUp(); - + Log::info(sprintf('Now in %s.', \get_class($this))); Route::middleware('auth')->any( '/_test/authenticate', function () { return 'OK'; diff --git a/tests/Unit/Middleware/AuthenticateTwoFactorTest.php b/tests/Unit/Middleware/AuthenticateTwoFactorTest.php index 4e4912c4f2..1bb23b87ca 100644 --- a/tests/Unit/Middleware/AuthenticateTwoFactorTest.php +++ b/tests/Unit/Middleware/AuthenticateTwoFactorTest.php @@ -29,6 +29,7 @@ use Preferences; use Route; use Symfony\Component\HttpFoundation\Response; use Tests\TestCase; +use Log; /** * Class AuthenticateTwoFactorTest @@ -41,7 +42,7 @@ class AuthenticateTwoFactorTest extends TestCase public function setUp(): void { parent::setUp(); - + Log::info(sprintf('Now in %s.', \get_class($this))); Route::middleware(AuthenticateTwoFactor::class)->any( '/_test/authenticate', function () { return 'OK'; diff --git a/tests/Unit/Middleware/BinderTest.php b/tests/Unit/Middleware/BinderTest.php index 492e927bfd..93839dd69b 100644 --- a/tests/Unit/Middleware/BinderTest.php +++ b/tests/Unit/Middleware/BinderTest.php @@ -32,6 +32,7 @@ use Illuminate\Support\Collection; use Route; use Symfony\Component\HttpFoundation\Response; use Tests\TestCase; +use Log; /** * Class BinderTest @@ -51,6 +52,7 @@ class BinderTest extends TestCase return 'OK'; } ); + Log::info(sprintf('Now in %s.', \get_class($this))); $this->be($this->user()); $response = $this->get('/_test/binder/1'); diff --git a/tests/Unit/Middleware/IsAdminTest.php b/tests/Unit/Middleware/IsAdminTest.php index 15e591062d..bf72e13f1b 100644 --- a/tests/Unit/Middleware/IsAdminTest.php +++ b/tests/Unit/Middleware/IsAdminTest.php @@ -27,6 +27,7 @@ use FireflyIII\Http\Middleware\IsAdmin; use Route; use Symfony\Component\HttpFoundation\Response; use Tests\TestCase; +use Log; /** * Class IsAdminTest @@ -39,12 +40,13 @@ class IsAdminTest extends TestCase public function setUp(): void { parent::setUp(); - + Log::info(sprintf('Now in %s.', \get_class($this))); Route::middleware(IsAdmin::class)->any( '/_test/is-admin', function () { return 'OK'; } ); + } /** diff --git a/tests/Unit/Middleware/IsDemoUserTest.php b/tests/Unit/Middleware/IsDemoUserTest.php index 9caeaaef7f..4bb1589a68 100644 --- a/tests/Unit/Middleware/IsDemoUserTest.php +++ b/tests/Unit/Middleware/IsDemoUserTest.php @@ -28,6 +28,7 @@ use FireflyIII\Http\Middleware\StartFireflySession; use Route; use Symfony\Component\HttpFoundation\Response; use Tests\TestCase; +use Log; /** * Class IsDemoUserTest @@ -40,7 +41,7 @@ class IsDemoUserTest extends TestCase public function setUp(): void { parent::setUp(); - + Log::info(sprintf('Now in %s.', \get_class($this))); Route::middleware([StartFireflySession::class, IsDemoUser::class])->any( '/_test/is-demo', function () { return 'OK'; diff --git a/tests/Unit/Middleware/IsSandstormUserTest.php b/tests/Unit/Middleware/IsSandstormUserTest.php index 908a606212..231cbb5763 100644 --- a/tests/Unit/Middleware/IsSandstormUserTest.php +++ b/tests/Unit/Middleware/IsSandstormUserTest.php @@ -27,6 +27,7 @@ use FireflyIII\Http\Middleware\IsSandStormUser; use Route; use Symfony\Component\HttpFoundation\Response; use Tests\TestCase; +use Log; /** * Class IsSandstormUserTest @@ -39,7 +40,7 @@ class IsSandstormUserTest extends TestCase public function setUp(): void { parent::setUp(); - + Log::info(sprintf('Now in %s.', \get_class($this))); Route::middleware(IsSandStormUser::class)->any( '/_test/is-sandstorm', function () { return 'OK'; diff --git a/tests/Unit/Middleware/RangeTest.php b/tests/Unit/Middleware/RangeTest.php index 4d7131487e..aad165e761 100644 --- a/tests/Unit/Middleware/RangeTest.php +++ b/tests/Unit/Middleware/RangeTest.php @@ -29,6 +29,7 @@ use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use Route; use Symfony\Component\HttpFoundation\Response; use Tests\TestCase; +use Log; /** * Class RangeTest @@ -41,7 +42,7 @@ class RangeTest extends TestCase public function setUp(): void { parent::setUp(); - + Log::info(sprintf('Now in %s.', \get_class($this))); Route::middleware(Range::class)->any( '/_test/range', function () { return view('test.test'); diff --git a/tests/Unit/Middleware/RedirectIf2FAAuthenticatedTest.php b/tests/Unit/Middleware/RedirectIf2FAAuthenticatedTest.php index 46f5701f9d..dde1d00f76 100644 --- a/tests/Unit/Middleware/RedirectIf2FAAuthenticatedTest.php +++ b/tests/Unit/Middleware/RedirectIf2FAAuthenticatedTest.php @@ -29,7 +29,7 @@ use Preferences; use Route; use Symfony\Component\HttpFoundation\Response; use Tests\TestCase; - +use Log; /** * Class RedirectIf2FAAuthenticatedTest */ @@ -41,7 +41,7 @@ class RedirectIf2FAAuthenticatedTest extends TestCase public function setUp(): void { parent::setUp(); - + Log::info(sprintf('Now in %s.', \get_class($this))); Route::middleware(RedirectIfTwoFactorAuthenticated::class)->any( '/_test/authenticate', function () { return 'OK'; diff --git a/tests/Unit/Middleware/RedirectIfAuthenticatedTest.php b/tests/Unit/Middleware/RedirectIfAuthenticatedTest.php index de208d2c30..149954899e 100644 --- a/tests/Unit/Middleware/RedirectIfAuthenticatedTest.php +++ b/tests/Unit/Middleware/RedirectIfAuthenticatedTest.php @@ -27,6 +27,7 @@ use FireflyIII\Http\Middleware\RedirectIfAuthenticated; use Route; use Symfony\Component\HttpFoundation\Response; use Tests\TestCase; +use Log; /** * Class RedirectIfAuthenticatedTest @@ -39,7 +40,7 @@ class RedirectIfAuthenticatedTest extends TestCase public function setUp(): void { parent::setUp(); - + Log::info(sprintf('Now in %s.', \get_class($this))); Route::middleware(RedirectIfAuthenticated::class)->any( '/_test/authenticate', function () { return 'OK'; diff --git a/tests/Unit/Middleware/SandstormTest.php b/tests/Unit/Middleware/SandstormTest.php index e37408f1e6..8342c744bd 100644 --- a/tests/Unit/Middleware/SandstormTest.php +++ b/tests/Unit/Middleware/SandstormTest.php @@ -29,6 +29,7 @@ use Mockery; use Route; use Symfony\Component\HttpFoundation\Response; use Tests\TestCase; +use Log; /** * Class RangeTest @@ -41,7 +42,7 @@ class SandstormTest extends TestCase public function setUp(): void { parent::setUp(); - + Log::info(sprintf('Now in %s.', \get_class($this))); Route::middleware(Sandstorm::class)->any( '/_test/sandstorm', function () { return view('test.test'); diff --git a/tests/Unit/Services/Internal/Destroy/AccountDestroyServiceTest.php b/tests/Unit/Services/Internal/Destroy/AccountDestroyServiceTest.php index e22adeee6d..c975a1281e 100644 --- a/tests/Unit/Services/Internal/Destroy/AccountDestroyServiceTest.php +++ b/tests/Unit/Services/Internal/Destroy/AccountDestroyServiceTest.php @@ -28,12 +28,21 @@ use FireflyIII\Models\Transaction; use FireflyIII\Services\Internal\Destroy\AccountDestroyService; use FireflyIII\Services\Internal\Destroy\JournalDestroyService; use Tests\TestCase; - +use Log; /** * Class AccountDestroyServiceTest */ class AccountDestroyServiceTest extends TestCase { + /** + * + */ + public function setUp(): void + { + parent::setUp(); + Log::info(sprintf('Now in %s.', \get_class($this))); + } + /** * @covers \FireflyIII\Services\Internal\Destroy\AccountDestroyService */ diff --git a/tests/Unit/Services/Internal/Update/AccountUpdateServiceTest.php b/tests/Unit/Services/Internal/Update/AccountUpdateServiceTest.php index 78d2873381..c3bd7ce287 100644 --- a/tests/Unit/Services/Internal/Update/AccountUpdateServiceTest.php +++ b/tests/Unit/Services/Internal/Update/AccountUpdateServiceTest.php @@ -32,12 +32,22 @@ use FireflyIII\Models\TransactionJournal; use FireflyIII\Services\Internal\Destroy\JournalDestroyService; use FireflyIII\Services\Internal\Update\AccountUpdateService; use Tests\TestCase; +use Log; /** * Class AccountUpdateServiceTest */ class AccountUpdateServiceTest extends TestCase { + /** + * + */ + public function setUp(): void + { + parent::setUp(); + Log::info(sprintf('Now in %s.', \get_class($this))); + } + /** * @covers \FireflyIII\Services\Internal\Update\AccountUpdateService * @covers \FireflyIII\Services\Internal\Support\AccountServiceTrait diff --git a/tests/Unit/Services/Internal/Update/JournalUpdateServiceTest.php b/tests/Unit/Services/Internal/Update/JournalUpdateServiceTest.php index 6cfc2e057b..2978a1d218 100644 --- a/tests/Unit/Services/Internal/Update/JournalUpdateServiceTest.php +++ b/tests/Unit/Services/Internal/Update/JournalUpdateServiceTest.php @@ -34,12 +34,22 @@ use FireflyIII\Services\Internal\Update\JournalUpdateService; use FireflyIII\Services\Internal\Update\TransactionUpdateService; use Mockery; use Tests\TestCase; +use Log; /** * Class JournalUpdateServiceTest */ class JournalUpdateServiceTest extends TestCase { + /** + * + */ + public function setUp(): void + { + parent::setUp(); + Log::info(sprintf('Now in %s.', \get_class($this))); + } + /** * @covers \FireflyIII\Services\Internal\Update\JournalUpdateService * @covers \FireflyIII\Services\Internal\Support\JournalServiceTrait diff --git a/tests/Unit/Services/Internal/Update/TransactionUpdateServiceTest.php b/tests/Unit/Services/Internal/Update/TransactionUpdateServiceTest.php index ae20ba3a19..0c04e1f0df 100644 --- a/tests/Unit/Services/Internal/Update/TransactionUpdateServiceTest.php +++ b/tests/Unit/Services/Internal/Update/TransactionUpdateServiceTest.php @@ -30,12 +30,22 @@ use FireflyIII\Models\Transaction; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Services\Internal\Update\TransactionUpdateService; use Tests\TestCase; +use Log; /** * Class TransactionUpdateServiceTest */ class TransactionUpdateServiceTest extends TestCase { + /** + * + */ + public function setUp(): void + { + parent::setUp(); + Log::info(sprintf('Now in %s.', \get_class($this))); + } + /** * @covers \FireflyIII\Services\Internal\Update\TransactionUpdateService */ diff --git a/tests/Unit/Support/Import/JobConfiguration/Bunq/ChooseAccountsHandlerTest.php b/tests/Unit/Support/Import/JobConfiguration/Bunq/ChooseAccountsHandlerTest.php index a17742f6ed..a216270f2f 100644 --- a/tests/Unit/Support/Import/JobConfiguration/Bunq/ChooseAccountsHandlerTest.php +++ b/tests/Unit/Support/Import/JobConfiguration/Bunq/ChooseAccountsHandlerTest.php @@ -37,12 +37,21 @@ use FireflyIII\Support\Import\JobConfiguration\Bunq\ChooseAccountsHandler; use Illuminate\Support\Collection; use Mockery; use Tests\TestCase; - +use Log; /** * Class ChooseAccountsHandlerTest */ class ChooseAccountsHandlerTest extends TestCase { + /** + * + */ + public function setUp(): void + { + parent::setUp(); + Log::info(sprintf('Now in %s.', \get_class($this))); + } + /** * @covers \FireflyIII\Support\Import\JobConfiguration\Bunq\ChooseAccountsHandler */ diff --git a/tests/Unit/Support/Import/JobConfiguration/Bunq/NewBunqJobHandlerTest.php b/tests/Unit/Support/Import/JobConfiguration/Bunq/NewBunqJobHandlerTest.php index 4f3ccb354c..2c1eba6298 100644 --- a/tests/Unit/Support/Import/JobConfiguration/Bunq/NewBunqJobHandlerTest.php +++ b/tests/Unit/Support/Import/JobConfiguration/Bunq/NewBunqJobHandlerTest.php @@ -28,12 +28,21 @@ use FireflyIII\Models\ImportJob; use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface; use FireflyIII\Support\Import\JobConfiguration\Bunq\NewBunqJobHandler; use Tests\TestCase; +use Log; /** * Class NewBunqJobHandlerTest */ class NewBunqJobHandlerTest extends TestCase { + /** + * + */ + public function setUp(): void + { + parent::setUp(); + Log::info(sprintf('Now in %s.', \get_class($this))); + } /** * @covers \FireflyIII\Support\Import\JobConfiguration\Bunq\NewBunqJobHandler */ diff --git a/tests/Unit/Support/Import/JobConfiguration/File/ConfigureMappingHandlerTest.php b/tests/Unit/Support/Import/JobConfiguration/File/ConfigureMappingHandlerTest.php index a85ca2dda2..2fbd1d8076 100644 --- a/tests/Unit/Support/Import/JobConfiguration/File/ConfigureMappingHandlerTest.php +++ b/tests/Unit/Support/Import/JobConfiguration/File/ConfigureMappingHandlerTest.php @@ -37,6 +37,7 @@ use League\Csv\Exception; use League\Csv\Reader; use Mockery; use Tests\TestCase; +use Log; /** * Class ConfigureMappingHandlerTest @@ -44,6 +45,15 @@ use Tests\TestCase; */ class ConfigureMappingHandlerTest extends TestCase { + /** + * + */ + public function setUp(): void + { + parent::setUp(); + Log::info(sprintf('Now in %s.', \get_class($this))); + } + /** * @covers \FireflyIII\Support\Import\JobConfiguration\File\ConfigureMappingHandler */ diff --git a/tests/Unit/Support/Import/JobConfiguration/File/ConfigureRolesHandlerTest.php b/tests/Unit/Support/Import/JobConfiguration/File/ConfigureRolesHandlerTest.php index 0810a2971d..d79c5046a5 100644 --- a/tests/Unit/Support/Import/JobConfiguration/File/ConfigureRolesHandlerTest.php +++ b/tests/Unit/Support/Import/JobConfiguration/File/ConfigureRolesHandlerTest.php @@ -36,12 +36,22 @@ use Illuminate\Support\Collection; use League\Csv\Reader; use Mockery; use Tests\TestCase; +use Log; /** * Class ConfigureRolesHandlerTest */ class ConfigureRolesHandlerTest extends TestCase { + /** + * + */ + public function setUp(): void + { + parent::setUp(); + Log::info(sprintf('Now in %s.', \get_class($this))); + } + /** * @covers \FireflyIII\Support\Import\JobConfiguration\File\ConfigureRolesHandler */ diff --git a/tests/Unit/Support/Import/JobConfiguration/File/ConfigureUploadHandlerTest.php b/tests/Unit/Support/Import/JobConfiguration/File/ConfigureUploadHandlerTest.php index 442a0524b2..94987ccb8e 100644 --- a/tests/Unit/Support/Import/JobConfiguration/File/ConfigureUploadHandlerTest.php +++ b/tests/Unit/Support/Import/JobConfiguration/File/ConfigureUploadHandlerTest.php @@ -30,12 +30,21 @@ use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface; use FireflyIII\Support\Import\JobConfiguration\File\ConfigureUploadHandler; use Mockery; use Tests\TestCase; - +use Log; /** * Class ConfigureUploadHandlerTest */ class ConfigureUploadHandlerTest extends TestCase { + /** + * + */ + public function setUp(): void + { + parent::setUp(); + Log::info(sprintf('Now in %s.', \get_class($this))); + } + /** * @covers \FireflyIII\Support\Import\JobConfiguration\File\ConfigureUploadHandler */ diff --git a/tests/Unit/Support/Import/JobConfiguration/File/NewFileJobHandlerTest.php b/tests/Unit/Support/Import/JobConfiguration/File/NewFileJobHandlerTest.php index 877e24e03e..c63d53ed08 100644 --- a/tests/Unit/Support/Import/JobConfiguration/File/NewFileJobHandlerTest.php +++ b/tests/Unit/Support/Import/JobConfiguration/File/NewFileJobHandlerTest.php @@ -33,12 +33,21 @@ use FireflyIII\Support\Import\JobConfiguration\File\NewFileJobHandler; use Illuminate\Support\Collection; use Mockery; use Tests\TestCase; - +use Log; /** * Class NewFileJobHandlerTest */ class NewFileJobHandlerTest extends TestCase { + /** + * + */ + public function setUp(): void + { + parent::setUp(); + Log::info(sprintf('Now in %s.', \get_class($this))); + } + /** * @covers \FireflyIII\Support\Import\JobConfiguration\File\NewFileJobHandler */ diff --git a/tests/Unit/Support/Import/JobConfiguration/Spectre/ChooseAccountsHandlerTest.php b/tests/Unit/Support/Import/JobConfiguration/Spectre/ChooseAccountsHandlerTest.php index e76be37a67..03f9122029 100644 --- a/tests/Unit/Support/Import/JobConfiguration/Spectre/ChooseAccountsHandlerTest.php +++ b/tests/Unit/Support/Import/JobConfiguration/Spectre/ChooseAccountsHandlerTest.php @@ -40,12 +40,21 @@ use FireflyIII\Support\Import\JobConfiguration\Spectre\ChooseAccountsHandler; use Illuminate\Support\Collection; use Mockery; use Tests\TestCase; +use Log; /** * Class ChooseAccountsHandlerTest */ class ChooseAccountsHandlerTest extends TestCase { + /** + * + */ + public function setUp(): void + { + parent::setUp(); + Log::info(sprintf('Now in %s.', \get_class($this))); + } /** * @covers \FireflyIII\Support\Import\JobConfiguration\Spectre\ChooseAccountsHandler */ diff --git a/tests/Unit/Support/Import/JobConfiguration/Spectre/ChooseLoginHandlerTest.php b/tests/Unit/Support/Import/JobConfiguration/Spectre/ChooseLoginHandlerTest.php index 92c8c9951c..0edc84de9b 100644 --- a/tests/Unit/Support/Import/JobConfiguration/Spectre/ChooseLoginHandlerTest.php +++ b/tests/Unit/Support/Import/JobConfiguration/Spectre/ChooseLoginHandlerTest.php @@ -38,12 +38,22 @@ use FireflyIII\Support\Import\JobConfiguration\Spectre\ChooseLoginHandler; use Mockery; use Preferences; use Tests\TestCase; +use Log; /** * Class ChooseLoginHandlerTest */ class ChooseLoginHandlerTest extends TestCase { + /** + * + */ + public function setUp(): void + { + parent::setUp(); + Log::info(sprintf('Now in %s.', \get_class($this))); + } + /** * @covers \FireflyIII\Support\Import\JobConfiguration\Spectre\ChooseLoginHandler */ diff --git a/tests/Unit/Support/Import/JobConfiguration/Spectre/DoAuthenticateHandlerTest.php b/tests/Unit/Support/Import/JobConfiguration/Spectre/DoAuthenticateHandlerTest.php index 91ef0280d8..91067c5c59 100644 --- a/tests/Unit/Support/Import/JobConfiguration/Spectre/DoAuthenticateHandlerTest.php +++ b/tests/Unit/Support/Import/JobConfiguration/Spectre/DoAuthenticateHandlerTest.php @@ -35,12 +35,21 @@ use FireflyIII\Support\Import\JobConfiguration\Spectre\DoAuthenticateHandler; use Mockery; use Preferences; use Tests\TestCase; - +use Log; /** * Class DoAuthenticateHandlerTest */ class DoAuthenticateHandlerTest extends TestCase { + /** + * + */ + public function setUp(): void + { + parent::setUp(); + Log::info(sprintf('Now in %s.', \get_class($this))); + } + /** * No token in config, but grab it from users preferences. * diff --git a/tests/Unit/Support/Import/Placeholder/ImportTransactionTest.php b/tests/Unit/Support/Import/Placeholder/ImportTransactionTest.php index df6f72cb34..b18481a6b2 100644 --- a/tests/Unit/Support/Import/Placeholder/ImportTransactionTest.php +++ b/tests/Unit/Support/Import/Placeholder/ImportTransactionTest.php @@ -28,12 +28,21 @@ use FireflyIII\Exceptions\FireflyException; use FireflyIII\Support\Import\Placeholder\ColumnValue; use FireflyIII\Support\Import\Placeholder\ImportTransaction; use Tests\TestCase; - +use Log; /** * Class ImportTransactionTest */ class ImportTransactionTest extends TestCase { + /** + * + */ + public function setUp(): void + { + parent::setUp(); + Log::info(sprintf('Now in %s.', \get_class($this))); + } + /** * Test what happens when you set the account-id using a ColumnValue. * Since this field can be mapped. Test with both the mapped and unmapped variant. diff --git a/tests/Unit/Support/Import/Routine/Bunq/StageImportDataHandlerTest.php b/tests/Unit/Support/Import/Routine/Bunq/StageImportDataHandlerTest.php index 91b7efa50f..c8f0a8b694 100644 --- a/tests/Unit/Support/Import/Routine/Bunq/StageImportDataHandlerTest.php +++ b/tests/Unit/Support/Import/Routine/Bunq/StageImportDataHandlerTest.php @@ -44,12 +44,22 @@ use FireflyIII\Support\Import\Routine\Bunq\StageImportDataHandler; use Mockery; use Preferences; use Tests\TestCase; +use Log; /** * Class StageImportDataHandlerTest */ class StageImportDataHandlerTest extends TestCase { + /** + * + */ + public function setUp(): void + { + parent::setUp(); + Log::info(sprintf('Now in %s.', \get_class($this))); + } + /** * @covers \FireflyIII\Support\Import\Routine\Bunq\StageImportDataHandler */ diff --git a/tests/Unit/Support/Import/Routine/Bunq/StageNewHandlerTest.php b/tests/Unit/Support/Import/Routine/Bunq/StageNewHandlerTest.php index 2fe4812a70..c0febf16e6 100644 --- a/tests/Unit/Support/Import/Routine/Bunq/StageNewHandlerTest.php +++ b/tests/Unit/Support/Import/Routine/Bunq/StageNewHandlerTest.php @@ -44,12 +44,22 @@ use Mockery; use Preferences; use Tests\Object\FakeApiContext; use Tests\TestCase; +use Log; /** * Class StageNewHandlerTest */ class StageNewHandlerTest extends TestCase { + /** + * + */ + public function setUp(): void + { + parent::setUp(); + Log::info(sprintf('Now in %s.', \get_class($this))); + } + /** * @covers \FireflyIII\Support\Import\Routine\Bunq\StageNewHandler */ diff --git a/tests/Unit/Support/Import/Routine/File/AssetAccountMapperTest.php b/tests/Unit/Support/Import/Routine/File/AssetAccountMapperTest.php index 46d6f38cca..0672cd77b1 100644 --- a/tests/Unit/Support/Import/Routine/File/AssetAccountMapperTest.php +++ b/tests/Unit/Support/Import/Routine/File/AssetAccountMapperTest.php @@ -29,12 +29,22 @@ use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Support\Import\Routine\File\AssetAccountMapper; use Illuminate\Support\Collection; use Tests\TestCase; +use Log; /** * Class AssetAccountMapperTest */ class AssetAccountMapperTest extends TestCase { + /** + * + */ + public function setUp(): void + { + parent::setUp(); + Log::info(sprintf('Now in %s.', \get_class($this))); + } + /** * Should return with the given $default account and not the $bad one. * diff --git a/tests/Unit/Support/Import/Routine/File/CSVProcessorTest.php b/tests/Unit/Support/Import/Routine/File/CSVProcessorTest.php index a76ef73a5a..9f4ae815f0 100644 --- a/tests/Unit/Support/Import/Routine/File/CSVProcessorTest.php +++ b/tests/Unit/Support/Import/Routine/File/CSVProcessorTest.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace Tests\Unit\Support\Import\Routine\File; +use Log; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Models\ImportJob; use FireflyIII\Support\Import\Routine\File\CSVProcessor; @@ -41,6 +42,14 @@ use Tests\TestCase; */ class CSVProcessorTest extends TestCase { + /** + * + */ + public function setUp(): void + { + parent::setUp(); + Log::info(sprintf('Now in %s.', \get_class($this))); + } /** * @covers \FireflyIII\Support\Import\Routine\File\CSVProcessor */ diff --git a/tests/Unit/Support/Import/Routine/File/CurrencyMapperTest.php b/tests/Unit/Support/Import/Routine/File/CurrencyMapperTest.php index 3a516cbc5f..c512b1b30f 100644 --- a/tests/Unit/Support/Import/Routine/File/CurrencyMapperTest.php +++ b/tests/Unit/Support/Import/Routine/File/CurrencyMapperTest.php @@ -28,12 +28,22 @@ use FireflyIII\Models\TransactionCurrency; use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; use FireflyIII\Support\Import\Routine\File\CurrencyMapper; use Tests\TestCase; +use Log; /** * Class CurrencyMapperTest */ class CurrencyMapperTest extends TestCase { + /** + * + */ + public function setUp(): void + { + parent::setUp(); + Log::info(sprintf('Now in %s.', \get_class($this))); + } + /** * @covers \FireflyIII\Support\Import\Routine\File\CurrencyMapper */ diff --git a/tests/Unit/Support/Import/Routine/File/ImportableConverterTest.php b/tests/Unit/Support/Import/Routine/File/ImportableConverterTest.php index 09c856a573..0de5b99fb2 100644 --- a/tests/Unit/Support/Import/Routine/File/ImportableConverterTest.php +++ b/tests/Unit/Support/Import/Routine/File/ImportableConverterTest.php @@ -35,6 +35,7 @@ use FireflyIII\Support\Import\Routine\File\ImportableConverter; use FireflyIII\Support\Import\Routine\File\OpposingAccountMapper; use Mockery; use Tests\TestCase; +use Log; /** * todo test foreign currency @@ -46,6 +47,15 @@ use Tests\TestCase; */ class ImportableConverterTest extends TestCase { + /** + * + */ + public function setUp(): void + { + parent::setUp(); + Log::info(sprintf('Now in %s.', \get_class($this))); + } + /** * Basic test. Should match a withdrawal. Amount is negative. * diff --git a/tests/Unit/Support/Import/Routine/File/ImportableCreatorTest.php b/tests/Unit/Support/Import/Routine/File/ImportableCreatorTest.php index 0c893def63..896f4126bd 100644 --- a/tests/Unit/Support/Import/Routine/File/ImportableCreatorTest.php +++ b/tests/Unit/Support/Import/Routine/File/ImportableCreatorTest.php @@ -28,12 +28,22 @@ use FireflyIII\Support\Import\Placeholder\ColumnValue; use FireflyIII\Support\Import\Placeholder\ImportTransaction; use FireflyIII\Support\Import\Routine\File\ImportableCreator; use Tests\TestCase; +use Log; /** * Class ImportableCreatorTest */ class ImportableCreatorTest extends TestCase { + /** + * + */ + public function setUp(): void + { + parent::setUp(); + Log::info(sprintf('Now in %s.', \get_class($this))); + } + /** * @covers \FireflyIII\Support\Import\Routine\File\ImportableCreator */ diff --git a/tests/Unit/Support/Import/Routine/File/LineReaderTest.php b/tests/Unit/Support/Import/Routine/File/LineReaderTest.php index 4c85b2ce22..b1031667c2 100644 --- a/tests/Unit/Support/Import/Routine/File/LineReaderTest.php +++ b/tests/Unit/Support/Import/Routine/File/LineReaderTest.php @@ -32,12 +32,22 @@ use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface; use FireflyIII\Support\Import\Routine\File\LineReader; use Illuminate\Support\Collection; use Tests\TestCase; +use Log; /** * Class LineReaderTest */ class LineReaderTest extends TestCase { + /** + * + */ + public function setUp(): void + { + parent::setUp(); + Log::info(sprintf('Now in %s.', \get_class($this))); + } + /** * @covers \FireflyIII\Support\Import\Routine\File\LineReader */ diff --git a/tests/Unit/Support/Import/Routine/File/MappedValuesValidatorTest.php b/tests/Unit/Support/Import/Routine/File/MappedValuesValidatorTest.php index cb85933a87..a49a83b930 100644 --- a/tests/Unit/Support/Import/Routine/File/MappedValuesValidatorTest.php +++ b/tests/Unit/Support/Import/Routine/File/MappedValuesValidatorTest.php @@ -35,12 +35,22 @@ use FireflyIII\Support\Import\Routine\File\MappedValuesValidator; use Illuminate\Support\Collection; use stdClass; use Tests\TestCase; +use Log; /** * Class MappedValuesValidatorTest */ class MappedValuesValidatorTest extends TestCase { + /** + * + */ + public function setUp(): void + { + parent::setUp(); + Log::info(sprintf('Now in %s.', \get_class($this))); + } + /** * @covers \FireflyIII\Support\Import\Routine\File\MappedValuesValidator */ diff --git a/tests/Unit/Support/Import/Routine/File/MappingConvergerTest.php b/tests/Unit/Support/Import/Routine/File/MappingConvergerTest.php index fef417afad..2556dd89fd 100644 --- a/tests/Unit/Support/Import/Routine/File/MappingConvergerTest.php +++ b/tests/Unit/Support/Import/Routine/File/MappingConvergerTest.php @@ -28,12 +28,21 @@ use FireflyIII\Exceptions\FireflyException; use FireflyIII\Models\ImportJob; use FireflyIII\Support\Import\Routine\File\MappingConverger; use Tests\TestCase; - +use Log; /** * Class MappingConvergerTest */ class MappingConvergerTest extends TestCase { + /** + * + */ + public function setUp(): void + { + parent::setUp(); + Log::info(sprintf('Now in %s.', \get_class($this))); + } + /** * @covers \FireflyIII\Support\Import\Routine\File\MappingConverger */ diff --git a/tests/Unit/Support/Import/Routine/File/OpposingAccountMapperTest.php b/tests/Unit/Support/Import/Routine/File/OpposingAccountMapperTest.php index adde7738a9..89ef6993dd 100644 --- a/tests/Unit/Support/Import/Routine/File/OpposingAccountMapperTest.php +++ b/tests/Unit/Support/Import/Routine/File/OpposingAccountMapperTest.php @@ -29,12 +29,22 @@ use FireflyIII\Models\AccountType; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Support\Import\Routine\File\OpposingAccountMapper; use Tests\TestCase; +use Log; /** * Class OpposingAccountMapperTest */ class OpposingAccountMapperTest extends TestCase { + /** + * + */ + public function setUp(): void + { + parent::setUp(); + Log::info(sprintf('Now in %s.', \get_class($this))); + } + /** * * Should return account with given ID (which is of correct type). diff --git a/tests/Unit/Support/Import/Routine/Spectre/StageAuthenticatedHandlerTest.php b/tests/Unit/Support/Import/Routine/Spectre/StageAuthenticatedHandlerTest.php index 0226738703..aff87197bc 100644 --- a/tests/Unit/Support/Import/Routine/Spectre/StageAuthenticatedHandlerTest.php +++ b/tests/Unit/Support/Import/Routine/Spectre/StageAuthenticatedHandlerTest.php @@ -38,12 +38,22 @@ use FireflyIII\Support\Import\Routine\Spectre\StageAuthenticatedHandler; use Mockery; use Preferences; use Tests\TestCase; +use Log; /** * Class StageAuthenticatedHandlerTest */ class StageAuthenticatedHandlerTest extends TestCase { + /** + * + */ + public function setUp(): void + { + parent::setUp(); + Log::info(sprintf('Now in %s.', \get_class($this))); + } + /** * Already have logins in configuration. * diff --git a/tests/Unit/Support/Import/Routine/Spectre/StageImportDataHandlerTest.php b/tests/Unit/Support/Import/Routine/Spectre/StageImportDataHandlerTest.php index 5d87619c1b..c6bb3e6708 100644 --- a/tests/Unit/Support/Import/Routine/Spectre/StageImportDataHandlerTest.php +++ b/tests/Unit/Support/Import/Routine/Spectre/StageImportDataHandlerTest.php @@ -36,12 +36,21 @@ use FireflyIII\Support\Import\Routine\File\OpposingAccountMapper; use FireflyIII\Support\Import\Routine\Spectre\StageImportDataHandler; use Mockery; use Tests\TestCase; +use Log; /** * Class StageImportDataHandlerTest */ class StageImportDataHandlerTest extends TestCase { + /** + * + */ + public function setUp(): void + { + parent::setUp(); + Log::info(sprintf('Now in %s.', \get_class($this))); + } /** * @covers \FireflyIII\Support\Import\Routine\Spectre\StageImportDataHandler */ diff --git a/tests/Unit/Support/Import/Routine/Spectre/StageNewHandlerTest.php b/tests/Unit/Support/Import/Routine/Spectre/StageNewHandlerTest.php index 9b32655e60..5c4eeccb72 100644 --- a/tests/Unit/Support/Import/Routine/Spectre/StageNewHandlerTest.php +++ b/tests/Unit/Support/Import/Routine/Spectre/StageNewHandlerTest.php @@ -39,13 +39,21 @@ use FireflyIII\Support\Import\Routine\Spectre\StageNewHandler; use Mockery; use Preferences; use Tests\TestCase; +use Log; /** * Class StageNewHandlerTest */ class StageNewHandlerTest extends TestCase { - + /** + * + */ + public function setUp(): void + { + parent::setUp(); + Log::info(sprintf('Now in %s.', \get_class($this))); + } // todo run() with zero logins and an existing customer (must be retrieved from Spectre). // todo run() with one login and an existing customer (must be retrieved from Spectre). diff --git a/tests/Unit/TransactionRules/Actions/AddTagTest.php b/tests/Unit/TransactionRules/Actions/AddTagTest.php index 87a4aaf0f4..2d20d420ad 100644 --- a/tests/Unit/TransactionRules/Actions/AddTagTest.php +++ b/tests/Unit/TransactionRules/Actions/AddTagTest.php @@ -28,6 +28,7 @@ use FireflyIII\Models\Tag; use FireflyIII\Models\TransactionJournal; use FireflyIII\TransactionRules\Actions\AddTag; use Tests\TestCase; +use Log; /** * Class AddTagTest @@ -35,7 +36,15 @@ use Tests\TestCase; class AddTagTest extends TestCase { /** - * @covers \FireflyIII\TransactionRules\Actions\AddTag + * + */ + public function setUp(): void + { + parent::setUp(); + Log::info(sprintf('Now in %s.', \get_class($this))); + } + + /** * @covers \FireflyIII\TransactionRules\Actions\AddTag */ public function testActExistingTag(): void diff --git a/tests/Unit/TransactionRules/Actions/AppendDescriptionTest.php b/tests/Unit/TransactionRules/Actions/AppendDescriptionTest.php index 2145f0fb71..ea202216fd 100644 --- a/tests/Unit/TransactionRules/Actions/AppendDescriptionTest.php +++ b/tests/Unit/TransactionRules/Actions/AppendDescriptionTest.php @@ -26,6 +26,7 @@ use FireflyIII\Models\RuleAction; use FireflyIII\Models\TransactionJournal; use FireflyIII\TransactionRules\Actions\AppendDescription; use Tests\TestCase; +use Log; /** * Class AppendDescriptionTest @@ -33,7 +34,15 @@ use Tests\TestCase; class AppendDescriptionTest extends TestCase { /** - * @covers \FireflyIII\TransactionRules\Actions\AppendDescription + * + */ + public function setUp(): void + { + parent::setUp(); + Log::info(sprintf('Now in %s.', \get_class($this))); + } + + /** * @covers \FireflyIII\TransactionRules\Actions\AppendDescription */ public function testActExistingTag(): void diff --git a/tests/Unit/TransactionRules/Actions/AppendNotesTest.php b/tests/Unit/TransactionRules/Actions/AppendNotesTest.php index bbc2715dac..e249482c48 100644 --- a/tests/Unit/TransactionRules/Actions/AppendNotesTest.php +++ b/tests/Unit/TransactionRules/Actions/AppendNotesTest.php @@ -27,12 +27,21 @@ use FireflyIII\Models\RuleAction; use FireflyIII\Models\TransactionJournal; use FireflyIII\TransactionRules\Actions\AppendNotes; use Tests\TestCase; - +use Log; /** * Class AppendNotesTest */ class AppendNotesTest extends TestCase { + /** + * + */ + public function setUp(): void + { + parent::setUp(); + Log::info(sprintf('Now in %s.', \get_class($this))); + } + /** * @covers \FireflyIII\TransactionRules\Actions\AppendNotes */ @@ -62,7 +71,6 @@ class AppendNotesTest extends TestCase } /** - * @covers \FireflyIII\TransactionRules\Actions\AppendNotes() * @covers \FireflyIII\TransactionRules\Actions\AppendNotes */ public function testActNewNote(): void diff --git a/tests/Unit/TransactionRules/Actions/ClearBudgetTest.php b/tests/Unit/TransactionRules/Actions/ClearBudgetTest.php index 2904dacfa4..18d48994a5 100644 --- a/tests/Unit/TransactionRules/Actions/ClearBudgetTest.php +++ b/tests/Unit/TransactionRules/Actions/ClearBudgetTest.php @@ -27,12 +27,22 @@ use FireflyIII\Models\Transaction; use FireflyIII\Models\TransactionJournal; use FireflyIII\TransactionRules\Actions\ClearBudget; use Tests\TestCase; +use Log; /** * Class ClearBudgetTest */ class ClearBudgetTest extends TestCase { + /** + * + */ + public function setUp(): void + { + parent::setUp(); + Log::info(sprintf('Now in %s.', \get_class($this))); + } + /** * @covers \FireflyIII\TransactionRules\Actions\ClearBudget */ diff --git a/tests/Unit/TransactionRules/Actions/ClearCategoryTest.php b/tests/Unit/TransactionRules/Actions/ClearCategoryTest.php index f81bd069e3..f99768aac9 100644 --- a/tests/Unit/TransactionRules/Actions/ClearCategoryTest.php +++ b/tests/Unit/TransactionRules/Actions/ClearCategoryTest.php @@ -27,12 +27,21 @@ use FireflyIII\Models\Transaction; use FireflyIII\Models\TransactionJournal; use FireflyIII\TransactionRules\Actions\ClearCategory; use Tests\TestCase; - +use Log; /** * Class ClearCategoryTest */ class ClearCategoryTest extends TestCase { + /** + * + */ + public function setUp(): void + { + parent::setUp(); + Log::info(sprintf('Now in %s.', \get_class($this))); + } + /** * @covers \FireflyIII\TransactionRules\Actions\ClearCategory */ diff --git a/tests/Unit/TransactionRules/Actions/ClearNotesTest.php b/tests/Unit/TransactionRules/Actions/ClearNotesTest.php index 051b9858e3..76662cb604 100644 --- a/tests/Unit/TransactionRules/Actions/ClearNotesTest.php +++ b/tests/Unit/TransactionRules/Actions/ClearNotesTest.php @@ -28,12 +28,23 @@ use FireflyIII\Models\RuleAction; use FireflyIII\Models\TransactionJournal; use FireflyIII\TransactionRules\Actions\ClearNotes; use Tests\TestCase; +use Log; + /** * Class ClearNotesTest */ class ClearNotesTest extends TestCase { + /** + * + */ + public function setUp(): void + { + parent::setUp(); + Log::info(sprintf('Now in %s.', \get_class($this))); + } + /** * @covers \FireflyIII\TransactionRules\Actions\ClearNotes */