kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-14 16:13:54 +00:00
Code Issues Projects Releases Wiki Activity

Code cleanup and realign.

Browse Source
This commit is contained in:
James Cole
2018-08-06 19:14:30 +02:00
parent f7eef25fed
commit 5908c0ce8c
188 changed files with 1019 additions and 1031 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/Unit/TransactionRules/Actions/ClearBudgetTest.php
View File

@@ -56,7 +56,7 @@ class ClearBudgetTest extends TestCase
$this->assertEquals(0, $journal->budgets()->count());
/** @var Transaction $transaction */
foreach($journal->transactions as $transaction) {
foreach ($journal->transactions as $transaction) {
$this->assertEquals(0, $transaction->budgets()->count());
}

2
tests/Unit/TransactionRules/Actions/ClearCategoryTest.php
View File

@@ -56,7 +56,7 @@ class ClearCategoryTest extends TestCase
$this->assertEquals(0, $journal->categories()->count());
/** @var Transaction $transaction */
foreach($journal->transactions as $transaction) {
foreach ($journal->transactions as $transaction) {
$this->assertEquals(0, $transaction->categories()->count());
}
}

4
tests/Unit/TransactionRules/Triggers/BudgetIsTest.php
View File

@@ -86,11 +86,11 @@ class BudgetIsTest extends TestCase
/** @var Collection $transactions */
$transactions = $journal->transactions()->get();
$budget = $journal->user->budgets()->first();
$budget = $journal->user->budgets()->first();
$journal->budgets()->detach();
/** @var Transaction $transaction */
foreach($transactions as $transaction) {
foreach ($transactions as $transaction) {
$transaction->budgets()->detach();
$transaction->budgets()->save($budget);
$this->assertEquals(1, $transaction->budgets()->count());

12
tests/Unit/TransactionRules/Triggers/FromAccountEndsTest.php
View File

@@ -92,8 +92,8 @@ class FromAccountEndsTest extends TestCase
public function testWillMatchEverythingEmpty(): void
{
$repository = $this->mock(JournalRepositoryInterface::class);
$value = '';
$result = FromAccountEnds::willMatchEverything($value);
$value = '';
$result = FromAccountEnds::willMatchEverything($value);
$this->assertTrue($result);
}
@@ -103,8 +103,8 @@ class FromAccountEndsTest extends TestCase
public function testWillMatchEverythingNotNull(): void
{
$repository = $this->mock(JournalRepositoryInterface::class);
$value = 'x';
$result = FromAccountEnds::willMatchEverything($value);
$value = 'x';
$result = FromAccountEnds::willMatchEverything($value);
$this->assertFalse($result);
}
@@ -114,8 +114,8 @@ class FromAccountEndsTest extends TestCase
public function testWillMatchEverythingNull(): void
{
$repository = $this->mock(JournalRepositoryInterface::class);
$value = null;
$result = FromAccountEnds::willMatchEverything($value);
$value = null;
$result = FromAccountEnds::willMatchEverything($value);
$this->assertTrue($result);
}
}

14
tests/Unit/TransactionRules/Triggers/FromAccountIsTest.php
View File

@@ -27,7 +27,7 @@ use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
use FireflyIII\TransactionRules\Triggers\FromAccountIs;
use Illuminate\Support\Collection;
use Tests\TestCase;
use Log;
/**
* Class FromAccountIsTest
*/
@@ -76,8 +76,8 @@ class FromAccountIsTest extends TestCase
public function testWillMatchEverythingEmpty(): void
{
$repository = $this->mock(JournalRepositoryInterface::class);
$value = '';
$result = FromAccountIs::willMatchEverything($value);
$value = '';
$result = FromAccountIs::willMatchEverything($value);
$this->assertTrue($result);
}
@@ -87,8 +87,8 @@ class FromAccountIsTest extends TestCase
public function testWillMatchEverythingNotNull(): void
{
$repository = $this->mock(JournalRepositoryInterface::class);
$value = 'x';
$result = FromAccountIs::willMatchEverything($value);
$value = 'x';
$result = FromAccountIs::willMatchEverything($value);
$this->assertFalse($result);
}
@@ -98,8 +98,8 @@ class FromAccountIsTest extends TestCase
public function testWillMatchEverythingNull(): void
{
$repository = $this->mock(JournalRepositoryInterface::class);
$value = null;
$result = FromAccountIs::willMatchEverything($value);
$value = null;
$result = FromAccountIs::willMatchEverything($value);
$this->assertTrue($result);
}
}

12
tests/Unit/TransactionRules/Triggers/FromAccountStartsTest.php
View File

@@ -103,8 +103,8 @@ class FromAccountStartsTest extends TestCase
public function testWillMatchEverythingEmpty(): void
{
$repository = $this->mock(JournalRepositoryInterface::class);
$value = '';
$result = FromAccountStarts::willMatchEverything($value);
$value = '';
$result = FromAccountStarts::willMatchEverything($value);
$this->assertTrue($result);
}
@@ -114,8 +114,8 @@ class FromAccountStartsTest extends TestCase
public function testWillMatchEverythingNotNull(): void
{
$repository = $this->mock(JournalRepositoryInterface::class);
$value = 'x';
$result = FromAccountStarts::willMatchEverything($value);
$value = 'x';
$result = FromAccountStarts::willMatchEverything($value);
$this->assertFalse($result);
}
@@ -125,8 +125,8 @@ class FromAccountStartsTest extends TestCase
public function testWillMatchEverythingNull(): void
{
$repository = $this->mock(JournalRepositoryInterface::class);
$value = null;
$result = FromAccountStarts::willMatchEverything($value);
$value = null;
$result = FromAccountStarts::willMatchEverything($value);
$this->assertTrue($result);
}
}

10
tests/Unit/TransactionRules/Triggers/HasAttachmentTest.php
View File

@@ -38,9 +38,9 @@ class HasAttachmentTest extends TestCase
{
do {
$journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first();
$count = $journal->attachments()->count();
} while($count !== 0);
$count = $journal->attachments()->count();
} while ($count !== 0);
$attachment = $journal->user->attachments()->first();
$journal->attachments()->save($attachment);
$this->assertEquals(1, $journal->attachments()->count());
@@ -58,8 +58,8 @@ class HasAttachmentTest extends TestCase
do {
// this is kind of cheating but OK.
$journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first();
$count = $journal->attachments()->count();
} while($count !== 0);
$count = $journal->attachments()->count();
} while ($count !== 0);
$this->assertEquals(0, $journal->attachments()->count());

4
tests/Unit/TransactionRules/Triggers/HasNoBudgetTest.php
View File

@@ -74,8 +74,8 @@ class HasNoBudgetTest extends TestCase
{
$loopCount = 0;
do {
$journal = $this->user()->transactionJournals()->inRandomOrder()->whereNull('deleted_at')->first();
$count = $journal->transactions()->count();
$journal = $this->user()->transactionJournals()->inRandomOrder()->whereNull('deleted_at')->first();
$count = $journal->transactions()->count();
} while ($loopCount < 30 && $count !== 2);
$transactions = $journal->transactions()->get();

12
tests/Unit/TransactionRules/Triggers/ToAccountContainsTest.php
View File

@@ -77,8 +77,8 @@ class ToAccountContainsTest extends TestCase
public function testWillMatchEverythingEmpty(): void
{
$repository = $this->mock(JournalRepositoryInterface::class);
$value = '';
$result = ToAccountContains::willMatchEverything($value);
$value = '';
$result = ToAccountContains::willMatchEverything($value);
$this->assertTrue($result);
}
@@ -88,8 +88,8 @@ class ToAccountContainsTest extends TestCase
public function testWillMatchEverythingNotNull(): void
{
$repository = $this->mock(JournalRepositoryInterface::class);
$value = 'x';
$result = ToAccountContains::willMatchEverything($value);
$value = 'x';
$result = ToAccountContains::willMatchEverything($value);
$this->assertFalse($result);
}
@@ -99,8 +99,8 @@ class ToAccountContainsTest extends TestCase
public function testWillMatchEverythingNull(): void
{
$repository = $this->mock(JournalRepositoryInterface::class);
$value = null;
$result = ToAccountContains::willMatchEverything($value);
$value = null;
$result = ToAccountContains::willMatchEverything($value);
$this->assertTrue($result);
}
}

1
tests/Unit/TransactionRules/Triggers/ToAccountEndsTest.php
View File

@@ -26,7 +26,6 @@ use FireflyIII\Models\TransactionJournal;
use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
use FireflyIII\TransactionRules\Triggers\ToAccountEnds;
use Illuminate\Support\Collection;
use Log;
use Tests\TestCase;
/**

14
tests/Unit/TransactionRules/Triggers/ToAccountIsTest.php
View File

@@ -27,7 +27,6 @@ use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
use FireflyIII\TransactionRules\Triggers\ToAccountIs;
use Illuminate\Support\Collection;
use Tests\TestCase;
use Log;
/**
* Class ToAccountIsTest
@@ -48,7 +47,6 @@ class ToAccountIsTest extends TestCase
$repository->shouldReceive('getJournalDestinationAccounts')->once()->andReturn($collection);
$trigger = ToAccountIs::makeFromStrings($account->name, false);
$result = $trigger->triggered($journal);
$this->assertTrue($result);
@@ -78,8 +76,8 @@ class ToAccountIsTest extends TestCase
public function testWillMatchEverythingEmpty(): void
{
$repository = $this->mock(JournalRepositoryInterface::class);
$value = '';
$result = ToAccountIs::willMatchEverything($value);
$value = '';
$result = ToAccountIs::willMatchEverything($value);
$this->assertTrue($result);
}
@@ -89,8 +87,8 @@ class ToAccountIsTest extends TestCase
public function testWillMatchEverythingNotNull(): void
{
$repository = $this->mock(JournalRepositoryInterface::class);
$value = 'x';
$result = ToAccountIs::willMatchEverything($value);
$value = 'x';
$result = ToAccountIs::willMatchEverything($value);
$this->assertFalse($result);
}
@@ -100,8 +98,8 @@ class ToAccountIsTest extends TestCase
public function testWillMatchEverythingNull(): void
{
$repository = $this->mock(JournalRepositoryInterface::class);
$value = null;
$result = ToAccountIs::willMatchEverything($value);
$value = null;
$result = ToAccountIs::willMatchEverything($value);
$this->assertTrue($result);
}
}

1
tests/Unit/TransactionRules/Triggers/ToAccountStartsTest.php
View File

@@ -26,7 +26,6 @@ use FireflyIII\Models\TransactionJournal;
use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
use FireflyIII\TransactionRules\Triggers\ToAccountStarts;
use Illuminate\Support\Collection;
use Log;
use Tests\TestCase;
/**