mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-02-25 18:45:27 -06:00
Merge tag '4.7.5' into develop
4.7.5
This commit is contained in:
commit
17f365941b
@ -53,7 +53,7 @@ class JobConfigurationControllerTest extends TestCase
|
||||
{
|
||||
$job = new ImportJob;
|
||||
$job->user_id = $this->user()->id;
|
||||
$job->key = 'Afake_job_' . random_int(1, 1000);
|
||||
$job->key = '1Afake_job_' . random_int(1, 1000);
|
||||
$job->status = 'has_prereq';
|
||||
$job->provider = 'fake';
|
||||
$job->file_type = '';
|
||||
@ -85,7 +85,7 @@ class JobConfigurationControllerTest extends TestCase
|
||||
{
|
||||
$job = new ImportJob;
|
||||
$job->user_id = $this->user()->id;
|
||||
$job->key = 'Bfake_job_' . random_int(1, 1000);
|
||||
$job->key = '2Bfake_job_' . random_int(1, 1000);
|
||||
$job->status = 'some_bad_state';
|
||||
$job->provider = 'fake';
|
||||
$job->file_type = '';
|
||||
@ -111,7 +111,7 @@ class JobConfigurationControllerTest extends TestCase
|
||||
{
|
||||
$job = new ImportJob;
|
||||
$job->user_id = $this->user()->id;
|
||||
$job->key = 'Cfake_job_' . random_int(1, 1000);
|
||||
$job->key = '3Cfake_job_' . random_int(1, 1000);
|
||||
$job->status = 'has_prereq';
|
||||
$job->provider = 'fake';
|
||||
$job->file_type = '';
|
||||
@ -140,7 +140,7 @@ class JobConfigurationControllerTest extends TestCase
|
||||
|
||||
$job = new ImportJob;
|
||||
$job->user_id = $this->user()->id;
|
||||
$job->key = 'Dfake_job_' . random_int(1, 1000);
|
||||
$job->key = '4Dfake_job_' . random_int(1, 1000);
|
||||
$job->status = 'has_prereq';
|
||||
$job->provider = 'fake';
|
||||
$job->file_type = '';
|
||||
@ -174,7 +174,7 @@ class JobConfigurationControllerTest extends TestCase
|
||||
|
||||
$job = new ImportJob;
|
||||
$job->user_id = $this->user()->id;
|
||||
$job->key = 'Ffake_job_' . random_int(1, 1000);
|
||||
$job->key = '5Ffake_job_' . random_int(1, 1000);
|
||||
$job->status = 'some_bad_state';
|
||||
$job->provider = 'fake';
|
||||
$job->file_type = '';
|
||||
@ -203,7 +203,7 @@ class JobConfigurationControllerTest extends TestCase
|
||||
|
||||
$job = new ImportJob;
|
||||
$job->user_id = $this->user()->id;
|
||||
$job->key = 'Efake_job_' . random_int(1, 1000);
|
||||
$job->key = '6Efake_job_' . random_int(1, 1000);
|
||||
$job->status = 'has_prereq';
|
||||
$job->provider = 'fake';
|
||||
$job->file_type = '';
|
||||
@ -233,7 +233,7 @@ class JobConfigurationControllerTest extends TestCase
|
||||
$file = UploadedFile::fake()->image('avatar.jpg');
|
||||
$job = new ImportJob;
|
||||
$job->user_id = $this->user()->id;
|
||||
$job->key = 'Dfake_job_' . random_int(1, 1000);
|
||||
$job->key = '7Dfake_job_' . random_int(1, 1000);
|
||||
$job->status = 'has_prereq';
|
||||
$job->provider = 'fake';
|
||||
$job->file_type = '';
|
||||
|
@ -37,12 +37,14 @@ class ToAccountStartsTest extends TestCase
|
||||
public function testTriggered(): void
|
||||
{
|
||||
$count = 0;
|
||||
while ($count === 0) {
|
||||
$account = null;
|
||||
while ($count !== 0 && $account !== null) {
|
||||
$journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first();
|
||||
$count = $journal->transactions()->where('amount', '>', 0)->count();
|
||||
$transaction = $journal->transactions()->where('amount', '>', 0)->first();
|
||||
$account = $transaction->account;
|
||||
}
|
||||
$account = $transaction->account;
|
||||
|
||||
|
||||
$trigger = ToAccountStarts::makeFromStrings(substr($account->name, 0, -3), false);
|
||||
$result = $trigger->triggered($journal);
|
||||
@ -55,12 +57,13 @@ class ToAccountStartsTest extends TestCase
|
||||
public function testTriggeredLonger(): void
|
||||
{
|
||||
$count = 0;
|
||||
while ($count === 0) {
|
||||
$account = null;
|
||||
while ($count !== 0 && $account !== null) {
|
||||
$journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first();
|
||||
$count = $journal->transactions()->where('amount', '>', 0)->count();
|
||||
$transaction = $journal->transactions()->where('amount', '>', 0)->first();
|
||||
$account = $transaction->account;
|
||||
}
|
||||
$account = $transaction->account;
|
||||
|
||||
$trigger = ToAccountStarts::makeFromStrings('bla-bla-bla' . $account->name, false);
|
||||
$result = $trigger->triggered($journal);
|
||||
|
Loading…
Reference in New Issue
Block a user