-
@@ -94,6 +96,26 @@
{% block scripts %}
diff --git a/tests/controllers/AccountControllerTest.php b/tests/controllers/AccountControllerTest.php
index 5913d750c7..86d5be5128 100644
--- a/tests/controllers/AccountControllerTest.php
+++ b/tests/controllers/AccountControllerTest.php
@@ -1,9 +1,6 @@
createAccount();
}
@@ -52,8 +50,12 @@ class AccountControllerTest extends TestCase
*/
public function createAccount()
{
+ $user = FactoryMuffin::create('FireflyIII\User');
+ $this->be($user);
if (is_null($this->account)) {
- $this->account = FactoryMuffin::create('FireflyIII\Models\Account');
+ $this->account = FactoryMuffin::create('FireflyIII\Models\Account');
+ $this->account->user_id = $user->id;
+ $this->account->save();
}
}
@@ -69,6 +71,7 @@ class AccountControllerTest extends TestCase
Preferences::shouldReceive('get')->withArgs(['viewRange', '1M'])->andReturn($pref);
+
$language = FactoryMuffin::create('FireflyIII\Models\Preference');
$language->data = 'en';
Preferences::shouldReceive('get')->withArgs(['language', 'en'])->andReturn($language);
@@ -78,6 +81,9 @@ class AccountControllerTest extends TestCase
Amount::shouldReceive('getDefaultCurrency')->once()->andReturn($currency);
Amount::shouldReceive('getAllCurrencies')->once()->andReturn([$currency]);
Amount::shouldReceive('getCurrencyCode')->andReturn('X');
+ $lastActivity = FactoryMuffin::create('FireflyIII\Models\Preference');
+ $lastActivity->data = microtime();
+ Preferences::shouldReceive('lastActivity')->andReturn($lastActivity);
$this->call('GET', '/accounts/create/asset');
$this->assertResponseOk();
diff --git a/tests/controllers/BillControllerTest.php b/tests/controllers/BillControllerTest.php
index 7ae7e26760..7242424df2 100644
--- a/tests/controllers/BillControllerTest.php
+++ b/tests/controllers/BillControllerTest.php
@@ -188,6 +188,7 @@ class BillControllerTest extends TestCase
$repository->shouldReceive('nextExpectedMatch')->once()->andReturn(new Carbon);
Amount::shouldReceive('format')->andReturn('XX');
+ Amount::shouldReceive('formatJournal')->andReturn('XX');
Amount::shouldReceive('getCurrencyCode')->andReturn('XX');
diff --git a/tests/controllers/BudgetControllerTest.php b/tests/controllers/BudgetControllerTest.php
index df08b1502a..1446f1220a 100644
--- a/tests/controllers/BudgetControllerTest.php
+++ b/tests/controllers/BudgetControllerTest.php
@@ -193,6 +193,10 @@ class BudgetControllerTest extends TestCase
$this->be($budget->user);
$date = Carbon::now()->startOfMonth()->format('FY');
Preferences::shouldReceive('set')->once()->withArgs(['budgetIncomeTotal' . $date, 1001]);
+ Preferences::shouldReceive('mark')->once()->andReturn(true);
+ $lastActivity = FactoryMuffin::create('FireflyIII\Models\Preference');
+ $lastActivity->data = microtime();
+ Preferences::shouldReceive('lastActivity')->andReturn($lastActivity);
// language preference:
$language = FactoryMuffin::create('FireflyIII\Models\Preference');
@@ -254,6 +258,29 @@ class BudgetControllerTest extends TestCase
}
+ /**
+ * @covers FireflyIII\Http\Controllers\BudgetController::show
+ */
+ public function testShowRepetition()
+ {
+ $repetition = FactoryMuffin::create('FireflyIII\Models\LimitRepetition');
+ $budget = $repetition->budgetLimit->budget;
+ $repository = $this->mock('FireflyIII\Repositories\Budget\BudgetRepositoryInterface');
+ $this->be($budget->user);
+
+ $paginator = new LengthAwarePaginator(new Collection, 0, 20, 1);
+
+ Amount::shouldReceive('getCurrencyCode')->andReturn('x');
+ Amount::shouldReceive('format')->andReturn('x');
+ $repository->shouldReceive('getJournals')->andReturn($paginator);
+ $repository->shouldReceive('getBudgetLimits')->andReturn(new Collection);
+
+
+ $this->call('GET', '/budgets/show/' . $budget->id . '/' . $repetition->id);
+ $this->assertResponseOk();
+
+ }
+
/**
* @covers FireflyIII\Http\Controllers\BudgetController::store
*/
@@ -385,6 +412,9 @@ class BudgetControllerTest extends TestCase
Amount::shouldReceive('format')->andReturn('xx');
Amount::shouldReceive('getCurrencyCode')->andReturn('X');
Amount::shouldReceive('getCurrencySymbol')->andReturn('X');
+ $lastActivity = FactoryMuffin::create('FireflyIII\Models\Preference');
+ $lastActivity->data = microtime();
+ Preferences::shouldReceive('lastActivity')->andReturn($lastActivity);
// language preference:
$language = FactoryMuffin::create('FireflyIII\Models\Preference');
diff --git a/tests/controllers/HomeControllerTest.php b/tests/controllers/HomeControllerTest.php
index 71444d6fef..c4872d64bb 100644
--- a/tests/controllers/HomeControllerTest.php
+++ b/tests/controllers/HomeControllerTest.php
@@ -108,6 +108,10 @@ class HomeControllerTest extends TestCase
$language->save();
Preferences::shouldReceive('get')->withAnyArgs()->andReturn($language);
+ $lastActivity = FactoryMuffin::create('FireflyIII\Models\Preference');
+ $lastActivity->data = microtime();
+ Preferences::shouldReceive('lastActivity')->andReturn($lastActivity);
+
Amount::shouldReceive('getCurrencyCode')->andReturn('EUR');
Amount::shouldReceive('format')->andReturn('xxx');
@@ -118,4 +122,32 @@ class HomeControllerTest extends TestCase
}
+ /**
+ * @covers FireflyIII\Http\Controllers\HomeController::index
+ */
+ public function testIndexEmpty()
+ {
+ $user = FactoryMuffin::create('FireflyIII\User');
+ $repository = $this->mock('FireflyIII\Repositories\Account\AccountRepositoryInterface');
+
+ $this->be($user);
+
+ // mock ALL THE THINGS!
+ $repository->shouldReceive('countAccounts')->once()->andReturn(0);
+
+ // language preference:
+ $language = FactoryMuffin::create('FireflyIII\Models\Preference');
+ $language->data = 'en';
+ $language->save();
+ Preferences::shouldReceive('get')->withAnyArgs()->andReturn($language);
+
+ $lastActivity = FactoryMuffin::create('FireflyIII\Models\Preference');
+ $lastActivity->data = microtime();
+ Preferences::shouldReceive('lastActivity')->andReturn($lastActivity);
+
+ $this->call('GET', '/');
+ $this->assertResponseStatus(302);
+ $this->assertRedirectedToRoute('new-user.index');
+ }
+
}
diff --git a/tests/controllers/NewUserControllerTest.php b/tests/controllers/NewUserControllerTest.php
new file mode 100644
index 0000000000..e27ddb0d72
--- /dev/null
+++ b/tests/controllers/NewUserControllerTest.php
@@ -0,0 +1,108 @@
+mock('FireflyIII\Repositories\Account\AccountRepositoryInterface');
+
+ $this->be($user);
+
+ // mock ALL THE THINGS!
+ $repository->shouldReceive('countAccounts')->once()->andReturn(0);
+
+ // language preference:
+ $language = FactoryMuffin::create('FireflyIII\Models\Preference');
+ $language->data = 'en';
+ $language->save();
+ Preferences::shouldReceive('get')->withAnyArgs()->andReturn($language);
+
+ $lastActivity = FactoryMuffin::create('FireflyIII\Models\Preference');
+ $lastActivity->data = microtime();
+ Preferences::shouldReceive('lastActivity')->andReturn($lastActivity);
+
+ $this->call('GET', '/new-user');
+ $this->assertResponseStatus(200);
+ }
+
+ public function testIndexNoAccounts()
+ {
+ $user = FactoryMuffin::create('FireflyIII\User');
+ $repository = $this->mock('FireflyIII\Repositories\Account\AccountRepositoryInterface');
+
+
+ $this->be($user);
+
+ // mock ALL THE THINGS!
+ $repository->shouldReceive('countAccounts')->once()->andReturn(3);
+
+ // language preference:
+ $language = FactoryMuffin::create('FireflyIII\Models\Preference');
+ $language->data = 'en';
+ $language->save();
+ Preferences::shouldReceive('get')->withAnyArgs()->andReturn($language);
+
+ $lastActivity = FactoryMuffin::create('FireflyIII\Models\Preference');
+ $lastActivity->data = microtime();
+ Preferences::shouldReceive('lastActivity')->andReturn($lastActivity);
+
+ $this->call('GET', '/new-user');
+ $this->assertResponseStatus(302);
+ $this->assertRedirectedToRoute('index');
+
+ }
+
+ public function testPostIndex()
+ {
+ $user = FactoryMuffin::create('FireflyIII\User');
+ $currency = FactoryMuffin::create('FireflyIII\Models\TransactionCurrency');
+ $account = FactoryMuffin::create('FireflyIII\Models\Account');
+ $repository = $this->mock('FireflyIII\Repositories\Account\AccountRepositoryInterface');
+ $this->be($user);
+
+ $data = [
+ '_token' => 'replaceMe',
+ 'bank_name' => 'Some Bank',
+ 'bank_balance' => '100',
+ 'balance_currency_id' => $currency->id,
+ 'savings_balance' => '100',
+ 'credit_card_limit' => '100',
+
+ ];
+
+ $repository->shouldReceive('store')->andReturn($account);
+
+ $this->call('POST', '/new-user/submit', $data);
+ $this->assertResponseStatus(302);
+ $this->assertRedirectedToRoute('index');
+
+ }
+
+}
diff --git a/tests/controllers/PreferencesControllerTest.php b/tests/controllers/PreferencesControllerTest.php
index 7a6a5b3b87..93ec1fa3ec 100644
--- a/tests/controllers/PreferencesControllerTest.php
+++ b/tests/controllers/PreferencesControllerTest.php
@@ -62,6 +62,10 @@ class PreferencesControllerTest extends TestCase
Amount::shouldReceive('getAllCurrencies')->andReturn(new Collection);
Amount::shouldReceive('getDefaultCurrency')->andReturn($currency);
+ $lastActivity = FactoryMuffin::create('FireflyIII\Models\Preference');
+ $lastActivity->data = microtime();
+ Preferences::shouldReceive('lastActivity')->andReturn($lastActivity);
+
// language preference:
$language = FactoryMuffin::create('FireflyIII\Models\Preference');
$language->data = 'en';
@@ -97,6 +101,7 @@ class PreferencesControllerTest extends TestCase
Preferences::shouldReceive('set')->once()->withArgs(['viewRange', '1M']);
Preferences::shouldReceive('set')->once()->withArgs(['budgetMaximum', 0]);
Preferences::shouldReceive('set')->once()->withArgs(['language', 'en']);
+ Preferences::shouldReceive('mark')->once()->andReturn(true);
// language preference:
$language = FactoryMuffin::create('FireflyIII\Models\Preference');
@@ -104,6 +109,10 @@ class PreferencesControllerTest extends TestCase
$language->save();
Preferences::shouldReceive('get')->withAnyArgs()->andReturn($language);
+ $lastActivity = FactoryMuffin::create('FireflyIII\Models\Preference');
+ $lastActivity->data = microtime();
+ Preferences::shouldReceive('lastActivity')->andReturn($lastActivity);
+
$this->call('POST', '/preferences', $data);
$this->assertResponseStatus(302);
diff --git a/tests/controllers/TagControllerTest.php b/tests/controllers/TagControllerTest.php
index 52840a7f50..9b6a29df69 100644
--- a/tests/controllers/TagControllerTest.php
+++ b/tests/controllers/TagControllerTest.php
@@ -248,6 +248,24 @@ class TagControllerTest extends TestCase
$this->call('POST', '/tags/update/' . $tag->id, $data);
$this->assertResponseStatus(302);
+ $this->assertSessionHas('success');
+ }
+
+ public function testUpdateNoNameChange()
+ {
+ $tag = FactoryMuffin::create('FireflyIII\Models\Tag');
+ $this->be($tag->user);
+
+ $data = [
+ '_token' => 'replaceMe',
+ 'tag' => $tag->tag,
+ 'tagMode' => 'nothing',
+ 'id' => $tag->id,
+ ];
+
+ $this->call('POST', '/tags/update/' . $tag->id, $data);
+ $this->assertResponseStatus(302);
+ $this->assertSessionHas('success');
}
/**
diff --git a/tests/controllers/TransactionControllerTest.php b/tests/controllers/TransactionControllerTest.php
index 9c672ac1cc..c778f49de2 100644
--- a/tests/controllers/TransactionControllerTest.php
+++ b/tests/controllers/TransactionControllerTest.php
@@ -97,6 +97,8 @@ class TransactionControllerTest extends TestCase
*/
public function testEdit()
{
+ $user = FactoryMuffin::create('FireflyIII\User');
+ $this->be($user);
// make complete journal:
$accountType = FactoryMuffin::create('FireflyIII\Models\AccountType');
$journal = FactoryMuffin::create('FireflyIII\Models\TransactionJournal');
diff --git a/tests/controllers/charts/ChartBillControllerTest.php b/tests/controllers/charts/ChartBillControllerTest.php
index 884c4627ff..b7f3ec3f9d 100644
--- a/tests/controllers/charts/ChartBillControllerTest.php
+++ b/tests/controllers/charts/ChartBillControllerTest.php
@@ -60,6 +60,14 @@ class ChartBillControllerTest extends TestCase
$repository->shouldReceive('createFakeBill')->andReturn($bills->first());
Steam::shouldReceive('balance')->andReturn(-10, 0);
+ $lastActivity = FactoryMuffin::create('FireflyIII\Models\Preference');
+ $lastActivity->data = microtime();
+ Preferences::shouldReceive('lastActivity')->andReturn($lastActivity);
+
+ $language = FactoryMuffin::create('FireflyIII\Models\Preference');
+ $language->data = 'en';
+ Preferences::shouldReceive('get')->withArgs(['language', 'en'])->andReturn($language);
+
$this->call('GET', '/chart/bill/frontpage');
$this->assertResponseOk();
diff --git a/tests/factories/all.php b/tests/factories/all.php
index f9c35f9047..d59765bf01 100644
--- a/tests/factories/all.php
+++ b/tests/factories/all.php
@@ -9,6 +9,9 @@ if (!class_exists('RandomString')) {
*/
class RandomString
{
+ public static $count = 0;
+ public static $set = [];
+
/**
* @param int $length
*
@@ -18,11 +21,22 @@ if (!class_exists('RandomString')) {
{
$characters = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
$charactersLength = strlen($characters);
- $randomString = '';
+
+
+ $randomString = '';
for ($i = 0; $i < $length; $i++) {
$randomString .= $characters[rand(0, $charactersLength - 1)];
}
+ while (in_array($randomString, self::$set)) {
+ // create another if its in the current $set:
+ $randomString = '';
+ for ($i = 0; $i < $length; $i++) {
+ $randomString .= $characters[rand(0, $charactersLength - 1)];
+ }
+ }
+ self::$set[] = $randomString;
+
return $randomString;
}
@@ -32,7 +46,7 @@ if (!class_exists('RandomString')) {
FactoryMuffin::define(
'FireflyIII\Models\Role',
[
- 'name' => 'word',
+ 'name' => 'word',
]
);
@@ -201,7 +215,7 @@ FactoryMuffin::define(
return RandomString::generateRandomString(3);
},
'symbol' => function () {
- return RandomString::generateRandomString(2);
+ return RandomString::generateRandomString(8);
},
'name' => 'word'
]
@@ -212,9 +226,12 @@ FactoryMuffin::define(
'FireflyIII\User',
[
'email' => function () {
- $faker = Faker\Factory::create();
+ $first = RandomString::generateRandomString(20);
+ $second = RandomString::generateRandomString(20);
+ $domain = RandomString::generateRandomString(30);
+ $email = $first . '.' . $second . '@' . $domain . '.com';
- return $faker->email;
+ return $email;
},
'password' => bcrypt('james'),
]
diff --git a/tests/helpers/ReportHelperTest.php b/tests/helpers/ReportHelperTest.php
index 3598c959eb..a97578afb8 100644
--- a/tests/helpers/ReportHelperTest.php
+++ b/tests/helpers/ReportHelperTest.php
@@ -4,8 +4,6 @@ use Carbon\Carbon;
use FireflyIII\Helpers\Collection\Account as AccountCollection;
use FireflyIII\Helpers\Report\ReportHelper;
use FireflyIII\Models\AccountMeta;
-use FireflyIII\Models\PiggyBankRepetition;
-use FireflyIII\Models\Transaction;
use Illuminate\Support\Collection;
use League\FactoryMuffin\Facade as FactoryMuffin;
@@ -48,13 +46,21 @@ class ReportHelperTest extends TestCase
FactoryMuffin::create('FireflyIII\Models\AccountType');
FactoryMuffin::create('FireflyIII\Models\AccountType');
$asset = FactoryMuffin::create('FireflyIII\Models\AccountType');
+ $cash = FactoryMuffin::create('FireflyIII\Models\AccountType');
$user = FactoryMuffin::create('FireflyIII\User');
for ($i = 0; $i < 5; $i++) {
$account = FactoryMuffin::create('FireflyIII\Models\Account');
$account->user_id = $user->id;
$account->account_type_id = $asset->id;
$account->save();
+
}
+
+ $cashAccount = FactoryMuffin::create('FireflyIII\Models\Account');
+ $cashAccount->user_id = $user->id;
+ $cashAccount->account_type_id = $cash->id;
+ $cashAccount->save();
+
$this->be($user);
/** @var AccountCollection $object */
$object = $this->object->getAccountReport(Carbon::now()->startOfMonth(), Carbon::now()->endOfMonth(), false);
@@ -111,6 +117,9 @@ class ReportHelperTest extends TestCase
*/
public function testGetBillReport()
{
+ $user = FactoryMuffin::create('FireflyIII\User');
+ $this->be($user);
+
// factory!
$set = new Collection;
$journals = new Collection;
@@ -191,7 +200,7 @@ class ReportHelperTest extends TestCase
// fake!
$repository->shouldReceive('getCategories')->andReturn($set);
- $repository->shouldReceive('spentInPeriodCorrected')->andReturn(rand(0, 100));
+ $repository->shouldReceive('spentInPeriodCorrected')->andReturn(rand(1, 100));
// test!
$object = $this->object->getCategoryReport(Carbon::now()->startOfMonth(), Carbon::now()->endOfMonth(), false);
diff --git a/tests/helpers/ReportQueryTest.php b/tests/helpers/ReportQueryTest.php
index af78cd15e8..5c413debde 100644
--- a/tests/helpers/ReportQueryTest.php
+++ b/tests/helpers/ReportQueryTest.php
@@ -80,16 +80,23 @@ class ReportQueryTest extends TestCase
]
);
+ $amount = 100;
+ if($i == 8) {
+ $amount = 0; // at least one "empty" journal.
+ }
+
// update both transactions
$journal->transactions[0]->account_id = $account1->id;
- $journal->transactions[0]->amount = -100;
+ $journal->transactions[0]->amount = $amount * -1;
$journal->transactions[0]->save();
$journal->transactions[1]->account_id = $account2->id;
- $journal->transactions[1]->amount = 100;
+ $journal->transactions[1]->amount = $amount;
$journal->transactions[1]->save();
+
+
}
$this->be($user);
@@ -97,7 +104,7 @@ class ReportQueryTest extends TestCase
$set = $this->object->expenseInPeriodCorrected($start, $end, false);
- $this->assertCount(10, $set);
+ $this->assertCount(9, $set);
}
/**
@@ -143,13 +150,18 @@ class ReportQueryTest extends TestCase
]
);
+ $amount = 100;
+ if($i == 8) {
+ $amount = 0; // at least one "empty" journal.
+ }
+
// update both transactions
$journal->transactions[0]->account_id = $account1->id;
- $journal->transactions[0]->amount = -100;
+ $journal->transactions[0]->amount = $amount * -1;
$journal->transactions[0]->save();
$journal->transactions[1]->account_id = $account2->id;
- $journal->transactions[1]->amount = 100;
+ $journal->transactions[1]->amount = $amount;
$journal->transactions[1]->save();
}
@@ -157,7 +169,7 @@ class ReportQueryTest extends TestCase
$set = $this->object->expenseInPeriodCorrected($start, $end, true);
- $this->assertCount(10, $set);
+ $this->assertCount(9, $set);
}
/**
@@ -258,13 +270,18 @@ class ReportQueryTest extends TestCase
]
);
+ $amount = 100;
+ if($i == 8) {
+ $amount = 0; // at least one "empty" journal.
+ }
+
// update both transactions
$journal->transactions[0]->account_id = $account1->id;
- $journal->transactions[0]->amount = 100;
+ $journal->transactions[0]->amount = $amount;
$journal->transactions[0]->save();
$journal->transactions[1]->account_id = $account2->id;
- $journal->transactions[1]->amount = -100;
+ $journal->transactions[1]->amount = $amount * -1;
$journal->transactions[1]->save();
}
@@ -272,7 +289,7 @@ class ReportQueryTest extends TestCase
$set = $this->object->incomeInPeriodCorrected($start, $end, false);
- $this->assertCount(10, $set);
+ $this->assertCount(9, $set);
}
/**
@@ -319,13 +336,18 @@ class ReportQueryTest extends TestCase
]
);
+ $amount = 100;
+ if($i == 8) {
+ $amount = 0; // at least one "empty" journal.
+ }
+
// update both transactions
$journal->transactions[0]->account_id = $account1->id;
- $journal->transactions[0]->amount = -100;
+ $journal->transactions[0]->amount = $amount * -1;
$journal->transactions[0]->save();
$journal->transactions[1]->account_id = $account2->id;
- $journal->transactions[1]->amount = 100;
+ $journal->transactions[1]->amount = $amount;
$journal->transactions[1]->save();
}
@@ -333,7 +355,7 @@ class ReportQueryTest extends TestCase
$set = $this->object->incomeInPeriodCorrected($start, $end, true);
- $this->assertCount(10, $set);
+ $this->assertCount(9, $set);
}
/**
diff --git a/tests/models/TransactionJournalModelTest.php b/tests/models/TransactionJournalModelTest.php
index d05f285529..c9e007d65f 100644
--- a/tests/models/TransactionJournalModelTest.php
+++ b/tests/models/TransactionJournalModelTest.php
@@ -1,6 +1,5 @@
be($user);
// make types:
$withdrawalType = FactoryMuffin::create('FireflyIII\Models\TransactionType');
$depositType = FactoryMuffin::create('FireflyIII\Models\TransactionType');
@@ -88,19 +91,19 @@ class TransactionJournalModelTest extends TestCase
// transactions are already in place, update them:
$withdrawal->transactions[0]->account_id = $asset->id;
- $withdrawal->transactions[0]->amount = -300;
+ $withdrawal->transactions[0]->amount = -300;
$withdrawal->transactions[0]->save();
$withdrawal->transactions[1]->account_id = $expense->id;
- $withdrawal->transactions[1]->amount = 300;
+ $withdrawal->transactions[1]->amount = 300;
$withdrawal->transactions[1]->save();
$deposit->transactions[0]->account_id = $revenue->id;
- $deposit->transactions[0]->amount = -89.88;
+ $deposit->transactions[0]->amount = -89.88;
$deposit->transactions[0]->save();
$deposit->transactions[1]->account_id = $asset->id;
- $deposit->transactions[1]->amount = 89.88;
+ $deposit->transactions[1]->amount = 89.88;
$deposit->transactions[1]->save();
// connect to tag:
@@ -114,12 +117,18 @@ class TransactionJournalModelTest extends TestCase
}
+
/**
* @covers FireflyIII\Models\TransactionJournal::getAmountAttribute
+ * @covers FireflyIII\Models\TransactionJournal::amountByTag
+ * @covers FireflyIII\Models\TransactionJournal::amountByTags
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
public function testGetAmountAttributeBalancingAct()
{
+ $user = FactoryMuffin::create('FireflyIII\User');
+ $this->be($user);
+
// make types:
$withdrawalType = FactoryMuffin::create('FireflyIII\Models\TransactionType');
FactoryMuffin::create('FireflyIII\Models\TransactionType');
@@ -144,27 +153,27 @@ class TransactionJournalModelTest extends TestCase
$tag->transactionJournals()->save($transfer);
// make accounts:
- $expense = FactoryMuffin::create('FireflyIII\Models\Account');
+ $expense = FactoryMuffin::create('FireflyIII\Models\Account');
$revenue = FactoryMuffin::create('FireflyIII\Models\Account');
- $asset = FactoryMuffin::create('FireflyIII\Models\Account');
+ $asset = FactoryMuffin::create('FireflyIII\Models\Account');
$revenue->account_type_id = $asset->account_type_id;
$revenue->save();
// transactions are already in place, update them:
$withdrawal->transactions[0]->account_id = $asset->id;
- $withdrawal->transactions[0]->amount = -123.45;
+ $withdrawal->transactions[0]->amount = -123.45;
$withdrawal->transactions[0]->save();
$withdrawal->transactions[1]->account_id = $expense->id;
- $withdrawal->transactions[1]->amount = 123.45;
+ $withdrawal->transactions[1]->amount = 123.45;
$withdrawal->transactions[1]->save();
$transfer->transactions[0]->account_id = $revenue->id;
- $transfer->transactions[0]->amount = -123.45;
+ $transfer->transactions[0]->amount = -123.45;
$transfer->transactions[0]->save();
$transfer->transactions[1]->account_id = $asset->id;
- $transfer->transactions[1]->amount = 123.45;
+ $transfer->transactions[1]->amount = 123.45;
$transfer->transactions[1]->save();
$amount = $withdrawal->amount;
@@ -174,9 +183,13 @@ class TransactionJournalModelTest extends TestCase
/**
* @covers FireflyIII\Models\TransactionJournal::getAmountAttribute
+ * @covers FireflyIII\Models\TransactionJournal::amountByTag
+ * @covers FireflyIII\Models\TransactionJournal::amountByTags
*/
public function testGetAmountAttributeNoTags()
{
+ $user = FactoryMuffin::create('FireflyIII\User');
+ $this->be($user);
$journal = FactoryMuffin::create('FireflyIII\Models\TransactionJournal');
$journal->transactions[0]->amount = 123.45;
@@ -191,9 +204,14 @@ class TransactionJournalModelTest extends TestCase
/**
* @covers FireflyIII\Models\TransactionJournal::getAmountAttribute
+ * @covers FireflyIII\Models\TransactionJournal::amountByTag
+ * @covers FireflyIII\Models\TransactionJournal::amountByTags
*/
public function testGetAmountAttributeTag()
{
+ $user = FactoryMuffin::create('FireflyIII\User');
+ $this->be($user);
+
// has a normal tag, but nothing special.
// make tag
$tag = FactoryMuffin::create('FireflyIII\Models\Tag');
@@ -210,11 +228,11 @@ class TransactionJournalModelTest extends TestCase
$expense = FactoryMuffin::create('FireflyIII\Models\Account');
$asset = FactoryMuffin::create('FireflyIII\Models\Account');
- $withdrawal->transactions[0]->amount = -300;
+ $withdrawal->transactions[0]->amount = -300;
$withdrawal->transactions[0]->account_id = $asset->id;
$withdrawal->transactions[0]->save();
- $withdrawal->transactions[1]->amount = 300;
+ $withdrawal->transactions[1]->amount = 300;
$withdrawal->transactions[1]->account_id = $expense->id;
$withdrawal->transactions[1]->save();
@@ -227,79 +245,22 @@ class TransactionJournalModelTest extends TestCase
}
/**
- * @covers FireflyIII\Models\TransactionJournal::getAssetAccountAttribute
+ * @covers FireflyIII\Models\TransactionJournal::getAmountAttribute
+ * @covers FireflyIII\Models\TransactionJournal::amountByTag
+ * @covers FireflyIII\Models\TransactionJournal::amountByTags
*/
- public function testGetAssetAccountAttributeDeposit()
+ public function testGetAmountAttributeTags()
{
- FactoryMuffin::create('FireflyIII\Models\TransactionType');
+ $user = FactoryMuffin::create('FireflyIII\User');
+ $this->be($user);
- // make withdrawal
- $depositType = FactoryMuffin::create('FireflyIII\Models\TransactionType');
- $deposit = FactoryMuffin::create('FireflyIII\Models\TransactionJournal');
- $deposit->transaction_type_id = $depositType->id;
- $deposit->save();
-
- // make accounts
- FactoryMuffin::create('FireflyIII\Models\Account');
- $revenue = FactoryMuffin::create('FireflyIII\Models\Account');
- $asset = FactoryMuffin::create('FireflyIII\Models\Account');
-
- // update transactions
- $deposit->transactions[0]->account_id = $asset->id;
- $deposit->transactions[0]->amount = 300;
- $deposit->transactions[0]->save();
-
- $deposit->transactions[1]->account_id = $revenue->id;
- $deposit->transactions[1]->amount = -300;
- $deposit->transactions[1]->save();
-
-
- // get asset account:
- $result = $deposit->asset_account;
-
- $this->assertEquals($asset->id, $result->id);
- }
-
- /**
- * @covers FireflyIII\Models\TransactionJournal::getAssetAccountAttribute
- */
- public function testGetAssetAccountAttributeFallback()
- {
- FactoryMuffin::create('FireflyIII\Models\TransactionType');
-
- // make accounts
- FactoryMuffin::create('FireflyIII\Models\Account');
- $revenue = FactoryMuffin::create('FireflyIII\Models\Account');
- $asset = FactoryMuffin::create('FireflyIII\Models\Account');
-
- // make withdrawal
- $depositType = FactoryMuffin::create('FireflyIII\Models\TransactionType');
- $deposit = FactoryMuffin::create('FireflyIII\Models\TransactionJournal');
- $deposit->transaction_type_id = $depositType->id;
- $deposit->save();
-
- $deposit->transactions[0]->account_id = $asset->id;
- $deposit->transactions[0]->amount = 300;
- $deposit->transactions[0]->save();
-
- $deposit->transactions[1]->account_id = $revenue->id;
- $deposit->transactions[1]->amount = -300;
- $deposit->transactions[1]->save();
-
- // get asset account:
- $result = $deposit->asset_account;
-
- $this->assertEquals($asset->id, $result->id);
- }
-
- /**
- * @covers FireflyIII\Models\TransactionJournal::getAssetAccountAttribute
- */
- public function testGetAssetAccountAttributeWithdrawal()
- {
- // make accounts
- $expense = FactoryMuffin::create('FireflyIII\Models\Account');
- $asset = FactoryMuffin::create('FireflyIII\Models\Account');
+ // has two normal tags:
+ $tag = FactoryMuffin::create('FireflyIII\Models\Tag');
+ $tag->tagMode = 'nothing';
+ $tag->save();
+ $tag2 = FactoryMuffin::create('FireflyIII\Models\Tag');
+ $tag2->tagMode = 'nothing';
+ $tag2->save();
// make withdrawal
$withdrawalType = FactoryMuffin::create('FireflyIII\Models\TransactionType');
@@ -307,20 +268,122 @@ class TransactionJournalModelTest extends TestCase
$withdrawal->transaction_type_id = $withdrawalType->id;
$withdrawal->save();
+ // make accounts
+ $expense = FactoryMuffin::create('FireflyIII\Models\Account');
+ $asset = FactoryMuffin::create('FireflyIII\Models\Account');
-
+ $withdrawal->transactions[0]->amount = -300;
$withdrawal->transactions[0]->account_id = $asset->id;
- $withdrawal->transactions[0]->amount = -300;
$withdrawal->transactions[0]->save();
+ $withdrawal->transactions[1]->amount = 300;
$withdrawal->transactions[1]->account_id = $expense->id;
- $withdrawal->transactions[1]->amount = 300;
$withdrawal->transactions[1]->save();
- // get asset account:
- $result = $withdrawal->asset_account;
+ // connect to tag:
+ $tag->transactionJournals()->save($withdrawal);
+ $tag2->transactionJournals()->save($withdrawal);
- $this->assertEquals($asset->id, $result->id);
+ $this->assertEquals('300', $withdrawal->amount);
+
+
+ }
+
+
+ /**
+ * @covers FireflyIII\Models\TransactionJournal::getCorrectAmountAttribute
+ */
+ public function testGetCorrectAmountAttribute()
+ {
+ $withdrawal = FactoryMuffin::create('FireflyIII\Models\TransactionType'); // withdrawal
+
+ // make accounts
+ FactoryMuffin::create('FireflyIII\Models\Account');
+ $revenue = FactoryMuffin::create('FireflyIII\Models\Account');
+ $asset = FactoryMuffin::create('FireflyIII\Models\Account');
+
+ // make withdrawal
+ $journal = FactoryMuffin::create('FireflyIII\Models\TransactionJournal');
+ $journal->transaction_type_id = $withdrawal->id;
+ $journal->save();
+
+ $journal->transactions[0]->account_id = $asset->id;
+ $journal->transactions[0]->amount = 300;
+ $journal->transactions[0]->save();
+
+ $journal->transactions[1]->account_id = $revenue->id;
+ $journal->transactions[1]->amount = -300;
+ $journal->transactions[1]->save();
+
+ // get asset account:
+ $result = $journal->correct_amount;
+
+ $this->assertEquals(-300, $result);
+ }
+
+ /**
+ * @covers FireflyIII\Models\TransactionJournal::getCorrectAmountAttribute
+ */
+ public function testGetCorrectAmountAttributeDeposit()
+ {
+ FactoryMuffin::create('FireflyIII\Models\TransactionType'); // withdrawal
+ $deposit = FactoryMuffin::create('FireflyIII\Models\TransactionType'); // deposit
+
+ // make accounts
+ FactoryMuffin::create('FireflyIII\Models\Account');
+ $revenue = FactoryMuffin::create('FireflyIII\Models\Account');
+ $asset = FactoryMuffin::create('FireflyIII\Models\Account');
+
+ // make withdrawal
+ $journal = FactoryMuffin::create('FireflyIII\Models\TransactionJournal');
+ $journal->transaction_type_id = $deposit->id;
+ $journal->save();
+
+ $journal->transactions[0]->account_id = $asset->id;
+ $journal->transactions[0]->amount = 300;
+ $journal->transactions[0]->save();
+
+ $journal->transactions[1]->account_id = $revenue->id;
+ $journal->transactions[1]->amount = -300;
+ $journal->transactions[1]->save();
+
+ // get asset account:
+ $result = $journal->correct_amount;
+
+ $this->assertEquals(300, $result);
+ }
+
+ /**
+ * @covers FireflyIII\Models\TransactionJournal::getCorrectAmountAttribute
+ */
+ public function testGetCorrectAmountAttributeTransfer()
+ {
+ FactoryMuffin::create('FireflyIII\Models\TransactionType'); // withdrawal
+ FactoryMuffin::create('FireflyIII\Models\TransactionType'); // deposit
+ $transfer = FactoryMuffin::create('FireflyIII\Models\TransactionType'); // transfer
+
+ // make accounts
+ FactoryMuffin::create('FireflyIII\Models\Account');
+ $revenue = FactoryMuffin::create('FireflyIII\Models\Account');
+ $asset = FactoryMuffin::create('FireflyIII\Models\Account');
+
+ // make withdrawal
+ $journal = FactoryMuffin::create('FireflyIII\Models\TransactionJournal');
+ $journal->transaction_type_id = $transfer->id;
+ $journal->save();
+
+ $journal->transactions[0]->account_id = $asset->id;
+ $journal->transactions[0]->amount = 300;
+ $journal->transactions[0]->save();
+
+ $journal->transactions[1]->account_id = $revenue->id;
+ $journal->transactions[1]->amount = -300;
+ $journal->transactions[1]->save();
+
+ // get asset account:
+ $result = $journal->correct_amount;
+
+ $this->assertEquals('300', $result);
}
/**
@@ -328,6 +391,8 @@ class TransactionJournalModelTest extends TestCase
*/
public function testGetDestinationAccountAttribute()
{
+ $user = FactoryMuffin::create('FireflyIII\User');
+ $this->be($user);
FactoryMuffin::create('FireflyIII\Models\TransactionType');
$depositType = FactoryMuffin::create('FireflyIII\Models\TransactionType');
$deposit = FactoryMuffin::create('FireflyIII\Models\TransactionJournal');
@@ -340,11 +405,11 @@ class TransactionJournalModelTest extends TestCase
$asset = FactoryMuffin::create('FireflyIII\Models\Account');
$deposit->transactions[0]->account_id = $asset->id;
- $deposit->transactions[0]->amount = 300;
+ $deposit->transactions[0]->amount = 300;
$deposit->transactions[0]->save();
$deposit->transactions[1]->account_id = $revenue->id;
- $deposit->transactions[1]->amount = -300;
+ $deposit->transactions[1]->amount = -300;
$deposit->transactions[1]->save();
// get asset account:
@@ -354,10 +419,12 @@ class TransactionJournalModelTest extends TestCase
}
/**
- * @covers FireflyIII\Models\TransactionJournal::getDestinationAccountAttribute
+ * @covers FireflyIII\Models\TransactionJournal::getSourceAccountAttribute
*/
- public function testGetDestinationAccountAttributeFallback()
+ public function testGetSourceAccountAttribute()
{
+ $user = FactoryMuffin::create('FireflyIII\User');
+ $this->be($user);
FactoryMuffin::create('FireflyIII\Models\TransactionType');
$depositType = FactoryMuffin::create('FireflyIII\Models\TransactionType');
$deposit = FactoryMuffin::create('FireflyIII\Models\TransactionJournal');
@@ -370,17 +437,17 @@ class TransactionJournalModelTest extends TestCase
$asset = FactoryMuffin::create('FireflyIII\Models\Account');
$deposit->transactions[0]->account_id = $asset->id;
- $deposit->transactions[0]->amount = -300;
+ $deposit->transactions[0]->amount = 300;
$deposit->transactions[0]->save();
$deposit->transactions[1]->account_id = $revenue->id;
- $deposit->transactions[1]->amount = -300;
+ $deposit->transactions[1]->amount = -300;
$deposit->transactions[1]->save();
// get asset account:
- $result = $deposit->destination_account;
+ $result = $deposit->source_account;
- $this->assertEquals($asset->id, $result->id);
+ $this->assertEquals($revenue->id, $result->id);
}
}
diff --git a/tests/repositories/AccountRepositoryTest.php b/tests/repositories/AccountRepositoryTest.php
index d96994e8b0..6a17b5d564 100644
--- a/tests/repositories/AccountRepositoryTest.php
+++ b/tests/repositories/AccountRepositoryTest.php
@@ -3,7 +3,6 @@ use Carbon\Carbon;
use FireflyIII\Models\Account;
use FireflyIII\Models\AccountMeta;
use FireflyIII\Models\Preference;
-use FireflyIII\Models\Transaction;
use FireflyIII\Repositories\Account\AccountRepository;
use Illuminate\Pagination\LengthAwarePaginator;
use League\FactoryMuffin\Facade as FactoryMuffin;
@@ -52,11 +51,21 @@ class AccountRepositoryTest extends TestCase
/**
* @covers FireflyIII\Repositories\Account\AccountRepository::destroy
+ * @covers FireflyIII\Providers\EventServiceProvider::boot
+ * @covers FireflyIII\Providers\EventServiceProvider::registerDeleteEvents
*/
public function testDestroy()
{
// create account:
- $account = FactoryMuffin::create('FireflyIII\Models\Account');
+ $account = FactoryMuffin::create('FireflyIII\Models\Account');
+
+ // create some transactions and attach them to the account:
+ for ($i = 0; $i < 5; $i++) {
+ $transaction = FactoryMuffin::create('FireflyIII\Models\Transaction');
+ $transaction->account_id = $account->id;
+ $transaction->save();
+ }
+
$accountId = $account->id;
$this->be($account->user);
@@ -113,9 +122,9 @@ class AccountRepositoryTest extends TestCase
*/
public function testGetFirstTransaction()
{
- $account = FactoryMuffin::create('FireflyIII\Models\Account');
- $journal = FactoryMuffin::create('FireflyIII\Models\TransactionJournal');
- $first = $journal->transactions()->orderBy('date', 'DESC')->first();
+ $account = FactoryMuffin::create('FireflyIII\Models\Account');
+ $journal = FactoryMuffin::create('FireflyIII\Models\TransactionJournal');
+ $first = $journal->transactions()->orderBy('date', 'DESC')->first();
$first->account_id = $account->id;
$first->save();
@@ -414,63 +423,80 @@ class AccountRepositoryTest extends TestCase
public function testGetTransfersInRange()
{
FactoryMuffin::create('FireflyIII\Models\Account');
-
-
- // three transfers, two out of range:
- FactoryMuffin::create('FireflyIII\Models\TransactionType');
- FactoryMuffin::create('FireflyIII\Models\TransactionType');
- $journal1 = FactoryMuffin::create('FireflyIII\Models\TransactionJournal');
- $journal2 = FactoryMuffin::create('FireflyIII\Models\TransactionJournal');
- $journal3 = FactoryMuffin::create('FireflyIII\Models\TransactionJournal');
- $account = FactoryMuffin::create('FireflyIII\Models\Account');
- $journal2->transaction_type_id = $journal1->transaction_type_id;
- $journal3->transaction_type_id = $journal1->transaction_type_id;
-
- // transactions are already present, update them!
- $journal1->transactions[0]->account_id = $account->id;
- $journal1->transactions[0]->amount = 100;
- $journal1->transactions[1]->account_id = $account->id;
- $journal1->transactions[1]->amount = 100;
- $journal2->transactions[0]->account_id = $account->id;
- $journal2->transactions[0]->amount = 100;
- $journal2->transactions[1]->account_id = $account->id;
- $journal2->transactions[1]->amount = 100;
- $journal3->transactions[0]->account_id = $account->id;
- $journal3->transactions[0]->amount = 100;
- $journal3->transactions[1]->account_id = $account->id;
- $journal3->transactions[1]->amount = 100;
- $journal1->transactions[0]->save();
- $journal1->transactions[1]->save();
- $journal2->transactions[0]->save();
- $journal2->transactions[1]->save();
- $journal3->transactions[0]->save();
- $journal3->transactions[1]->save();
-
- // check date:
+ FactoryMuffin::create('FireflyIII\Models\TransactionType'); // withdrawal
+ FactoryMuffin::create('FireflyIII\Models\TransactionType'); // deposit
+ FactoryMuffin::create('FireflyIII\Models\AccountType'); // expense
+ FactoryMuffin::create('FireflyIII\Models\AccountType'); // revenue
+ $asset = FactoryMuffin::create('FireflyIII\Models\AccountType'); // asset
+ $transfer = FactoryMuffin::create('FireflyIII\Models\TransactionType'); // transfer
+ $user = FactoryMuffin::create('FireflyIII\User'); // user!
+ $accounts = [];
+ $opposings = []; // opposing accounts.
+ $journals = [];
+ // dates
$start = new Carbon('2014-01-01');
$end = new Carbon('2014-01-31');
$inRange = new Carbon('2014-01-15');
$before = new Carbon('2013-01-15');
- $after = new Carbon('2015-01-15');
- // journal 1 will match:
- $journal1->date = $inRange;
- $journal1->user_id = $account->user_id;
- $journal2->date = $before;
- $journal2->user_id = $account->user_id;
- $journal3->date = $after;
- $journal3->user_id = $account->user_id;
- $journal1->save();
- $journal2->save();
- $journal3->save();
- $this->be($account->user);
+ // create two accounts:
+ for ($i = 0; $i < 2; $i++) {
+ $account = FactoryMuffin::create('FireflyIII\Models\Account');
+ $account->account_type_id = $asset->id;
+ $account->user_id = $user->id;
+ $account->save();
+ $accounts[] = $account;
- $set = $this->object->getTransfersInRange($account, $start, $end);
+ $opposing = FactoryMuffin::create('FireflyIII\Models\Account');
+ $opposing->account_type_id = $asset->id;
+ $opposing->user_id = $user->id;
+ $opposing->save();
+ $opposings[] = $opposing;
+ }
+
+ // for each account, create ten journals
+ foreach ($accounts as $index => $account) {
+ for ($i = 0; $i < 10; $i++) {
+ $journal = FactoryMuffin::create('FireflyIII\Models\TransactionJournal');
+ $journal->user_id = $user->id;
+ $journal->transaction_type_id = $transfer->id;
+ $journal->save();
+
+ // if $i < 6, transfer is in range:
+ if ($i < 6) {
+ $journal->date = $inRange;
+ } else {
+ $journal->date = $before;
+ }
+
+ /*
+ * Transfers can go either way (see the amount)
+ */
+ if ($i < 4) {
+ $amount = 100;
+ } else {
+ $amount = -100;
+ }
- $this->assertEquals(1, $set->count());
+ $journal->transactions[0]->account_id = $account->id;
+ $journal->transactions[0]->amount = $amount;
+ $journal->transactions[1]->account_id = $opposings[$index]->id;
+ $journal->transactions[1]->amount = $amount * -1;
+ $journal->transactions[0]->save();
+ $journal->transactions[1]->save();
+ // save journal:
+ $journal->save();
+ $journals[] = $journal;
+ }
+ }
+ $this->be($user);
+
+ $set = $this->object->getTransfersInRange($accounts[0], $start, $end);
+
+ $this->assertEquals(4, $set->count());
$this->assertEquals(100, $set->first()->amount);
- $this->assertEquals($journal1->description, $set->first()->description);
+ $this->assertEquals($journals[0]->description, $set->first()->description);
}
@@ -587,6 +613,8 @@ class AccountRepositoryTest extends TestCase
}
/**
+ * This function should give a big fat error, but it doesnt.
+ *
* @covers FireflyIII\Repositories\Account\AccountRepository::store
* @covers FireflyIII\Repositories\Account\AccountRepository::storeAccount
* @covers FireflyIII\Repositories\Account\AccountRepository::storeMetadata
@@ -594,12 +622,12 @@ class AccountRepositoryTest extends TestCase
*/
public function testStoreWithExistingAccount()
{
- $account = FactoryMuffin::create('FireflyIII\Models\Account');
- FactoryMuffin::create('FireflyIII\Models\AccountType');
- FactoryMuffin::create('FireflyIII\Models\AccountType');
- FactoryMuffin::create('FireflyIII\Models\TransactionType');
- FactoryMuffin::create('FireflyIII\Models\TransactionType');
- FactoryMuffin::create('FireflyIII\Models\TransactionType');
+ $account = FactoryMuffin::create('FireflyIII\Models\Account'); // expense
+ FactoryMuffin::create('FireflyIII\Models\AccountType'); // revenue
+ FactoryMuffin::create('FireflyIII\Models\AccountType'); // asset
+ FactoryMuffin::create('FireflyIII\Models\TransactionType'); // withdrawal
+ FactoryMuffin::create('FireflyIII\Models\TransactionType'); // deposit
+ FactoryMuffin::create('FireflyIII\Models\TransactionType'); // transfer
$currency = FactoryMuffin::create('FireflyIII\Models\TransactionCurrency');
$this->be($account->user);
@@ -616,7 +644,6 @@ class AccountRepositoryTest extends TestCase
'openingBalanceDate' => '2015-01-01',
];
-
$newAccount = $this->object->store($data);
$this->assertEquals($account->name, $newAccount->name);
diff --git a/tests/repositories/BillRepositoryTest.php b/tests/repositories/BillRepositoryTest.php
index 5c1de9fe92..36356391f5 100644
--- a/tests/repositories/BillRepositoryTest.php
+++ b/tests/repositories/BillRepositoryTest.php
@@ -38,6 +38,9 @@ class BillRepositoryTest extends TestCase
public function testBillPaymentsInRange()
{
+ $user = FactoryMuffin::create('FireflyIII\User');
+ $this->be($user);
+
$bill = FactoryMuffin::create('FireflyIII\Models\Bill');
$start = Carbon::now()->startOfMonth();
$end = Carbon::now()->endOfMonth();
@@ -297,9 +300,13 @@ class BillRepositoryTest extends TestCase
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*
* @covers FireflyIII\Repositories\Bill\BillRepository::scan
+ * @covers FireflyIII\Repositories\Bill\BillRepository::doWordMatch
+ * @covers FireflyIII\Repositories\Bill\BillRepository::doAmountMatch
*/
public function testScanMatch()
{
+ $user = FactoryMuffin::create('FireflyIII\User');
+ $this->be($user);
$bill = FactoryMuffin::create('FireflyIII\Models\Bill');
$bill->date = new Carbon('2012-01-07');
$bill->repeat_freq = 'monthly';
@@ -316,24 +323,6 @@ class BillRepositoryTest extends TestCase
$journal->user_id = $bill->user_id;
$journal->save();
- // two transactions:
- $account1 = FactoryMuffin::create('FireflyIII\Models\Account');
- $account2 = FactoryMuffin::create('FireflyIII\Models\Account');
- Transaction::create(
- [
- 'account_id' => $account1->id,
- 'transaction_journal_id' => $journal->id,
- 'amount' => 100,
- ]
- );
- Transaction::create(
- [
- 'account_id' => $account2->id,
- 'transaction_journal_id' => $journal->id,
- 'amount' => 100,
- ]
- );
-
$this->object->scan($bill, $journal);
$newJournal = TransactionJournal::find($journal->id);
@@ -342,6 +331,8 @@ class BillRepositoryTest extends TestCase
/**
* @covers FireflyIII\Repositories\Bill\BillRepository::scan
+ * @covers FireflyIII\Repositories\Bill\BillRepository::doWordMatch
+ * @covers FireflyIII\Repositories\Bill\BillRepository::doAmountMatch
*/
public function testScanNoMatch()
{
@@ -383,6 +374,8 @@ class BillRepositoryTest extends TestCase
/**
* @covers FireflyIII\Repositories\Bill\BillRepository::scan
+ * @covers FireflyIII\Repositories\Bill\BillRepository::doWordMatch
+ * @covers FireflyIII\Repositories\Bill\BillRepository::doAmountMatch
*/
public function testScanNoMatchButAttached()
{
diff --git a/tests/repositories/BudgetRepositoryTest.php b/tests/repositories/BudgetRepositoryTest.php
index 8008d78f11..f172274f1e 100644
--- a/tests/repositories/BudgetRepositoryTest.php
+++ b/tests/repositories/BudgetRepositoryTest.php
@@ -38,6 +38,7 @@ class BudgetRepositoryTest extends TestCase
/**
* @covers FireflyIII\Repositories\Budget\BudgetRepository::cleanupBudgets
+ * @covers FireflyIII\Providers\EventServiceProvider::boot
*/
public function testCleanupBudgets()
{
@@ -155,6 +156,8 @@ class BudgetRepositoryTest extends TestCase
*/
public function testGetCurrentRepetition()
{
+ $user = FactoryMuffin::create('FireflyIII\User');
+ $this->be($user);
/** @var Budget $budget */
$budget = FactoryMuffin::create('FireflyIII\Models\Budget');
$rep = $this->object->getCurrentRepetition($budget, new Carbon);
@@ -210,6 +213,9 @@ class BudgetRepositoryTest extends TestCase
*/
public function testGetJournals()
{
+ $user = FactoryMuffin::create('FireflyIII\User');
+ $this->be($user);
+
$repetition = FactoryMuffin::create('FireflyIII\Models\LimitRepetition');
$set = $this->object->getJournals($repetition->budgetlimit->budget, $repetition);
@@ -290,9 +296,13 @@ class BudgetRepositoryTest extends TestCase
/**
* @covers FireflyIII\Repositories\Budget\BudgetRepository::spentInPeriodCorrected
+ * @covers FireflyIII\Repositories\Shared\ComponentRepository::spentInPeriod
*/
public function testSpentInPeriodCorrected()
{
+ $user = FactoryMuffin::create('FireflyIII\User');
+ $this->be($user);
+
$budget = FactoryMuffin::create('FireflyIII\Models\Budget');
$amount = $this->object->spentInPeriodCorrected($budget, new Carbon, new Carbon, false);
@@ -301,9 +311,13 @@ class BudgetRepositoryTest extends TestCase
/**
* @covers FireflyIII\Repositories\Budget\BudgetRepository::spentInPeriodCorrected
+ * @covers FireflyIII\Repositories\Shared\ComponentRepository::spentInPeriod
*/
public function testSpentInPeriodCorrectedShared()
{
+ $user = FactoryMuffin::create('FireflyIII\User');
+ $this->be($user);
+
$budget = FactoryMuffin::create('FireflyIII\Models\Budget');
$amount = $this->object->spentInPeriodCorrected($budget, new Carbon, new Carbon, true);
diff --git a/tests/repositories/CategoryRepositoryTest.php b/tests/repositories/CategoryRepositoryTest.php
index 9ea3727bc4..63ed85ee83 100644
--- a/tests/repositories/CategoryRepositoryTest.php
+++ b/tests/repositories/CategoryRepositoryTest.php
@@ -84,53 +84,43 @@ class CategoryRepositoryTest extends TestCase
*/
public function testGetCategoriesAndExpensesCorrected()
{
- $user = FactoryMuffin::create('FireflyIII\User');
- $type = FactoryMuffin::create('FireflyIII\Models\TransactionType');
- // some journals and categories:
- for ($i = 0; $i < 5; $i++) {
- $journal = FactoryMuffin::create('FireflyIII\Models\TransactionJournal');
+ $user = FactoryMuffin::create('FireflyIII\User');
+ $type = FactoryMuffin::create('FireflyIII\Models\TransactionType'); // withdrawal
+ $currency = FactoryMuffin::create('FireflyIII\Models\TransactionCurrency'); // something
+
+ // some dates:
+ $start = new Carbon('2014-01-01');
+ $end = new Carbon('2014-01-31');
+ $inRange = new Carbon('2014-01-12');
+
+ // generate three categories
+ // with ten journals each:
+ for ($i = 0; $i < 3; $i++) {
+ // category:
/** @var Category $category */
- $category = FactoryMuffin::create('FireflyIII\Models\Category');
- $journal->user_id = $user->id;
- $journal->date = new Carbon('2015-02-11');
- $journal->transaction_type_id = $type->id;
- $category->user_id = $user->id;
- $category->transactionjournals()->save($journal);
- $journal->save();
- $category->save();
- }
-
- for ($i = 0; $i < 5; $i++) {
- $journal1 = FactoryMuffin::create('FireflyIII\Models\TransactionJournal');
- $journal2 = FactoryMuffin::create('FireflyIII\Models\TransactionJournal');
- /** @var Category $category */
- $category = FactoryMuffin::create('FireflyIII\Models\Category');
-
- $journal1->user_id = $user->id;
- $journal1->date = new Carbon('2015-02-11');
- $journal1->transaction_type_id = $type->id;
-
- $journal2->user_id = $user->id;
- $journal2->date = new Carbon('2015-02-11');
- $journal2->transaction_type_id = $type->id;
-
+ $category = FactoryMuffin::create('FireflyIII\Models\Category');
$category->user_id = $user->id;
- $category->transactionjournals()->save($journal1);
- $category->transactionjournals()->save($journal2);
-
- $journal1->save();
- $journal2->save();
$category->save();
- }
+ for ($j = 0; $j < 10; $j++) {
+ $journal = FactoryMuffin::create('FireflyIII\Models\TransactionJournal');
+ $journal->user_id = $user->id;
+ $journal->transaction_currency_id = $currency->id;
+ $journal->transaction_type_id = $type->id; // make it a withdrawal
+ $journal->date = $inRange;
+ $journal->save();
+ // connect to category:
+ $category->transactionjournals()->save($journal);
+ }
+ }
$this->be($user);
- $set = $this->object->getCategoriesAndExpensesCorrected(new Carbon('2015-02-01'), new Carbon('2015-02-28'));
- $this->assertCount(10, $set);
+ $set = $this->object->getCategoriesAndExpensesCorrected($start, $end);
+ $this->assertCount(3, $set);
reset($set);
- // every journal has amount 100.
- $this->assertEquals(100, current($set)['sum']);
+ // 10 journals of 100 each = 1000.
+ $this->assertEquals('1000', current($set)['sum']);
}
/**
@@ -218,9 +208,12 @@ class CategoryRepositoryTest extends TestCase
/**
* @covers FireflyIII\Repositories\Category\CategoryRepository::spentInPeriodCorrected
+ * @covers FireflyIII\Repositories\Shared\ComponentRepository::spentInPeriod
*/
public function testSpentInPeriodSumCorrected()
{
+ $user = FactoryMuffin::create('FireflyIII\User');
+ $this->be($user);
$category = FactoryMuffin::create('FireflyIII\Models\Category');
$sum = $this->object->spentInPeriodCorrected($category, new Carbon, new Carbon, false);
@@ -231,9 +224,12 @@ class CategoryRepositoryTest extends TestCase
/**
* @covers FireflyIII\Repositories\Category\CategoryRepository::spentInPeriodCorrected
+ * @covers FireflyIII\Repositories\Shared\ComponentRepository::spentInPeriod
*/
public function testSpentInPeriodSumCorrectedShared()
{
+ $user = FactoryMuffin::create('FireflyIII\User');
+ $this->be($user);
$category = FactoryMuffin::create('FireflyIII\Models\Category');
$sum = $this->object->spentInPeriodCorrected($category, new Carbon, new Carbon, true);
diff --git a/tests/repositories/JournalRepositoryTest.php b/tests/repositories/JournalRepositoryTest.php
index 375b06e70d..9216dc9662 100644
--- a/tests/repositories/JournalRepositoryTest.php
+++ b/tests/repositories/JournalRepositoryTest.php
@@ -1,4 +1,5 @@
$account->id,
- 'transaction_journal_id' => $journal->id,
- 'amount' => 100,
- ]
- );
-
+ $transaction = $journal->transactions[0];
$this->object->delete($journal);
$this->assertEquals(0, TransactionJournal::where('id', $journal->id)->whereNull('deleted_at')->count());
@@ -92,12 +87,40 @@ class JournalRepositoryTest extends TestCase
*/
public function testGetAmountBefore()
{
+ // create some accounts:
+ $expense = FactoryMuffin::create('FireflyIII\Models\Account'); // expense
+ FactoryMuffin::create('FireflyIII\Models\Account'); // revenue
+ $asset = FactoryMuffin::create('FireflyIII\Models\Account'); // asset
+
+ // transaction type
+ $withdrawal = FactoryMuffin::create('FireflyIII\Models\TransactionType'); // withdrawal
+
+ // create five journals with incrementing dates:
+ $today = new Carbon('2015-01-01');
+ for($i=0;$i<5;$i++) {
+ // create journal:
+ $journal = FactoryMuffin::create('FireflyIII\Models\TransactionJournal');
+ $journal->transaction_type_id = $withdrawal;
+ $journal->date = $today;
+ $journal->save();
+
+ // update transactions:
+ $journal->transactions[0]->amount = -100;
+ $journal->transactions[0]->account_id = $asset->id;
+ $journal->transactions[0]->save();
+
+ $journal->transactions[1]->amount = 100;
+ $journal->transactions[1]->account_id = $expense->id;
+ $journal->transactions[1]->save();
+
+ // connect to expense
+ $today->addDay();
+ }
- $transaction = FactoryMuffin::create('FireflyIII\Models\Transaction');
- $before = $this->object->getAmountBefore($transaction->transactionjournal, $transaction);
-
- $this->assertEquals(0, $before);
+ $before = $this->object->getAmountBefore($journal, $journal->transactions[1]);
+ // five transactions, we check the last one, so amount should be 400.
+ $this->assertEquals(400, $before);
}
/**
@@ -446,6 +469,9 @@ class JournalRepositoryTest extends TestCase
*/
public function testUpdate()
{
+ $user = FactoryMuffin::create('FireflyIII\User');
+ $this->be($user);
+
for ($i = 0; $i < 4; $i++) {
FactoryMuffin::create('FireflyIII\Models\AccountType');
}
@@ -504,6 +530,9 @@ class JournalRepositoryTest extends TestCase
*/
public function testUpdateNoTags()
{
+ $user = FactoryMuffin::create('FireflyIII\User');
+ $this->be($user);
+
for ($i = 0; $i < 4; $i++) {
FactoryMuffin::create('FireflyIII\Models\AccountType');
}
diff --git a/tests/repositories/PiggyBankRepositoryTest.php b/tests/repositories/PiggyBankRepositoryTest.php
index 79fd026f59..e032384047 100644
--- a/tests/repositories/PiggyBankRepositoryTest.php
+++ b/tests/repositories/PiggyBankRepositoryTest.php
@@ -1,7 +1,7 @@
remindersable_id = $piggyBank->id;
+ $reminder->remindersable_type = 'FireflyIII\Models\PiggyBank';
+ $reminder->save();
$this->object->destroy($piggyBank);
$this->assertCount(0, PiggyBank::where('id', $piggyBank->id)->whereNull('deleted_at')->get());
+ $this->assertCount(0, Reminder::where('id', $reminder->id)->whereNull('deleted_at')->get());
}
@@ -125,6 +134,8 @@ class PiggyBankRepositoryTest extends TestCase
/**
* @covers FireflyIII\Repositories\PiggyBank\PiggyBankRepository::store
+ * @covers FireflyIII\Providers\EventServiceProvider::boot
+ * @covers FireflyIII\Providers\EventServiceProvider::registerCreateEvents
*/
public function testStore()
{
@@ -147,6 +158,8 @@ class PiggyBankRepositoryTest extends TestCase
/**
* @covers FireflyIII\Repositories\PiggyBank\PiggyBankRepository::store
+ * @covers FireflyIII\Providers\EventServiceProvider::boot
+ * @covers FireflyIII\Providers\EventServiceProvider::registerCreateEvents
*/
public function testStoreRedirect()
{
diff --git a/tests/repositories/TagRepositoryTest.php b/tests/repositories/TagRepositoryTest.php
index 3a8962dc29..23d736d5c0 100644
--- a/tests/repositories/TagRepositoryTest.php
+++ b/tests/repositories/TagRepositoryTest.php
@@ -1,6 +1,6 @@
be($user);
+
$withdrawal = FactoryMuffin::create('FireflyIII\Models\TransactionType');
$deposit = FactoryMuffin::create('FireflyIII\Models\TransactionType');
FactoryMuffin::create('FireflyIII\Models\TransactionType');
@@ -212,11 +226,18 @@ class TagRepositoryTest extends TestCase
* Once one or more journals have been accepted by the tag, others must match the asset account
* id. For this to work, we must also create an asset account, and a transaction.
*
+ * This covers the advance payment
+ *
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
* @covers FireflyIII\Repositories\Tag\TagRepository::connect
+ * @covers FireflyIII\Repositories\Tag\TagRepository::connectAdvancePayment
+ * @covers FireflyIII\Repositories\Tag\TagRepository::matchAll
*/
public function testConnectPaymentNoMatch()
{
+ $user = FactoryMuffin::create('FireflyIII\User');
+ $this->be($user);
+
$withdrawal = FactoryMuffin::create('FireflyIII\Models\TransactionType');
$deposit = FactoryMuffin::create('FireflyIII\Models\TransactionType');
FactoryMuffin::create('FireflyIII\Models\TransactionType');
@@ -266,12 +287,17 @@ class TagRepositoryTest extends TestCase
}
/**
- * An advance payment accepts no transfers
+ * An advance payment accepts no transfers.
*
* @covers FireflyIII\Repositories\Tag\TagRepository::connect
+ * @covers FireflyIII\Repositories\Tag\TagRepository::connectAdvancePayment
+ * @covers FireflyIII\Repositories\Tag\TagRepository::matchAll
*/
public function testConnectPaymentOneTransfer()
{
+ $user = FactoryMuffin::create('FireflyIII\User');
+ $this->be($user);
+
FactoryMuffin::create('FireflyIII\Models\TransactionType');
FactoryMuffin::create('FireflyIII\Models\TransactionType');
$transfer = FactoryMuffin::create('FireflyIII\Models\TransactionType');
@@ -294,9 +320,14 @@ class TagRepositoryTest extends TestCase
* An advance payment accepts only one withdrawal, not two.
*
* @covers FireflyIII\Repositories\Tag\TagRepository::connect
+ * @covers FireflyIII\Repositories\Tag\TagRepository::connectAdvancePayment
+ * @covers FireflyIII\Repositories\Tag\TagRepository::matchAll
*/
public function testConnectPaymentOneWithdrawal()
{
+ $user = FactoryMuffin::create('FireflyIII\User');
+ $this->be($user);
+
$withdrawal = FactoryMuffin::create('FireflyIII\Models\TransactionType');
FactoryMuffin::create('FireflyIII\Models\TransactionType');
FactoryMuffin::create('FireflyIII\Models\TransactionType');
@@ -319,9 +350,14 @@ class TagRepositoryTest extends TestCase
* An advance payment accepts only one withdrawal, not two.
*
* @covers FireflyIII\Repositories\Tag\TagRepository::connect
+ * @covers FireflyIII\Repositories\Tag\TagRepository::connectAdvancePayment
+ * @covers FireflyIII\Repositories\Tag\TagRepository::matchAll
*/
public function testConnectPaymentTwoWithdrawals()
{
+ $user = FactoryMuffin::create('FireflyIII\User');
+ $this->be($user);
+
$withdrawal = FactoryMuffin::create('FireflyIII\Models\TransactionType');
FactoryMuffin::create('FireflyIII\Models\TransactionType');
FactoryMuffin::create('FireflyIII\Models\TransactionType');
@@ -344,6 +380,110 @@ class TagRepositoryTest extends TestCase
}
+ /**
+ * An advance payment accepts only one withdrawal, not two, even not
+ * if the accounts are the same
+ *
+ * @covers FireflyIII\Repositories\Tag\TagRepository::connect
+ * @covers FireflyIII\Repositories\Tag\TagRepository::connectAdvancePayment
+ * @covers FireflyIII\Repositories\Tag\TagRepository::matchAll
+ */
+ public function testConnectPaymentTwoWithdrawalsSameAccounts()
+ {
+ $user = FactoryMuffin::create('FireflyIII\User');
+ $this->be($user);
+
+ $withdrawal = FactoryMuffin::create('FireflyIII\Models\TransactionType');
+ FactoryMuffin::create('FireflyIII\Models\TransactionType');
+ FactoryMuffin::create('FireflyIII\Models\TransactionType');
+
+ $journal = FactoryMuffin::create('FireflyIII\Models\TransactionJournal');
+ $otherJournal = FactoryMuffin::create('FireflyIII\Models\TransactionJournal');
+ $tag = FactoryMuffin::create('FireflyIII\Models\Tag');
+
+ $journal->transaction_type_id = $withdrawal->id;
+ $otherJournal->transaction_type_id = $withdrawal->id;
+
+ // match up accounts:
+ $otherJournal->transactions[0]->account_id = $journal->transactions[0]->account_id;
+ $otherJournal->transactions[1]->account_id = $journal->transactions[1]->account_id;
+ $otherJournal->transactions[0]->save();
+ $otherJournal->transactions[1]->save();
+
+
+ $tag->tagMode = 'advancePayment';
+
+ $tag->save();
+ $journal->save();
+ $otherJournal->save();
+ $otherJournal->tags()->save($tag);
+
+ $result = $this->object->connect($journal, $tag);
+ $this->assertFalse($result);
+ }
+
+ /**
+ * @covers FireflyIII\Repositories\Tag\TagRepository::coveredByBalancingActs
+ */
+ public function testCoveredByBalancingActs()
+ {
+ // create a user:
+ $user = FactoryMuffin::create('FireflyIII\User');
+ $this->be($user);
+
+ // create transaction and account types:
+ FactoryMuffin::create('FireflyIII\Models\TransactionType'); // withdrawal
+ FactoryMuffin::create('FireflyIII\Models\TransactionType'); // deposit
+ $transfer = FactoryMuffin::create('FireflyIII\Models\TransactionType'); // transfer
+ FactoryMuffin::create('FireflyIII\Models\AccountType'); // expense
+ FactoryMuffin::create('FireflyIII\Models\AccountType'); // revenue
+ $asset = FactoryMuffin::create('FireflyIII\Models\AccountType'); // asset
+
+ // create two accounts:
+ $fromAccount = FactoryMuffin::create('FireflyIII\Models\Account'); // asset
+ $toAccount = FactoryMuffin::create('FireflyIII\Models\Account'); // asset
+ $fromAccount->account_type_id = $asset->id;
+ $toAccount->account_type_id = $asset->id;
+ $fromAccount->save();
+ $toAccount->save();
+
+
+ // create a tag
+ $tag = FactoryMuffin::create('FireflyIII\Models\Tag');
+ $tag->tagMode = 'balancingAct';
+ $tag->user_id = $user->id;
+ $tag->save();
+
+ // date
+ $today = new Carbon('2014-01-12');
+ $start = new Carbon('2014-01-01');
+ $end = new Carbon('2014-01-31');
+
+ // store five journals
+ for ($i = 0; $i < 5; $i++) {
+ $journal = FactoryMuffin::create('FireflyIII\Models\TransactionJournal'); // deposit!
+ // set date:
+ $journal->date = $today;
+ $journal->user_id = $user->id;
+ $journal->transaction_type_id = $transfer->id;
+ $journal->tags()->save($tag);
+ $journal->save();
+
+ // update accounts:
+ $journal->transactions[0]->account_id = $fromAccount->id;
+ $journal->transactions[0]->amount = '-100';
+ $journal->transactions[0]->save();
+ $journal->transactions[1]->account_id = $toAccount->id;
+ $journal->transactions[1]->amount = '100';
+ $journal->transactions[1]->save();
+
+ }
+
+ $amount = $this->object->coveredByBalancingActs($toAccount, $start, $end);
+ // five transactions, 100 each.
+ $this->assertEquals('500', $amount);
+ }
+
/**
* @covers FireflyIII\Repositories\Tag\TagRepository::destroy
*/
@@ -402,6 +542,171 @@ class TagRepositoryTest extends TestCase
$this->assertEquals($data['tag'], $tag->tag);
}
+ /**
+ * By default, any tag can become an advancePayment
+ *
+ * @covers FireflyIII\Repositories\Tag\TagRepository::tagAllowAdvance
+ */
+ public function testTagAllowAdvance()
+ {
+ // create a tag
+ $user = FactoryMuffin::create('FireflyIII\User');
+ $tag = FactoryMuffin::create('FireflyIII\Models\Tag');
+ $tag->tagMode = 'nothing';
+ $tag->user_id = $user->id;
+ $tag->save();
+
+ $result = $this->object->tagAllowAdvance($tag);
+ $this->assertTrue($result);
+ }
+
+ /**
+ * If the tag has one transfer, it can NOT become an advance payment.
+ *
+ * @covers FireflyIII\Repositories\Tag\TagRepository::tagAllowAdvance
+ */
+ public function testTagAllowAdvanceWithTransfer()
+ {
+ // create a tag
+ $user = FactoryMuffin::create('FireflyIII\User');
+ $tag = FactoryMuffin::create('FireflyIII\Models\Tag');
+ FactoryMuffin::create('FireflyIII\Models\TransactionType'); // withdrawal
+ FactoryMuffin::create('FireflyIII\Models\TransactionType'); // deposit
+ $transfer = FactoryMuffin::create('FireflyIII\Models\TransactionType'); // transfer
+ $tag->tagMode = 'nothing';
+ $tag->user_id = $user->id;
+ $tag->save();
+
+ // create withdrawal:
+ $journal = FactoryMuffin::create('FireflyIII\Models\TransactionJournal');
+ $journal->transaction_type_id = $transfer->id;
+ $journal->save();
+ $journal->tags()->save($tag);
+
+ $result = $this->object->tagAllowAdvance($tag);
+ $this->assertFalse($result);
+ }
+
+ /**
+ * If the tag has one withdrawal, it can still become an advance payment.
+ *
+ * @covers FireflyIII\Repositories\Tag\TagRepository::tagAllowAdvance
+ */
+ public function testTagAllowAdvanceWithWithdrawal()
+ {
+ // create a tag
+ $user = FactoryMuffin::create('FireflyIII\User');
+ $tag = FactoryMuffin::create('FireflyIII\Models\Tag');
+ $tag->tagMode = 'nothing';
+ $tag->user_id = $user->id;
+ $tag->save();
+
+ // create withdrawal:
+ $journal = FactoryMuffin::create('FireflyIII\Models\TransactionJournal');
+ $journal->tags()->save($tag);
+
+ $result = $this->object->tagAllowAdvance($tag);
+ $this->assertTrue($result);
+ }
+
+ /**
+ * If the tag has two withdrawals, it CANNOT become an advance payment.
+ *
+ * @covers FireflyIII\Repositories\Tag\TagRepository::tagAllowAdvance
+ */
+ public function testTagAllowAdvanceWithWithdrawals()
+ {
+ // create a tag
+ $user = FactoryMuffin::create('FireflyIII\User');
+ $tag = FactoryMuffin::create('FireflyIII\Models\Tag');
+ $withdrawal = FactoryMuffin::create('FireflyIII\Models\TransactionType');
+ $tag->tagMode = 'nothing';
+ $tag->user_id = $user->id;
+ $tag->save();
+
+ // create withdrawals
+ for ($i = 0; $i < 2; $i++) {
+ $journal = FactoryMuffin::create('FireflyIII\Models\TransactionJournal');
+ $journal->transaction_type_id = $withdrawal->id;
+ $journal->save();
+ $journal->tags()->save($tag);
+ }
+
+ $result = $this->object->tagAllowAdvance($tag);
+ $this->assertFalse($result);
+ }
+
+ /**
+ * By default, an empty tag can become a balancing act.
+ *
+ * @covers FireflyIII\Repositories\Tag\TagRepository::tagAllowBalancing
+ */
+ public function testTagAllowBalancing()
+ {
+ // create a tag
+ $user = FactoryMuffin::create('FireflyIII\User');
+ $tag = FactoryMuffin::create('FireflyIII\Models\Tag');
+ $tag->tagMode = 'nothing';
+ $tag->user_id = $user->id;
+ $tag->save();
+
+ $result = $this->object->tagAllowBalancing($tag);
+ $this->assertTrue($result);
+ }
+
+ /**
+ * When the tag has one deposit, it can NOT become a balancing act.
+ *
+ * @covers FireflyIII\Repositories\Tag\TagRepository::tagAllowBalancing
+ */
+ public function testTagAllowBalancingDeposit()
+ {
+
+ // create a tag
+ FactoryMuffin::create('FireflyIII\Models\TransactionType'); // withdrawal
+ $deposit = FactoryMuffin::create('FireflyIII\Models\TransactionType'); // deposit
+ $user = FactoryMuffin::create('FireflyIII\User');
+ $tag = FactoryMuffin::create('FireflyIII\Models\Tag');
+ $tag->tagMode = 'nothing';
+ $tag->user_id = $user->id;
+ $tag->save();
+
+ // create three journals and connect them:
+ for ($i = 0; $i < 1; $i++) {
+ $journal = FactoryMuffin::create('FireflyIII\Models\TransactionJournal');
+ $journal->transaction_type_id = $deposit->id;
+ $journal->save();
+ $journal->tags()->save($tag);
+ }
+
+ $result = $this->object->tagAllowBalancing($tag);
+ $this->assertFalse($result);
+ }
+
+ /**
+ * When the tag has more than 2 transactions connected to it, it cannot become abalancing act.
+ *
+ * @covers FireflyIII\Repositories\Tag\TagRepository::tagAllowBalancing
+ */
+ public function testTagAllowBalancingManyJournals()
+ {
+ // create a tag
+ $user = FactoryMuffin::create('FireflyIII\User');
+ $tag = FactoryMuffin::create('FireflyIII\Models\Tag');
+ $tag->tagMode = 'nothing';
+ $tag->user_id = $user->id;
+ $tag->save();
+
+ // create three journals and connect them:
+ for ($i = 0; $i < 3; $i++) {
+ $journal = FactoryMuffin::create('FireflyIII\Models\TransactionJournal');
+ $journal->tags()->save($tag);
+ }
+
+ $result = $this->object->tagAllowBalancing($tag);
+ $this->assertFalse($result);
+ }
+
/**
* @covers FireflyIII\Repositories\Tag\TagRepository::update
*/
diff --git a/tests/support/AmountSupportTest.php b/tests/support/AmountSupportTest.php
new file mode 100644
index 0000000000..63631e0578
--- /dev/null
+++ b/tests/support/AmountSupportTest.php
@@ -0,0 +1,300 @@
+object = new Amount;
+ $user = FactoryMuffin::create('FireflyIII\User');
+ $this->be($user);
+
+
+ }
+
+ /**
+ * Tears down the fixture, for example, closes a network connection.
+ * This method is called after a test is executed.
+ */
+ public function tearDown()
+ {
+ parent::tearDown();
+ }
+
+ /**
+ * @covers FireflyIII\Support\Amount::format
+ * @covers FireflyIII\Support\Amount::getCurrencySymbol
+ */
+ public function testFormat()
+ {
+ $amount = '123';
+ $result = $this->object->format($amount, true);
+ $this->assertTrue(str_contains($result, $amount));
+ }
+
+ /**
+ * @covers FireflyIII\Support\Amount::formatJournal
+ */
+ public function testFormatJournalColouredTransfer()
+ {
+
+
+ FactoryMuffin::create('FireflyIII\Models\TransactionType'); // withdrawal
+ FactoryMuffin::create('FireflyIII\Models\TransactionType'); // deposit
+ /** @var \FireflyIII\Models\TransactionJournal $journal */
+ $journal = FactoryMuffin::create('FireflyIII\Models\TransactionJournal');
+ $symbol = $journal->transactionCurrency->symbol;
+
+ $result = $this->object->formatJournal($journal, true);
+
+ // transfer is blue:
+ $this->assertTrue(str_contains($result, '
'));
+ // transfer contains currency code:
+ $this->assertTrue(str_contains($result, $symbol));
+ // all amounts are 100.
+ $this->assertTrue(str_contains($result, '100'));
+ }
+
+ /**
+ * @covers FireflyIII\Support\Amount::formatJournal
+ */
+ public function testFormatJournalUncolouredTransfer()
+ {
+ FactoryMuffin::create('FireflyIII\Models\TransactionType'); // withdrawal
+ FactoryMuffin::create('FireflyIII\Models\TransactionType'); // deposit
+ /** @var \FireflyIII\Models\TransactionJournal $journal */
+ $journal = FactoryMuffin::create('FireflyIII\Models\TransactionJournal');
+ $symbol = $journal->transactionCurrency->symbol;
+
+ $result = $this->object->formatJournal($journal, false);
+
+ // transfer is not blue:
+ $this->assertFalse(str_contains($result, ''));
+ // transfer contains currency code:
+ $this->assertTrue(str_contains($result, $symbol));
+ // all amounts are 100.
+ $this->assertTrue(str_contains($result, '100'));
+ }
+
+ /**
+ * @covers FireflyIII\Support\Amount::formatJournal
+ */
+ public function testFormatJournalWithSymbol()
+ {
+ FactoryMuffin::create('FireflyIII\Models\TransactionType'); // withdrawal
+ /** @var \FireflyIII\Models\TransactionJournal $journal */
+ $journal = FactoryMuffin::create('FireflyIII\Models\TransactionJournal');
+ $symbol = $journal->transactionCurrency->symbol;
+ $journal->symbol = $symbol;
+
+ $result = $this->object->formatJournal($journal, true);
+
+ // transfer is not blue:
+ $this->assertFalse(str_contains($result, ''));
+ // transfer contains currency code:
+ $this->assertTrue(str_contains($result, $symbol));
+ // all amounts are 100.
+ $this->assertTrue(str_contains($result, '100'));
+ }
+
+ /**
+ * @covers FireflyIII\Support\Amount::formatJournal
+ */
+ public function testFormatJournalWithdrawal()
+ {
+ /** @var \FireflyIII\Models\TransactionJournal $journal */
+ $journal = FactoryMuffin::create('FireflyIII\Models\TransactionJournal');
+ $symbol = $journal->transactionCurrency->symbol;
+
+ $result = $this->object->formatJournal($journal, true);
+
+ // transfer is not blue:
+ $this->assertFalse(str_contains($result, ''));
+ // transfer contains currency code:
+ $this->assertTrue(str_contains($result, $symbol));
+ // all amounts are 100.
+ $this->assertTrue(str_contains($result, '100'));
+ }
+
+ /**
+ * @covers FireflyIII\Support\Amount::formatTransaction
+ */
+ public function testFormatTransaction()
+ {
+ // is a withdrawal.
+ $transaction = FactoryMuffin::create('FireflyIII\Models\Transaction');
+ $transaction->amount = -100;
+ $transaction->save();
+ $result = $this->object->formatTransaction($transaction, true);
+
+
+ // withdrawal is red:
+ $this->assertTrue(str_contains($result, ''));
+ // all amounts are 100.
+ $this->assertTrue(str_contains($result, '100'));
+ }
+
+ /**
+ * @covers FireflyIII\Support\Amount::formatWithSymbol
+ */
+ public function testFormatWithSymbolColouredAboveZero()
+ {
+ $amount = 123;
+ $symbol = 'top';
+ $coloured = true;
+
+ $result = $this->object->formatWithSymbol($symbol, $amount, $coloured);
+
+ // has colour:
+ $this->assertTrue(str_contains($result, ''));
+ // has symbol:
+ $this->assertTrue(str_contains($result, $symbol));
+ // has amount:
+ $this->assertTrue(str_contains($result, '123'));
+ }
+
+ /**
+ * @covers FireflyIII\Support\Amount::formatWithSymbol
+ */
+ public function testFormatWithSymbolColouredBelowZero()
+ {
+ $amount = -123;
+ $symbol = 'top';
+ $coloured = true;
+
+ $result = $this->object->formatWithSymbol($symbol, $amount, $coloured);
+
+ // has colour:
+ $this->assertTrue(str_contains($result, ''));
+ // has symbol:
+ $this->assertTrue(str_contains($result, $symbol));
+ // has amount:
+ $this->assertTrue(str_contains($result, '123'));
+ }
+
+ /**
+ * @covers FireflyIII\Support\Amount::formatWithSymbol
+ */
+ public function testFormatWithSymbolColouredZero()
+ {
+ $amount = 0.0;
+ $symbol = 'top';
+ $coloured = true;
+
+ $result = $this->object->formatWithSymbol($symbol, $amount, $coloured);
+
+ // has colour:
+ $this->assertTrue(str_contains($result, '#999'));
+ // has symbol:
+ $this->assertTrue(str_contains($result, $symbol));
+ // has amount:
+ $this->assertTrue(str_contains($result, '0'));
+ }
+
+ /**
+ * @covers FireflyIII\Support\Amount::formatWithSymbol
+ */
+ public function testFormatWithSymbolNotColoured()
+ {
+ $amount = 0;
+ $symbol = 'top';
+ $coloured = false;
+
+ $result = $this->object->formatWithSymbol($symbol, $amount, $coloured);
+
+ // has symbol:
+ $this->assertTrue(str_contains($result, $symbol));
+ // has amount:
+ $this->assertTrue(str_contains($result, '0'));
+ }
+
+ /**
+ * @covers FireflyIII\Support\Amount::getAllCurrencies
+ */
+ public function testGetAllCurrencies()
+ {
+ $size = TransactionCurrency::count();
+ $list = $this->object->getAllCurrencies();
+ $this->assertCount($size, $list);
+ }
+
+ /**
+ * @covers FireflyIII\Support\Amount::getCurrencyCode
+ */
+ public function testGetCurrencyCode()
+ {
+ $code = $this->object->getCurrencyCode();
+ $this->assertEquals('EUR', $code);
+ }
+
+ /**
+ * @covers FireflyIII\Support\Amount::getCurrencyCode
+ */
+ public function testGetCurrencyCodeNoSuchCurrency()
+ {
+ $user = FactoryMuffin::create('FireflyIII\User');
+ $this->be($user);
+
+ // delete any currency preferences:
+ Preference::where('user_id', $user->id)->delete();
+
+ // delete transaction currencies:
+ foreach (TransactionCurrency::get() as $c) {
+ $c->delete();
+ }
+
+ $preference = FactoryMuffin::create('FireflyIII\Models\Preference');
+ $preference->user_id = $user->id;
+ $preference->name = 'currencyPreference';
+ $preference->data = 'SOM';
+ $preference->save();
+
+ Preferences::shouldReceive('get')->withArgs(['currencyPreference', 'EUR'])->andReturn($preference);
+
+ $code = $this->object->getCurrencyCode();
+ $this->assertEquals('EUR', $code);
+ }
+
+ /**
+ * @covers FireflyIII\Support\Amount::getCurrencySymbol
+ */
+ public function testGetCurrencySymbol()
+ {
+ // will the the euro:
+ $eur = TransactionCurrency::whereCode('EUR')->first();
+
+ $result = $this->object->getCurrencySymbol();
+ $this->assertEquals($eur->symbol, $result);
+ }
+
+ /**
+ * @covers FireflyIII\Support\Amount::getDefaultCurrency
+ */
+ public function testGetDefaultCurrency()
+ {
+ // will the the euro:
+ $eur = TransactionCurrency::whereCode('EUR')->first();
+
+ $result = $this->object->getDefaultCurrency();
+ $this->assertEquals($eur->id, $result->id);
+ }
+
+
+}
diff --git a/tests/support/ExpandedFormTest.php b/tests/support/ExpandedFormTest.php
new file mode 100644
index 0000000000..c69a885d17
--- /dev/null
+++ b/tests/support/ExpandedFormTest.php
@@ -0,0 +1,202 @@
+object = new ExpandedForm;
+ $user = FactoryMuffin::create('FireflyIII\User');
+ $this->be($user);
+ }
+
+ /**
+ * @covers FireflyIII\Support\ExpandedForm::amount
+ * @covers FireflyIII\Support\ExpandedForm::label
+ * @covers FireflyIII\Support\ExpandedForm::expandOptionArray
+ * @covers FireflyIII\Support\ExpandedForm::getHolderClasses
+ * @covers FireflyIII\Support\ExpandedForm::fillFieldValue
+ */
+ public function testAmount()
+ {
+ $result = $this->object->amount('abcde', '12.23', ['label' => 'Some Label']);
+
+ $this->assertTrue(str_contains($result, '23'));
+ $this->assertTrue(str_contains($result, 'abcde_holder'));
+ }
+
+ /**
+ * @covers FireflyIII\Support\ExpandedForm::balance
+ * @covers FireflyIII\Support\ExpandedForm::label
+ */
+ public function testBalance()
+ {
+ $result = $this->object->balance('abcde', '12.23', []);
+
+ $this->assertTrue(str_contains($result, '23'));
+ $this->assertTrue(str_contains($result, 'abcde_holder'));
+ }
+
+ /**
+ * @covers FireflyIII\Support\ExpandedForm::checkbox
+ * @covers FireflyIII\Support\ExpandedForm::getHolderClasses
+ */
+ public function testCheckbox()
+ {
+ // add error to session for this thing:
+ $errors = new MessageBag;
+ $errors->add('abcde', 'Some error here.');
+ $this->session(['errors' => $errors]);
+
+ $result = $this->object->checkbox('abcde', 1, true);
+
+
+ $this->assertTrue(str_contains($result, 'checked="checked"'));
+ $this->assertTrue(str_contains($result, 'abcde_holder'));
+ }
+
+ /**
+ * @covers FireflyIII\Support\ExpandedForm::date
+ * @covers FireflyIII\Support\ExpandedForm::fillFieldValue
+ */
+ public function testDate()
+ {
+ $preFilled = [
+ 'abcde' => '1998-01-01'
+ ];
+ $this->session(['preFilled' => $preFilled]);
+
+ $result = $this->object->date('abcde');
+
+ $this->assertTrue(str_contains($result, '1998'));
+ $this->assertTrue(str_contains($result, 'type="date"'));
+ $this->assertTrue(str_contains($result, 'abcde_holder'));
+ }
+
+ /**
+ * @covers FireflyIII\Support\ExpandedForm::integer
+ */
+ public function testInteger()
+ {
+ $result = $this->object->integer('abcde', 12345);
+
+ $this->assertTrue(str_contains($result, '12345'));
+ $this->assertTrue(str_contains($result, 'type="number"'));
+ $this->assertTrue(str_contains($result, 'step="1"'));
+ $this->assertTrue(str_contains($result, 'abcde_holder'));
+ }
+
+ /**
+ * @covers FireflyIII\Support\ExpandedForm::location
+ */
+ public function testLocation()
+ {
+ $result = $this->object->location('abcde');
+
+ $this->assertTrue(str_contains($result, 'id="clearLocation"'));
+ $this->assertTrue(str_contains($result, 'id="map-canvas"'));
+ $this->assertTrue(str_contains($result, 'abcde_holder'));
+ }
+
+ /**
+ * @covers FireflyIII\Support\ExpandedForm::makeSelectList
+ */
+ public function testMakeSelectList()
+ {
+ $collection = new Collection;
+ for ($i = 0; $i < 5; $i++) {
+ $collection->push(FactoryMuffin::create('FireflyIII\Models\Account'));
+ }
+ $result = $this->object->makeSelectList($collection, true);
+
+ $this->assertCount(6, $result);
+ }
+
+ /**
+ * @covers FireflyIII\Support\ExpandedForm::multiRadio
+ */
+ public function testMultiRadio()
+ {
+ $list = [
+ 'some' => 'BlaBla',
+ 'other' => 'ThisIsCool'
+ ];
+
+ $result = $this->object->multiRadio('abcde', $list);
+
+ $this->assertTrue(str_contains($result, 'ThisIsCool'));
+ $this->assertTrue(str_contains($result, 'other'));
+ $this->assertTrue(str_contains($result, 'abcde_holder'));
+ }
+
+ /**
+ * @covers FireflyIII\Support\ExpandedForm::optionsList
+ */
+ public function testOptionsList()
+ {
+ $result = $this->object->optionsList('update', 'MotorCycle');
+ $this->assertTrue(str_contains($result, 'MotorCycle'));
+ }
+
+ /**
+ * @covers FireflyIII\Support\ExpandedForm::select
+ */
+ public function testSelect()
+ {
+ $list = [
+ 'some' => 'BlaBla',
+ 'other' => 'ThisIsCool'
+ ];
+
+ $result = $this->object->select('abcde', $list);
+ $this->assertTrue(str_contains($result, 'ThisIsCool'));
+ $this->assertTrue(str_contains($result, 'abcde_holder'));
+ }
+
+ /**
+ * @covers FireflyIII\Support\ExpandedForm::tags
+ */
+ public function testTags()
+ {
+ $result = $this->object->tags('abcde', 'some,tags');
+ $this->assertTrue(str_contains($result, 'data-role="tagsinput"'));
+ $this->assertTrue(str_contains($result, 'abcde_holder'));
+ }
+
+ /**
+ * @covers FireflyIII\Support\ExpandedForm::text
+ */
+ public function testText()
+ {
+ $result = $this->object->text('abcde', 'MotorBike!');
+ $this->assertTrue(str_contains($result, 'MotorBike!'));
+ $this->assertTrue(str_contains($result, 'abcde_holder'));
+ }
+
+ /**
+ * @covers FireflyIII\Support\ExpandedForm::textarea
+ */
+ public function testTextarea()
+ {
+ $result = $this->object->textarea('abcde', 'Pillow fight!');
+ $this->assertTrue(str_contains($result, 'Pillow fight!'));
+ $this->assertTrue(str_contains($result, 'abcde_holder'));
+ }
+}
\ No newline at end of file