kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-20 08:30:06 +00:00
Code Issues Projects Releases Wiki Activity

This should fix the tests.

Browse Source
This commit is contained in:
James Cole
2016-02-04 11:07:34 +01:00
parent f0bb462f1c
commit 93d9c44585
3 changed files with 55 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
database/seeds/TestDataSeeder.php
View File

@@ -3,8 +3,6 @@
use Carbon\Carbon;
use FireflyIII\Models\Account;
use FireflyIII\Models\Attachment;
use FireflyIII\Models\Budget;
use FireflyIII\Models\BudgetLimit;
use FireflyIII\Models\Category;
use FireflyIII\Models\Role;
use FireflyIII\Models\Transaction;
@@ -55,6 +53,11 @@ class TestDataSeeder extends Seeder
// create some budgets for user #1
TestData::createBudgets($user);
// create budget limits for these budgets
TestData::createBudgetLimit($user, new Carbon, 'Groceries', 400);
TestData::createBudgetLimit($user, new Carbon, 'Bills', 1000);
TestData::createBudgetLimit($user, new Carbon, 'Car', 100);
// create some categories for user #1
$this->createCategories($user);

48
database/seeds/VisualTestDataSeeder.php
View File

@@ -487,9 +487,9 @@ class VisualTestDataSeeder extends Seeder
$this->createCar($current);
// budget limit for this month, on "Groceries".
$this->createBudgetLimit($current, 'Groceries', 400);
$this->createBudgetLimit($current, 'Bills', 1000);
$this->createBudgetLimit($current, 'Car', 100);
TestData::createBudgetLimit($current, 'Groceries', 400);
TestData::createBudgetLimit($current, 'Bills', 1000);
TestData::createBudgetLimit($current, 'Car', 100);
echo 'Created test data for ' . $month . "\n";
$current->addMonth();
@@ -497,30 +497,6 @@ class VisualTestDataSeeder extends Seeder
}
/**
* @param Carbon $current
* @param $name
* @param $amount
*/
protected function createBudgetLimit(Carbon $current, $name, $amount)
{
$start = clone $current;
$end = clone $current;
$budget = $this->findBudget($name);
$start->startOfMonth();
$end->endOfMonth();
BudgetLimit::create(
[
'budget_id' => $budget->id,
'startdate' => $start->format('Y-m-d'),
'amount' => $amount,
'repeats' => 0,
'repeat_freq' => 'monthly',
]
);
}
/**
* @param $date
*
@@ -1085,24 +1061,6 @@ class VisualTestDataSeeder extends Seeder
return null;
}
/**
* @param $name
*
* @return Budget|null
*/
protected function findBudget($name)
{
/** @var Budget $budget */
foreach (Budget::get() as $budget) {
if ($budget->name == $name && $this->user->id == $budget->user_id) {
return $budget;
break;
}
}
return null;
}
/**
* @param $name
*