kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-29 02:57:45 +00:00
Code Issues Projects Releases Wiki Activity

Some more coverage.

Browse Source
This commit is contained in:
James Cole
2015-05-06 18:09:45 +02:00
parent 96d06b7a93
commit 2b6b896c2e
11 changed files with 97 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Models/PiggyBankRepetition.php
View File

@@ -12,6 +12,8 @@ use Illuminate\Database\Eloquent\Model;
class PiggyBankRepetition extends Model
{
protected $fillable = ['piggy_bank_id', 'startdate', 'targetdate', 'currentamount'];
/**
* @return array
*/

2
app/Repositories/Account/AccountRepository.php
View File

@@ -226,7 +226,7 @@ class AccountRepository implements AccountRepositoryInterface
// then, percentage.
$difference = $account->endBalance - $account->piggyBalance;
$account->difference = $difference;
$account->percentage = $difference != 0 ? round((($difference / $account->endBalance) * 100)) : 100;
$account->percentage = $difference != 0 && $account->endBalance != 0 ? round((($difference / $account->endBalance) * 100)) : 100;
}
);

13
tests/factories/all.php
View File

@@ -227,6 +227,19 @@ FactoryMuffin::define(
]
);
FactoryMuffin::define(
'FireflyIII\Models\PiggyBankRepetition',
[
'piggy_bank_id' => 'factory|FireflyIII\Models\PiggyBank',
'startdate' => 'date',
'targetdate' => 'date',
'currentamount' => function () {
return rand(1, 100);
},
]
);
FactoryMuffin::define(
'FireflyIII\Models\PiggyBankEvent',
[

80
tests/repositories/AccountRepositoryTest.php
View File

@@ -2,6 +2,7 @@
use Carbon\Carbon;
use FireflyIII\Models\Account;
use FireflyIII\Models\AccountMeta;
use FireflyIII\Models\PiggyBankRepetition;
use FireflyIII\Models\Preference;
use FireflyIII\Models\Transaction;
use FireflyIII\Repositories\Account\AccountRepository;
@@ -169,7 +170,6 @@ class AccountRepositoryTest extends TestCase
/**
* @covers FireflyIII\Repositories\Account\AccountRepository::getFrontpageAccounts
* @todo Implement testGetFrontpageAccounts().
*/
public function testGetFrontpageAccountsWithPreference()
{
@@ -316,12 +316,49 @@ class AccountRepositoryTest extends TestCase
/**
* @covers FireflyIII\Repositories\Account\AccountRepository::getLastActivity
* @todo Implement testGetLastActivity().
*/
public function testGetLastActivity()
{
// Remove the following lines when you implement this test.
$this->markTestIncomplete('This test has not been implemented yet.');
$date = new Carbon('2012-02-02');
// one journals
/** @var Account $account */
$account = FactoryMuffin::create('FireflyIII\Models\Account');
$journal = FactoryMuffin::create('FireflyIII\Models\TransactionJournal');
$journal->date = $date;
$journal->user_id = $account->user_id;
$journal->save();
// transaction to match the date (one will do)
Transaction::create(
[
'account_id' => $account->id,
'transaction_journal_id' => $journal->id,
'amount' => 100
]
);
// be user
$this->be($journal->user);
$latest = $this->object->getLastActivity($account);
$this->assertEquals($date->format('Y-m-d'), $latest->format('Y-m-d'));
}
/**
* @covers FireflyIII\Repositories\Account\AccountRepository::getLastActivity
*/
public function testGetLastActivityNoActivity()
{
$date = new Carbon('2012-02-02');
// one journals
/** @var Account $account */
$account = FactoryMuffin::create('FireflyIII\Models\Account');
$this->be($account->user);
$latest = $this->object->getLastActivity($account);
$this->assertnull($latest);
}
/**
@@ -330,8 +367,39 @@ class AccountRepositoryTest extends TestCase
*/
public function testGetPiggyBankAccounts()
{
// Remove the following lines when you implement this test.
$this->markTestIncomplete('This test has not been implemented yet.');
$date = Carbon::now()->startOfMonth()->addDays(3);
/*
* Quite the collection of objects for this one.
*/
$piggyBank = FactoryMuffin::create('FireflyIII\Models\PiggyBank');
$account = FactoryMuffin::create('FireflyIII\Models\Account');
$piggyBankRepetition = $piggyBank->piggybankRepetitions()->first();
/*
* Update id's to match each other:
*/
$piggyBankRepetition->currentamount = rand(1,100);
$piggyBankRepetition->startdate = $date;
$piggyBankRepetition->targetdate = $date;
$piggyBank->account_id = $account->id;
$piggyBankRepetition->save();
$piggyBank->save();
/*
* Put dates in session:
*/
$this->session(['start' => Carbon::now()->startOfMonth(), 'end' => Carbon::now()->endOfMonth()]);
/*
* Run method:
*/
$this->be($account->user);
$collection = $this->object->getPiggyBankAccounts();
$this->assertCount(1, $collection);
$this->assertEquals($collection->first()->id, $account->id);
$this->assertEquals($collection->first()->piggyBalance, $piggyBankRepetition->currentamount);
$this->assertEquals(0, $collection->first()->startBalance);
$this->assertEquals(0, $collection->first()->endBalance);
}
/**

1
tests/repositories/BudgetRepositoryTest.php
View File

@@ -27,6 +27,7 @@ class BudgetRepositoryTest extends TestCase
*/
public function tearDown()
{
parent::tearDown();
}
/**

1
tests/repositories/CategoryRepositoryTest.php
View File

@@ -27,6 +27,7 @@ class CategoryRepositoryTest extends TestCase
*/
public function tearDown()
{
parent::tearDown();
}
/**

1
tests/repositories/CurrencyRepositoryTest.php
View File

@@ -27,6 +27,7 @@ class CurrencyRepositoryTest extends TestCase
*/
public function tearDown()
{
parent::tearDown();
}
/**

1
tests/repositories/JournalRepositoryTest.php
View File

@@ -27,6 +27,7 @@ class JournalRepositoryTest extends TestCase
*/
public function tearDown()
{
parent::tearDown();
}
/**

1
tests/repositories/PiggyBankRepositoryTest.php
View File

@@ -27,6 +27,7 @@ class PiggyBankRepositoryTest extends TestCase
*/
public function tearDown()
{
parent::tearDown();
}
/**

1
tests/repositories/ReminderRepositoryTest.php
View File

@@ -27,6 +27,7 @@ class ReminderRepositoryTest extends TestCase
*/
public function tearDown()
{
parent::tearDown();
}
/**

1
tests/repositories/TagRepositoryTest.php
View File

@@ -27,6 +27,7 @@ class TagRepositoryTest extends TestCase
*/
public function tearDown()
{
parent::tearDown();
}
/**