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

Refactor code and fix tests.

Browse Source
This commit is contained in:
James Cole
2018-05-21 09:40:19 +02:00
parent 714b54ed06
commit ebf97f710f
16 changed files with 63 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
tests/Unit/Import/JobConfiguration/SpectreJobConfigurationTest.php
View File

@@ -26,11 +26,11 @@ namespace Tests\Unit\Import\JobConfiguration;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Import\JobConfiguration\SpectreJobConfiguration;
use FireflyIII\Models\ImportJob;
use FireflyIII\Support\Import\JobConfiguration\Spectre\AuthenticateConfig;
use FireflyIII\Support\Import\JobConfiguration\Spectre\AuthenticatedConfigHandler;
use FireflyIII\Support\Import\JobConfiguration\Spectre\ChooseAccount;
use FireflyIII\Support\Import\JobConfiguration\Spectre\AuthenticatedHandler;
use FireflyIII\Support\Import\JobConfiguration\Spectre\ChooseAccountsHandler;
use FireflyIII\Support\Import\JobConfiguration\Spectre\ChooseLoginHandler;
use FireflyIII\Support\Import\JobConfiguration\Spectre\NewConfig;
use FireflyIII\Support\Import\JobConfiguration\Spectre\DoAuthenticateHandler;
use FireflyIII\Support\Import\JobConfiguration\Spectre\NewSpectreJobHandler;
use Illuminate\Support\MessageBag;
use Tests\TestCase;
@@ -54,8 +54,8 @@ class SpectreJobConfigurationTest extends TestCase
$job->configuration = [];
$job->save();
// expect "NewConfig" to be created because job is new.
$handler = $this->mock(NewConfig::class);
// expect "NewSpectreJobHandler" to be created because job is new.
$handler = $this->mock(NewSpectreJobHandler::class);
$handler->shouldReceive('setImportJob')->once();
$handler->shouldReceive('configurationComplete')->once()->andReturn(true);
@@ -77,7 +77,7 @@ class SpectreJobConfigurationTest extends TestCase
$job->user_id = $this->user()->id;
$job->key = 'spectre_jc_B' . random_int(1, 1000);
$job->status = 'new';
$job->stage = 'authenticate';
$job->stage = 'do-authenticate';
$job->provider = 'spectre';
$job->file_type = '';
$job->configuration = [];
@@ -86,8 +86,8 @@ class SpectreJobConfigurationTest extends TestCase
$return = new MessageBag();
$return->add('some', 'return message');
// expect "NewConfig" to be created because job is new.
$handler = $this->mock(AuthenticateConfig::class);
// expect "DoAuthenticateHandler" to be created because job is in "do-authenticate".
$handler = $this->mock(DoAuthenticateHandler::class);
$handler->shouldReceive('setImportJob')->once();
$handler->shouldReceive('configureJob')->once()->withArgs([$configData])->andReturn($return);
@@ -116,6 +116,7 @@ class SpectreJobConfigurationTest extends TestCase
$job->save();
$data = ['ssome' => 'values'];
// Expect choose-login handler because of state.
$handler = $this->mock(ChooseLoginHandler::class);
$handler->shouldReceive('setImportJob')->once();
$handler->shouldReceive('getNextData')->once()->andReturn($data);
@@ -144,7 +145,8 @@ class SpectreJobConfigurationTest extends TestCase
$job->configuration = [];
$job->save();
$handler = $this->mock(AuthenticatedConfigHandler::class);
// expect "AuthenticatedHandler" because of state.
$handler = $this->mock(AuthenticatedHandler::class);
$handler->shouldReceive('setImportJob')->once();
$handler->shouldReceive('getNextView')->once()->andReturn('import.fake.view');
@@ -166,13 +168,14 @@ class SpectreJobConfigurationTest extends TestCase
$job->user_id = $this->user()->id;
$job->key = 'spectre_jc_E' . random_int(1, 1000);
$job->status = 'new';
$job->stage = 'choose-account';
$job->stage = 'choose-accounts';
$job->provider = 'spectre';
$job->file_type = '';
$job->configuration = [];
$job->save();
$handler = $this->mock(ChooseAccount::class);
// expect "ChooseAccountsHandler" because of state.
$handler = $this->mock(ChooseAccountsHandler::class);
$handler->shouldReceive('setImportJob')->once();
$handler->shouldReceive('getNextView')->once()->andReturn('import.fake.view2');

8
tests/Unit/Import/Routine/SpectreRoutineTest.php
View File

@@ -42,13 +42,13 @@ class SpectreRoutineTest extends TestCase
/**
* @covers \FireflyIII\Import\Routine\SpectreRoutine
*/
public function testRunAuthenticate(): void
public function testRunDoAuthenticate(): void
{
$job = new ImportJob;
$job->user_id = $this->user()->id;
$job->key = 'SRA' . random_int(1, 1000);
$job->status = 'ready_to_run';
$job->stage = 'authenticate';
$job->stage = 'do-authenticate';
$job->provider = 'spectre';
$job->file_type = '';
$job->configuration = [];
@@ -93,7 +93,7 @@ class SpectreRoutineTest extends TestCase
$repository->shouldReceive('setUser')->once();
$repository->shouldReceive('setStatus')->withArgs([Mockery::any(), 'running'])->once();
$repository->shouldReceive('setStatus')->withArgs([Mockery::any(), 'need_job_config'])->once();
$repository->shouldReceive('setStage')->withArgs([Mockery::any(), 'choose-account'])->once();
$repository->shouldReceive('setStage')->withArgs([Mockery::any(), 'choose-accounts'])->once();
// mock calls for handler
$handler->shouldReceive('setImportJob')->once();
@@ -210,7 +210,7 @@ class SpectreRoutineTest extends TestCase
$repository->shouldReceive('setUser')->once();
$repository->shouldReceive('setStatus')->withArgs([Mockery::any(), 'running'])->once();
$repository->shouldReceive('setStatus')->withArgs([Mockery::any(), 'ready_to_run'])->once();
$repository->shouldReceive('setStage')->withArgs([Mockery::any(), 'authenticate'])->once();
$repository->shouldReceive('setStage')->withArgs([Mockery::any(), 'do-authenticate'])->once();
// mock calls for handler
$handler->shouldReceive('setImportJob')->once();