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

Fix code coverage and a test #1443

Browse Source
This commit is contained in:
James Cole
2018-05-30 18:04:43 +02:00
parent f263795a99
commit c339a183b9
2 changed files with 119 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Http/Controllers/Import/IndexController.php
View File

@@ -71,7 +71,7 @@ class IndexController extends Controller
*/
public function create(string $importProvider)
{
Log::debug(sprintf('Will create job for provider %s', $importProvider));
Log::debug(sprintf('Will create job for provider "%s"', $importProvider));
// can only create "fake" for demo user.
$providers = array_keys($this->getProviders());
if (!\in_array($importProvider, $providers, true)) {
@@ -91,11 +91,13 @@ class IndexController extends Controller
Log::debug('Provider has no prerequisites. Continue.');
// if job provider also has no configuration:
if ($hasConfig === false) {
// @codeCoverageIgnoreStart
Log::debug('Provider needs no configuration for job. Job is ready to start.');
$this->repository->updateStatus($importJob, 'ready_to_run');
Log::debug('Redirect to status-page.');
return redirect(route('import.job.status.index', [$importJob->key]));
// @codeCoverageIgnoreEnd
}
// update job to say "has_prereq".
@@ -127,11 +129,13 @@ class IndexController extends Controller
// update job to say "has_prereq".
$this->repository->setStatus($importJob, 'has_prereq');
if ($hasConfig === false) {
// @codeCoverageIgnoreStart
Log::debug('Provider has no configuration. Job is ready to start.');
$this->repository->updateStatus($importJob, 'ready_to_run');
Log::debug('Redirect to status-page.');
return redirect(route('import.job.status.index', [$importJob->key]));
// @codeCoverageIgnoreEnd
}
Log::debug('Job has configuration. Redirect to job-config.');
// Otherwise just redirect to job configuration.
@@ -182,7 +186,7 @@ class IndexController extends Controller
}
if ($isDemoUser === false && $allowedForUser === false && $isDebug === false) {
//Log::debug('User is not demo and this provider is not allowed for such users. NEXT!');
continue;
continue; // @codeCoverageIgnore
}
$providers[$providerName] = [