Prep for bunq and spectre import.

This commit is contained in:
James Cole 2018-05-13 15:00:30 +02:00
parent 470b3e0973
commit 5a093b58d8
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
9 changed files with 24 additions and 8 deletions

View File

@ -95,4 +95,5 @@ DEMO_PASSWORD=
IS_DOCKER=true IS_DOCKER=true
IS_SANDSTORM=false IS_SANDSTORM=false
IS_HEROKU=false IS_HEROKU=false
BUNQ_USE_SANDBOX=false
TZ=${TZ} TZ=${TZ}

View File

@ -98,4 +98,5 @@ DEMO_USERNAME=
DEMO_PASSWORD= DEMO_PASSWORD=
IS_DOCKER=false IS_DOCKER=false
IS_SANDSTORM=false IS_SANDSTORM=false
BUNQ_USE_SANDBOX=false
IS_HEROKU=false IS_HEROKU=false

View File

@ -98,4 +98,5 @@ DEMO_USERNAME=
DEMO_PASSWORD= DEMO_PASSWORD=
IS_DOCKER=false IS_DOCKER=false
IS_SANDSTORM=false IS_SANDSTORM=false
BUNQ_USE_SANDBOX=false
IS_HEROKU=true IS_HEROKU=true

View File

@ -98,4 +98,5 @@ DEMO_USERNAME=
DEMO_PASSWORD= DEMO_PASSWORD=
IS_DOCKER=false IS_DOCKER=false
IS_SANDSTORM=true IS_SANDSTORM=true
BUNQ_USE_SANDBOX=false
IS_HEROKU=false IS_HEROKU=false

View File

@ -94,4 +94,5 @@ DEMO_USERNAME=
DEMO_PASSWORD= DEMO_PASSWORD=
IS_DOCKER=false IS_DOCKER=false
IS_SANDSTORM=false IS_SANDSTORM=false
BUNQ_USE_SANDBOX=false
IS_HEROKU=false IS_HEROKU=false

View File

@ -30,8 +30,6 @@ use Log;
use Preferences; use Preferences;
/** /**
* @deprecated
* @codeCoverageIgnore
* This class contains all the routines necessary to connect to Spectre. * This class contains all the routines necessary to connect to Spectre.
*/ */
class SpectrePrerequisites implements PrerequisitesInterface class SpectrePrerequisites implements PrerequisitesInterface
@ -196,7 +194,7 @@ class SpectrePrerequisites implements PrerequisitesInterface
*/ */
public function getView(): string public function getView(): string
{ {
return ''; return 'import.spectre.prerequisites';
} }
/** /**

View File

@ -25,6 +25,7 @@ declare(strict_types=1);
use FireflyIII\Import\JobConfiguration\FakeJobConfiguration; use FireflyIII\Import\JobConfiguration\FakeJobConfiguration;
use FireflyIII\Import\JobConfiguration\FileJobConfiguration; use FireflyIII\Import\JobConfiguration\FileJobConfiguration;
use FireflyIII\Import\Prerequisites\FakePrerequisites; use FireflyIII\Import\Prerequisites\FakePrerequisites;
use FireflyIII\Import\Prerequisites\SpectrePrerequisites;
use FireflyIII\Import\Routine\FakeRoutine; use FireflyIII\Import\Routine\FakeRoutine;
use FireflyIII\Import\Routine\FileRoutine; use FireflyIII\Import\Routine\FileRoutine;
use FireflyIII\Support\Import\Routine\File\CSVProcessor; use FireflyIII\Support\Import\Routine\File\CSVProcessor;
@ -60,6 +61,7 @@ return [
'quovo' => true, 'quovo' => true,
'yodlee' => true, 'yodlee' => true,
], ],
// some providers have pre-requisites.
'has_prereq' => [ 'has_prereq' => [
'fake' => true, 'fake' => true,
'file' => false, 'file' => false,
@ -69,15 +71,17 @@ return [
'quovo' => true, 'quovo' => true,
'yodlee' => true, 'yodlee' => true,
], ],
// if so, there must be a class to handle them.
'prerequisites' => [ 'prerequisites' => [
'fake' => FakePrerequisites::class, 'fake' => FakePrerequisites::class,
'file' => false, 'file' => false,
'bunq' => false, 'bunq' => SpectrePrerequisites::class,
'spectre' => false, 'spectre' => false,
'plaid' => false, 'plaid' => false,
'quovo' => false, 'quovo' => false,
'yodlee' => false, 'yodlee' => false,
], ],
// some providers may have extra configuration per job.
'has_config' => [ 'has_config' => [
'fake' => true, 'fake' => true,
'file' => true, 'file' => true,
@ -87,6 +91,7 @@ return [
'quovo' => true, 'quovo' => true,
'yodlee' => true, 'yodlee' => true,
], ],
// if so, this is the class that handles it.
'configuration' => [ 'configuration' => [
'fake' => FakeJobConfiguration::class, 'fake' => FakeJobConfiguration::class,
'file' => FileJobConfiguration::class, 'file' => FileJobConfiguration::class,
@ -96,6 +101,7 @@ return [
'quovo' => false, 'quovo' => false,
'yodlee' => false, 'yodlee' => false,
], ],
// this is the routine that runs the actual import.
'routine' => [ 'routine' => [
'fake' => FakeRoutine::class, 'fake' => FakeRoutine::class,
'file' => FileRoutine::class, 'file' => FileRoutine::class,
@ -128,5 +134,8 @@ return [
'spectre' => [ 'spectre' => [
'server' => 'www.saltedge.com', 'server' => 'www.saltedge.com',
], ],
'plaid' => [],
'quovo' => [],
'yodlee' => [],
], ],
]; ];

View File

@ -71,6 +71,7 @@
</div> </div>
</div> </div>
</div> </div>
{#
<div class="col-lg-4 col-md-12 col-sm-12 col-xs-12"> <div class="col-lg-4 col-md-12 col-sm-12 col-xs-12">
<div class="box box-default"> <div class="box box-default">
<div class="box-header with-border"> <div class="box-header with-border">
@ -90,6 +91,7 @@
</div> </div>
</div> </div>
</div> </div>
#}
</div> </div>
<!-- <!--
<div class="row"> <div class="row">

View File

@ -64,9 +64,10 @@ class IndexControllerTest extends TestCase
$importJob->key = 'fake_job_1'; $importJob->key = 'fake_job_1';
// mock call: // mock call:
$userRepository->shouldReceive('hasRole')->withArgs([Mockery::any(),'demo'])->andReturn(true)->once();
$repository->shouldReceive('create')->withArgs(['fake'])->andReturn($importJob); $repository->shouldReceive('create')->withArgs(['fake'])->andReturn($importJob);
$fakePrerequisites->shouldReceive('isComplete')->once()->andReturn(false); $fakePrerequisites->shouldReceive('isComplete')->twice()->andReturn(false);
$fakePrerequisites->shouldReceive('setUser')->once(); $fakePrerequisites->shouldReceive('setUser')->twice();
$this->be($this->user()); $this->be($this->user());
@ -93,9 +94,10 @@ class IndexControllerTest extends TestCase
$importJob->key = 'fake_job_2'; $importJob->key = 'fake_job_2';
// mock call: // mock call:
$userRepository->shouldReceive('hasRole')->withArgs([Mockery::any(),'demo'])->andReturn(true)->once();
$repository->shouldReceive('create')->withArgs(['fake'])->andReturn($importJob); $repository->shouldReceive('create')->withArgs(['fake'])->andReturn($importJob);
$fakePrerequisites->shouldReceive('isComplete')->once()->andReturn(true); $fakePrerequisites->shouldReceive('isComplete')->twice()->andReturn(true);
$fakePrerequisites->shouldReceive('setUser')->once(); $fakePrerequisites->shouldReceive('setUser')->twice();
$repository->shouldReceive('setStatus')->withArgs([Mockery::any(), 'has_prereq'])->andReturn($importJob)->once(); $repository->shouldReceive('setStatus')->withArgs([Mockery::any(), 'has_prereq'])->andReturn($importJob)->once();