IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

More tests! Yay!

Browse Source
This commit is contained in:
James Cole 2014-12-25 00:42:31 +01:00
parent 18c1223c7b
commit ce27e97b92
8 changed files with 208 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

154
app/controllers/RecurringController.php
View File

@ -1,6 +1,6 @@
<?php
use FireflyIII\Database\RecurringTransaction\RecurringTransaction as Repository;
use FireflyIII\Exception\FireflyException;
use Illuminate\Support\MessageBag;
/**
* Class RecurringController
@ -8,11 +8,16 @@ use Illuminate\Support\MessageBag;
*/
class RecurringController extends BaseController
{
/** @var Repository */
protected $_repository;
/**
*
* @param Repository $repository
*/
public function __construct()
public function __construct(Repository $repository)
{
$this->_repository = $repository;
View::share('title', 'Recurring transactions');
View::share('mainTitleIcon', 'fa-rotate-right');
@ -47,17 +52,8 @@ class RecurringController extends BaseController
*/
public function destroy(RecurringTransaction $recurringTransaction)
{
//Event::fire('recurring.destroy', [$recurringTransaction]);
/** @var \FireflyIII\Database\RecurringTransaction\RecurringTransaction $repository */
$repository = App::make('FireflyIII\Database\RecurringTransaction\RecurringTransaction');
$result = $repository->destroy($recurringTransaction);
if ($result === true) {
Session::flash('success', 'The recurring transaction was deleted.');
} else {
Session::flash('error', 'Could not delete the recurring transaction. Check the logs to be sure.');
}
$this->_repository->destroy($recurringTransaction);
Session::flash('success', 'The recurring transaction was deleted.');
return Redirect::route('recurring.index');
@ -82,10 +78,7 @@ class RecurringController extends BaseController
*/
public function index()
{
/** @var \FireflyIII\Database\RecurringTransaction\RecurringTransaction $repos */
$repos = App::make('FireflyIII\Database\RecurringTransaction\RecurringTransaction');
$recurring = $repos->get();
$recurring = $this->_repository->get();
return View::make('recurring.index', compact('recurring'));
}
@ -100,16 +93,14 @@ class RecurringController extends BaseController
if (intval($recurringTransaction->active) == 0) {
Session::flash('warning', 'Inactive recurring transactions cannot be scanned.');
return Redirect::back();
return Redirect::intended('/');
}
/** @var \FireflyIII\Database\RecurringTransaction\RecurringTransaction $repos */
$repos = App::make('FireflyIII\Database\RecurringTransaction\RecurringTransaction');
$repos->scanEverything($recurringTransaction);
$this->_repository->scanEverything($recurringTransaction);
Session::flash('success', 'Rescanned everything.');
return Redirect::back();
return Redirect::intended('/');
}
/**
@ -134,45 +125,35 @@ class RecurringController extends BaseController
*/
public function store()
{
$data = Input::except('_token');
/** @var \FireflyIII\Database\RecurringTransaction\RecurringTransaction $repos */
$repos = App::make('FireflyIII\Database\RecurringTransaction\RecurringTransaction');
$data = Input::all();
$data['user_id'] = Auth::user()->id;
switch ($data['post_submit_action']) {
default:
throw new FireflyException('Cannot handle post_submit_action "' . e($data['post_submit_action']) . '"');
break;
case 'create_another':
case 'store':
$messages = $repos->validate($data);
/** @var MessageBag $messages ['errors'] */
if ($messages['errors']->count() > 0) {
Session::flash('warnings', $messages['warnings']);
Session::flash('successes', $messages['successes']);
Session::flash('error', 'Could not save recurring transaction: ' . $messages['errors']->first());
return Redirect::route('recurring.create')->withInput()->withErrors($messages['errors']);
}
// store!
$repos->store($data);
Session::flash('success', 'New recurring transaction stored!');
// always validate:
$messages = $this->_repository->validate($data);
if ($data['post_submit_action'] == 'create_another') {
return Redirect::route('recurring.create')->withInput();
} else {
return Redirect::route('recurring.index');
}
break;
case 'validate_only':
$messageBags = $repos->validate($data);
Session::flash('warnings', $messageBags['warnings']);
Session::flash('successes', $messageBags['successes']);
Session::flash('errors', $messageBags['errors']);
return Redirect::route('recurring.create')->withInput();
break;
// flash messages:
Session::flash('warnings', $messages['warnings']);
Session::flash('successes', $messages['successes']);
Session::flash('errors', $messages['errors']);
if ($messages['errors']->count() > 0) {
Session::flash('error', 'Could not store recurring transaction: ' . $messages['errors']->first());
}
// return to create screen:
if ($data['post_submit_action'] == 'validate_only' || $messages['errors']->count() > 0) {
return Redirect::route('recurring.create')->withInput();
}
// store:
$this->_repository->store($data);
Session::flash('success', 'Recurring transaction "' . e($data['name']) . '" stored.');
if ($data['post_submit_action'] == 'store') {
return Redirect::route('recurring.index');
}
return Redirect::route('recurring.create')->withInput();
}
/**
@ -183,45 +164,38 @@ class RecurringController extends BaseController
*/
public function update(RecurringTransaction $recurringTransaction)
{
/** @var \FireflyIII\Database\RecurringTransaction\RecurringTransaction $repos */
$repos = App::make('FireflyIII\Database\RecurringTransaction\RecurringTransaction');
$data = Input::except('_token');
$data['active'] = isset($data['active']) ? 1 : 0;
$data['automatch'] = isset($data['automatch']) ? 1 : 0;
$data['user_id'] = Auth::user()->id;
switch (Input::get('post_submit_action')) {
default:
throw new FireflyException('Cannot handle post_submit_action "' . e(Input::get('post_submit_action')) . '"');
break;
case 'create_another':
case 'update':
$messages = $repos->validate($data);
/** @var MessageBag $messages ['errors'] */
if ($messages['errors']->count() > 0) {
Session::flash('warnings', $messages['warnings']);
Session::flash('successes', $messages['successes']);
Session::flash('error', 'Could not save recurring transaction: ' . $messages['errors']->first());
// always validate:
$messages = $this->_repository->validate($data);
return Redirect::route('recurring.edit', $recurringTransaction->id)->withInput()->withErrors($messages['errors']);
}
// store!
$repos->update($recurringTransaction, $data);
Session::flash('success', 'Recurring transaction updated!');
if ($data['post_submit_action'] == 'create_another') {
return Redirect::route('recurring.edit', $recurringTransaction->id);
} else {
return Redirect::route('recurring.index');
}
case 'validate_only':
$messageBags = $repos->validate($data);
Session::flash('warnings', $messageBags['warnings']);
Session::flash('successes', $messageBags['successes']);
Session::flash('errors', $messageBags['errors']);
return Redirect::route('recurring.edit', $recurringTransaction->id)->withInput();
break;
// flash messages:
Session::flash('warnings', $messages['warnings']);
Session::flash('successes', $messages['successes']);
Session::flash('errors', $messages['errors']);
if ($messages['errors']->count() > 0) {
Session::flash('error', 'Could not update recurring transaction: ' . $messages['errors']->first());
}
// return to update screen:
if ($data['post_submit_action'] == 'validate_only' || $messages['errors']->count() > 0) {
return Redirect::route('recurring.edit', $recurringTransaction->id)->withInput();
}
// update
$this->_repository->update($recurringTransaction, $data);
Session::flash('success', 'Recurring transaction "' . e($data['name']) . '" updated.');
// go back to list
if ($data['post_submit_action'] == 'update') {
return Redirect::route('recurring.index');
}
// go back to update screen.
return Redirect::route('piggy_banks.edit', $recurringTransaction->id)->withInput(['post_submit_action' => 'return_to_edit']);
}
}

2
app/database/seeds/TestContentSeeder.php
View File

@ -160,7 +160,7 @@ class TestContentSeeder extends Seeder
'amount_min' => 500,
'amount_max' => 700,
'date' => '2014-01-12',
'active' => 1,
'active' => 0,
'automatch' => 1,
'repeat_freq' => 'monthly',
'skip' => 0,

1
app/lib/FireflyIII/Database/PiggyBank/PiggyBank.php
View File

@ -36,6 +36,7 @@ class PiggyBank implements CUD, CommonDatabaseCalls, PiggyBankInterface
public function destroy(Eloquent $model)
{
$model->delete();
}
/**

2
app/views/recurring/create.blade.php
View File

@ -1,7 +1,7 @@
@extends('layouts.default')
@section('content')
{{ Breadcrumbs::renderIfExists(Route::getCurrentRoute()->getName()) }}
{{Form::open(['class' => 'form-horizontal','url' => route('recurring.store')])}}
{{Form::open(['class' => 'form-horizontal','id' => 'store','url' => route('recurring.store')])}}
<div class="row">
<div class="col-lg-6 col-md-12 col-sm-6">

2
app/views/recurring/delete.blade.php
View File

@ -1,7 +1,7 @@
@extends('layouts.default')
@section('content')
{{ Breadcrumbs::renderIfExists(Route::getCurrentRoute()->getName(), $recurringTransaction) }}
{{Form::open(['class' => 'form-horizontal','url' => route('recurring.destroy',$recurringTransaction->id)])}}
{{Form::open(['class' => 'form-horizontal','id' => 'destroy','url' => route('recurring.destroy',$recurringTransaction->id)])}}
<div class="row">
<div class="col-lg-6 col-md-12 col-sm-12">
<div class="panel panel-red">

2
app/views/recurring/edit.blade.php
View File

@ -1,7 +1,7 @@
@extends('layouts.default')
@section('content')
{{ Breadcrumbs::renderIfExists(Route::getCurrentRoute()->getName(), $recurringTransaction) }}
{{Form::model($recurringTransaction, ['class' => 'form-horizontal','url' => route('recurring.update', $recurringTransaction->id)])}}
{{Form::model($recurringTransaction, ['class' => 'form-horizontal','id' => 'update','url' => route('recurring.update', $recurringTransaction->id)])}}
<div class="row">
<div class="col-lg-6 col-md-12 col-sm-6">

30
tests/functional/PiggyBankControllerCest.php
View File

@ -52,6 +52,7 @@ class PiggyBankControllerCest
$I->wantTo('delete a piggy bank');
$I->amOnPage('/piggy_banks/delete/1');
$I->see('Delete &quot;New camera&quot;');
}
/**
@ -64,6 +65,7 @@ class PiggyBankControllerCest
$I->see('Delete &quot;New camera&quot;');
$I->submitForm('#destroy', []);
$I->see('Piggy bank &quot;New camera&quot; deleted.');
}
/**
@ -242,13 +244,13 @@ class PiggyBankControllerCest
$I->see('Edit piggy bank "New camera"');
$I->submitForm(
'#update', [
'name' => 'Updated camera',
'account_id' => 2,
'targetamount' => 2000,
'targetdate' => '',
'reminder' => 'week',
'post_submit_action' => 'update',
]
'name' => 'Updated camera',
'account_id' => 2,
'targetamount' => 2000,
'targetdate' => '',
'reminder' => 'week',
'post_submit_action' => 'update',
]
);
$I->see('Piggy bank &quot;Updated camera&quot; updated.');
@ -311,13 +313,13 @@ class PiggyBankControllerCest
$I->see('Edit piggy bank "New camera"');
$I->submitForm(
'#update', [
'name' => '',
'account_id' => 2,
'targetamount' => 2000,
'targetdate' => '',
'reminder' => 'week',
'post_submit_action' => 'update',
]
'name' => '',
'account_id' => 2,
'targetamount' => 2000,
'targetdate' => '',
'reminder' => 'week',
'post_submit_action' => 'update',
]
);
$I->see('Name is too short');
$I->seeInDatabase('piggy_banks', ['name' => 'New camera']);

123
tests/functional/RecurringControllerCest.php Normal file
View File

@ -0,0 +1,123 @@
<?php
/**
* Class RecurringControllerCest
*/
class RecurringControllerCest
{
/**
* @param FunctionalTester $I
*/
public function _after(FunctionalTester $I)
{
}
/**
* @param FunctionalTester $I
*/
public function _before(FunctionalTester $I)
{
$I->amLoggedAs(['email' => 'thegrumpydictator@gmail.com', 'password' => 'james']);
}
/**
* @param FunctionalTester $I
*/
public function create(FunctionalTester $I)
{
$I->wantTo('create a recurring transaction');
$I->amOnPage('/recurring/create');
}
/**
* @param FunctionalTester $I
*/
public function delete(FunctionalTester $I)
{
$I->wantTo('delete a recurring transaction');
$I->amOnPage('/recurring/delete/1');
$I->see('Delete "Huur"');
}
/**
* @param FunctionalTester $I
*/
public function destroy(FunctionalTester $I)
{
$I->wantTo('destroy a recurring transaction');
$I->amOnPage('/recurring/delete/1');
$I->see('Delete "Huur"');
$I->submitForm('#destroy', []);
$I->see('The recurring transaction was deleted.');
}
/**
* @param FunctionalTester $I
*/
public function edit(FunctionalTester $I)
{
$I->wantTo('edit a recurring transaction');
$I->amOnPage('/recurring/edit/1');
}
/**
* @param FunctionalTester $I
*/
public function index(FunctionalTester $I)
{
$I->wantTo('see all recurring transactions');
$I->amOnPage('/recurring');
}
/**
* @param FunctionalTester $I
*/
public function rescan(FunctionalTester $I)
{
$I->wantTo('rescan a recurring transaction');
$I->amOnPage('/recurring/rescan/1');
$I->see('Rescanned everything.');
}
/**
* @param FunctionalTester $I
*/
public function rescanInactive(FunctionalTester $I)
{
$I->wantTo('rescan an inactive recurring transaction');
$I->amOnPage('/recurring/rescan/2');
$I->see('Inactive recurring transactions cannot be scanned.');
}
/**
* @param FunctionalTester $I
*/
public function show(FunctionalTester $I)
{
$I->wantTo('show a recurring transaction');
$I->amOnPage('/recurring/show/1');
}
/**
* @param FunctionalTester $I
*/
public function store(FunctionalTester $I)
{
$I->wantTo('store a recurring transaction');
$I->amOnPage('/recurring/create');
}
/**
* @param FunctionalTester $I
*/
public function update(FunctionalTester $I)
{
$I->wantTo('update a recurring transaction');
$I->amOnPage('/recurring/edit/1');
}
}