kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 23:45:10 +00:00
Code Issues Projects Releases Wiki Activity

Code clean up.

Browse Source
This commit is contained in:
James Cole
2017-11-15 11:33:07 +01:00
parent ef837f20dd
commit 57dcdfa0c4
60 changed files with 398 additions and 347 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/CreatesApplication.php
View File

@@ -35,7 +35,7 @@ trait CreatesApplication
*/
public function createApplication()
{
$app = require __DIR__.'/../bootstrap/app.php';
$app = require __DIR__ . '/../bootstrap/app.php';
$app->make(Kernel::class)->bootstrap();

2
tests/Feature/Controllers/BudgetControllerTest.php
View File

@@ -205,7 +205,7 @@ class BudgetControllerTest extends TestCase
// mock stuff
$budget = factory(Budget::class)->make();
$budgetLimit = factory(BudgetLimit::class)->make();
$budgetInfo = [
$budgetInfo = [
$budget->id => [
'spent' => '0',
'budgeted' => '0',

2
tests/Feature/Controllers/ExportControllerTest.php
View File

@@ -155,7 +155,7 @@ class ExportControllerTest extends TestCase
$processor->shouldReceive('collectOldUploads')->once();
$processor->shouldReceive('collectAttachments')->once();
$job = new ExportJob;
$job = new ExportJob;
$job->user = $this->user();
$repository->shouldReceive('changeStatus')->andReturn(true);

5
tests/Feature/Controllers/JsonControllerTest.php
View File

@@ -23,15 +23,10 @@ declare(strict_types=1);
namespace Tests\Feature\Controllers;
use Amount;
use FireflyIII\Helpers\Collector\JournalCollectorInterface;
use FireflyIII\Models\Budget;
use FireflyIII\Models\Category;
use FireflyIII\Models\Tag;
use FireflyIII\Models\Transaction;
use FireflyIII\Models\TransactionJournal;
use FireflyIII\Models\TransactionType;
use FireflyIII\Repositories\Bill\BillRepositoryInterface;
use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
use FireflyIII\Repositories\Journal\JournalRepositoryInterface;

2
tests/Feature/Controllers/Transaction/SingleControllerTest.php
View File

@@ -296,7 +296,7 @@ class SingleControllerTest extends TestCase
/**
* @covers \FireflyIII\Http\Controllers\Transaction\SingleController::store
* @covers \FireflyIII\Http\Controllers\Transaction\SingleController::groupedActiveAccountList
* @covers \FireflyIII\Http\Controllers\Transaction\SingleController::groupedActiveAccountList
*/
public function testStoreSuccess()
{

1
tests/Feature/ExampleTest.php
View File

@@ -25,7 +25,6 @@ declare(strict_types=1);
namespace Tests\Feature;
use Tests\TestCase;
use Illuminate\Foundation\Testing\RefreshDatabase;
class ExampleTest extends TestCase
{

1
tests/Unit/ExampleTest.php
View File

@@ -25,7 +25,6 @@ declare(strict_types=1);
namespace Tests\Unit;
use Tests\TestCase;
use Illuminate\Foundation\Testing\RefreshDatabase;
class ExampleTest extends TestCase
{

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

@@ -22,6 +22,7 @@
declare(strict_types=1);
namespace Tests\Unit\TransactionRules\Actions;
use FireflyIII\Models\RuleAction;
use FireflyIII\Models\TransactionJournal;
use FireflyIII\TransactionRules\Actions\ClearCategory;
@@ -41,7 +42,7 @@ class ClearCategoryTest extends TestCase
public function testAct()
{
// associate budget with journal:
$journal = TransactionJournal::find(5);
$journal = TransactionJournal::find(5);
$category = $journal->user->categories()->first();
$journal->budgets()->save($category);
$this->assertGreaterThan(0, $journal->categories()->count());

4
tests/Unit/TransactionRules/Actions/PrependDescriptionTest.php
View File

@@ -55,10 +55,10 @@ class PrependDescriptionTest extends TestCase
$action = new PrependDescription($ruleAction);
$result = $action->act($journal);
$this->assertTrue($result);
$journal = TransactionJournal::find(7);
$journal = TransactionJournal::find(7);
// assert result
$this->assertEquals($prepend.$description, $journal->description);
$this->assertEquals($prepend . $description, $journal->description);
}
}

1
tests/Unit/TransactionRules/Actions/SetDestinationAccountTest.php
View File

@@ -166,6 +166,7 @@ class SetDestinationAccountTest extends TestCase
/**
* Test this on a split journal.
*
* @covers \FireflyIII\TransactionRules\Actions\SetDestinationAccount::__construct()
* @covers \FireflyIII\TransactionRules\Actions\SetDestinationAccount::act()
*/

1
tests/Unit/TransactionRules/Actions/SetNotesTest.php
View File

@@ -27,7 +27,6 @@ namespace Tests\Unit\TransactionRules\Actions;
use FireflyIII\Models\Note;
use FireflyIII\Models\RuleAction;
use FireflyIII\Models\TransactionJournal;
use FireflyIII\TransactionRules\Actions\ClearNotes;
use FireflyIII\TransactionRules\Actions\SetNotes;
use Tests\TestCase;

24
tests/Unit/TransactionRules/Triggers/AmountLessTest.php
View File

@@ -35,18 +35,6 @@ use Tests\TestCase;
*/
class AmountLessTest extends TestCase
{
/**
* @covers \FireflyIII\TransactionRules\Triggers\AmountLess::triggered
*/
public function testTriggeredLess()
{
$journal = new TransactionJournal;
$journal->destination_amount = '12.34';
$trigger = AmountLess::makeFromStrings('12.50', false);
$result = $trigger->triggered($journal);
$this->assertTrue($result);
}
/**
* @covers \FireflyIII\TransactionRules\Triggers\AmountLess::triggered
*/
@@ -59,6 +47,18 @@ class AmountLessTest extends TestCase
$this->assertFalse($result);
}
/**
* @covers \FireflyIII\TransactionRules\Triggers\AmountLess::triggered
*/
public function testTriggeredLess()
{
$journal = new TransactionJournal;
$journal->destination_amount = '12.34';
$trigger = AmountLess::makeFromStrings('12.50', false);
$result = $trigger->triggered($journal);
$this->assertTrue($result);
}
/**
* @covers \FireflyIII\TransactionRules\Triggers\AmountLess::triggered
*/

25
tests/Unit/TransactionRules/Triggers/DescriptionContainsTest.php
View File

@@ -47,19 +47,6 @@ class DescriptionContainsTest extends TestCase
$this->assertTrue($result);
}
/**
* @covers \FireflyIII\TransactionRules\Triggers\DescriptionContains::triggered
*/
public function testTriggeredNot()
{
$journal = new TransactionJournal;
$journal->description = 'Lorem IPSUM bla bla ';
$trigger = DescriptionContains::makeFromStrings('blurb', false);
$result = $trigger->triggered($journal);
$this->assertFalse($result);
}
/**
* @covers \FireflyIII\TransactionRules\Triggers\DescriptionContains::triggered
*/
@@ -84,6 +71,18 @@ class DescriptionContainsTest extends TestCase
$this->assertTrue($result);
}
/**
* @covers \FireflyIII\TransactionRules\Triggers\DescriptionContains::triggered
*/
public function testTriggeredNot()
{
$journal = new TransactionJournal;
$journal->description = 'Lorem IPSUM bla bla ';
$trigger = DescriptionContains::makeFromStrings('blurb', false);
$result = $trigger->triggered($journal);
$this->assertFalse($result);
}
/**
* @covers \FireflyIII\TransactionRules\Triggers\DescriptionContains::triggered
*/

19
tests/Unit/TransactionRules/Triggers/DescriptionEndsTest.php
View File

@@ -50,16 +50,15 @@ class DescriptionEndsTest extends TestCase
/**
* @covers \FireflyIII\TransactionRules\Triggers\DescriptionEnds::triggered
*/
public function testTriggeredNot()
public function testTriggeredClose()
{
$journal = new TransactionJournal;
$journal->description = 'Lorem IPSUM blabla';
$trigger = DescriptionEnds::makeFromStrings('lorem', false);
$journal->description = 'Something is going to happen';
$trigger = DescriptionEnds::makeFromStrings('happe', false);
$result = $trigger->triggered($journal);
$this->assertFalse($result);
}
/**
* @covers \FireflyIII\TransactionRules\Triggers\DescriptionEnds::triggered
*/
@@ -75,11 +74,11 @@ class DescriptionEndsTest extends TestCase
/**
* @covers \FireflyIII\TransactionRules\Triggers\DescriptionEnds::triggered
*/
public function testTriggeredClose()
public function testTriggeredLongSearch()
{
$journal = new TransactionJournal;
$journal->description = 'Something is going to happen';
$trigger = DescriptionEnds::makeFromStrings('happe', false);
$journal->description = 'Something';
$trigger = DescriptionEnds::makeFromStrings('Something is', false);
$result = $trigger->triggered($journal);
$this->assertFalse($result);
}
@@ -99,11 +98,11 @@ class DescriptionEndsTest extends TestCase
/**
* @covers \FireflyIII\TransactionRules\Triggers\DescriptionEnds::triggered
*/
public function testTriggeredLongSearch()
public function testTriggeredNot()
{
$journal = new TransactionJournal;
$journal->description = 'Something';
$trigger = DescriptionEnds::makeFromStrings('Something is', false);
$journal->description = 'Lorem IPSUM blabla';
$trigger = DescriptionEnds::makeFromStrings('lorem', false);
$result = $trigger->triggered($journal);
$this->assertFalse($result);
}

13
tests/Unit/TransactionRules/Triggers/DescriptionIsTest.php
View File

@@ -50,16 +50,15 @@ class DescriptionIsTest extends TestCase
/**
* @covers \FireflyIII\TransactionRules\Triggers\DescriptionIs::triggered
*/
public function testTriggeredNot()
public function testTriggeredClose()
{
$journal = new TransactionJournal;
$journal->description = 'Lorem IPSUM blabla';
$trigger = DescriptionIs::makeFromStrings('lorem', false);
$journal->description = 'Something is going to happen';
$trigger = DescriptionIs::makeFromStrings('Something is going to happe', false);
$result = $trigger->triggered($journal);
$this->assertFalse($result);
}
/**
* @covers \FireflyIII\TransactionRules\Triggers\DescriptionIs::triggered
*/
@@ -75,11 +74,11 @@ class DescriptionIsTest extends TestCase
/**
* @covers \FireflyIII\TransactionRules\Triggers\DescriptionIs::triggered
*/
public function testTriggeredClose()
public function testTriggeredNot()
{
$journal = new TransactionJournal;
$journal->description = 'Something is going to happen';
$trigger = DescriptionIs::makeFromStrings('Something is going to happe', false);
$journal->description = 'Lorem IPSUM blabla';
$trigger = DescriptionIs::makeFromStrings('lorem', false);
$result = $trigger->triggered($journal);
$this->assertFalse($result);
}

19
tests/Unit/TransactionRules/Triggers/DescriptionStartsTest.php
View File

@@ -50,16 +50,15 @@ class DescriptionStartsTest extends TestCase
/**
* @covers \FireflyIII\TransactionRules\Triggers\DescriptionStarts::triggered
*/
public function testTriggeredNot()
public function testTriggeredClose()
{
$journal = new TransactionJournal;
$journal->description = 'Lorem IPSUM blabla';
$trigger = DescriptionStarts::makeFromStrings('blabla', false);
$journal->description = 'Something is going to happen';
$trigger = DescriptionStarts::makeFromStrings('omething', false);
$result = $trigger->triggered($journal);
$this->assertFalse($result);
}
/**
* @covers \FireflyIII\TransactionRules\Triggers\DescriptionStarts::triggered
*/
@@ -75,11 +74,11 @@ class DescriptionStartsTest extends TestCase
/**
* @covers \FireflyIII\TransactionRules\Triggers\DescriptionStarts::triggered
*/
public function testTriggeredClose()
public function testTriggeredLongSearch()
{
$journal = new TransactionJournal;
$journal->description = 'Something is going to happen';
$trigger = DescriptionStarts::makeFromStrings('omething', false);
$journal->description = 'Something';
$trigger = DescriptionStarts::makeFromStrings('Something is', false);
$result = $trigger->triggered($journal);
$this->assertFalse($result);
}
@@ -87,11 +86,11 @@ class DescriptionStartsTest extends TestCase
/**
* @covers \FireflyIII\TransactionRules\Triggers\DescriptionStarts::triggered
*/
public function testTriggeredLongSearch()
public function testTriggeredNot()
{
$journal = new TransactionJournal;
$journal->description = 'Something';
$trigger = DescriptionStarts::makeFromStrings('Something is', false);
$journal->description = 'Lorem IPSUM blabla';
$trigger = DescriptionStarts::makeFromStrings('blabla', false);
$result = $trigger->triggered($journal);
$this->assertFalse($result);
}

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

@@ -62,6 +62,16 @@ class FromAccountIsTest extends TestCase
$this->assertFalse($result);
}
/**
* @covers \FireflyIII\TransactionRules\Triggers\FromAccountIs::willMatchEverything
*/
public function testWillMatchEverythingEmpty()
{
$value = '';
$result = FromAccountIs::willMatchEverything($value);
$this->assertTrue($result);
}
/**
* @covers \FireflyIII\TransactionRules\Triggers\FromAccountIs::willMatchEverything
*/
@@ -82,15 +92,4 @@ class FromAccountIsTest extends TestCase
$this->assertTrue($result);
}
/**
* @covers \FireflyIII\TransactionRules\Triggers\FromAccountIs::willMatchEverything
*/
public function testWillMatchEverythingEmpty()
{
$value = '';
$result = FromAccountIs::willMatchEverything($value);
$this->assertTrue($result);
}
}

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

@@ -44,7 +44,7 @@ class FromAccountStartsTest extends TestCase
$transaction = $journal->transactions()->where('amount', '<', 0)->first();
$account = $transaction->account;
$trigger = FromAccountStarts::makeFromStrings(substr($account->name,0, -3), false);
$trigger = FromAccountStarts::makeFromStrings(substr($account->name, 0, -3), false);
$result = $trigger->triggered($journal);
$this->assertTrue($result);
}

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

@@ -39,8 +39,8 @@ class HasAnyTagTest extends TestCase
*/
public function testTriggered()
{
$journal = TransactionJournal::find(25);
$tag = $journal->user->tags()->first();
$journal = TransactionJournal::find(25);
$tag = $journal->user->tags()->first();
$journal->tags()->detach();
$journal->tags()->save($tag);

32
tests/Unit/TransactionRules/Triggers/NotesAreTest.php
View File

@@ -53,22 +53,6 @@ class NotesAreTest extends TestCase
$this->assertTrue($result);
}
/**
* @covers \FireflyIII\TransactionRules\Triggers\NotesAre::triggered
*/
public function testTriggeredEmpty()
{
$journal = TransactionJournal::find(40);
$journal->notes()->delete();
$note = new Note();
$note->noteable()->associate($journal);
$note->text = '';
$note->save();
$trigger = NotesAre::makeFromStrings('', false);
$result = $trigger->triggered($journal);
$this->assertFalse($result);
}
/**
* @covers \FireflyIII\TransactionRules\Triggers\NotesAre::triggered
*/
@@ -85,6 +69,22 @@ class NotesAreTest extends TestCase
$this->assertFalse($result);
}
/**
* @covers \FireflyIII\TransactionRules\Triggers\NotesAre::triggered
*/
public function testTriggeredEmpty()
{
$journal = TransactionJournal::find(40);
$journal->notes()->delete();
$note = new Note();
$note->noteable()->associate($journal);
$note->text = '';
$note->save();
$trigger = NotesAre::makeFromStrings('', false);
$result = $trigger->triggered($journal);
$this->assertFalse($result);
}
/**
* @covers \FireflyIII\TransactionRules\Triggers\NotesAre::triggered
*/

64
tests/Unit/TransactionRules/Triggers/NotesContainTest.php
View File

@@ -53,38 +53,6 @@ class NotesContainTest extends TestCase
$this->assertTrue($result);
}
/**
* @covers \FireflyIII\TransactionRules\Triggers\NotesContain::triggered
*/
public function testTriggeredEmpty()
{
$journal = TransactionJournal::find(44);
$journal->notes()->delete();
$note = new Note();
$note->noteable()->associate($journal);
$note->text = '';
$note->save();
$trigger = NotesContain::makeFromStrings('', false);
$result = $trigger->triggered($journal);
$this->assertFalse($result);
}
/**
* @covers \FireflyIII\TransactionRules\Triggers\NotesContain::triggered
*/
public function testTriggeredPartial()
{
$journal = TransactionJournal::find(45);
$journal->notes()->delete();
$note = new Note();
$note->noteable()->associate($journal);
$note->text = 'Some note';
$note->save();
$trigger = NotesContain::makeFromStrings('Some note contains', false);
$result = $trigger->triggered($journal);
$this->assertFalse($result);
}
/**
* @covers \FireflyIII\TransactionRules\Triggers\NotesContain::triggered
*/
@@ -101,6 +69,22 @@ class NotesContainTest extends TestCase
$this->assertFalse($result);
}
/**
* @covers \FireflyIII\TransactionRules\Triggers\NotesContain::triggered
*/
public function testTriggeredEmpty()
{
$journal = TransactionJournal::find(44);
$journal->notes()->delete();
$note = new Note();
$note->noteable()->associate($journal);
$note->text = '';
$note->save();
$trigger = NotesContain::makeFromStrings('', false);
$result = $trigger->triggered($journal);
$this->assertFalse($result);
}
/**
* @covers \FireflyIII\TransactionRules\Triggers\NotesContain::triggered
*/
@@ -113,6 +97,22 @@ class NotesContainTest extends TestCase
$this->assertFalse($result);
}
/**
* @covers \FireflyIII\TransactionRules\Triggers\NotesContain::triggered
*/
public function testTriggeredPartial()
{
$journal = TransactionJournal::find(45);
$journal->notes()->delete();
$note = new Note();
$note->noteable()->associate($journal);
$note->text = 'Some note';
$note->save();
$trigger = NotesContain::makeFromStrings('Some note contains', false);
$result = $trigger->triggered($journal);
$this->assertFalse($result);
}
/**
* @covers \FireflyIII\TransactionRules\Triggers\NotesContain::willMatchEverything
*/

28
tests/Unit/TransactionRules/Triggers/TagIsTest.php
View File

@@ -36,6 +36,20 @@ use Tests\TestCase;
class TagIsTest extends TestCase
{
/**
* @covers \FireflyIII\TransactionRules\Triggers\TagIs::triggered
*/
public function testNotTriggered()
{
$journal = TransactionJournal::find(58);
$journal->tags()->detach();
$this->assertEquals(0, $journal->tags()->count());
$trigger = TagIs::makeFromStrings('SomeTag', false);
$result = $trigger->triggered($journal);
$this->assertFalse($result);
}
/**
* @covers \FireflyIII\TransactionRules\Triggers\TagIs::triggered
*/
@@ -58,20 +72,6 @@ class TagIsTest extends TestCase
$this->assertTrue($result);
}
/**
* @covers \FireflyIII\TransactionRules\Triggers\TagIs::triggered
*/
public function testNotTriggered()
{
$journal = TransactionJournal::find(58);
$journal->tags()->detach();
$this->assertEquals(0, $journal->tags()->count());
$trigger = TagIs::makeFromStrings('SomeTag', false);
$result = $trigger->triggered($journal);
$this->assertFalse($result);
}
/**
* @covers \FireflyIII\TransactionRules\Triggers\TagIs::willMatchEverything
*/

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

@@ -62,16 +62,6 @@ class ToAccountIsTest extends TestCase
$this->assertFalse($result);
}
/**
* @covers \FireflyIII\TransactionRules\Triggers\ToAccountIs::willMatchEverything
*/
public function testWillMatchEverythingNotNull()
{
$value = 'x';
$result = ToAccountIs::willMatchEverything($value);
$this->assertFalse($result);
}
/**
* @covers \FireflyIII\TransactionRules\Triggers\ToAccountIs::willMatchEverything
*/
@@ -82,6 +72,16 @@ class ToAccountIsTest extends TestCase
$this->assertTrue($result);
}
/**
* @covers \FireflyIII\TransactionRules\Triggers\ToAccountIs::willMatchEverything
*/
public function testWillMatchEverythingNotNull()
{
$value = 'x';
$result = ToAccountIs::willMatchEverything($value);
$this->assertFalse($result);
}
/**
* @covers \FireflyIII\TransactionRules\Triggers\ToAccountIs::willMatchEverything
*/

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

@@ -44,7 +44,7 @@ class ToAccountStartsTest extends TestCase
$transaction = $journal->transactions()->where('amount', '>', 0)->first();
$account = $transaction->account;
$trigger = ToAccountStarts::makeFromStrings(substr($account->name,0, -3), false);
$trigger = ToAccountStarts::makeFromStrings(substr($account->name, 0, -3), false);
$result = $trigger->triggered($journal);
$this->assertTrue($result);
}