Expand test coverage and improve transaction management code.

2025-10-12 15:35:15 +00:00 · 2019-07-01 20:22:35 +02:00
parent 94acb50a6f
commit 5bbe1eab7c
63 changed files with 1251 additions and 812 deletions
--- a/tests/Feature/Controllers/Rule/CreateControllerTest.php
+++ b/tests/Feature/Controllers/Rule/CreateControllerTest.php
@@ -33,6 +33,7 @@ use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface;
 use FireflyIII\Repositories\User\UserRepositoryInterface;
 use Log;
 use Mockery;
+use Preferences;
 use Tests\TestCase;

 /**
@@ -56,12 +57,13 @@ class CreateControllerTest extends TestCase
    public function testCreate(): void
    {
        // 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);
-        $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal);
+
+        $this->mockDefaultSession();
+        $this->mockIntroPreference('shown_demo_rules_create');

        $ruleGroupRepos->shouldReceive('count')->atLeast()->once()->andReturn(1);
        $ruleRepos->shouldReceive('count')->atLeast()->once()->andReturn(1);
@@ -80,17 +82,17 @@ class CreateControllerTest extends TestCase
    public function testCreateFromBill(): void
    {
        // 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);

+        $this->mockDefaultSession();
+
        $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());
        $response = $this->get(route('rules.create-from-bill', [1, 1]));
@@ -114,17 +116,17 @@ class CreateControllerTest extends TestCase
        $this->session(['_old_input' => $old]);

        // mock stuff
-        $journalRepos   = $this->mock(JournalRepositoryInterface::class);
        $ruleRepos      = $this->mock(RuleRepositoryInterface::class);
        $ruleGroupRepos = $this->mock(RuleGroupRepositoryInterface::class);
        $userRepos      = $this->mock(UserRepositoryInterface::class);

+        $this->mockDefaultSession();
+        $this->mockIntroPreference('shown_demo_rules_create');
+
        $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());
        $response = $this->get(route('rules.create', [1]));
        $response->assertStatus(200);
@@ -139,12 +141,13 @@ 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);

+        $this->mockDefaultSession();
+        Preferences::shouldReceive('mark')->atLeast()->once();
+

-        $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal);
        $repository->shouldReceive('store')->andReturn(new Rule);

        $this->session(['rules.create.uri' => 'http://localhost']);
--- a/tests/Feature/Controllers/Rule/DeleteControllerTest.php
+++ b/tests/Feature/Controllers/Rule/DeleteControllerTest.php
@@ -30,6 +30,7 @@ use FireflyIII\Repositories\Rule\RuleRepositoryInterface;
 use FireflyIII\Repositories\User\UserRepositoryInterface;
 use Log;
 use Mockery;
+use Preferences;
 use Tests\TestCase;

 /**
@@ -54,13 +55,14 @@ class DeleteControllerTest extends TestCase
    public function testDelete(): void
    {
        // mock stuff
-        $journalRepos = $this->mock(JournalRepositoryInterface::class);
        $ruleRepos    = $this->mock(RuleRepositoryInterface::class);
        $userRepos    = $this->mock(UserRepositoryInterface::class);

+        $this->mockDefaultSession();
+
        $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'owner'])->atLeast()->once()->andReturn(true);

-        $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal);
+

        $this->be($this->user());
        $response = $this->get(route('rules.delete', [1]));
@@ -75,10 +77,11 @@ class DeleteControllerTest extends TestCase
    {
        // mock stuff
        $repository   = $this->mock(RuleRepositoryInterface::class);
-        $journalRepos = $this->mock(JournalRepositoryInterface::class);
-        $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal);
        $repository->shouldReceive('destroy');

+        $this->mockDefaultSession();
+        Preferences::shouldReceive('mark')->atLeast()->once();
+
        $this->session(['rules.delete.uri' => 'http://localhost']);
        $this->be($this->user());
        $response = $this->post(route('rules.destroy', [1]));
--- a/tests/Feature/Controllers/Rule/EditControllerTest.php
+++ b/tests/Feature/Controllers/Rule/EditControllerTest.php
@@ -33,6 +33,7 @@ use FireflyIII\Repositories\User\UserRepositoryInterface;
 use Illuminate\Support\Collection;
 use Log;
 use Mockery;
+use Preferences;
 use Tests\TestCase;

 /**
@@ -57,12 +58,11 @@ class EditControllerTest extends TestCase
        // mock stuff
        $groupRepos   = $this->mock(RuleGroupRepositoryInterface::class);
        $repository   = $this->mock(RuleRepositoryInterface::class);
-        $journalRepos = $this->mock(JournalRepositoryInterface::class);
        $userRepos    = $this->mock(UserRepositoryInterface::class);
+        $this->mockDefaultSession();

        $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);

@@ -90,11 +90,11 @@ class EditControllerTest extends TestCase
        // mock stuff
        $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);
+        $this->mockDefaultSession();
+

-        $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal);
        $repository->shouldReceive('getPrimaryTrigger')->andReturn(new Rule);
        $groupRepos->shouldReceive('get')->andReturn(new Collection);

@@ -112,11 +112,12 @@ 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);
+
+        $this->mockDefaultSession();
+        Preferences::shouldReceive('mark')->atLeast()->once();
+
        $repository->shouldReceive('update');

        $data = [
--- a/tests/Feature/Controllers/Rule/IndexControllerTest.php
+++ b/tests/Feature/Controllers/Rule/IndexControllerTest.php
@@ -59,11 +59,11 @@ class IndexControllerTest 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('moveDown');
+        $this->mockDefaultSession();


        $this->be($this->user());
@@ -81,11 +81,12 @@ class IndexControllerTest extends TestCase
        // mock stuff
        $repository     = $this->mock(RuleRepositoryInterface::class);
        $ruleGroupRepos = $this->mock(RuleGroupRepositoryInterface::class);
-        $journalRepos   = $this->mock(JournalRepositoryInterface::class);
        $userRepos      = $this->mock(UserRepositoryInterface::class);
+        $this->mockDefaultSession();
+        $this->mockIntroPreference('shown_demo_rules_index');

        $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'owner'])->atLeast()->once()->andReturn(true);
-        $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal);
+
        $ruleGroupRepos->shouldReceive('count')->andReturn(0);
        $ruleGroupRepos->shouldReceive('store');
        $repository->shouldReceive('getFirstRuleGroup')->andReturn(new RuleGroup);
@@ -106,11 +107,10 @@ class IndexControllerTest extends TestCase
    {
        // mock stuff
        $repository     = $this->mock(RuleRepositoryInterface::class);
-        $journalRepos   = $this->mock(JournalRepositoryInterface::class);
        $ruleGroupRepos = $this->mock(RuleGroupRepositoryInterface::class);
        $userRepos      = $this->mock(UserRepositoryInterface::class);
+        $this->mockDefaultSession();

-        $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal);

        $data = ['actions' => [1, 2, 3]];
        $repository->shouldReceive('reorderRuleActions')->once();
@@ -127,11 +127,10 @@ class IndexControllerTest extends TestCase
    {
        // mock stuff
        $repository     = $this->mock(RuleRepositoryInterface::class);
-        $journalRepos   = $this->mock(JournalRepositoryInterface::class);
        $ruleGroupRepos = $this->mock(RuleGroupRepositoryInterface::class);
        $userRepos      = $this->mock(UserRepositoryInterface::class);
+        $this->mockDefaultSession();

-        $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal);
        $data = ['triggers' => [1, 2, 3]];
        $repository->shouldReceive('reorderRuleTriggers')->once();

@@ -148,12 +147,11 @@ class IndexControllerTest extends TestCase
    {
        // mock stuff
        $repository     = $this->mock(RuleRepositoryInterface::class);
-        $journalRepos   = $this->mock(JournalRepositoryInterface::class);
        $ruleGroupRepos = $this->mock(RuleGroupRepositoryInterface::class);
        $userRepos      = $this->mock(UserRepositoryInterface::class);
+        $this->mockDefaultSession();


-        $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal);
        $repository->shouldReceive('moveUp');

        $this->be($this->user());
--- a/tests/Feature/Controllers/Rule/SelectControllerTest.php
+++ b/tests/Feature/Controllers/Rule/SelectControllerTest.php
@@ -63,6 +63,7 @@ class SelectControllerTest extends TestCase
        $accountRepos = $this->mock(AccountRepositoryInterface::class);
        $repository   = $this->mock(RuleRepositoryInterface::class);
        $userRepos    = $this->mock(UserRepositoryInterface::class);
+        $this->mockDefaultSession();

        $this->session(['first' => new Carbon('2010-01-01')]);
        $accountRepos->shouldReceive('getAccountsById')->andReturn(new Collection([$account]));
@@ -81,7 +82,7 @@ class SelectControllerTest extends TestCase

        Queue::assertPushed(
            ExecuteRuleOnExistingTransactions::class, function (Job $job) {
-            return $job->getRule()->id === 1;
+            return 1=== $job->getRule()->id;
        }
        );
    }
@@ -93,6 +94,7 @@ class SelectControllerTest extends TestCase
    {
        $accountRepos = $this->mock(AccountRepositoryInterface::class);
        $userRepos    = $this->mock(UserRepositoryInterface::class);
+        $this->mockDefaultSession();

        $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'owner'])->atLeast()->once()->andReturn(true);
        $accountRepos->shouldReceive('getAccountsByType')->andReturn(new Collection);
@@ -119,11 +121,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);
+        $this->mockDefaultSession();

        $matcher->shouldReceive('setStrict')->once()->withArgs([false])->andReturnSelf();
        $matcher->shouldReceive('setTriggeredLimit')->withArgs([10])->andReturnSelf()->once();
@@ -144,11 +144,12 @@ class SelectControllerTest extends TestCase
    {
        $matcher      = $this->mock(TransactionMatcher::class);
        $accountRepos = $this->mock(AccountRepositoryInterface::class);
+        $this->mockDefaultSession();

        $matcher->shouldReceive('setTriggeredLimit')->withArgs([10])->andReturnSelf()->once();
        $matcher->shouldReceive('setSearchLimit')->withArgs([200])->andReturnSelf()->once();
        $matcher->shouldReceive('setRule')->andReturnSelf()->once();
-        $matcher->shouldReceive('findTransactionsByRule')->andReturn(new Collection);
+        $matcher->shouldReceive('findTransactionsByRule')->andReturn([]);

        $this->be($this->user());
        $response = $this->get(route('rules.test-triggers-rule', [1]));
@@ -163,11 +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->mockDefaultSession();

        $this->be($this->user());
        $uri      = route('rules.test-triggers');