From 7b040e8583f1dd26faff4f1dd61829e435f8e5c4 Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 22 Jan 2016 21:08:04 +0100 Subject: [PATCH] Some changes to test coverage. --- app/Helpers/Csv/Data.php | 2 +- app/Http/Controllers/CsvController.php | 2 +- phpunit.default.xml | 8 -------- tests/acceptance/Controllers/AccountControllerTest.php | 1 + 4 files changed, 3 insertions(+), 10 deletions(-) diff --git a/app/Helpers/Csv/Data.php b/app/Helpers/Csv/Data.php index 72593ce30f..32e1ca4477 100644 --- a/app/Helpers/Csv/Data.php +++ b/app/Helpers/Csv/Data.php @@ -214,7 +214,7 @@ class Data * * @param array $specifix */ - public function setSpecifix($specifix) + public function setSpecifix(array $specifix) { Session::put('csv-specifix', $specifix); $this->specifix = $specifix; diff --git a/app/Http/Controllers/CsvController.php b/app/Http/Controllers/CsvController.php index 45f760702f..ebd9f0b7fd 100644 --- a/app/Http/Controllers/CsvController.php +++ b/app/Http/Controllers/CsvController.php @@ -396,7 +396,7 @@ class CsvController extends Controller $settings = []; $settings['date-format'] = Input::get('date_format'); $settings['has-headers'] = intval(Input::get('has_headers')) === 1; - $settings['specifix'] = Input::get('specifix'); + $settings['specifix'] = is_array(Input::get('specifix')) ? Input::get('specifix') : []; $settings['import-account'] = intval(Input::get('csv_import_account')); $settings['delimiter'] = Input::get('csv_delimiter', ','); diff --git a/phpunit.default.xml b/phpunit.default.xml index 04f27f97f4..cc0841c1d3 100755 --- a/phpunit.default.xml +++ b/phpunit.default.xml @@ -18,14 +18,6 @@ app/ - - diff --git a/tests/acceptance/Controllers/AccountControllerTest.php b/tests/acceptance/Controllers/AccountControllerTest.php index f4cd9ac26b..60d4591296 100644 --- a/tests/acceptance/Controllers/AccountControllerTest.php +++ b/tests/acceptance/Controllers/AccountControllerTest.php @@ -62,6 +62,7 @@ class AccountControllerTest extends TestCase /** * @covers FireflyIII\Http\Controllers\AccountController::index + * @covers FireflyIII\Http\Controllers\AccountController::isInArray */ public function testIndex() {