diff --git a/app/Http/Middleware/Authenticate.php b/app/Http/Middleware/Authenticate.php
index 50f026df35..289fff1515 100644
--- a/app/Http/Middleware/Authenticate.php
+++ b/app/Http/Middleware/Authenticate.php
@@ -98,6 +98,7 @@ class Authenticate
return $this->auth->authenticate();
}
+ // @codeCoverageIgnoreStart
foreach ($guards as $guard) {
if ($this->auth->guard($guard)->check()) {
return $this->auth->shouldUse($guard);
@@ -105,5 +106,6 @@ class Authenticate
}
throw new AuthenticationException('Unauthenticated.', $guards);
+ // @codeCoverageIgnoreEnd
}
}
diff --git a/app/Http/Middleware/IsDemoUser.php b/app/Http/Middleware/IsDemoUser.php
index c4b1b5123f..7f704adc14 100644
--- a/app/Http/Middleware/IsDemoUser.php
+++ b/app/Http/Middleware/IsDemoUser.php
@@ -34,26 +34,28 @@ use Session;
class IsDemoUser
{
/**
- * Handle an incoming request. May not be a limited user (ie. Sandstorm env. or demo user).
+ * Handle an incoming request.
*
- * @param \Illuminate\Http\Request $request
- * @param \Closure $next
- * @param string|null $guard
+ * @param \Illuminate\Http\Request $request
+ * @param \Closure $next
+ * @param string[] ...$guards
*
* @return mixed
*/
- public function handle(Request $request, Closure $next, $guard = null)
+ public function handle(Request $request, Closure $next)
{
- if (Auth::guard($guard)->guest()) {
- // don't care when not logged in, usual stuff applies:
+ /** @var User $user */
+ $user = $request->user();
+ if (is_null($user)) {
return $next($request);
}
- /** @var User $user */
- $user = auth()->user();
+
if ($user->hasRole('demo')) {
Session::flash('info', strval(trans('firefly.not_available_demo_user')));
- return redirect($request->session()->previousUrl());
+ redirect($request->session()->previousUrl());
+
+ return $next($request);
}
return $next($request);
diff --git a/app/Http/Middleware/Range.php b/app/Http/Middleware/Range.php
index 11e85836f2..15f9b10b21 100644
--- a/app/Http/Middleware/Range.php
+++ b/app/Http/Middleware/Range.php
@@ -38,35 +38,17 @@ use View;
*/
class Range
{
- /**
- * The Guard implementation.
- *
- * @var Guard
- */
- protected $auth;
-
- /**
- * Create a new filter instance.
- *
- * @param Guard $auth
- */
- public function __construct(Guard $auth)
- {
- $this->auth = $auth;
- }
-
/**
* Handle an incoming request.
*
* @param \Illuminate\Http\Request $request
* @param Closure $next
- * @param string|null $guard
*
* @return mixed
*/
- public function handle(Request $request, Closure $next, $guard = null)
+ public function handle(Request $request, Closure $next)
{
- if (!Auth::guard($guard)->guest()) {
+ if ($request->user()) {
// set start, end and finish:
$this->setRange();
diff --git a/app/Http/Requests/JournalFormRequest.php b/app/Http/Requests/JournalFormRequest.php
index 5df273d26f..eaa39797eb 100644
--- a/app/Http/Requests/JournalFormRequest.php
+++ b/app/Http/Requests/JournalFormRequest.php
@@ -207,7 +207,7 @@ class JournalFormRequest extends Request
break;
default:
- throw new FireflyException('Cannot handle transaction type of type ' . e($what) . ' . ');
+ throw new FireflyException(sprintf('Cannot handle transaction type of type "%s"', $what)); // @codeCoverageIgnore
}
return $rules;
diff --git a/app/Http/Requests/ReconciliationStoreRequest.php b/app/Http/Requests/ReconciliationStoreRequest.php
index 015304b79f..0c76a052d2 100644
--- a/app/Http/Requests/ReconciliationStoreRequest.php
+++ b/app/Http/Requests/ReconciliationStoreRequest.php
@@ -47,7 +47,7 @@ class ReconciliationStoreRequest extends Request
{
$transactions = $this->get('transactions');
if (!is_array($transactions)) {
- $transactions = [];
+ $transactions = []; // @codeCoverageIgnore
}
$data = [
'start' => $this->date('start'),
diff --git a/app/Http/Requests/ReportFormRequest.php b/app/Http/Requests/ReportFormRequest.php
index 9d57443286..1808b793bc 100644
--- a/app/Http/Requests/ReportFormRequest.php
+++ b/app/Http/Requests/ReportFormRequest.php
@@ -122,9 +122,12 @@ class ReportFormRequest extends Request
if (2 === count($parts)) {
try {
$date = new Carbon($parts[1]);
+ // @codeCoverageIgnoreStart
} catch (Exception $e) {
throw new FireflyException(sprintf('"%s" is not a valid date range.', $range));
+ // @codeCoverageIgnoreEnd
}
+
}
return $date;
@@ -165,8 +168,10 @@ class ReportFormRequest extends Request
if (2 === count($parts)) {
try {
$date = new Carbon($parts[0]);
+ // @codeCoverageIgnoreStart
} catch (Exception $e) {
throw new FireflyException(sprintf('"%s" is not a valid date range.', $range));
+ // @codeCoverageIgnoreEnd
}
}
diff --git a/app/Http/Requests/Request.php b/app/Http/Requests/Request.php
index 5efa3b4a89..2b0406614c 100644
--- a/app/Http/Requests/Request.php
+++ b/app/Http/Requests/Request.php
@@ -120,15 +120,4 @@ class Request extends FormRequest
{
return $this->get($field) ? new Carbon($this->get($field)) : null;
}
-
- /**
- * @param string $field
- *
- * @return float
- */
- protected function float(string $field): float
- {
- return round($this->input($field), 12);
- }
-
}
diff --git a/resources/views/vendor/passport/authorize.twig b/resources/views/vendor/passport/authorize.twig
index 737c5fe2e0..9105fe2205 100644
--- a/resources/views/vendor/passport/authorize.twig
+++ b/resources/views/vendor/passport/authorize.twig
@@ -5,7 +5,7 @@
- Firefly III v{{ config('firefly.version') }} - Authorization
+ Firefly III v{{ config('firefly.version') }} - {{ 'authorization'|_ }}
diff --git a/tests/Feature/Controllers/Account/ReconcileControllerTest.php b/tests/Feature/Controllers/Account/ReconcileControllerTest.php
index 4c183134b4..0d5c2dbcdc 100644
--- a/tests/Feature/Controllers/Account/ReconcileControllerTest.php
+++ b/tests/Feature/Controllers/Account/ReconcileControllerTest.php
@@ -237,6 +237,7 @@ class ReconcileControllerTest extends TestCase
/**
* @covers \FireflyIII\Http\Controllers\Account\ReconcileController::submit()
+ * @covers \FireflyIII\Http\Requests\ReconciliationStoreRequest
*/
public function testSubmit()
{
@@ -288,6 +289,7 @@ class ReconcileControllerTest extends TestCase
/**
* @covers \FireflyIII\Http\Controllers\Account\ReconcileController::update
+ * @covers \FireflyIII\Http\Requests\ReconciliationUpdateRequest
*/
public function testUpdate()
{
@@ -310,6 +312,7 @@ class ReconcileControllerTest extends TestCase
/**
* @covers \FireflyIII\Http\Controllers\Account\ReconcileController::update
+ * @covers \FireflyIII\Http\Requests\ReconciliationUpdateRequest
*/
public function testUpdateNotReconcile()
{
@@ -326,6 +329,7 @@ class ReconcileControllerTest extends TestCase
/**
* @covers \FireflyIII\Http\Controllers\Account\ReconcileController::update
+ * @covers \FireflyIII\Http\Requests\ReconciliationUpdateRequest
*/
public function testUpdateZero()
{
diff --git a/tests/Feature/Controllers/AccountControllerTest.php b/tests/Feature/Controllers/AccountControllerTest.php
index 7ea250cfea..befdf903ae 100644
--- a/tests/Feature/Controllers/AccountControllerTest.php
+++ b/tests/Feature/Controllers/AccountControllerTest.php
@@ -309,6 +309,7 @@ class AccountControllerTest extends TestCase
/**
* @covers \FireflyIII\Http\Controllers\AccountController::store
+ * @covers \FireflyIII\Http\Requests\AccountFormRequest
* @covers \FireflyIII\Http\Controllers\Controller::getPreviousUri
*/
public function testStore()
@@ -337,6 +338,7 @@ class AccountControllerTest extends TestCase
/**
* @covers \FireflyIII\Http\Controllers\AccountController::store
+ * @covers \FireflyIII\Http\Requests\AccountFormRequest
* @covers \FireflyIII\Http\Controllers\Controller::getPreviousUri
*/
public function testStoreAnother()
@@ -363,6 +365,7 @@ class AccountControllerTest extends TestCase
/**
* @covers \FireflyIII\Http\Controllers\AccountController::update
+ * @covers \FireflyIII\Http\Requests\AccountFormRequest
* @covers \FireflyIII\Http\Controllers\Controller::getPreviousUri
*/
public function testUpdate()
@@ -389,6 +392,7 @@ class AccountControllerTest extends TestCase
/**
* @covers \FireflyIII\Http\Controllers\AccountController::update
+ * @covers \FireflyIII\Http\Requests\AccountFormRequest
* @covers \FireflyIII\Http\Controllers\Controller::getPreviousUri
*/
public function testUpdateAgain()
diff --git a/tests/Feature/Controllers/Admin/LinkControllerTest.php b/tests/Feature/Controllers/Admin/LinkControllerTest.php
index 64cb540d02..bf3a68b126 100644
--- a/tests/Feature/Controllers/Admin/LinkControllerTest.php
+++ b/tests/Feature/Controllers/Admin/LinkControllerTest.php
@@ -161,6 +161,7 @@ class LinkControllerTest extends TestCase
/**
* @covers \FireflyIII\Http\Controllers\Admin\LinkController::store
+ * @covers \FireflyIII\Http\Requests\LinkTypeFormRequest
*/
public function testStore()
{
@@ -182,6 +183,7 @@ class LinkControllerTest extends TestCase
/**
* @covers \FireflyIII\Http\Controllers\Admin\LinkController::store
+ * @covers \FireflyIII\Http\Requests\LinkTypeFormRequest
*/
public function testStoreRedirect()
{
@@ -202,6 +204,7 @@ class LinkControllerTest extends TestCase
/**
* @covers \FireflyIII\Http\Controllers\Admin\LinkController::update
+ * @covers \FireflyIII\Http\Requests\LinkTypeFormRequest
*/
public function testUpdate()
{
@@ -225,6 +228,7 @@ class LinkControllerTest extends TestCase
/**
* @covers \FireflyIII\Http\Controllers\Admin\LinkController::update
+ * @covers \FireflyIII\Http\Requests\LinkTypeFormRequest
*/
public function testUpdateNonEditable()
{
@@ -246,6 +250,7 @@ class LinkControllerTest extends TestCase
/**
* @covers \FireflyIII\Http\Controllers\Admin\LinkController::update
+ * @covers \FireflyIII\Http\Requests\LinkTypeFormRequest
*/
public function testUpdateRedirect()
{
diff --git a/tests/Feature/Controllers/BillControllerTest.php b/tests/Feature/Controllers/BillControllerTest.php
index b999823c9d..d2d678379d 100644
--- a/tests/Feature/Controllers/BillControllerTest.php
+++ b/tests/Feature/Controllers/BillControllerTest.php
@@ -209,6 +209,8 @@ class BillControllerTest extends TestCase
/**
* @covers \FireflyIII\Http\Controllers\BillController::store
+ * @covers \FireflyIII\Http\Requests\BillFormRequest
+ * @covers \FireflyIII\Http\Requests\Request
*/
public function testStore()
{
@@ -241,6 +243,8 @@ class BillControllerTest extends TestCase
/**
* @covers \FireflyIII\Http\Controllers\BillController::update
+ * @covers \FireflyIII\Http\Requests\BillFormRequest
+ * @covers \FireflyIII\Http\Requests\Request
*/
public function testUpdate()
{
@@ -254,6 +258,7 @@ class BillControllerTest extends TestCase
$attachHelper->shouldReceive('getMessages')->andReturn(new MessageBag);
$data = [
+ 'id' => 1,
'name' => 'Updated Bill ' . rand(1000, 9999),
'match' => 'some more words',
'amount_min' => '100',
diff --git a/tests/Feature/Controllers/CategoryControllerTest.php b/tests/Feature/Controllers/CategoryControllerTest.php
index 127abe15a2..f3e94b50b6 100644
--- a/tests/Feature/Controllers/CategoryControllerTest.php
+++ b/tests/Feature/Controllers/CategoryControllerTest.php
@@ -432,6 +432,7 @@ class CategoryControllerTest extends TestCase
/**
* @covers \FireflyIII\Http\Controllers\CategoryController::store
+ * @covers \FireflyIII\Http\Requests\CategoryFormRequest
*/
public function testStore()
{
@@ -455,15 +456,17 @@ class CategoryControllerTest extends TestCase
/**
* @covers \FireflyIII\Http\Controllers\CategoryController::update
+ * @covers \FireflyIII\Http\Requests\CategoryFormRequest
*/
public function testUpdate()
{
+ $category = Category::first();
$repository = $this->mock(CategoryRepositoryInterface::class);
$journalRepos = $this->mock(JournalRepositoryInterface::class);
$accountRepos = $this->mock(AccountRepositoryInterface::class);
$journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal);
$repository->shouldReceive('update');
- $repository->shouldReceive('find')->andReturn(new Category);
+ $repository->shouldReceive('find')->andReturn($category);
$this->session(['categories.edit.uri' => 'http://localhost']);
diff --git a/tests/Feature/Controllers/CurrencyControllerTest.php b/tests/Feature/Controllers/CurrencyControllerTest.php
index 42a8033878..ba1dd0fe00 100644
--- a/tests/Feature/Controllers/CurrencyControllerTest.php
+++ b/tests/Feature/Controllers/CurrencyControllerTest.php
@@ -251,6 +251,7 @@ class CurrencyControllerTest extends TestCase
/**
* @covers \FireflyIII\Http\Controllers\CurrencyController::store
+ * @covers \FireflyIII\Http\Requests\CurrencyFormRequest
*/
public function testStore()
{
@@ -278,6 +279,7 @@ class CurrencyControllerTest extends TestCase
/**
* @covers \FireflyIII\Http\Controllers\CurrencyController::store
+ * @covers \FireflyIII\Http\Requests\CurrencyFormRequest
*/
public function testStoreNoRights()
{
@@ -305,6 +307,7 @@ class CurrencyControllerTest extends TestCase
/**
* @covers \FireflyIII\Http\Controllers\CurrencyController::update
+ * @covers \FireflyIII\Http\Requests\CurrencyFormRequest
*/
public function testUpdate()
{
@@ -319,6 +322,7 @@ class CurrencyControllerTest extends TestCase
$this->session(['currencies.edit.uri' => 'http://localhost']);
$data = [
+ 'id' => 2,
'name' => 'XA',
'code' => 'XAX',
'symbol' => 'a',
diff --git a/tests/Feature/Controllers/ExportControllerTest.php b/tests/Feature/Controllers/ExportControllerTest.php
index 96e8d37055..480a58b73f 100644
--- a/tests/Feature/Controllers/ExportControllerTest.php
+++ b/tests/Feature/Controllers/ExportControllerTest.php
@@ -117,6 +117,7 @@ class ExportControllerTest extends TestCase
/**
* @covers \FireflyIII\Http\Controllers\ExportController::postIndex
+ * @covers \FireflyIII\Http\Requests\ExportFormRequest
*/
public function testPostIndex()
{
diff --git a/tests/Feature/Controllers/PiggyBankControllerTest.php b/tests/Feature/Controllers/PiggyBankControllerTest.php
index 39489df204..90460a3bb7 100644
--- a/tests/Feature/Controllers/PiggyBankControllerTest.php
+++ b/tests/Feature/Controllers/PiggyBankControllerTest.php
@@ -334,7 +334,8 @@ class PiggyBankControllerTest extends TestCase
}
/**
- * @covers \FireflyIII\Http\Controllers\PiggyBankController::store
+ * @covers \FireflyIII\Http\Controllers\PiggyBankController::store
+ * @covers \FireflyIII\Http\Requests\PiggyBankFormRequest
*/
public function testStore()
{
@@ -359,7 +360,8 @@ class PiggyBankControllerTest extends TestCase
}
/**
- * @covers \FireflyIII\Http\Controllers\PiggyBankController::update
+ * @covers \FireflyIII\Http\Controllers\PiggyBankController::update
+ * @covers \FireflyIII\Http\Requests\PiggyBankFormRequest
*/
public function testUpdate()
{
@@ -371,6 +373,7 @@ class PiggyBankControllerTest extends TestCase
$this->session(['piggy-banks.edit.uri' => 'http://localhost']);
$data = [
+ 'id' => 3,
'name' => 'Updated Piggy ' . rand(999, 10000),
'targetamount' => '100.123',
'account_id' => 2,
diff --git a/tests/Feature/Controllers/ReportControllerTest.php b/tests/Feature/Controllers/ReportControllerTest.php
index e9700b667f..94039de247 100644
--- a/tests/Feature/Controllers/ReportControllerTest.php
+++ b/tests/Feature/Controllers/ReportControllerTest.php
@@ -302,6 +302,7 @@ class ReportControllerTest extends TestCase
/**
* @covers \FireflyIII\Http\Controllers\ReportController::postIndex
+ * @covers \FireflyIII\Http\Requests\ReportFormRequest
*/
public function testPostIndexAccountOK()
{
@@ -328,6 +329,7 @@ class ReportControllerTest extends TestCase
/**
* @covers \FireflyIII\Http\Controllers\ReportController::postIndex
+ * @covers \FireflyIII\Http\Requests\ReportFormRequest
*/
public function testPostIndexAuditOK()
{
@@ -353,6 +355,7 @@ class ReportControllerTest extends TestCase
/**
* @covers \FireflyIII\Http\Controllers\ReportController::postIndex
+ * @covers \FireflyIII\Http\Requests\ReportFormRequest
*/
public function testPostIndexBudgetError()
{
@@ -381,6 +384,7 @@ class ReportControllerTest extends TestCase
/**
* @covers \FireflyIII\Http\Controllers\ReportController::postIndex
+ * @covers \FireflyIII\Http\Requests\ReportFormRequest
*/
public function testPostIndexBudgetOK()
{
@@ -409,6 +413,7 @@ class ReportControllerTest extends TestCase
/**
* @covers \FireflyIII\Http\Controllers\ReportController::postIndex
+ * @covers \FireflyIII\Http\Requests\ReportFormRequest
*/
public function testPostIndexCategoryError()
{
@@ -437,6 +442,7 @@ class ReportControllerTest extends TestCase
/**
* @covers \FireflyIII\Http\Controllers\ReportController::postIndex
+ * @covers \FireflyIII\Http\Requests\ReportFormRequest
*/
public function testPostIndexCategoryOK()
{
@@ -464,6 +470,7 @@ class ReportControllerTest extends TestCase
/**
* @covers \FireflyIII\Http\Controllers\ReportController::postIndex
+ * @covers \FireflyIII\Http\Requests\ReportFormRequest
*/
public function testPostIndexDefaultOK()
{
@@ -489,6 +496,7 @@ class ReportControllerTest extends TestCase
/**
* @covers \FireflyIII\Http\Controllers\ReportController::postIndex
+ * @covers \FireflyIII\Http\Requests\ReportFormRequest
*/
public function testPostIndexDefaultStartEnd()
{
@@ -514,6 +522,7 @@ class ReportControllerTest extends TestCase
/**
* @covers \FireflyIII\Http\Controllers\ReportController::postIndex
+ * @covers \FireflyIII\Http\Requests\ReportFormRequest
*/
public function testPostIndexTagError()
{
@@ -541,6 +550,7 @@ class ReportControllerTest extends TestCase
/**
* @covers \FireflyIII\Http\Controllers\ReportController::postIndex
+ * @covers \FireflyIII\Http\Requests\ReportFormRequest
*/
public function testPostIndexTagOK()
{
@@ -569,6 +579,7 @@ class ReportControllerTest extends TestCase
/**
* @covers \FireflyIII\Http\Controllers\ReportController::postIndex
+ * @covers \FireflyIII\Http\Requests\ReportFormRequest
*/
public function testPostIndexZeroAccounts()
{
diff --git a/tests/Feature/Controllers/RuleControllerTest.php b/tests/Feature/Controllers/RuleControllerTest.php
index 195225dccb..6b0be466da 100644
--- a/tests/Feature/Controllers/RuleControllerTest.php
+++ b/tests/Feature/Controllers/RuleControllerTest.php
@@ -300,6 +300,7 @@ class RuleControllerTest extends TestCase
/**
* @covers \FireflyIII\Http\Controllers\RuleController::store
+ * @covers \FireflyIII\Http\Requests\RuleFormRequest
*/
public function testStore()
{
@@ -449,6 +450,7 @@ class RuleControllerTest extends TestCase
/**
* @covers \FireflyIII\Http\Controllers\RuleController::update
+ * @covers \FireflyIII\Http\Requests\RuleFormRequest
*/
public function testUpdate()
{
diff --git a/tests/Feature/Controllers/RuleGroupControllerTest.php b/tests/Feature/Controllers/RuleGroupControllerTest.php
index fcc2e49720..60fe2595be 100644
--- a/tests/Feature/Controllers/RuleGroupControllerTest.php
+++ b/tests/Feature/Controllers/RuleGroupControllerTest.php
@@ -170,7 +170,8 @@ class RuleGroupControllerTest extends TestCase
}
/**
- * @covers \FireflyIII\Http\Controllers\RuleGroupController::store
+ * @covers \FireflyIII\Http\Controllers\RuleGroupController::store
+ * @covers \FireflyIII\Http\Requests\RuleGroupFormRequest
*/
public function testStore()
{
@@ -211,7 +212,8 @@ class RuleGroupControllerTest extends TestCase
}
/**
- * @covers \FireflyIII\Http\Controllers\RuleGroupController::update
+ * @covers \FireflyIII\Http\Controllers\RuleGroupController::update
+ * @covers \FireflyIII\Http\Requests\RuleGroupFormRequest
*/
public function testUpdate()
{
@@ -221,13 +223,14 @@ class RuleGroupControllerTest extends TestCase
$journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal);
$data = [
+ 'id' => 1,
'title' => 'C',
'description' => 'XX',
];
$this->session(['rule-groups.edit.uri' => 'http://localhost']);
$repository->shouldReceive('update');
- $repository->shouldReceive('find')->andReturn(new RuleGroup);
+ $repository->shouldReceive('find')->andReturn(RuleGroup::first());
$this->be($this->user());
$response = $this->post(route('rule-groups.update', [1]), $data);
diff --git a/tests/Feature/Controllers/TagControllerTest.php b/tests/Feature/Controllers/TagControllerTest.php
index 3d2ca65bab..ba49750159 100644
--- a/tests/Feature/Controllers/TagControllerTest.php
+++ b/tests/Feature/Controllers/TagControllerTest.php
@@ -242,7 +242,8 @@ class TagControllerTest extends TestCase
}
/**
- * @covers \FireflyIII\Http\Controllers\TagController::store
+ * @covers \FireflyIII\Http\Controllers\TagController::store
+ * @covers \FireflyIII\Http\Requests\TagFormRequest
*/
public function testStore()
{
@@ -255,8 +256,10 @@ class TagControllerTest extends TestCase
$this->session(['tags.create.uri' => 'http://localhost']);
$data = [
- 'tag' => 'Hello new tag' . rand(999, 10000),
- 'tagMode' => 'nothing',
+ 'tag' => 'Hello new tag' . rand(999, 10000),
+ 'tagMode' => 'nothing',
+ 'tag_position_has_tag' => 'true',
+
];
$this->be($this->user());
$response = $this->post(route('tags.store'), $data);
@@ -265,7 +268,8 @@ class TagControllerTest extends TestCase
}
/**
- * @covers \FireflyIII\Http\Controllers\TagController::update
+ * @covers \FireflyIII\Http\Controllers\TagController::update
+ * @covers \FireflyIII\Http\Requests\TagFormRequest
*/
public function testUpdate()
{
@@ -276,12 +280,13 @@ class TagControllerTest extends TestCase
$this->session(['tags.edit.uri' => 'http://localhost']);
$data = [
+ 'id' => 1,
'tag' => 'Hello updated tag' . rand(999, 10000),
'tagMode' => 'nothing',
];
$repository->shouldReceive('update');
- $repository->shouldReceive('find')->andReturn(new Tag);
+ $repository->shouldReceive('find')->andReturn(Tag::first());
$this->be($this->user());
$response = $this->post(route('tags.update', [1]), $data);
diff --git a/tests/Feature/Controllers/Transaction/BulkControllerTest.php b/tests/Feature/Controllers/Transaction/BulkControllerTest.php
index 749f8a9f19..e189df4f0f 100644
--- a/tests/Feature/Controllers/Transaction/BulkControllerTest.php
+++ b/tests/Feature/Controllers/Transaction/BulkControllerTest.php
@@ -138,6 +138,7 @@ class BulkControllerTest extends TestCase
/**
* @covers \FireflyIII\Http\Controllers\Transaction\BulkController::update
+ * @covers \FireflyIII\Http\Requests\BulkEditJournalRequest
*/
public function testUpdate()
{
diff --git a/tests/Feature/Controllers/Transaction/LinkControllerTest.php b/tests/Feature/Controllers/Transaction/LinkControllerTest.php
index 871bebe9ff..999d1bfcaf 100644
--- a/tests/Feature/Controllers/Transaction/LinkControllerTest.php
+++ b/tests/Feature/Controllers/Transaction/LinkControllerTest.php
@@ -73,6 +73,7 @@ class LinkControllerTest extends TestCase
/**
* @covers \FireflyIII\Http\Controllers\Transaction\LinkController::store
+ * @covers \FireflyIII\Http\Requests\JournalLinkRequest
*/
public function testStore()
{
@@ -98,6 +99,7 @@ class LinkControllerTest extends TestCase
/**
* @covers \FireflyIII\Http\Controllers\Transaction\LinkController::store
+ * @covers \FireflyIII\Http\Requests\JournalLinkRequest
*/
public function testStoreAlreadyLinked()
{
@@ -122,6 +124,7 @@ class LinkControllerTest extends TestCase
/**
* @covers \FireflyIII\Http\Controllers\Transaction\LinkController::store
+ * @covers \FireflyIII\Http\Requests\JournalLinkRequest
*/
public function testStoreInvalid()
{
diff --git a/tests/Feature/Controllers/Transaction/SingleControllerTest.php b/tests/Feature/Controllers/Transaction/SingleControllerTest.php
index e3b36ca6bc..8bdf397291 100644
--- a/tests/Feature/Controllers/Transaction/SingleControllerTest.php
+++ b/tests/Feature/Controllers/Transaction/SingleControllerTest.php
@@ -230,7 +230,9 @@ class SingleControllerTest extends TestCase
$journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal);
$account = $this->user()->accounts()->first();
- $accountRepos->shouldReceive('getAccountsByType')->once()->withArgs([[AccountType::DEFAULT, AccountType::ASSET]])->andReturn(new Collection([$account]));
+ $accountRepos->shouldReceive('getAccountsByType')->once()->withArgs([[AccountType::DEFAULT, AccountType::ASSET]])->andReturn(
+ new Collection([$account])
+ );
$budgetRepos->shouldReceive('getBudgets')->andReturn(new Collection)->once();
@@ -574,6 +576,7 @@ class SingleControllerTest extends TestCase
/**
* @covers \FireflyIII\Http\Controllers\Transaction\SingleController::store
* @covers \FireflyIII\Http\Controllers\Transaction\SingleController::groupedActiveAccountList
+ * @covers \FireflyIII\Http\Requests\JournalFormRequest
*/
public function testStoreError()
{
@@ -610,6 +613,7 @@ class SingleControllerTest extends TestCase
/**
* @covers \FireflyIII\Http\Controllers\Transaction\SingleController::store
* @covers \FireflyIII\Http\Controllers\Transaction\SingleController::groupedActiveAccountList
+ * @covers \FireflyIII\Http\Requests\JournalFormRequest
*/
public function testStoreSuccess()
{
@@ -659,8 +663,170 @@ class SingleControllerTest extends TestCase
$response->assertSessionHas('info');
}
+ /**
+ * @covers \FireflyIII\Http\Controllers\Transaction\SingleController::store
+ * @covers \FireflyIII\Http\Controllers\Transaction\SingleController::groupedActiveAccountList
+ * @covers \FireflyIII\Http\Requests\JournalFormRequest
+ */
+ public function testStoreSuccessDeposit()
+ {
+
+ $accountRepos = $this->mock(AccountRepositoryInterface::class);
+ $budgetRepos = $this->mock(BudgetRepositoryInterface::class);
+ $piggyRepos = $this->mock(PiggyBankRepositoryInterface::class);
+ $attRepos = $this->mock(AttachmentHelperInterface::class);
+ $currencyRepos = $this->mock(CurrencyRepositoryInterface::class);
+ $journalRepos = $this->mock(JournalRepositoryInterface::class);
+ $journalRepos->shouldReceive('first')->andReturn(new TransactionJournal);
+
+ // mock results:
+ $journal = new TransactionJournal();
+ $journal->id = 1000;
+ $journal->description = 'New deposit';
+ $journalRepos->shouldReceive('store')->andReturn($journal);
+ $this->expectsEvents(StoredTransactionJournal::class);
+
+ $errors = new MessageBag;
+ $errors->add('attachments', 'Fake error');
+
+ $messages = new MessageBag;
+ $messages->add('attachments', 'Fake error');
+
+ // mock attachment helper, trigger an error AND and info thing.
+ $attRepos->shouldReceive('saveAttachmentsForModel');
+ $attRepos->shouldReceive('getErrors')->andReturn($errors);
+ $attRepos->shouldReceive('getMessages')->andReturn($messages);
+
+ $this->session(['transactions.create.uri' => 'http://localhost']);
+ $this->be($this->user());
+
+ $data = [
+ 'what' => 'deposit',
+ 'amount' => '10',
+ 'amount_currency_id_amount' => 1,
+ 'destination_account_id' => 1,
+ 'source_account_name' => 'Some source',
+ 'date' => '2016-01-01',
+ 'description' => 'Test descr',
+ ];
+ $response = $this->post(route('transactions.store', ['deposit']), $data);
+ $response->assertStatus(302);
+ $response->assertSessionHas('success');
+ $response->assertSessionHas('error');
+ $response->assertSessionHas('info');
+ }
+
+ /**
+ * @covers \FireflyIII\Http\Controllers\Transaction\SingleController::store
+ * @covers \FireflyIII\Http\Controllers\Transaction\SingleController::groupedActiveAccountList
+ * @covers \FireflyIII\Http\Requests\JournalFormRequest
+ */
+ public function testStoreSuccessTransfer()
+ {
+
+ $accountRepos = $this->mock(AccountRepositoryInterface::class);
+ $budgetRepos = $this->mock(BudgetRepositoryInterface::class);
+ $piggyRepos = $this->mock(PiggyBankRepositoryInterface::class);
+ $attRepos = $this->mock(AttachmentHelperInterface::class);
+ $currencyRepos = $this->mock(CurrencyRepositoryInterface::class);
+ $journalRepos = $this->mock(JournalRepositoryInterface::class);
+ $journalRepos->shouldReceive('first')->andReturn(new TransactionJournal);
+
+ // mock results:
+ $journal = new TransactionJournal();
+ $journal->id = 1000;
+ $journal->description = 'New transfer';
+ $journalRepos->shouldReceive('store')->andReturn($journal);
+ $this->expectsEvents(StoredTransactionJournal::class);
+
+ $errors = new MessageBag;
+ $errors->add('attachments', 'Fake error');
+
+ $messages = new MessageBag;
+ $messages->add('attachments', 'Fake error');
+
+ // mock attachment helper, trigger an error AND and info thing.
+ $attRepos->shouldReceive('saveAttachmentsForModel');
+ $attRepos->shouldReceive('getErrors')->andReturn($errors);
+ $attRepos->shouldReceive('getMessages')->andReturn($messages);
+
+ $this->session(['transactions.create.uri' => 'http://localhost']);
+ $this->be($this->user());
+
+ $data = [
+ 'what' => 'transfer',
+ 'amount' => '10',
+ 'amount_currency_id_amount' => 1,
+ 'destination_account_id' => 1,
+ 'source_account_id' => 2,
+ 'date' => '2016-01-01',
+ 'description' => 'Test descr',
+ ];
+ $response = $this->post(route('transactions.store', ['transfer']), $data);
+ $response->assertStatus(302);
+ $response->assertSessionHas('success');
+ $response->assertSessionHas('error');
+ $response->assertSessionHas('info');
+ }
+
+ /**
+ * @covers \FireflyIII\Http\Controllers\Transaction\SingleController::store
+ * @covers \FireflyIII\Http\Controllers\Transaction\SingleController::groupedActiveAccountList
+ * @covers \FireflyIII\Http\Requests\JournalFormRequest
+ */
+ public function testStoreSuccessTransferForeign()
+ {
+
+ $accountRepos = $this->mock(AccountRepositoryInterface::class);
+ $budgetRepos = $this->mock(BudgetRepositoryInterface::class);
+ $piggyRepos = $this->mock(PiggyBankRepositoryInterface::class);
+ $attRepos = $this->mock(AttachmentHelperInterface::class);
+ $currencyRepos = $this->mock(CurrencyRepositoryInterface::class);
+ $journalRepos = $this->mock(JournalRepositoryInterface::class);
+ $journalRepos->shouldReceive('first')->andReturn(new TransactionJournal);
+
+ // mock results:
+ $journal = new TransactionJournal();
+ $journal->id = 1000;
+ $journal->description = 'New transfer';
+ $journalRepos->shouldReceive('store')->andReturn($journal);
+ $this->expectsEvents(StoredTransactionJournal::class);
+
+ $errors = new MessageBag;
+ $errors->add('attachments', 'Fake error');
+
+ $messages = new MessageBag;
+ $messages->add('attachments', 'Fake error');
+
+ // mock attachment helper, trigger an error AND and info thing.
+ $attRepos->shouldReceive('saveAttachmentsForModel');
+ $attRepos->shouldReceive('getErrors')->andReturn($errors);
+ $attRepos->shouldReceive('getMessages')->andReturn($messages);
+
+ $this->session(['transactions.create.uri' => 'http://localhost']);
+ $this->be($this->user());
+
+ $data = [
+ 'what' => 'transfer',
+ 'amount' => '10',
+ 'amount_currency_id_amount' => 1,
+ 'source_account_currency' => 1,
+ 'destination_account_currency' => 2,
+ 'destination_account_id' => 1,
+ 'source_account_id' => 2,
+ 'date' => '2016-01-01',
+ 'description' => 'Test descr',
+ ];
+ $response = $this->post(route('transactions.store', ['transfer']), $data);
+ $response->assertStatus(302);
+ $response->assertSessionHas('success');
+ $response->assertSessionHas('error');
+ $response->assertSessionHas('info');
+ }
+
/**
* @covers \FireflyIII\Http\Controllers\Transaction\SingleController::update
+ * @covers \FireflyIII\Http\Requests\JournalFormRequest
*/
public function testUpdate()
{
diff --git a/tests/Feature/Controllers/Transaction/SplitControllerTest.php b/tests/Feature/Controllers/Transaction/SplitControllerTest.php
index 8f0e6970fc..4154d4c020 100644
--- a/tests/Feature/Controllers/Transaction/SplitControllerTest.php
+++ b/tests/Feature/Controllers/Transaction/SplitControllerTest.php
@@ -63,11 +63,11 @@ class SplitControllerTest extends TestCase
$attHelper = $this->mock(AttachmentHelperInterface::class);
- $deposit = TransactionJournal::where('transaction_type_id', 2)->where('user_id', $this->user()->id)->first();
- $destination = $deposit->transactions()->where('amount', '>', 0)->first();
- $account = $destination->account;
- $transactions = factory(Transaction::class, 3)->make();
- $array = $transactions->toArray();
+ $deposit = TransactionJournal::where('transaction_type_id', 2)->where('user_id', $this->user()->id)->first();
+ $destination = $deposit->transactions()->where('amount', '>', 0)->first();
+ $account = $destination->account;
+ $transactions = factory(Transaction::class, 3)->make();
+ $array = $transactions->toArray();
$array[0]['category'] = '';
$journalRepos->shouldReceive('first')->once()->andReturn($deposit);
@@ -260,7 +260,8 @@ class SplitControllerTest extends TestCase
}
/**
- * @covers \FireflyIII\Http\Controllers\Transaction\SplitController::update
+ * @covers \FireflyIII\Http\Controllers\Transaction\SplitController::update
+ * @covers \FireflyIII\Http\Requests\SplitJournalFormRequest
*/
public function testUpdate()
{
@@ -315,8 +316,9 @@ class SplitControllerTest extends TestCase
}
/**
- * @covers \FireflyIII\Http\Controllers\Transaction\SplitController::update
- * @covers \FireflyIII\Http\Controllers\Transaction\SplitController::isOpeningBalance
+ * @covers \FireflyIII\Http\Controllers\Transaction\SplitController::update
+ * @covers \FireflyIII\Http\Controllers\Transaction\SplitController::isOpeningBalance
+ * @covers \FireflyIII\Http\Requests\SplitJournalFormRequest
*/
public function testUpdateOpeningBalance()
{
@@ -356,4 +358,118 @@ class SplitControllerTest extends TestCase
$response->assertStatus(302);
$response->assertSessionMissing('success');
}
+
+ /**
+ * @covers \FireflyIII\Http\Controllers\Transaction\SplitController::update
+ * @covers \FireflyIII\Http\Requests\SplitJournalFormRequest
+ */
+ public function testUpdateTransfer()
+ {
+ $currencyRepository = $this->mock(CurrencyRepositoryInterface::class);
+ $accountRepository = $this->mock(AccountRepositoryInterface::class);
+ $budgetRepository = $this->mock(BudgetRepositoryInterface::class);
+ $journalRepos = $this->mock(JournalRepositoryInterface::class);
+ $attHelper = $this->mock(AttachmentHelperInterface::class);
+ $tasker = $this->mock(JournalTaskerInterface::class);
+ $ruleRepos = $this->mock(RuleGroupRepositoryInterface::class);
+ $billRepos = $this->mock(BillRepositoryInterface::class);
+
+ $billRepos->shouldReceive('scan');
+ $ruleRepos->shouldReceive('getActiveGroups')->andReturn(new Collection);
+
+
+ $this->session(['transactions.edit-split.uri' => 'http://localhost']);
+ $transfer = $this->user()->transactionJournals()->inRandomOrder()->where('transaction_type_id', 3)->first();
+ $data = [
+ 'id' => $transfer->id,
+ 'what' => 'transfer',
+ 'journal_description' => 'Some updated withdrawal',
+ 'journal_currency_id' => 1,
+ 'journal_source_account_id' => 1,
+ 'journal_amount' => 1591,
+ 'date' => '2014-01-24',
+ 'tags' => '',
+ 'transactions' => [
+ [
+ 'description' => 'Split #1',
+ 'source_account_id' => '1',
+ 'destination_account_id' => '2',
+ 'transaction_currency_id' => 1,
+ 'amount' => 1591,
+ 'category' => '',
+ ],
+ ],
+ ];
+
+ // mock stuff
+ $journalRepos->shouldReceive('update')->andReturn($transfer);
+ $journalRepos->shouldReceive('first')->andReturn($transfer);
+ $journalRepos->shouldReceive('getTransactionType')->andReturn('Withdrawal');
+
+ $attHelper->shouldReceive('saveAttachmentsForModel');
+ $attHelper->shouldReceive('getMessages')->andReturn(new MessageBag);
+
+ $this->be($this->user());
+ $response = $this->post(route('transactions.split.update', [$transfer->id]), $data);
+ $response->assertStatus(302);
+ $response->assertRedirect(route('index'));
+ $response->assertSessionHas('success');
+ }
+
+ /**
+ * @covers \FireflyIII\Http\Controllers\Transaction\SplitController::update
+ * @covers \FireflyIII\Http\Requests\SplitJournalFormRequest
+ */
+ public function testUpdateWithdrawal()
+ {
+ $currencyRepository = $this->mock(CurrencyRepositoryInterface::class);
+ $accountRepository = $this->mock(AccountRepositoryInterface::class);
+ $budgetRepository = $this->mock(BudgetRepositoryInterface::class);
+ $journalRepos = $this->mock(JournalRepositoryInterface::class);
+ $attHelper = $this->mock(AttachmentHelperInterface::class);
+ $tasker = $this->mock(JournalTaskerInterface::class);
+ $ruleRepos = $this->mock(RuleGroupRepositoryInterface::class);
+ $billRepos = $this->mock(BillRepositoryInterface::class);
+
+ $billRepos->shouldReceive('scan');
+ $ruleRepos->shouldReceive('getActiveGroups')->andReturn(new Collection);
+
+
+ $this->session(['transactions.edit-split.uri' => 'http://localhost']);
+ $withdrawal = $this->user()->transactionJournals()->inRandomOrder()->where('transaction_type_id', 1)->first();
+ $data = [
+ 'id' => $withdrawal->id,
+ 'what' => 'withdrawal',
+ 'journal_description' => 'Some updated withdrawal',
+ 'journal_currency_id' => 1,
+ 'journal_source_account_id' => 1,
+ 'journal_amount' => 1591,
+ 'date' => '2014-01-24',
+ 'tags' => '',
+ 'transactions' => [
+ [
+ 'description' => 'Split #1',
+ 'source_account_id' => '1',
+ 'destination_account_name' => 'some expense',
+ 'transaction_currency_id' => 1,
+ 'amount' => 1591,
+ 'category' => '',
+ ],
+ ],
+ ];
+
+ // mock stuff
+ $journalRepos->shouldReceive('update')->andReturn($withdrawal);
+ $journalRepos->shouldReceive('first')->andReturn($withdrawal);
+ $journalRepos->shouldReceive('getTransactionType')->andReturn('Withdrawal');
+
+ $attHelper->shouldReceive('saveAttachmentsForModel');
+ $attHelper->shouldReceive('getMessages')->andReturn(new MessageBag);
+
+ $this->be($this->user());
+ $response = $this->post(route('transactions.split.update', [$withdrawal->id]), $data);
+ $response->assertStatus(302);
+ $response->assertRedirect(route('index'));
+ $response->assertSessionHas('success');
+ }
}
diff --git a/tests/Unit/Import/Object/ImportAccountTest.php b/tests/Unit/Import/Object/ImportAccountTest.php
index 5de2216467..873edb1d21 100644
--- a/tests/Unit/Import/Object/ImportAccountTest.php
+++ b/tests/Unit/Import/Object/ImportAccountTest.php
@@ -40,12 +40,7 @@ class ImportAccountTest extends TestCase
/**
* Should error because it requires a default asset account.
*
- * @covers \FireflyIII\Import\Object\ImportAccount::__construct
- * @covers \FireflyIII\Import\Object\ImportAccount::getAccount
- * @covers \FireflyIII\Import\Object\ImportAccount::store
- * @covers \FireflyIII\Import\Object\ImportAccount::findMappedObject
- * @covers \FireflyIII\Import\Object\ImportAccount::findExistingObject
- * @covers \FireflyIII\Import\Object\ImportAccount::getMappedObject
+ * @covers \FireflyIII\Import\Object\ImportAccount
*/
public function testBasic()
{
@@ -72,12 +67,7 @@ class ImportAccountTest extends TestCase
/**
* Should error because it requires a default asset account.
*
- * @covers \FireflyIII\Import\Object\ImportAccount::__construct
- * @covers \FireflyIII\Import\Object\ImportAccount::getAccount
- * @covers \FireflyIII\Import\Object\ImportAccount::store
- * @covers \FireflyIII\Import\Object\ImportAccount::findMappedObject
- * @covers \FireflyIII\Import\Object\ImportAccount::findExistingObject
- * @covers \FireflyIII\Import\Object\ImportAccount::getMappedObject
+ * @covers \FireflyIII\Import\Object\ImportAccount
*/
public function testEmptyMappingAccountId()
{
@@ -112,9 +102,7 @@ class ImportAccountTest extends TestCase
}
/**
- * @covers \FireflyIII\Import\Object\ImportAccount::__construct
- * @covers \FireflyIII\Import\Object\ImportAccount::getAccount
- * @covers \FireflyIII\Import\Object\ImportAccount::store
+ * @covers \FireflyIII\Import\Object\ImportAccount
* @expectedException \FireflyIII\Exceptions\FireflyException
* @expectedExceptionMessage ImportAccount cannot continue without a default account to fall back on.
*/
@@ -128,9 +116,7 @@ class ImportAccountTest extends TestCase
}
/**
- * @covers \FireflyIII\Import\Object\ImportAccount::__construct
- * @covers \FireflyIII\Import\Object\ImportAccount::getAccount
- * @covers \FireflyIII\Import\Object\ImportAccount::store
+ * @covers \FireflyIII\Import\Object\ImportAccount
* @expectedException \FireflyIII\Exceptions\FireflyException
* @expectedExceptionMessage ImportAccount cannot continue without user.
*/
diff --git a/tests/Unit/Middleware/AuthenticateTest.php b/tests/Unit/Middleware/AuthenticateTest.php
index ee4b45738f..e7ae03a1c2 100644
--- a/tests/Unit/Middleware/AuthenticateTest.php
+++ b/tests/Unit/Middleware/AuthenticateTest.php
@@ -26,27 +26,29 @@ namespace Tests\Unit\Middleware;
use Route;
use Symfony\Component\HttpFoundation\Response;
use Tests\TestCase;
-
+use Log;
/**
* Class AuthenticateTest
*/
class AuthenticateTest extends TestCase
{
/**
- * @covers \FireflyIII\Http\Middleware\Authenticate::handle
+ * @covers \FireflyIII\Http\Middleware\Authenticate
*/
public function testMiddleware()
{
+ Log::debug('Now at testMiddleware');
$response = $this->get('/_test/authenticate');
$this->assertEquals(Response::HTTP_FOUND, $response->getStatusCode());
$response->assertRedirect(route('login'));
}
/**
- * @covers \FireflyIII\Http\Middleware\Authenticate::handle
+ * @covers \FireflyIII\Http\Middleware\Authenticate
*/
public function testMiddlewareAjax()
{
+ Log::debug('Now at testMiddlewareAjax');
//$this->withoutExceptionHandling();
$server = ['HTTP_X-Requested-With' => 'XMLHttpRequest'];
$response = $this->get('/_test/authenticate', $server);
@@ -54,20 +56,22 @@ class AuthenticateTest extends TestCase
}
/**
- * @covers \FireflyIII\Http\Middleware\Authenticate::handle
+ * @covers \FireflyIII\Http\Middleware\Authenticate
*/
public function testMiddlewareAuth()
{
+ Log::debug('Now at testMiddlewareAuth');
$this->be($this->user());
$response = $this->get('/_test/authenticate');
$this->assertEquals(Response::HTTP_OK, $response->getStatusCode());
}
/**
- * @covers \FireflyIII\Http\Middleware\Authenticate::handle
+ * @covers \FireflyIII\Http\Middleware\Authenticate
*/
public function testMiddlewareBlockedUser()
{
+ Log::debug('Now at testMiddlewareBlockedUser');
$user = $this->user();
$user->blocked = 1;
@@ -80,10 +84,11 @@ class AuthenticateTest extends TestCase
}
/**
- * @covers \FireflyIII\Http\Middleware\Authenticate::handle
+ * @covers \FireflyIII\Http\Middleware\Authenticate
*/
public function testMiddlewareEmail()
{
+ Log::debug('Now at testMiddlewareEmail');
//$this->withoutExceptionHandling();
$user = $this->user();
$user->blocked = 1;
diff --git a/tests/Unit/Middleware/IsDemoUserTest.php b/tests/Unit/Middleware/IsDemoUserTest.php
index 3e93f448d6..4e44188fdb 100644
--- a/tests/Unit/Middleware/IsDemoUserTest.php
+++ b/tests/Unit/Middleware/IsDemoUserTest.php
@@ -35,7 +35,7 @@ use Tests\TestCase;
class IsDemoUserTest extends TestCase
{
/**
- * @covers \FireflyIII\Http\Middleware\IsDemoUser::handle
+ * @covers \FireflyIII\Http\Middleware\IsDemoUser
*/
public function testMiddlewareAuthenticated()
{
@@ -45,9 +45,8 @@ class IsDemoUserTest extends TestCase
$this->assertEquals(Response::HTTP_OK, $response->getStatusCode());
}
-
/**
- * @covers \FireflyIII\Http\Middleware\IsDemoUser::handle
+ * @covers \FireflyIII\Http\Middleware\IsDemoUser
*/
public function testMiddlewareNotAuthenticated()
{
@@ -56,6 +55,17 @@ class IsDemoUserTest extends TestCase
$this->assertEquals(Response::HTTP_OK, $response->getStatusCode());
}
+ /**
+ * @covers \FireflyIII\Http\Middleware\IsDemoUser
+ */
+ public function testMiddlewareIsDemoUser()
+ {
+ $this->be($this->demoUser());
+ $response = $this->get('/_test/is-demo');
+ $this->assertEquals(Response::HTTP_OK, $response->getStatusCode());
+ $response->assertSessionHas('info');
+ }
+
/**
* Set up test
*/
diff --git a/tests/Unit/Middleware/RangeTest.php b/tests/Unit/Middleware/RangeTest.php
index 296db2792a..5dc11cfdf0 100644
--- a/tests/Unit/Middleware/RangeTest.php
+++ b/tests/Unit/Middleware/RangeTest.php
@@ -24,6 +24,8 @@ declare(strict_types=1);
namespace Tests\Unit\Middleware;
use FireflyIII\Http\Middleware\Range;
+use FireflyIII\Models\TransactionJournal;
+use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
use Route;
use Symfony\Component\HttpFoundation\Response;
use Tests\TestCase;
@@ -34,14 +36,12 @@ use Tests\TestCase;
class RangeTest extends TestCase
{
/**
- * @covers \FireflyIII\Http\Middleware\Range::handle
- * @covers \FireflyIII\Http\Middleware\Range::__construct
- * @covers \FireflyIII\Http\Middleware\Range::configureList
- * @covers \FireflyIII\Http\Middleware\Range::configureView
- * @covers \FireflyIII\Http\Middleware\Range::setRange
+ * @covers \FireflyIII\Http\Middleware\Range
*/
public function testMiddlewareAuthenticated()
{
+ $repository = $this->mock(JournalRepositoryInterface::class);
+ $repository->shouldReceive('first')->andReturn(TransactionJournal::first());
$this->withoutExceptionHandling();
$this->be($this->user());
$response = $this->get('/_test/range');
@@ -54,8 +54,7 @@ class RangeTest extends TestCase
}
/**
- * @covers \FireflyIII\Http\Middleware\Range::handle
- * @covers \FireflyIII\Http\Middleware\Range::__construct
+ * @covers \FireflyIII\Http\Middleware\Range
*/
public function testMiddlewareNotAuthenticated()
{