Move code around for simplicity and fix tests.

This commit is contained in:
James Cole
2017-06-07 11:13:04 +02:00
parent 92c5cabd70
commit 8bbd3063ec
14 changed files with 271 additions and 251 deletions

View File

@@ -7,7 +7,7 @@
* See the LICENSE file for details.
*/
declare(strict_types = 1);
declare(strict_types=1);
namespace Tests\Feature\Controllers\Transaction;
@@ -18,7 +18,6 @@ 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;
@@ -172,9 +171,8 @@ class MassControllerTest extends TestCase
->first();
// mock stuff
$repository = $this->mock(JournalRepositoryInterface::class);
$updater = $this->mock(JournalUpdateInterface::class);
$repository->shouldReceive('first')->once()->andReturn(new TransactionJournal);
$updater->shouldReceive('update')->once();
$repository->shouldReceive('update')->once();
$repository->shouldReceive('find')->once()->andReturn($deposit);

View File

@@ -23,7 +23,6 @@ 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;
@@ -270,7 +269,6 @@ class SingleControllerTest extends TestCase
// mock
$this->expectsEvents(UpdatedTransactionJournal::class);
$updater = $this->mock(JournalUpdateInterface::class);
$repository = $this->mock(JournalRepositoryInterface::class);
$journal = new TransactionJournal();
@@ -280,7 +278,7 @@ class SingleControllerTest extends TestCase
$journal->transactionType()->associate($type);
$updater->shouldReceive('update')->andReturn($journal);
$repository->shouldReceive('update')->andReturn($journal);
$repository->shouldReceive('first')->times(2)->andReturn(new TransactionJournal);
$this->session(['transactions.edit.uri' => 'http://localhost']);

View File

@@ -21,7 +21,6 @@ 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;
@@ -135,8 +134,7 @@ class SplitControllerTest extends TestCase
// mock stuff
$repository = $this->mock(JournalRepositoryInterface::class);
$updater = $this->mock(JournalUpdateInterface::class);
$updater->shouldReceive('updateSplitJournal')->andReturn($deposit);
$repository->shouldReceive('updateSplitJournal')->andReturn($deposit);
$repository->shouldReceive('first')->times(2)->andReturn(new TransactionJournal);
$attachmentRepos = $this->mock(AttachmentHelperInterface::class);
$attachmentRepos->shouldReceive('saveAttachmentsForModel');