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

Move code around for simplicity and fix tests.

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -444,14 +444,16 @@ class BudgetControllerTest extends TestCase
*/
public function testUpdateIncome()
{
// must be in list
$this->be($this->user());
// mock stuff
$repository = $this->mock(BudgetRepositoryInterface::class);
$journalRepos = $this->mock(JournalRepositoryInterface::class);
$journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal);
$repository->shouldReceive('getAvailableBudget')->andReturn('1');
$repository->shouldReceive('cleanupBudgets');
// must be in list
$this->be($this->user());
$response = $this->get(route('budgets.income', [1]));
$response->assertStatus(200);
}

6
tests/Feature/Controllers/Transaction/MassControllerTest.php
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);

4
tests/Feature/Controllers/Transaction/SingleControllerTest.php
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']);

4
tests/Feature/Controllers/Transaction/SplitControllerTest.php
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');

4
tests/Unit/Handlers/Events/UserEventHandlerTest.php
View File

@@ -56,7 +56,7 @@ class UserEventHandlerTest extends TestCase
Mail::assertSent(
RequestedNewPasswordMail::class, function ($mail) use ($user) {
return $mail->hasTo($user->email) && $mail->ip === '127.0.0.1';
return $mail->hasTo($user->email) && $mail->ipAddress === '127.0.0.1';
}
);
@@ -78,7 +78,7 @@ class UserEventHandlerTest extends TestCase
// must send user an email:
Mail::assertSent(
RegisteredUserMail::class, function ($mail) use ($user) {
return $mail->hasTo($user->email) && $mail->ip === '127.0.0.1';
return $mail->hasTo($user->email) && $mail->ipAddress === '127.0.0.1';
}
);