diff --git a/tests/Feature/Controllers/Json/AutoCompleteControllerTest.php b/tests/Feature/Controllers/Json/AutoCompleteControllerTest.php index ccdea87a69..42f4b663ab 100644 --- a/tests/Feature/Controllers/Json/AutoCompleteControllerTest.php +++ b/tests/Feature/Controllers/Json/AutoCompleteControllerTest.php @@ -13,6 +13,7 @@ declare(strict_types=1); namespace Tests\Feature\Controllers\Json; +use FireflyIII\Helpers\Collector\JournalCollectorInterface; use FireflyIII\Models\Account; use FireflyIII\Models\AccountType; use FireflyIII\Models\TransactionJournal; @@ -29,6 +30,7 @@ use Tests\TestCase; class AutoCompleteControllerTest extends TestCase { + /** * @covers \FireflyIII\Http\Controllers\Json\AutoCompleteController::allAccounts */ @@ -44,6 +46,21 @@ class AutoCompleteControllerTest extends TestCase $response->assertStatus(200); } + /** + * @covers \FireflyIII\Http\Controllers\Json\AutoCompleteController::allTransactionJournals + */ + public function testAllTransactionJournals() + { + $collector = $this->mock(JournalCollectorInterface::class); + $collector->shouldReceive('setLimit')->withArgs([250])->andReturnSelf(); + $collector->shouldReceive('setPage')->withArgs([1])->andReturnSelf(); + $collector->shouldReceive('getJournals')->andReturn(new Collection); + + $this->be($this->user()); + $response = $this->get(route('json.all-transaction-journals')); + $response->assertStatus(200); + } + /** * @covers \FireflyIII\Http\Controllers\Json\AutoCompleteController::expenseAccounts */ @@ -84,4 +101,24 @@ class AutoCompleteControllerTest extends TestCase $response->assertExactJson([$account->name]); } + /** + * @covers \FireflyIII\Http\Controllers\Json\AutoCompleteController::transactionJournals + */ + public function testTransactionJournals() + { + // mock stuff + $collector = $this->mock(JournalCollectorInterface::class); + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal); + $collector->shouldReceive('setTypes')->andReturnSelf(); + $collector->shouldReceive('setLimit')->andReturnSelf(); + $collector->shouldReceive('setPage')->andReturnSelf(); + $collector->shouldReceive('getJournals')->andReturn(new Collection); + + $this->be($this->user()); + $response = $this->get(route('json.transaction-journals', ['deposit'])); + $response->assertStatus(200); + $response->assertExactJson([]); + } + } diff --git a/tests/Feature/Controllers/JsonControllerTest.php b/tests/Feature/Controllers/JsonControllerTest.php index bef5b28839..72567af9a8 100644 --- a/tests/Feature/Controllers/JsonControllerTest.php +++ b/tests/Feature/Controllers/JsonControllerTest.php @@ -54,21 +54,6 @@ class JsonControllerTest extends TestCase $response->assertStatus(200); } - /** - * @covers \FireflyIII\Http\Controllers\JsonController::allTransactionJournals() - */ - public function testAllTransactionJournals() - { - $collector = $this->mock(JournalCollectorInterface::class); - $collector->shouldReceive('setLimit')->withArgs([100])->andReturnSelf(); - $collector->shouldReceive('setPage')->withArgs([1])->andReturnSelf(); - $collector->shouldReceive('getJournals')->andReturn(new Collection); - - $this->be($this->user()); - $response = $this->get(route('json.all-transaction-journals')); - $response->assertStatus(200); - } - /** * @covers \FireflyIII\Http\Controllers\JsonController::boxBillsPaid */ @@ -214,26 +199,6 @@ class JsonControllerTest extends TestCase $response->assertExactJson([$tag->tag]); } - /** - * @covers \FireflyIII\Http\Controllers\JsonController::transactionJournals - */ - public function testTransactionJournals() - { - // mock stuff - $collector = $this->mock(JournalCollectorInterface::class); - $journalRepos = $this->mock(JournalRepositoryInterface::class); - $journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal); - $collector->shouldReceive('setTypes')->andReturnSelf(); - $collector->shouldReceive('setLimit')->andReturnSelf(); - $collector->shouldReceive('setPage')->andReturnSelf(); - $collector->shouldReceive('getJournals')->andReturn(new Collection); - - $this->be($this->user()); - $response = $this->get(route('json.transaction-journals', ['deposit'])); - $response->assertStatus(200); - $response->assertExactJson([]); - } - /** * @covers \FireflyIII\Http\Controllers\JsonController::transactionTypes */ diff --git a/tests/Feature/Controllers/TransactionControllerTest.php b/tests/Feature/Controllers/TransactionControllerTest.php index 43e705f369..3465d7c59e 100644 --- a/tests/Feature/Controllers/TransactionControllerTest.php +++ b/tests/Feature/Controllers/TransactionControllerTest.php @@ -58,8 +58,6 @@ class TransactionControllerTest extends TestCase $collector->shouldReceive('getPaginatedJournals')->andReturn(new LengthAwarePaginator([], 0, 10)); $collector->shouldReceive('getJournals')->andReturn(new Collection); - Steam::shouldReceive('positive')->once()->andReturn('1'); - $this->be($this->user()); $response = $this->get(route('transactions.index', ['transfer'])); $response->assertStatus(200); @@ -119,8 +117,6 @@ class TransactionControllerTest extends TestCase $collector->shouldReceive('getPaginatedJournals')->andReturn(new LengthAwarePaginator([], 0, 10)); $collector->shouldReceive('getJournals')->andReturn(new Collection); - Steam::shouldReceive('positive')->once()->andReturn('1'); - $this->be($this->user()); $response = $this->get(route('transactions.index', ['transfer', '2016-01-01'])); $response->assertStatus(200);