From bc67113d77dc58350707b9e6529de0879535c086 Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 10 Feb 2016 12:01:45 +0100 Subject: [PATCH] This fixes the broken tests. --- app/Repositories/Budget/BudgetRepository.php | 2 +- app/Repositories/Budget/BudgetRepositoryInterface.php | 2 +- config/app.php | 1 + database/seeds/TestDataSeeder.php | 2 +- tests/BasicTest.php | 1 - tests/TestCase.php | 2 +- tests/acceptance/Controllers/Auth/AuthControllerTest.php | 1 - .../acceptance/Controllers/Chart/ChartBudgetControllerTest.php | 2 +- tests/acceptance/Controllers/HomeControllerTest.php | 1 - 9 files changed, 6 insertions(+), 8 deletions(-) diff --git a/app/Repositories/Budget/BudgetRepository.php b/app/Repositories/Budget/BudgetRepository.php index 51ed3fef26..334bc6c6a7 100644 --- a/app/Repositories/Budget/BudgetRepository.php +++ b/app/Repositories/Budget/BudgetRepository.php @@ -607,7 +607,7 @@ class BudgetRepository extends ComponentRepository implements BudgetRepositoryIn * * @return array */ - public function spentPerDay(Budget $budget, Carbon $start, Carbon $end) + public function spentPerDay(Budget $budget, Carbon $start, Carbon $end): array { /** @var Collection $query */ $query = $budget->transactionjournals() diff --git a/app/Repositories/Budget/BudgetRepositoryInterface.php b/app/Repositories/Budget/BudgetRepositoryInterface.php index e3f00681b5..d6ab73938e 100644 --- a/app/Repositories/Budget/BudgetRepositoryInterface.php +++ b/app/Repositories/Budget/BudgetRepositoryInterface.php @@ -221,7 +221,7 @@ interface BudgetRepositoryInterface * * @return array */ - public function spentPerDay(Budget $budget, Carbon $start, Carbon $end); + public function spentPerDay(Budget $budget, Carbon $start, Carbon $end): array; /** * @param array $data diff --git a/config/app.php b/config/app.php index aa8b880314..963e49629e 100644 --- a/config/app.php +++ b/config/app.php @@ -161,6 +161,7 @@ return [ // own stuff: // Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider::class, +// Barryvdh\Debugbar\ServiceProvider::class, 'DaveJamesMiller\Breadcrumbs\ServiceProvider', 'TwigBridge\ServiceProvider', diff --git a/database/seeds/TestDataSeeder.php b/database/seeds/TestDataSeeder.php index 663f5656e5..0983894137 100644 --- a/database/seeds/TestDataSeeder.php +++ b/database/seeds/TestDataSeeder.php @@ -88,7 +88,7 @@ class TestDataSeeder extends Seeder TestData::createBudgetLimit($user, $current, 'Bills', '1000'); TestData::createBudgetLimit($user, $current, 'Car', '100'); - echo 'Created test data for ' . $month . "\n"; + Log::info('Created test data for ' . $month); $current->addMonth(); } } diff --git a/tests/BasicTest.php b/tests/BasicTest.php index 0511cc14b9..7bd632ca03 100644 --- a/tests/BasicTest.php +++ b/tests/BasicTest.php @@ -4,7 +4,6 @@ * Class BasicTest */ -/** @noinspection PhpUndefinedClassInspection */ class BasicTest extends TestCase { /** diff --git a/tests/TestCase.php b/tests/TestCase.php index 83899cda8d..df6bace4ed 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -7,7 +7,7 @@ use FireflyIII\User; * Class TestCase */ -/** @noinspection PhpUndefinedClassInspection */ + class TestCase extends Illuminate\Foundation\Testing\TestCase { /** diff --git a/tests/acceptance/Controllers/Auth/AuthControllerTest.php b/tests/acceptance/Controllers/Auth/AuthControllerTest.php index dfe2c60576..8c97ee4abb 100644 --- a/tests/acceptance/Controllers/Auth/AuthControllerTest.php +++ b/tests/acceptance/Controllers/Auth/AuthControllerTest.php @@ -11,7 +11,6 @@ * Generated by PHPUnit_SkeletonGenerator on 2016-01-19 at 15:40:28. */ -/** @noinspection PhpUndefinedClassInspection */ class AuthControllerTest extends TestCase { diff --git a/tests/acceptance/Controllers/Chart/ChartBudgetControllerTest.php b/tests/acceptance/Controllers/Chart/ChartBudgetControllerTest.php index ccdda57dd5..c5f05623ab 100644 --- a/tests/acceptance/Controllers/Chart/ChartBudgetControllerTest.php +++ b/tests/acceptance/Controllers/Chart/ChartBudgetControllerTest.php @@ -24,7 +24,7 @@ class ChartBudgetControllerTest extends TestCase { $repository = $this->mock('FireflyIII\Repositories\Budget\BudgetRepositoryInterface'); - $repository->shouldReceive('getExpensesPerMonth')->once()->andReturn(new Collection([new Budget])); + $repository->shouldReceive('spentPerDay')->once()->andReturn([]); $repository->shouldReceive('getFirstBudgetLimitDate')->once()->andReturn(new Carbon); $this->be($this->user()); diff --git a/tests/acceptance/Controllers/HomeControllerTest.php b/tests/acceptance/Controllers/HomeControllerTest.php index cbf285e6b4..9800585e23 100644 --- a/tests/acceptance/Controllers/HomeControllerTest.php +++ b/tests/acceptance/Controllers/HomeControllerTest.php @@ -8,7 +8,6 @@ * of the MIT license. See the LICENSE file for details. */ -/** @noinspection PhpUndefinedClassInspection */ class HomeControllerTest extends TestCase { /**