IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Code cleanup.

Browse Source
This commit is contained in:
James Cole 2017-03-05 11:19:06 +01:00
parent e5a2e1a8c7
commit 879f74e521
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
15 changed files with 111 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/CreatesApplication.php
View File

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

6
tests/Feature/Controllers/AccountControllerTest.php
View File

@ -223,7 +223,7 @@ class AccountControllerTest extends TestCase
{
$journalRepos = $this->mock(JournalRepositoryInterface::class);
$journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal);
$date = new Carbon;
$date = new Carbon;
$this->session(['start' => $date, 'end' => clone $date]);
$this->be($this->user());
@ -244,7 +244,7 @@ class AccountControllerTest extends TestCase
$transaction = factory(Transaction::class)->make();
$journalRepos = $this->mock(JournalRepositoryInterface::class);
$journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal);
$collector = $this->mock(JournalCollectorInterface::class);
$collector = $this->mock(JournalCollectorInterface::class);
$collector->shouldReceive('setAccounts')->andReturnSelf();
$collector->shouldReceive('setRange')->andReturnSelf();
$collector->shouldReceive('setLimit')->andReturnSelf();
@ -307,7 +307,7 @@ class AccountControllerTest extends TestCase
{
$journalRepos = $this->mock(JournalRepositoryInterface::class);
$journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal);
$date = new Carbon;
$date = new Carbon;
$this->session(['start' => $date, 'end' => clone $date]);
$this->be($this->user());

6
tests/Feature/Controllers/AttachmentControllerTest.php
View File

@ -40,7 +40,7 @@ class AttachmentControllerTest extends TestCase
{
// mock stuff
$journalRepos = $this->mock(JournalRepositoryInterface::class);
$repository = $this->mock(AttachmentRepositoryInterface::class);
$repository = $this->mock(AttachmentRepositoryInterface::class);
$repository->shouldReceive('destroy')->andReturn(true);
$journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal);
@ -58,7 +58,7 @@ class AttachmentControllerTest extends TestCase
{
// mock stuff
$journalRepos = $this->mock(JournalRepositoryInterface::class);
$repository = $this->mock(AttachmentRepositoryInterface::class);
$repository = $this->mock(AttachmentRepositoryInterface::class);
$repository->shouldReceive('exists')->once()->andReturn(true);
$repository->shouldReceive('getContent')->once()->andReturn('This is attachment number one.');
$journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal);
@ -104,7 +104,7 @@ class AttachmentControllerTest extends TestCase
{
// mock stuff
$journalRepos = $this->mock(JournalRepositoryInterface::class);
$repository = $this->mock(AttachmentRepositoryInterface::class);
$repository = $this->mock(AttachmentRepositoryInterface::class);
$repository->shouldReceive('update')->once();
$journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal);

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

@ -202,7 +202,7 @@ class BudgetControllerTest extends TestCase
$journalRepos = $this->mock(JournalRepositoryInterface::class);
$journalRepos->shouldReceive('first')->andReturn(new TransactionJournal);
$collector = $this->mock(JournalCollectorInterface::class);
$collector = $this->mock(JournalCollectorInterface::class);
$collector->shouldReceive('setAllAssetAccounts')->andReturnSelf();
$collector->shouldReceive('setRange')->andReturnSelf();
$collector->shouldReceive('setLimit')->andReturnSelf();
@ -238,7 +238,7 @@ class BudgetControllerTest extends TestCase
public function testShowByBudgetLimit(string $range)
{
// mock stuff
$journalRepos = $this->mock(JournalRepositoryInterface::class);
$journalRepos = $this->mock(JournalRepositoryInterface::class);
$journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal);
// mock account repository
@ -276,7 +276,7 @@ class BudgetControllerTest extends TestCase
public function testStore()
{
// mock stuff
$budget = factory(Budget::class)->make();
$budget = factory(Budget::class)->make();
$repository = $this->mock(BudgetRepositoryInterface::class);
$journalRepos = $this->mock(JournalRepositoryInterface::class);
$journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal);
@ -299,7 +299,7 @@ class BudgetControllerTest extends TestCase
public function testUpdate()
{
// mock stuff
$budget = factory(Budget::class)->make();
$budget = factory(Budget::class)->make();
$repository = $this->mock(BudgetRepositoryInterface::class);
$journalRepos = $this->mock(JournalRepositoryInterface::class);
$journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal);

7
tests/Feature/Controllers/Chart/BudgetControllerTest.php
View File

@ -15,6 +15,7 @@ namespace Tests\Feature\Controllers\Chart;
use Carbon\Carbon;
use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
use Tests\TestCase;
class BudgetControllerTest extends TestCase
{
@ -51,7 +52,7 @@ class BudgetControllerTest extends TestCase
$this->be($this->user());
$this->changeDateRange($this->user(), $range);
$response = $this->get(route('chart.budget.budget-limit', [1,1]));
$response = $this->get(route('chart.budget.budget-limit', [1, 1]));
$response->assertStatus(200);
}
@ -75,7 +76,7 @@ class BudgetControllerTest extends TestCase
public function testPeriod()
{
$this->be($this->user());
$response = $this->get(route('chart.budget.period', [1,'1','20120101','20120131']));
$response = $this->get(route('chart.budget.period', [1, '1', '20120101', '20120131']));
$response->assertStatus(200);
}
@ -85,7 +86,7 @@ class BudgetControllerTest extends TestCase
public function testPeriodNoBudget()
{
$this->be($this->user());
$response = $this->get(route('chart.budget.period.no-budget', ['1','20120101','20120131']));
$response = $this->get(route('chart.budget.period.no-budget', ['1', '20120101', '20120131']));
$response->assertStatus(200);
}

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

@ -70,7 +70,7 @@ class ExportControllerTest extends TestCase
);
$data = [
$data = [
'export_start_range' => '2015-01-01',
'export_end_range' => '2015-01-21',

6
tests/Feature/Controllers/ImportControllerTest.php
View File

@ -13,8 +13,8 @@ namespace Tests\Feature\Controllers;
use FireflyIII\Import\ImportProcedureInterface;
use FireflyIII\Import\Setup\CsvSetup;
use Tests\TestCase;
use Illuminate\Http\UploadedFile;
use Tests\TestCase;
class ImportControllerTest extends TestCase
{
@ -160,8 +160,8 @@ class ImportControllerTest extends TestCase
*/
public function testUpload()
{
$path = resource_path('stubs/csv.csv');
$file = new UploadedFile($path, 'upload.csv', filesize($path), 'text/csv', null, true);
$path = resource_path('stubs/csv.csv');
$file = new UploadedFile($path, 'upload.csv', filesize($path), 'text/csv', null, true);
$response = $this->post(route('import.upload'), [], [], ['import_file' => $file], ['Accept' => 'application/json']);
$response->assertStatus(302);
}

10
tests/Feature/Controllers/Popup/ReportControllerTest.php
View File

@ -43,7 +43,7 @@ class ReportControllerTest extends TestCase
],
];
$uri = route('popup.general') . '?' . http_build_query($arguments);
$response = $this->get($uri);
$response = $this->get($uri);
$response->assertStatus(200);
}
@ -66,7 +66,7 @@ class ReportControllerTest extends TestCase
],
];
$uri = route('popup.general') . '?' . http_build_query($arguments);
$response = $this->get($uri);
$response = $this->get($uri);
$response->assertStatus(200);
}
@ -89,7 +89,7 @@ class ReportControllerTest extends TestCase
],
];
$uri = route('popup.general') . '?' . http_build_query($arguments);
$response = $this->get($uri);
$response = $this->get($uri);
$response->assertStatus(200);
}
@ -112,7 +112,7 @@ class ReportControllerTest extends TestCase
],
];
$uri = route('popup.general') . '?' . http_build_query($arguments);
$response = $this->get($uri);
$response = $this->get($uri);
$response->assertStatus(200);
}
@ -135,7 +135,7 @@ class ReportControllerTest extends TestCase
],
];
$uri = route('popup.general') . '?' . http_build_query($arguments);
$response = $this->get($uri);
$response = $this->get($uri);
$response->assertStatus(200);
}

4
tests/Feature/Controllers/Report/OperationsControllerTest.php
View File

@ -27,7 +27,7 @@ class OperationsControllerTest extends TestCase
public function testExpenses()
{
$transactions = factory(Transaction::class, 10)->make();
$collector = $this->mock(JournalCollectorInterface::class);
$collector = $this->mock(JournalCollectorInterface::class);
$collector->shouldReceive('setAccounts')->andReturnSelf();
$collector->shouldReceive('setRange')->andReturnSelf();
$collector->shouldReceive('setTypes')->withArgs([[TransactionType::WITHDRAWAL, TransactionType::TRANSFER]])->andReturnSelf();
@ -48,7 +48,7 @@ class OperationsControllerTest extends TestCase
public function testIncome()
{
$transactions = factory(Transaction::class, 10)->make();
$collector = $this->mock(JournalCollectorInterface::class);
$collector = $this->mock(JournalCollectorInterface::class);
$collector->shouldReceive('setAccounts')->andReturnSelf();
$collector->shouldReceive('setRange')->andReturnSelf();
$collector->shouldReceive('setTypes')->withArgs([[TransactionType::DEPOSIT, TransactionType::TRANSFER]])->andReturnSelf();

4
tests/Feature/Controllers/RuleGroupControllerTest.php
View File

@ -147,8 +147,8 @@ class RuleGroupControllerTest extends TestCase
public function testUpdate()
{
$data = [
'title' => 'C',
'description' => 'XX',
'title' => 'C',
'description' => 'XX',
];
$this->session(['rule-groups.edit.url' => 'http://localhost']);

1
tests/Feature/Controllers/Transaction/ConvertControllerTest.php
View File

@ -18,7 +18,6 @@ use FireflyIII\Models\AccountType;
use FireflyIII\Models\TransactionJournal;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
use FireflyIII\Support\Twig\Transaction;
use Illuminate\Support\Collection;
use Illuminate\Support\MessageBag;
use Tests\TestCase;

32
tests/Feature/Controllers/Transaction/MassControllerTest.php
View File

@ -90,7 +90,7 @@ class MassControllerTest extends TestCase
/**
* @covers \FireflyIII\Http\Controllers\Transaction\MassController::edit
*/
public function testEditMultipleNothingLeft()
public function testEditMultiple()
{
Log::debug('Edit multiple.');
// mock stuff:
@ -98,7 +98,19 @@ class MassControllerTest extends TestCase
$repository->shouldReceive('getAccountsByType')->once()->withArgs([[AccountType::DEFAULT, AccountType::ASSET]])->andReturn(new Collection);
// default transactions
$collection = new Collection;
$collection = TransactionJournal::where('transaction_type_id', 3)->where('user_id', $this->user()->id)->take(2)->get();
// add deposit (with multiple sources)
$collection->push(
TransactionJournal::where('transaction_type_id', 2)
->whereNull('transaction_journals.deleted_at')
->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
->groupBy('transaction_journals.id')
->orderBy('ct', 'DESC')
->where('user_id', $this->user()->id)->first(['transaction_journals.id', DB::raw('count(transactions.`id`) as ct')])
);
// add withdrawal (with multiple destinations)
$collection->push(
TransactionJournal::where('transaction_type_id', 1)
->whereNull('transaction_journals.deleted_at')
@ -121,7 +133,7 @@ class MassControllerTest extends TestCase
/**
* @covers \FireflyIII\Http\Controllers\Transaction\MassController::edit
*/
public function testEditMultiple()
public function testEditMultipleNothingLeft()
{
Log::debug('Edit multiple.');
// mock stuff:
@ -129,19 +141,7 @@ class MassControllerTest extends TestCase
$repository->shouldReceive('getAccountsByType')->once()->withArgs([[AccountType::DEFAULT, AccountType::ASSET]])->andReturn(new Collection);
// default transactions
$collection = TransactionJournal::where('transaction_type_id', 3)->where('user_id', $this->user()->id)->take(2)->get();
// add deposit (with multiple sources)
$collection->push(
TransactionJournal::where('transaction_type_id', 2)
->whereNull('transaction_journals.deleted_at')
->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
->groupBy('transaction_journals.id')
->orderBy('ct', 'DESC')
->where('user_id', $this->user()->id)->first(['transaction_journals.id', DB::raw('count(transactions.`id`) as ct')])
);
// add withdrawal (with multiple destinations)
$collection = new Collection;
$collection->push(
TransactionJournal::where('transaction_type_id', 1)
->whereNull('transaction_journals.deleted_at')

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

@ -185,54 +185,6 @@ class SingleControllerTest extends TestCase
$response->assertStatus(302);
}
/**
* @covers \FireflyIII\Http\Controllers\Transaction\SingleController::store
*/
public function testStoreSuccess()
{
// mock results:
$repository = $this->mock(JournalRepositoryInterface::class);
$journal = new TransactionJournal();
$journal->id = 1000;
$journal->description = 'New journal';
$repository->shouldReceive('store')->andReturn($journal);
$repository->shouldReceive('first')->once()->andReturn(new TransactionJournal);
$this->expectsEvents(StoredTransactionJournal::class);
$errors = new MessageBag;
$errors->add('attachments','Fake error');
$messages = new MessageBag;
$messages->add('attachments','Fake error');
// mock attachment helper, trigger an error AND and info thing.
$attachmentRepo = $this->mock(AttachmentHelperInterface::class);
$attachmentRepo->shouldReceive('saveAttachmentsForModel');
$attachmentRepo->shouldReceive('getErrors')->andReturn($errors);
$attachmentRepo->shouldReceive('getMessages')->andReturn($messages);
$this->session(['transactions.create.url' => 'http://localhost']);
$this->be($this->user());
$data = [
'what' => 'withdrawal',
'amount' => '10',
'amount_currency_id_amount' => 1,
'source_account_id' => 1,
'destination_account_name' => 'Some destination',
'date' => '2016-01-01',
'description' => 'Test descr',
];
$response = $this->post(route('transactions.store', ['withdrawal']), $data);
$response->assertStatus(302);
$response->assertSessionHas('success');
$response->assertSessionHas('error');
$response->assertSessionHas('info');
}
/**
* @covers \FireflyIII\Http\Controllers\Transaction\SingleController::store
*/
@ -261,6 +213,52 @@ class SingleControllerTest extends TestCase
$response->assertSessionHas('error');
}
/**
* @covers \FireflyIII\Http\Controllers\Transaction\SingleController::store
*/
public function testStoreSuccess()
{
// mock results:
$repository = $this->mock(JournalRepositoryInterface::class);
$journal = new TransactionJournal();
$journal->id = 1000;
$journal->description = 'New journal';
$repository->shouldReceive('store')->andReturn($journal);
$repository->shouldReceive('first')->once()->andReturn(new TransactionJournal);
$this->expectsEvents(StoredTransactionJournal::class);
$errors = new MessageBag;
$errors->add('attachments', 'Fake error');
$messages = new MessageBag;
$messages->add('attachments', 'Fake error');
// mock attachment helper, trigger an error AND and info thing.
$attachmentRepo = $this->mock(AttachmentHelperInterface::class);
$attachmentRepo->shouldReceive('saveAttachmentsForModel');
$attachmentRepo->shouldReceive('getErrors')->andReturn($errors);
$attachmentRepo->shouldReceive('getMessages')->andReturn($messages);
$this->session(['transactions.create.url' => 'http://localhost']);
$this->be($this->user());
$data = [
'what' => 'withdrawal',
'amount' => '10',
'amount_currency_id_amount' => 1,
'source_account_id' => 1,
'destination_account_name' => 'Some destination',
'date' => '2016-01-01',
'description' => 'Test descr',
];
$response = $this->post(route('transactions.store', ['withdrawal']), $data);
$response->assertStatus(302);
$response->assertSessionHas('success');
$response->assertSessionHas('error');
$response->assertSessionHas('info');
}
/**
* @covers \FireflyIII\Http\Controllers\Transaction\SingleController::update
*/
@ -272,9 +270,9 @@ class SingleControllerTest extends TestCase
$repository = $this->mock(JournalRepositoryInterface::class);
$journal = new TransactionJournal();
$type = TransactionType::find(1);
$journal->id = 1000;
$journal->description = 'New journal';
$type = TransactionType::find(1);
$journal->id = 1000;
$journal->description = 'New journal';
$journal->transactionType()->associate($type);

24
tests/Feature/Controllers/TransactionControllerTest.php
View File

@ -67,18 +67,6 @@ class TransactionControllerTest extends TestCase
$response->assertStatus(200);
}
/**
* @covers \FireflyIII\Http\Controllers\Controller::redirectToAccount
* @covers \FireflyIII\Http\Controllers\TransactionController::show
*/
public function testShowOpeningBalance()
{
$this->be($this->user());
$journal = $this->user()->transactionJournals()->where('transaction_type_id',4)->first();
$response = $this->get(route('transactions.show', [$journal->id]));
$response->assertStatus(302);
}
/**
* @covers \FireflyIII\Http\Controllers\TransactionController::show
*/
@ -90,4 +78,16 @@ class TransactionControllerTest extends TestCase
$response->assertSee('<ol class="breadcrumb">');
}
/**
* @covers \FireflyIII\Http\Controllers\Controller::redirectToAccount
* @covers \FireflyIII\Http\Controllers\TransactionController::show
*/
public function testShowOpeningBalance()
{
$this->be($this->user());
$journal = $this->user()->transactionJournals()->where('transaction_type_id', 4)->first();
$response = $this->get(route('transactions.show', [$journal->id]));
$response->assertStatus(302);
}
}

12
tests/Feature/ExampleTest.php
View File

@ -19,11 +19,11 @@ class ExampleTest extends TestCase
*
* @return void
*/
public function testBasicTest()
public function testAnotherBasicTest()
{
$response = $this->get('/login');
$response = $this->get('/');
$response->assertStatus(200);
$response->assertStatus(302);
}
/**
@ -31,10 +31,10 @@ class ExampleTest extends TestCase
*
* @return void
*/
public function testAnotherBasicTest()
public function testBasicTest()
{
$response = $this->get('/');
$response = $this->get('/login');
$response->assertStatus(302);
$response->assertStatus(200);
}
}