Code cleanup and refactoring.

This commit is contained in:
James Cole
2017-06-05 08:31:22 +02:00
parent 1dec270907
commit 64831b4c86
17 changed files with 769 additions and 623 deletions

View File

@@ -18,6 +18,7 @@ use FireflyIII\Models\TransactionJournal;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
use FireflyIII\Repositories\Journal\JournalUpdateInterface;
use Illuminate\Support\Collection;
use Tests\TestCase;
@@ -171,8 +172,9 @@ class MassControllerTest extends TestCase
->first();
// mock stuff
$repository = $this->mock(JournalRepositoryInterface::class);
$updater = $this->mock(JournalUpdateInterface::class);
$repository->shouldReceive('first')->once()->andReturn(new TransactionJournal);
$repository->shouldReceive('update')->once();
$updater->shouldReceive('update')->once();
$repository->shouldReceive('find')->once()->andReturn($deposit);

View File

@@ -23,6 +23,7 @@ use FireflyIII\Models\TransactionType;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
use FireflyIII\Repositories\Journal\JournalUpdateInterface;
use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;
use Illuminate\Support\Collection;
use Illuminate\Support\MessageBag;
@@ -269,6 +270,7 @@ class SingleControllerTest extends TestCase
// mock
$this->expectsEvents(UpdatedTransactionJournal::class);
$updater = $this->mock(JournalUpdateInterface::class);
$repository = $this->mock(JournalRepositoryInterface::class);
$journal = new TransactionJournal();
@@ -278,7 +280,7 @@ class SingleControllerTest extends TestCase
$journal->transactionType()->associate($type);
$repository->shouldReceive('update')->andReturn($journal);
$updater->shouldReceive('update')->andReturn($journal);
$repository->shouldReceive('first')->times(2)->andReturn(new TransactionJournal);
$this->session(['transactions.edit.uri' => 'http://localhost']);

View File

@@ -21,6 +21,7 @@ use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
use FireflyIII\Repositories\Journal\JournalTaskerInterface;
use FireflyIII\Repositories\Journal\JournalUpdateInterface;
use Illuminate\Support\Collection;
use Illuminate\Support\MessageBag;
use Tests\TestCase;
@@ -134,7 +135,8 @@ class SplitControllerTest extends TestCase
// mock stuff
$repository = $this->mock(JournalRepositoryInterface::class);
$repository->shouldReceive('updateSplitJournal')->andReturn($deposit);
$updater = $this->mock(JournalUpdateInterface::class);
$updater->shouldReceive('updateSplitJournal')->andReturn($deposit);
$repository->shouldReceive('first')->times(2)->andReturn(new TransactionJournal);
$attachmentRepos = $this->mock(AttachmentHelperInterface::class);
$attachmentRepos->shouldReceive('saveAttachmentsForModel');