From 22bd995b42fffbeb0004ec3f6cab3ec21aa4565d Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 21 Aug 2014 07:21:56 +0200 Subject: [PATCH] Updated factory muffin. This breaks everything. Let's skip Travis until we've fixed it. [skip ci] --- app/models/Account.php | 15 +--------- app/models/AccountType.php | 5 ---- app/models/Budget.php | 6 ---- app/models/Category.php | 6 ---- app/models/Piggybank.php | 2 ++ app/models/PiggybankEvent.php | 17 +++++++++++ app/models/TransactionJournal.php | 4 +++ app/models/User.php | 15 +--------- app/tests/TestCase.php | 7 +++++ .../controllers/AccountControllerTest.php | 29 ++++++++++++++----- .../controllers/BudgetControllerTest.php | 2 +- .../controllers/CategoryControllerTest.php | 2 +- app/tests/controllers/ChartControllerTest.php | 2 +- app/tests/controllers/HomeControllerTest.php | 2 +- app/tests/controllers/JsonControllerTest.php | 2 +- app/tests/controllers/LimitControllerTest.php | 2 +- .../controllers/PiggybankControllerTest.php | 2 +- .../controllers/ProfileControllerTest.php | 2 +- .../controllers/RecurringControllerTest.php | 2 +- .../controllers/TransactionControllerTest.php | 2 +- app/tests/controllers/UserControllerTest.php | 2 +- app/tests/factories/Account.php | 12 ++++++++ app/tests/factories/AccountType.php | 17 +++++++++++ app/tests/factories/Budget.php | 11 +++++++ app/tests/factories/Category.php | 11 +++++++ app/tests/factories/User.php | 17 +++++++++++ app/tests/models/ModelTest.php | 2 +- app/views/partials/menu.blade.php | 4 ++- composer.json | 2 +- 29 files changed, 138 insertions(+), 66 deletions(-) create mode 100644 app/tests/factories/Account.php create mode 100644 app/tests/factories/AccountType.php create mode 100644 app/tests/factories/Budget.php create mode 100644 app/tests/factories/Category.php create mode 100644 app/tests/factories/User.php diff --git a/app/models/Account.php b/app/models/Account.php index 8b5f787e14..b28c5f095e 100644 --- a/app/models/Account.php +++ b/app/models/Account.php @@ -36,23 +36,10 @@ class Account extends Ardent 'name' => 'required|between:1,100', 'user_id' => 'required|exists:users,id', 'account_type_id' => 'required|exists:account_types,id', - 'active' => 'required|between:0,1|numeric' + 'active' => 'required|boolean' ]; - /** - * Factory instructions - * - * @var array - */ - public static $factory - = [ - 'name' => 'string', - 'user_id' => 'factory|User', - 'account_type_id' => 'factory|AccountType', - 'active' => '1' - ]; - /** * Account type. * diff --git a/app/models/AccountType.php b/app/models/AccountType.php index b1206e714b..c761dcb956 100644 --- a/app/models/AccountType.php +++ b/app/models/AccountType.php @@ -17,11 +17,6 @@ class AccountType extends Eloquent { - public static $factory - = [ - 'description' => 'string' - ]; - /** * @return \Illuminate\Database\Eloquent\Relations\HasMany */ diff --git a/app/models/Budget.php b/app/models/Budget.php index 488b3547f9..2eb23fca1f 100644 --- a/app/models/Budget.php +++ b/app/models/Budget.php @@ -22,12 +22,6 @@ */ class Budget extends Component { - public static $factory - = [ - 'name' => 'string', - 'user_id' => 'factory|User', - 'class' => 'Budget' - ]; protected $isSubclass = true; /** diff --git a/app/models/Category.php b/app/models/Category.php index e08108bd18..da35743774 100644 --- a/app/models/Category.php +++ b/app/models/Category.php @@ -22,12 +22,6 @@ */ class Category extends Component { - public static $factory - = [ - 'name' => 'string', - 'user_id' => 'factory|User', - 'class' => 'Category' - ]; protected $isSubclass = true; /** diff --git a/app/models/Piggybank.php b/app/models/Piggybank.php index d686e32dae..fbfe7a936e 100644 --- a/app/models/Piggybank.php +++ b/app/models/Piggybank.php @@ -37,6 +37,8 @@ use LaravelBook\Ardent\Ardent as Ardent; * @method static \Illuminate\Database\Query\Builder|\Piggybank whereReminder($value) * @method static \Illuminate\Database\Query\Builder|\Piggybank whereReminderSkip($value) * @method static \Illuminate\Database\Query\Builder|\Piggybank whereOrder($value) + * @property-read \Illuminate\Database\Eloquent\Collection|\PiggybankEvent[] $piggybankevents + * @property-read \Illuminate\Database\Eloquent\Collection|\Transaction[] $transactions */ class Piggybank extends Ardent { diff --git a/app/models/PiggybankEvent.php b/app/models/PiggybankEvent.php index 88ef4168e6..11c9779cec 100644 --- a/app/models/PiggybankEvent.php +++ b/app/models/PiggybankEvent.php @@ -3,6 +3,23 @@ use Carbon\Carbon; use LaravelBook\Ardent\Ardent as Ardent; +/** + * PiggybankEvent + * + * @property integer $id + * @property \Carbon\Carbon $created_at + * @property \Carbon\Carbon $updated_at + * @property integer $piggybank_id + * @property \Carbon\Carbon $date + * @property float $amount + * @property-read \Piggybank $piggybank + * @method static \Illuminate\Database\Query\Builder|\PiggybankEvent whereId($value) + * @method static \Illuminate\Database\Query\Builder|\PiggybankEvent whereCreatedAt($value) + * @method static \Illuminate\Database\Query\Builder|\PiggybankEvent whereUpdatedAt($value) + * @method static \Illuminate\Database\Query\Builder|\PiggybankEvent wherePiggybankId($value) + * @method static \Illuminate\Database\Query\Builder|\PiggybankEvent whereDate($value) + * @method static \Illuminate\Database\Query\Builder|\PiggybankEvent whereAmount($value) + */ class PiggybankEvent extends Ardent { diff --git a/app/models/TransactionJournal.php b/app/models/TransactionJournal.php index 3b5cafdadf..a862a69664 100644 --- a/app/models/TransactionJournal.php +++ b/app/models/TransactionJournal.php @@ -35,6 +35,10 @@ use LaravelBook\Ardent\Ardent; * @method static \Illuminate\Database\Query\Builder|\TransactionJournal whereDate($value) * @method static \TransactionJournal after($date) * @method static \TransactionJournal before($date) + * @property-read \Illuminate\Database\Eloquent\Collection|\ + * 'Budget[] $budgets + * @property-read \Illuminate\Database\Eloquent\Collection|\ + * 'Category[] $categories */ class TransactionJournal extends Ardent { diff --git a/app/models/User.php b/app/models/User.php index 77164b0996..729ec33d12 100644 --- a/app/models/User.php +++ b/app/models/User.php @@ -44,7 +44,7 @@ class User extends Ardent implements UserInterface, RemindableInterface public static $rules = [ 'email' => 'required|email|unique:users,email', - 'migrated' => 'required|numeric|between:0,1', + 'migrated' => 'required|boolean', 'password' => 'required|between:60,60', 'reset' => 'between:32,32', ]; @@ -61,19 +61,6 @@ class User extends Ardent implements UserInterface, RemindableInterface */ protected $hidden = ['remember_token']; - /** - * @return array - */ - public static function factory() - { - return [ - 'email' => 'email', - 'password' => 'sander', - 'migrated' => '0' - - ]; - } - /** * @return \Illuminate\Database\Eloquent\Relations\HasMany */ diff --git a/app/tests/TestCase.php b/app/tests/TestCase.php index c291be445a..f6230dd2ef 100644 --- a/app/tests/TestCase.php +++ b/app/tests/TestCase.php @@ -1,4 +1,5 @@ _repository = $this->mock('Firefly\Storage\Account\AccountRepositoryInterface'); @@ -114,9 +117,15 @@ class AccountControllerTest extends TestCase Auth::shouldReceive('user')->andReturn($this->_user); Auth::shouldReceive('check')->andReturn(true); $this->_user->shouldReceive('getAttribute')->with('id')->once()->andReturn($account->user_id); - $this->_user->shouldReceive('getAttribute')->with('email')->once()->andReturn('some@email'); + $this->_user->shouldReceive('getAttribute')->with('email')->andReturn('some@email'); $this->_accounts->shouldReceive('openingBalanceTransaction')->once()->andReturn(null); + // test if the view works: + View::shouldReceive('make')->with('accounts.edit')->once()->andReturn(m::self())->shouldReceive('with')->with( + 'account', m::any() + ) + ->andReturn(m::self())->shouldReceive('with')->with('openingBalance', null)->andReturn(m::self()); + $this->action('GET', 'AccountController@edit', $account->id); $this->assertResponseOk(); } @@ -127,14 +136,20 @@ class AccountControllerTest extends TestCase $collection = new Collection(); $collection->add($account); + // create some fake accounts: + $personal = f::create('Account'); + $bene = f::create('Account'); + $init = f::create('Account'); + $cash = f::create('Account'); + $list = [ - 'personal' => [], - 'beneficiaries' => [], - 'initial' => [], - 'cash' => [] + 'personal' => [$personal], + 'beneficiaries' => [$bene], + 'initial' => [$init], + 'cash' => [$cash] ]; - $this->_repository->shouldReceive('get')->with()->once()->andReturn($collection); + $this->_repository->shouldReceive('get')->once()->andReturn($collection); $this->_accounts->shouldReceive('index')->with($collection)->once()->andReturn($list); $this->action('GET', 'AccountController@index'); $this->assertResponseOk(); diff --git a/app/tests/controllers/BudgetControllerTest.php b/app/tests/controllers/BudgetControllerTest.php index d3432943e3..6fc751bdb5 100644 --- a/app/tests/controllers/BudgetControllerTest.php +++ b/app/tests/controllers/BudgetControllerTest.php @@ -3,7 +3,7 @@ use Carbon\Carbon; use Illuminate\Database\Eloquent\Collection; use Mockery as m; -use Zizaco\FactoryMuff\Facade\FactoryMuff as f; +use League\FactoryMuffin\Facade as f; /** * Class BudgetControllerTest diff --git a/app/tests/controllers/CategoryControllerTest.php b/app/tests/controllers/CategoryControllerTest.php index 7d87683cf3..5d04d3b433 100644 --- a/app/tests/controllers/CategoryControllerTest.php +++ b/app/tests/controllers/CategoryControllerTest.php @@ -3,7 +3,7 @@ use Carbon\Carbon; use Illuminate\Database\Eloquent\Collection; use Mockery as m; -use Zizaco\FactoryMuff\Facade\FactoryMuff as f; +use League\FactoryMuffin\Facade as f; /** * Class CategoryControllerTest diff --git a/app/tests/controllers/ChartControllerTest.php b/app/tests/controllers/ChartControllerTest.php index 0b86bf7f57..261b7ea248 100644 --- a/app/tests/controllers/ChartControllerTest.php +++ b/app/tests/controllers/ChartControllerTest.php @@ -3,7 +3,7 @@ use Carbon\Carbon; use Illuminate\Database\Eloquent\Collection; use Mockery as m; -use Zizaco\FactoryMuff\Facade\FactoryMuff as f; +use League\FactoryMuffin\Facade as f; /** diff --git a/app/tests/controllers/HomeControllerTest.php b/app/tests/controllers/HomeControllerTest.php index 16c9798f88..07f812459c 100644 --- a/app/tests/controllers/HomeControllerTest.php +++ b/app/tests/controllers/HomeControllerTest.php @@ -1,7 +1,7 @@ 'factory|User', + 'account_type_id' => 'factory|AccountType', + 'name' => 'word', + 'active' => 'boolean' + ] +); \ No newline at end of file diff --git a/app/tests/factories/AccountType.php b/app/tests/factories/AccountType.php new file mode 100644 index 0000000000..df48a184b5 --- /dev/null +++ b/app/tests/factories/AccountType.php @@ -0,0 +1,17 @@ + function() { + $types = [ + 'Default account', + 'Cash account', + 'Initial balance account', + 'Beneficiary account' + ]; + return $types[rand(0,3)]; + } + ] +); \ No newline at end of file diff --git a/app/tests/factories/Budget.php b/app/tests/factories/Budget.php new file mode 100644 index 0000000000..a7b68c6ed3 --- /dev/null +++ b/app/tests/factories/Budget.php @@ -0,0 +1,11 @@ + 'word', + 'user_id' => 'factory|User', + 'class' => 'Budget' + ] +); \ No newline at end of file diff --git a/app/tests/factories/Category.php b/app/tests/factories/Category.php new file mode 100644 index 0000000000..71f1df47e8 --- /dev/null +++ b/app/tests/factories/Category.php @@ -0,0 +1,11 @@ + 'word', + 'user_id' => 'factory|User', + 'class' => 'Category' + ] +); \ No newline at end of file diff --git a/app/tests/factories/User.php b/app/tests/factories/User.php new file mode 100644 index 0000000000..1649da1e1f --- /dev/null +++ b/app/tests/factories/User.php @@ -0,0 +1,17 @@ + 'safeEmail', + 'password' => function () { + return \Str::random(60); + }, + 'reset' => function () { + return \Str::random(32); + }, + 'remember_token' => null, + 'migrated' => 'boolean' + ] +); \ No newline at end of file diff --git a/app/tests/models/ModelTest.php b/app/tests/models/ModelTest.php index 1393580d2a..b8b3e77741 100644 --- a/app/tests/models/ModelTest.php +++ b/app/tests/models/ModelTest.php @@ -1,6 +1,6 @@ getName();
  • Withdrawal
    • - + @if(\Auth::user() && \Auth::check())