From 58365121a384029f718a758e25f0dce8a71a4328 Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 15 May 2015 20:15:58 +0200 Subject: [PATCH] Fixed tests. --- tests/controllers/GoogleChartControllerTest.php | 4 ++-- tests/controllers/JsonControllerTest.php | 6 +++--- tests/helpers/ReportQueryTest.php | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/controllers/GoogleChartControllerTest.php b/tests/controllers/GoogleChartControllerTest.php index 8f443357b6..86ddb053fd 100644 --- a/tests/controllers/GoogleChartControllerTest.php +++ b/tests/controllers/GoogleChartControllerTest.php @@ -313,7 +313,7 @@ class GoogleChartControllerTest extends TestCase $repository = $this->mock('FireflyIII\Helpers\Report\ReportQueryInterface'); // expect! - $repository->shouldReceive('incomeByPeriod')->andReturn($journals); + $repository->shouldReceive('incomeInPeriod')->andReturn($journals); $repository->shouldReceive('journalsByExpenseAccount')->andReturn($journals); Preferences::shouldReceive('get')->withArgs(['showSharedReports', false])->once()->andReturn($preference); @@ -342,7 +342,7 @@ class GoogleChartControllerTest extends TestCase $repository = $this->mock('FireflyIII\Helpers\Report\ReportQueryInterface'); // expect! - $repository->shouldReceive('incomeByPeriod')->andReturn($journals); + $repository->shouldReceive('incomeInPeriod')->andReturn($journals); $repository->shouldReceive('journalsByExpenseAccount')->andReturn($journals); Preferences::shouldReceive('get')->withArgs(['showSharedReports', false])->once()->andReturn($preference); diff --git a/tests/controllers/JsonControllerTest.php b/tests/controllers/JsonControllerTest.php index bb7f1a37c0..1e02428844 100644 --- a/tests/controllers/JsonControllerTest.php +++ b/tests/controllers/JsonControllerTest.php @@ -97,7 +97,7 @@ class JsonControllerTest extends TestCase $this->be($user); $repository = $this->mock('FireflyIII\Helpers\Report\ReportQueryInterface'); - $repository->shouldReceive('incomeByPeriod')->andReturn(new Collection); + $repository->shouldReceive('incomeInPeriod')->andReturn(new Collection); Amount::shouldReceive('format')->andReturn('xx'); Amount::shouldReceive('getCurrencyCode')->andReturn('X'); @@ -184,8 +184,8 @@ class JsonControllerTest extends TestCase $user = FactoryMuffin::create('FireflyIII\User'); $this->be($user); - Preferences::shouldReceive('get')->withArgs(['showSharedReports', false])->andReturn($pref); - Preferences::shouldReceive('set')->withArgs(['showSharedReports', true]); + Preferences::shouldReceive('get')->withArgs(['includeShared', false])->andReturn($pref); + Preferences::shouldReceive('set')->withArgs(['includeShared', true]); // language preference: $language = FactoryMuffin::create('FireflyIII\Models\Preference'); diff --git a/tests/helpers/ReportQueryTest.php b/tests/helpers/ReportQueryTest.php index f95d2e5f94..61d30075ae 100644 --- a/tests/helpers/ReportQueryTest.php +++ b/tests/helpers/ReportQueryTest.php @@ -61,7 +61,7 @@ class ReportQueryTest extends TestCase $this->markTestIncomplete(); } - public function testIncomeByPeriod() + public function testIncomeInPeriod() { $this->markTestIncomplete(); }