Optimise test code.

tests/Unit/Console/Commands/Correction/DeleteEmptyJournalsTest.php

@@ -104,7 +104,7 @@ class DeleteEmptyJournalsTest extends TestCase
 
         $this->artisan('firefly-iii:delete-empty-journals')
              ->expectsOutput(sprintf('Deleted transaction journal #%d because it had an uneven number of transactions.', $journal->id))
-            ->expectsOutput('No empty transaction journals.')
+             ->expectsOutput('No empty transaction journals.')
              ->assertExitCode(0);
 
         // verify both are gone

tests/Unit/Console/Commands/Correction/EnableCurrenciesTest.php

@@ -50,7 +50,7 @@ class EnableCurrenciesTest extends TestCase
         $count = TransactionCurrency::where('enabled', 1)->count();
 
         $this->artisan('firefly-iii:enable-currencies')
-            ->expectsOutput('All currencies are correctly enabled or disabled.')
+             ->expectsOutput('All currencies are correctly enabled or disabled.')
              ->assertExitCode(0);
 
 

tests/Unit/Console/Commands/Correction/RenameMetaFieldsTest.php

@@ -46,7 +46,7 @@ class RenameMetaFieldsTest extends TestCase
     public function testHandle(): void
     {
         $this->artisan('firefly-iii:rename-meta-fields')
-            ->expectsOutput('All meta fields are correct.')
+             ->expectsOutput('All meta fields are correct.')
              ->assertExitCode(0);
     }
 
@@ -66,7 +66,7 @@ class RenameMetaFieldsTest extends TestCase
         );
 
         $this->artisan('firefly-iii:rename-meta-fields')
-            ->expectsOutput('Renamed 1 meta field(s).')
+             ->expectsOutput('Renamed 1 meta field(s).')
              ->assertExitCode(0);
 
         // verify update

tests/Unit/Console/Commands/DecryptDatabaseTest.php

@@ -61,7 +61,6 @@ class DecryptDatabaseTest extends TestCase
             ]);
 
 
-
         FireflyConfig::shouldReceive('get')->withArgs([Mockery::any(), false])->atLeast()->once()->andReturn(null);
         FireflyConfig::shouldReceive('set')->withArgs([Mockery::any(), true])->atLeast()->once();
 
@@ -113,9 +112,9 @@ class DecryptDatabaseTest extends TestCase
     public function testHandleNotEncrypted(): void
     {
         // create encrypted account:
-        $name          = 'Encrypted name';
-        $iban          = 'HR1723600001101234565';
-        $account       = Account::create(
+        $name    = 'Encrypted name';
+        $iban    = 'HR1723600001101234565';
+        $account = Account::create(
             [
                 'user_id'         => 1,
                 'account_type_id' => 1,

tests/Unit/Console/Commands/Tools/ApplyRulesTest.php

@@ -27,6 +27,7 @@ use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
 use FireflyIII\Repositories\Rule\RuleRepositoryInterface;
 use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface;
+use FireflyIII\Repositories\User\UserRepositoryInterface;
 use FireflyIII\TransactionRules\Engine\RuleEngine;
 use Illuminate\Support\Collection;
 use Log;
@@ -59,6 +60,7 @@ class ApplyRulesTest extends TestCase
         $collector      = $this->mock(GroupCollectorInterface::class);
         $accountRepos   = $this->mock(AccountRepositoryInterface::class);
         $ruleEngine     = $this->mock(RuleEngine::class);
+        $userRepos      = $this->mock(UserRepositoryInterface::class);
 
         // data
         $asset   = $this->getRandomAsset();
@@ -69,6 +71,7 @@ class ApplyRulesTest extends TestCase
         $rules   = new Collection([$rule]);
 
         // expected calls:
+        $userRepos->shouldReceive('findNull')->atLeast()->once()->andReturn($this->user());
         $ruleRepos->shouldReceive('setUser')->atLeast()->once();
         $ruleGroupRepos->shouldReceive('setUser')->atLeast()->once();
         $accountRepos->shouldReceive('setUser')->atLeast()->once();
@@ -109,7 +112,7 @@ class ApplyRulesTest extends TestCase
      *
      * @covers \FireflyIII\Console\Commands\Tools\ApplyRules
      */
-    public function testHandEmptye(): void
+    public function testHandEmpty(): void
     {
         $ruleRepos      = $this->mock(RuleRepositoryInterface::class);
         $ruleGroupRepos = $this->mock(RuleGroupRepositoryInterface::class);
@@ -117,6 +120,7 @@ class ApplyRulesTest extends TestCase
         $collector      = $this->mock(GroupCollectorInterface::class);
         $accountRepos   = $this->mock(AccountRepositoryInterface::class);
         $ruleEngine     = $this->mock(RuleEngine::class);
+        $userRepos      = $this->mock(UserRepositoryInterface::class);
 
         // data
         $asset   = $this->getRandomAsset();
@@ -125,6 +129,7 @@ class ApplyRulesTest extends TestCase
         $groups  = new Collection([$group]);
 
         // expected calls:
+        $userRepos->shouldReceive('findNull')->atLeast()->once()->andReturn($this->user());
         $ruleRepos->shouldReceive('setUser')->atLeast()->once();
         $ruleGroupRepos->shouldReceive('setUser')->atLeast()->once();
         $accountRepos->shouldReceive('setUser')->atLeast()->once();
@@ -172,6 +177,7 @@ class ApplyRulesTest extends TestCase
         $collector    = $this->mock(GroupCollectorInterface::class);
         $accountRepos = $this->mock(AccountRepositoryInterface::class);
         $ruleEngine   = $this->mock(RuleEngine::class);
+        $userRepos    = $this->mock(UserRepositoryInterface::class);
 
         // data
         $asset  = $this->getRandomAsset();
@@ -181,6 +187,7 @@ class ApplyRulesTest extends TestCase
         $rules  = new Collection([$rule]);
 
         // expected calls:
+        $userRepos->shouldReceive('findNull')->atLeast()->once()->andReturn($this->user());
         $ruleRepos->shouldReceive('setUser')->atLeast()->once();
         $ruleGroupRepos->shouldReceive('setUser')->atLeast()->once();
         $accountRepos->shouldReceive('setUser')->atLeast()->once();
@@ -227,6 +234,7 @@ class ApplyRulesTest extends TestCase
         $collector      = $this->mock(GroupCollectorInterface::class);
         $accountRepos   = $this->mock(AccountRepositoryInterface::class);
         $ruleEngine     = $this->mock(RuleEngine::class);
+        $userRepos      = $this->mock(UserRepositoryInterface::class);
 
         // data
         $asset        = $this->getRandomAsset();
@@ -238,6 +246,7 @@ class ApplyRulesTest extends TestCase
         $rules        = new Collection([$activeRule]);
 
         // expected calls:
+        $userRepos->shouldReceive('findNull')->atLeast()->once()->andReturn($this->user());
         $ruleRepos->shouldReceive('setUser')->atLeast()->once();
         $ruleGroupRepos->shouldReceive('setUser')->atLeast()->once();
         $accountRepos->shouldReceive('setUser')->atLeast()->once();
@@ -287,6 +296,7 @@ class ApplyRulesTest extends TestCase
         $collector      = $this->mock(GroupCollectorInterface::class);
         $accountRepos   = $this->mock(AccountRepositoryInterface::class);
         $ruleEngine     = $this->mock(RuleEngine::class);
+        $userRepos      = $this->mock(UserRepositoryInterface::class);
 
         $activeGroup   = $this->user()->ruleGroups()->where('active', 1)->inRandomOrder()->first();
         $inactiveGroup = $this->user()->ruleGroups()->where('active', 0)->inRandomOrder()->first();
@@ -299,6 +309,7 @@ class ApplyRulesTest extends TestCase
         $rules   = new Collection([$rule]);
 
         // expected calls:
+        $userRepos->shouldReceive('findNull')->atLeast()->once()->andReturn($this->user());
         $ruleRepos->shouldReceive('setUser')->atLeast()->once();
         $ruleGroupRepos->shouldReceive('setUser')->atLeast()->once();
         $accountRepos->shouldReceive('setUser')->atLeast()->once();
@@ -348,8 +359,10 @@ class ApplyRulesTest extends TestCase
         $this->mock(GroupCollectorInterface::class);
         $this->mock(AccountRepositoryInterface::class);
         $this->mock(RuleEngine::class);
+        $userRepos = $this->mock(UserRepositoryInterface::class);
 
         // expected calls:
+        $userRepos->shouldReceive('findNull')->atLeast()->once()->andReturn($this->user());
         $ruleRepos->shouldReceive('setUser')->atLeast()->once();
         $ruleGroupRepos->shouldReceive('setUser')->atLeast()->once();
 
@@ -374,15 +387,17 @@ class ApplyRulesTest extends TestCase
     {
         $ruleRepos      = $this->mock(RuleRepositoryInterface::class);
         $ruleGroupRepos = $this->mock(RuleGroupRepositoryInterface::class);
+        $accountRepos   = $this->mock(AccountRepositoryInterface::class);
+        $userRepos      = $this->mock(UserRepositoryInterface::class);
+        $this->mock(RuleEngine::class);
         $this->mock(JournalRepositoryInterface::class);
         $this->mock(GroupCollectorInterface::class);
-        $accountRepos = $this->mock(AccountRepositoryInterface::class);
-        $this->mock(RuleEngine::class);
 
         // data
         $expense = $this->getRandomExpense();
 
         // expected calls:
+        $userRepos->shouldReceive('findNull')->atLeast()->once()->andReturn($this->user());
         $ruleRepos->shouldReceive('setUser')->atLeast()->once();
         $ruleGroupRepos->shouldReceive('setUser')->atLeast()->once();
         $accountRepos->shouldReceive('setUser')->atLeast()->once();

tests/Unit/Console/Commands/Upgrade/BudgetLimitCurrencyTest.php

@@ -50,7 +50,7 @@ class BudgetLimitCurrencyTest extends TestCase
         BudgetLimit::whereNull('transaction_currency_id')->forceDelete();
 
         $this->artisan('firefly-iii:bl-currency')
-            ->expectsOutput('All budget limits are correct.')
+             ->expectsOutput('All budget limits are correct.')
              ->assertExitCode(0);
     }
 

tests/Unit/Console/Commands/Upgrade/MigrateToGroupsTest.php

@@ -57,6 +57,8 @@ class MigrateToGroupsTest extends TestCase
     public function testHandle(): void
     {
         $journalRepos = $this->mock(JournalRepositoryInterface::class);
+        $service      = $this->mock(JournalDestroyService::class);
+        $groupFactory = $this->mock(TransactionGroupFactory::class);
 
         // mock calls:
         $journalRepos->shouldReceive('getSplitJournals')
@@ -85,9 +87,12 @@ class MigrateToGroupsTest extends TestCase
     public function testHandleNoGroup(): void
     {
         $journalRepos = $this->mock(JournalRepositoryInterface::class);
-        $asset        = $this->getRandomAsset();
-        $expense      = $this->getRandomExpense();
-        $journal      = TransactionJournal::create(
+        $service      = $this->mock(JournalDestroyService::class);
+        $groupFactory = $this->mock(TransactionGroupFactory::class);
+
+        $asset   = $this->getRandomAsset();
+        $expense = $this->getRandomExpense();
+        $journal = TransactionJournal::create(
             [
                 'user_id'                 => 1,
                 'transaction_currency_id' => 1,
@@ -97,7 +102,7 @@ class MigrateToGroupsTest extends TestCase
                 'date'                    => '2019-01-01',
             ]
         );
-        $one          = Transaction::create(
+        $one     = Transaction::create(
             [
                 'transaction_journal_id' => $journal->id,
                 'account_id'             => $asset->id,
@@ -105,7 +110,7 @@ class MigrateToGroupsTest extends TestCase
                 'identifier'             => 1,
             ]
         );
-        $two          = Transaction::create(
+        $two     = Transaction::create(
             [
                 'transaction_journal_id' => $journal->id,
                 'account_id'             => $expense->id,
@@ -113,7 +118,7 @@ class MigrateToGroupsTest extends TestCase
                 'identifier'             => 1,
             ]
         );
-        $array        = $journal->toArray();
+        $array   = $journal->toArray();
 
         // mock calls:
         $journalRepos->shouldReceive('getSplitJournals')

tests/Unit/Console/Commands/Upgrade/TransactionIdentifierTest.php

@@ -140,7 +140,7 @@ class TransactionIdentifierTest extends TestCase
 
         // assume all is well.
         $this->artisan('firefly-iii:transaction-identifiers')
-            ->expectsOutput('Fixed 2 split journal transaction identifier(s).')
+             ->expectsOutput('Fixed 2 split journal transaction identifier(s).')
              ->assertExitCode(0);
 
         // see results: