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

Update various tests and the composer lock file.

Browse Source
This commit is contained in:
James Cole 2016-12-18 10:37:59 +01:00
parent 3d8adfa7e4
commit 7716ff4e8c
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
16 changed files with 161 additions and 233 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/CategoryController.php
View File

@ -15,6 +15,7 @@ namespace FireflyIII\Http\Controllers;
use Carbon\Carbon; use Carbon\Carbon;
use FireflyIII\Helpers\Collector\JournalCollector; use FireflyIII\Helpers\Collector\JournalCollector;
use FireflyIII\Helpers\Collector\JournalCollectorInterface;
use FireflyIII\Http\Requests\CategoryFormRequest; use FireflyIII\Http\Requests\CategoryFormRequest;
use FireflyIII\Models\AccountType; use FireflyIII\Models\AccountType;
use FireflyIII\Models\Category; use FireflyIII\Models\Category;
@ -60,7 +61,6 @@ class CategoryController extends Controller
*/ */
public function create() public function create()
{ {
// put previous url in session if not redirect from store (not "create another").
if (session('categories.create.fromStore') !== true) { if (session('categories.create.fromStore') !== true) {
Session::put('categories.create.url', URL::previous()); Session::put('categories.create.url', URL::previous());
} }
@ -190,7 +190,7 @@ class CategoryController extends Controller
$subTitleIcon = 'fa-bar-chart'; $subTitleIcon = 'fa-bar-chart';
// use journal collector // use journal collector
$collector = new JournalCollector(auth()->user()); $collector = app(JournalCollectorInterface::class);
$collector->setPage($page)->setLimit($pageSize)->setAllAssetAccounts()->setRange($start, $end)->setCategory($category); $collector->setPage($page)->setLimit($pageSize)->setAllAssetAccounts()->setRange($start, $end)->setCategory($category);
$journals = $collector->getPaginatedJournals(); $journals = $collector->getPaginatedJournals();
$journals->setPath('categories/show/' . $category->id); $journals->setPath('categories/show/' . $category->id);
@ -257,7 +257,7 @@ class CategoryController extends Controller
$pageSize = intval(Preferences::get('transactionPageSize', 50)->data); $pageSize = intval(Preferences::get('transactionPageSize', 50)->data);
// new collector: // new collector:
$collector = new JournalCollector(auth()->user()); $collector = app(JournalCollectorInterface::class);
$collector->setPage($page)->setLimit($pageSize)->setAllAssetAccounts()->setRange($start, $end)->setCategory($category); $collector->setPage($page)->setLimit($pageSize)->setAllAssetAccounts()->setRange($start, $end)->setCategory($category);
$journals = $collector->getPaginatedJournals(); $journals = $collector->getPaginatedJournals();
$journals->setPath('categories/show/' . $category->id . '/' . $date); $journals->setPath('categories/show/' . $category->id . '/' . $date);

11
app/Repositories/Journal/JournalRepository.php
View File

@ -82,10 +82,15 @@ class JournalRepository implements JournalRepositoryInterface
$destinationTransaction->save(); $destinationTransaction->save();
$journal->transaction_type_id = $type->id; $journal->transaction_type_id = $type->id;
$journal->save(); $journal->save();
Preferences::mark();
$messages = new MessageBag;
return $messages; // if journal is a transfer now, remove budget:
if ($type->type === TransactionType::TRANSFER) {
$journal->budgets()->detach();
}
Preferences::mark();
return new MessageBag;
} }
/** /**

146
composer.lock generated
View File

@ -1942,16 +1942,16 @@
}, },
{ {
"name": "symfony/console", "name": "symfony/console",
"version": "v3.1.7", "version": "v3.1.8",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/console.git", "url": "https://github.com/symfony/console.git",
"reference": "5be36e1f3ac7ecbe7e34fb641480ad8497b83aa6" "reference": "221a60fb2f369a065eea1ed96b61183219fdfa6e"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/console/zipball/5be36e1f3ac7ecbe7e34fb641480ad8497b83aa6", "url": "https://api.github.com/repos/symfony/console/zipball/221a60fb2f369a065eea1ed96b61183219fdfa6e",
"reference": "5be36e1f3ac7ecbe7e34fb641480ad8497b83aa6", "reference": "221a60fb2f369a065eea1ed96b61183219fdfa6e",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1999,11 +1999,11 @@
], ],
"description": "Symfony Console Component", "description": "Symfony Console Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2016-11-16 22:17:09" "time": "2016-12-08 14:58:14"
}, },
{ {
"name": "symfony/debug", "name": "symfony/debug",
"version": "v3.1.7", "version": "v3.1.8",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/debug.git", "url": "https://github.com/symfony/debug.git",
@ -2060,7 +2060,7 @@
}, },
{ {
"name": "symfony/event-dispatcher", "name": "symfony/event-dispatcher",
"version": "v3.2.0", "version": "v3.2.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/event-dispatcher.git", "url": "https://github.com/symfony/event-dispatcher.git",
@ -2120,16 +2120,16 @@
}, },
{ {
"name": "symfony/finder", "name": "symfony/finder",
"version": "v3.1.7", "version": "v3.1.8",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/finder.git", "url": "https://github.com/symfony/finder.git",
"reference": "9925935bf7144f9e4d2b976905881b4face036fb" "reference": "74dcd370c8d057882575e535616fde935e411b19"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/finder/zipball/9925935bf7144f9e4d2b976905881b4face036fb", "url": "https://api.github.com/repos/symfony/finder/zipball/74dcd370c8d057882575e535616fde935e411b19",
"reference": "9925935bf7144f9e4d2b976905881b4face036fb", "reference": "74dcd370c8d057882575e535616fde935e411b19",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2165,20 +2165,20 @@
], ],
"description": "Symfony Finder Component", "description": "Symfony Finder Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2016-11-03 08:04:31" "time": "2016-12-13 09:38:21"
}, },
{ {
"name": "symfony/http-foundation", "name": "symfony/http-foundation",
"version": "v3.1.7", "version": "v3.1.8",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/http-foundation.git", "url": "https://github.com/symfony/http-foundation.git",
"reference": "5a4c8099a1547fe451256e056180ad4624177017" "reference": "88a1d3cee2dbd06f7103ff63938743b903b65a92"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/http-foundation/zipball/5a4c8099a1547fe451256e056180ad4624177017", "url": "https://api.github.com/repos/symfony/http-foundation/zipball/88a1d3cee2dbd06f7103ff63938743b903b65a92",
"reference": "5a4c8099a1547fe451256e056180ad4624177017", "reference": "88a1d3cee2dbd06f7103ff63938743b903b65a92",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2218,20 +2218,20 @@
], ],
"description": "Symfony HttpFoundation Component", "description": "Symfony HttpFoundation Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2016-11-16 22:17:09" "time": "2016-11-27 04:21:07"
}, },
{ {
"name": "symfony/http-kernel", "name": "symfony/http-kernel",
"version": "v3.1.7", "version": "v3.1.8",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/http-kernel.git", "url": "https://github.com/symfony/http-kernel.git",
"reference": "674ac403c7b3742c2a988a86e3baf9aca2c696a0" "reference": "d7a4671a6f8e4174127770263dcd95bee5713f76"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/http-kernel/zipball/674ac403c7b3742c2a988a86e3baf9aca2c696a0", "url": "https://api.github.com/repos/symfony/http-kernel/zipball/d7a4671a6f8e4174127770263dcd95bee5713f76",
"reference": "674ac403c7b3742c2a988a86e3baf9aca2c696a0", "reference": "d7a4671a6f8e4174127770263dcd95bee5713f76",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2300,7 +2300,7 @@
], ],
"description": "Symfony HttpKernel Component", "description": "Symfony HttpKernel Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2016-11-21 02:44:20" "time": "2016-12-13 12:52:10"
}, },
{ {
"name": "symfony/polyfill-mbstring", "name": "symfony/polyfill-mbstring",
@ -2471,16 +2471,16 @@
}, },
{ {
"name": "symfony/process", "name": "symfony/process",
"version": "v3.1.7", "version": "v3.1.8",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/process.git", "url": "https://github.com/symfony/process.git",
"reference": "66de154ae86b1a07001da9fbffd620206e4faf94" "reference": "d23427a7f97a373129f61bc3b876fe4c66e2b3c7"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/process/zipball/66de154ae86b1a07001da9fbffd620206e4faf94", "url": "https://api.github.com/repos/symfony/process/zipball/d23427a7f97a373129f61bc3b876fe4c66e2b3c7",
"reference": "66de154ae86b1a07001da9fbffd620206e4faf94", "reference": "d23427a7f97a373129f61bc3b876fe4c66e2b3c7",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2516,20 +2516,20 @@
], ],
"description": "Symfony Process Component", "description": "Symfony Process Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2016-09-29 14:13:09" "time": "2016-11-24 01:08:05"
}, },
{ {
"name": "symfony/routing", "name": "symfony/routing",
"version": "v3.1.7", "version": "v3.1.8",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/routing.git", "url": "https://github.com/symfony/routing.git",
"reference": "8edf62498a1a4c57ba317664a4b698339c10cdf6" "reference": "4beb3dceb14cf2dd63dd222d1825ca981a2952cb"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/routing/zipball/8edf62498a1a4c57ba317664a4b698339c10cdf6", "url": "https://api.github.com/repos/symfony/routing/zipball/4beb3dceb14cf2dd63dd222d1825ca981a2952cb",
"reference": "8edf62498a1a4c57ba317664a4b698339c10cdf6", "reference": "4beb3dceb14cf2dd63dd222d1825ca981a2952cb",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2591,11 +2591,11 @@
"uri", "uri",
"url" "url"
], ],
"time": "2016-08-16 14:58:24" "time": "2016-11-25 12:27:14"
}, },
{ {
"name": "symfony/translation", "name": "symfony/translation",
"version": "v3.1.7", "version": "v3.1.8",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/translation.git", "url": "https://github.com/symfony/translation.git",
@ -2659,16 +2659,16 @@
}, },
{ {
"name": "symfony/var-dumper", "name": "symfony/var-dumper",
"version": "v3.1.7", "version": "v3.1.8",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/var-dumper.git", "url": "https://github.com/symfony/var-dumper.git",
"reference": "0c2d613e890e33f4da810159ac97931068f5bd17" "reference": "5ccbd23a97035886e595ce497dbe94bc88ac0b57"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/var-dumper/zipball/0c2d613e890e33f4da810159ac97931068f5bd17", "url": "https://api.github.com/repos/symfony/var-dumper/zipball/5ccbd23a97035886e595ce497dbe94bc88ac0b57",
"reference": "0c2d613e890e33f4da810159ac97931068f5bd17", "reference": "5ccbd23a97035886e595ce497dbe94bc88ac0b57",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2718,20 +2718,20 @@
"debug", "debug",
"dump" "dump"
], ],
"time": "2016-11-03 08:04:31" "time": "2016-12-08 14:58:14"
}, },
{ {
"name": "twig/twig", "name": "twig/twig",
"version": "v1.28.2", "version": "v1.29.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/twigphp/Twig.git", "url": "https://github.com/twigphp/Twig.git",
"reference": "b22ce0eb070e41f7cba65d78fe216de29726459c" "reference": "74f723e542368ca2080b252740be5f1113ebb898"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/twigphp/Twig/zipball/b22ce0eb070e41f7cba65d78fe216de29726459c", "url": "https://api.github.com/repos/twigphp/Twig/zipball/74f723e542368ca2080b252740be5f1113ebb898",
"reference": "b22ce0eb070e41f7cba65d78fe216de29726459c", "reference": "74f723e542368ca2080b252740be5f1113ebb898",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2744,7 +2744,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.28-dev" "dev-master": "1.29-dev"
} }
}, },
"autoload": { "autoload": {
@ -2779,7 +2779,7 @@
"keywords": [ "keywords": [
"templating" "templating"
], ],
"time": "2016-11-23 18:41:40" "time": "2016-12-13 17:28:18"
}, },
{ {
"name": "vlucas/phpdotenv", "name": "vlucas/phpdotenv",
@ -2939,16 +2939,16 @@
}, },
{ {
"name": "barryvdh/laravel-ide-helper", "name": "barryvdh/laravel-ide-helper",
"version": "v2.2.1", "version": "v2.2.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/barryvdh/laravel-ide-helper.git", "url": "https://github.com/barryvdh/laravel-ide-helper.git",
"reference": "28af7cd19ca41cc0c63dd1de2b46c2b84d31c463" "reference": "105f14a50d0959a0e80004a15b3350fdf78f9623"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/28af7cd19ca41cc0c63dd1de2b46c2b84d31c463", "url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/105f14a50d0959a0e80004a15b3350fdf78f9623",
"reference": "28af7cd19ca41cc0c63dd1de2b46c2b84d31c463", "reference": "105f14a50d0959a0e80004a15b3350fdf78f9623",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -3001,7 +3001,7 @@
"phpstorm", "phpstorm",
"sublime" "sublime"
], ],
"time": "2016-07-04 11:52:48" "time": "2016-11-15 08:21:23"
}, },
{ {
"name": "barryvdh/reflection-docblock", "name": "barryvdh/reflection-docblock",
@ -3822,16 +3822,16 @@
}, },
{ {
"name": "phpunit/phpunit", "name": "phpunit/phpunit",
"version": "5.7.2", "version": "5.7.4",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git", "url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "336aff0ac52e306c98e7455bc3e8d7b0bf777a5e" "reference": "af91da3f2671006ff5d0628023de3b7ac4d1ef09"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/336aff0ac52e306c98e7455bc3e8d7b0bf777a5e", "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/af91da3f2671006ff5d0628023de3b7ac4d1ef09",
"reference": "336aff0ac52e306c98e7455bc3e8d7b0bf777a5e", "reference": "af91da3f2671006ff5d0628023de3b7ac4d1ef09",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -3842,7 +3842,7 @@
"ext-xml": "*", "ext-xml": "*",
"myclabs/deep-copy": "~1.3", "myclabs/deep-copy": "~1.3",
"php": "^5.6 || ^7.0", "php": "^5.6 || ^7.0",
"phpspec/prophecy": "^1.3.1", "phpspec/prophecy": "^1.6.2",
"phpunit/php-code-coverage": "^4.0.3", "phpunit/php-code-coverage": "^4.0.3",
"phpunit/php-file-iterator": "~1.4", "phpunit/php-file-iterator": "~1.4",
"phpunit/php-text-template": "~1.2", "phpunit/php-text-template": "~1.2",
@ -3852,7 +3852,7 @@
"sebastian/diff": "~1.2", "sebastian/diff": "~1.2",
"sebastian/environment": "^1.3.4 || ^2.0", "sebastian/environment": "^1.3.4 || ^2.0",
"sebastian/exporter": "~2.0", "sebastian/exporter": "~2.0",
"sebastian/global-state": "~1.0", "sebastian/global-state": "^1.0 || ^2.0",
"sebastian/object-enumerator": "~2.0", "sebastian/object-enumerator": "~2.0",
"sebastian/resource-operations": "~1.0", "sebastian/resource-operations": "~1.0",
"sebastian/version": "~1.0|~2.0", "sebastian/version": "~1.0|~2.0",
@ -3900,20 +3900,20 @@
"testing", "testing",
"xunit" "xunit"
], ],
"time": "2016-12-03 08:33:00" "time": "2016-12-13 16:19:44"
}, },
{ {
"name": "phpunit/phpunit-mock-objects", "name": "phpunit/phpunit-mock-objects",
"version": "3.4.2", "version": "3.4.3",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git", "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
"reference": "90a08f5deed5f7ac35463c161f2e8fa0e5652faf" "reference": "3ab72b65b39b491e0c011e2e09bb2206c2aa8e24"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/90a08f5deed5f7ac35463c161f2e8fa0e5652faf", "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/3ab72b65b39b491e0c011e2e09bb2206c2aa8e24",
"reference": "90a08f5deed5f7ac35463c161f2e8fa0e5652faf", "reference": "3ab72b65b39b491e0c011e2e09bb2206c2aa8e24",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -3959,7 +3959,7 @@
"mock", "mock",
"xunit" "xunit"
], ],
"time": "2016-11-27 07:52:03" "time": "2016-12-08 20:27:08"
}, },
{ {
"name": "sebastian/code-unit-reverse-lookup", "name": "sebastian/code-unit-reverse-lookup",
@ -4476,7 +4476,7 @@
}, },
{ {
"name": "symfony/class-loader", "name": "symfony/class-loader",
"version": "v3.2.0", "version": "v3.2.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/class-loader.git", "url": "https://github.com/symfony/class-loader.git",
@ -4532,7 +4532,7 @@
}, },
{ {
"name": "symfony/css-selector", "name": "symfony/css-selector",
"version": "v3.1.7", "version": "v3.1.8",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/css-selector.git", "url": "https://github.com/symfony/css-selector.git",
@ -4585,16 +4585,16 @@
}, },
{ {
"name": "symfony/dom-crawler", "name": "symfony/dom-crawler",
"version": "v3.1.7", "version": "v3.1.8",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/dom-crawler.git", "url": "https://github.com/symfony/dom-crawler.git",
"reference": "1eb3b4d216e8db117218dd2bb7d23dfe67bdf518" "reference": "51e979357eba65b1e6aac7cba75cf5aa6379b8f3"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/dom-crawler/zipball/1eb3b4d216e8db117218dd2bb7d23dfe67bdf518", "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/51e979357eba65b1e6aac7cba75cf5aa6379b8f3",
"reference": "1eb3b4d216e8db117218dd2bb7d23dfe67bdf518", "reference": "51e979357eba65b1e6aac7cba75cf5aa6379b8f3",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -4637,20 +4637,20 @@
], ],
"description": "Symfony DomCrawler Component", "description": "Symfony DomCrawler Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2016-11-14 16:20:02" "time": "2016-12-10 14:24:45"
}, },
{ {
"name": "symfony/yaml", "name": "symfony/yaml",
"version": "v3.2.0", "version": "v3.2.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/yaml.git", "url": "https://github.com/symfony/yaml.git",
"reference": "f2300ba8fbb002c028710b92e1906e7457410693" "reference": "a7095af4b97a0955f85c8989106c249fa649011f"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/yaml/zipball/f2300ba8fbb002c028710b92e1906e7457410693", "url": "https://api.github.com/repos/symfony/yaml/zipball/a7095af4b97a0955f85c8989106c249fa649011f",
"reference": "f2300ba8fbb002c028710b92e1906e7457410693", "reference": "a7095af4b97a0955f85c8989106c249fa649011f",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -4692,7 +4692,7 @@
], ],
"description": "Symfony Yaml Component", "description": "Symfony Yaml Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2016-11-18 21:17:59" "time": "2016-12-10 10:07:06"
}, },
{ {
"name": "webmozart/assert", "name": "webmozart/assert",

2
routes/web.php
View File

@ -392,7 +392,7 @@ Route::group(
Route::get('trigger', ['uses' => 'JsonController@trigger', 'as' => 'trigger']); Route::get('trigger', ['uses' => 'JsonController@trigger', 'as' => 'trigger']);
Route::get('action', ['uses' => 'JsonController@action', 'as' => 'action']); Route::get('action', ['uses' => 'JsonController@action', 'as' => 'action']);
Route::post('end-tour', ['uses' => 'JsonController@endTour']); Route::post('end-tour', ['uses' => 'JsonController@endTour','as' => 'end-tour']);
} }
); );

37
tests/acceptance/Controllers/CategoryControllerTest.php
View File

@ -8,7 +8,12 @@
* *
* See the LICENSE file for details. * See the LICENSE file for details.
*/ */
use Carbon\Carbon;
use FireflyIII\Helpers\Collector\JournalCollectorInterface;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\Category\CategoryRepositoryInterface; use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
use Illuminate\Pagination\LengthAwarePaginator;
use Illuminate\Support\Collection;
/** /**
@ -114,6 +119,27 @@ class CategoryControllerTest extends TestCase
*/ */
public function testShow(string $range) public function testShow(string $range)
{ {
$collector = $this->mock(JournalCollectorInterface::class);
$accRepository = $this->mock(AccountRepositoryInterface::class);
$catRepository = $this->mock(CategoryRepositoryInterface::class);
$accRepository->shouldReceive('getAccountsByType')->once()->andReturn(new Collection);
$catRepository->shouldReceive('firstUseDate')->once()->andReturn(new Carbon);
// collector stuff:
$collector->shouldReceive('setPage')->andReturnSelf()->once();
$collector->shouldReceive('setLimit')->andReturnSelf()->once();
$collector->shouldReceive('setAllAssetAccounts')->andReturnSelf()->once();
$collector->shouldReceive('setRange')->andReturnSelf()->once();
$collector->shouldReceive('setCategory')->andReturnSelf()->once();
$collector->shouldReceive('getPaginatedJournals')->andReturn(new LengthAwarePaginator([], 0, 10))->once();
// more repos stuff:
$catRepository->shouldReceive('spentInPeriod')->andReturn('0');
$catRepository->shouldReceive('earnedInPeriod')->andReturn('0');
$this->be($this->user()); $this->be($this->user());
$this->changeDateRange($this->user(), $range); $this->changeDateRange($this->user(), $range);
$this->call('GET', route('categories.show', [1])); $this->call('GET', route('categories.show', [1]));
@ -129,6 +155,17 @@ class CategoryControllerTest extends TestCase
*/ */
public function testShowByDate(string $range) public function testShowByDate(string $range)
{ {
$collector = $this->mock(JournalCollectorInterface::class);
// collector stuff:
$collector->shouldReceive('setPage')->andReturnSelf()->once();
$collector->shouldReceive('setLimit')->andReturnSelf()->once();
$collector->shouldReceive('setAllAssetAccounts')->andReturnSelf()->once();
$collector->shouldReceive('setRange')->andReturnSelf()->once();
$collector->shouldReceive('setCategory')->andReturnSelf()->once();
$collector->shouldReceive('getPaginatedJournals')->andReturn(new LengthAwarePaginator([], 0, 10))->once();
$this->be($this->user()); $this->be($this->user());
$this->changeDateRange($this->user(), $range); $this->changeDateRange($this->user(), $range);
$this->call('GET', route('categories.show', [1, '2015-01-01'])); $this->call('GET', route('categories.show', [1, '2015-01-01']));

112
tests/acceptance/Controllers/JsonControllerTest.php
View File

@ -28,165 +28,131 @@ class JsonControllerTest extends TestCase
/** /**
* @covers \FireflyIII\Http\Controllers\JsonController::action * @covers \FireflyIII\Http\Controllers\JsonController::action
* Implement testAction().
*/ */
public function testAction() public function testAction()
{ {
// Remove the following lines when you implement this test. $this->be($this->user());
$this->markTestIncomplete( $this->call('get', route('json.action'));
'This test has not been implemented yet.' $this->assertResponseStatus(200);
);
} }
/** /**
* @covers \FireflyIII\Http\Controllers\JsonController::boxBillsPaid * @covers \FireflyIII\Http\Controllers\JsonController::boxBillsPaid
* Implement testBoxBillsPaid().
*/ */
public function testBoxBillsPaid() public function testBoxBillsPaid()
{ {
// Remove the following lines when you implement this test. $this->be($this->user());
$this->markTestIncomplete( $this->call('get', route('json.box.paid'));
'This test has not been implemented yet.' $this->assertResponseStatus(200);
);
} }
/** /**
* @covers \FireflyIII\Http\Controllers\JsonController::boxBillsUnpaid * @covers \FireflyIII\Http\Controllers\JsonController::boxBillsUnpaid
* Implement testBoxBillsUnpaid().
*/ */
public function testBoxBillsUnpaid() public function testBoxBillsUnpaid()
{ {
// Remove the following lines when you implement this test. $this->be($this->user());
$this->markTestIncomplete( $this->call('get', route('json.box.unpaid'));
'This test has not been implemented yet.' $this->assertResponseStatus(200);
);
} }
/** /**
* @covers \FireflyIII\Http\Controllers\JsonController::boxIn * @covers \FireflyIII\Http\Controllers\JsonController::boxIn
* Implement testBoxIn().
*/ */
public function testBoxIn() public function testBoxIn()
{ {
// Remove the following lines when you implement this test. $this->be($this->user());
$this->markTestIncomplete( $this->call('get', route('json.box.in'));
'This test has not been implemented yet.' $this->assertResponseStatus(200);
);
} }
/** /**
* @covers \FireflyIII\Http\Controllers\JsonController::boxOut * @covers \FireflyIII\Http\Controllers\JsonController::boxOut
* Implement testBoxOut().
*/ */
public function testBoxOut() public function testBoxOut()
{ {
// Remove the following lines when you implement this test. $this->be($this->user());
$this->markTestIncomplete( $this->call('get', route('json.box.out'));
'This test has not been implemented yet.' $this->assertResponseStatus(200);
);
} }
/** /**
* @covers \FireflyIII\Http\Controllers\JsonController::categories * @covers \FireflyIII\Http\Controllers\JsonController::categories
* Implement testCategories().
*/ */
public function testCategories() public function testCategories()
{ {
// Remove the following lines when you implement this test. $this->be($this->user());
$this->markTestIncomplete( $this->call('get', route('json.categories'));
'This test has not been implemented yet.' $this->assertResponseStatus(200);
);
} }
/** /**
* @covers \FireflyIII\Http\Controllers\JsonController::endTour * @covers \FireflyIII\Http\Controllers\JsonController::endTour
* Implement testEndTour().
*/ */
public function testEndTour() public function testEndTour()
{ {
// Remove the following lines when you implement this test. $this->be($this->user());
$this->markTestIncomplete( $this->call('post', route('json.end-tour'));
'This test has not been implemented yet.' $this->assertResponseStatus(200);
);
} }
/** /**
* @covers \FireflyIII\Http\Controllers\JsonController::expenseAccounts * @covers \FireflyIII\Http\Controllers\JsonController::expenseAccounts
* Implement testExpenseAccounts().
*/ */
public function testExpenseAccounts() public function testExpenseAccounts()
{ {
// Remove the following lines when you implement this test. $this->be($this->user());
$this->markTestIncomplete( $this->call('get', route('json.expense-accounts'));
'This test has not been implemented yet.' $this->assertResponseStatus(200);
);
} }
/** /**
* @covers \FireflyIII\Http\Controllers\JsonController::revenueAccounts * @covers \FireflyIII\Http\Controllers\JsonController::revenueAccounts
* Implement testRevenueAccounts().
*/ */
public function testRevenueAccounts() public function testRevenueAccounts()
{ {
// Remove the following lines when you implement this test. $this->be($this->user());
$this->markTestIncomplete( $this->call('get', route('json.revenue-accounts'));
'This test has not been implemented yet.' $this->assertResponseStatus(200);
);
} }
/** /**
* @covers \FireflyIII\Http\Controllers\JsonController::tags * @covers \FireflyIII\Http\Controllers\JsonController::tags
* Implement testTags().
*/ */
public function testTags() public function testTags()
{ {
// Remove the following lines when you implement this test. $this->be($this->user());
$this->markTestIncomplete( $this->call('get', route('json.tags'));
'This test has not been implemented yet.' $this->assertResponseStatus(200);
);
} }
/** /**
* @covers \FireflyIII\Http\Controllers\JsonController::tour * @covers \FireflyIII\Http\Controllers\JsonController::tour
* Implement testTour().
*/ */
public function testTour() public function testTour()
{ {
// Remove the following lines when you implement this test. $this->be($this->user());
$this->markTestIncomplete( $this->call('get', route('json.tour'));
'This test has not been implemented yet.' $this->assertResponseStatus(200);
);
} }
/** /**
* @covers \FireflyIII\Http\Controllers\JsonController::transactionJournals * @covers \FireflyIII\Http\Controllers\JsonController::transactionJournals
* Implement testTransactionJournals().
*/ */
public function testTransactionJournals() public function testTransactionJournals()
{ {
// Remove the following lines when you implement this test. $this->be($this->user());
$this->markTestIncomplete( $this->call('get', route('json.transaction-journals', ['deposit']));
'This test has not been implemented yet.' $this->assertResponseStatus(200);
);
} }
/** /**
* @covers \FireflyIII\Http\Controllers\JsonController::trigger * @covers \FireflyIII\Http\Controllers\JsonController::trigger
* Implement testTrigger().
*/ */
public function testTrigger() public function testTrigger()
{ {
// Remove the following lines when you implement this test. $this->be($this->user());
$this->markTestIncomplete( $this->call('get', route('json.trigger'));
'This test has not been implemented yet.' $this->assertResponseStatus(200);
);
}
/**
* Tears down the fixture, for example, closes a network connection.
* This method is called after a test is executed.
*/
protected function tearDown()
{
} }
} }

9
tests/acceptance/Controllers/NewUserControllerTest.php
View File

@ -28,7 +28,6 @@ class NewUserControllerTest extends TestCase
/** /**
* @covers \FireflyIII\Http\Controllers\NewUserController::index * @covers \FireflyIII\Http\Controllers\NewUserController::index
* Implement testIndex().
*/ */
public function testIndex() public function testIndex()
{ {
@ -40,7 +39,6 @@ class NewUserControllerTest extends TestCase
/** /**
* @covers \FireflyIII\Http\Controllers\NewUserController::submit * @covers \FireflyIII\Http\Controllers\NewUserController::submit
* Implement testSubmit().
*/ */
public function testSubmit() public function testSubmit()
{ {
@ -50,11 +48,4 @@ class NewUserControllerTest extends TestCase
); );
} }
/**
* Tears down the fixture, for example, closes a network connection.
* This method is called after a test is executed.
*/
protected function tearDown()
{
}
} }

7
tests/acceptance/Controllers/PiggyBankControllerTest.php
View File

@ -206,11 +206,4 @@ class PiggyBankControllerTest extends TestCase
); );
} }
/**
* Tears down the fixture, for example, closes a network connection.
* This method is called after a test is executed.
*/
protected function tearDown()
{
}
} }

8
tests/acceptance/Controllers/PreferencesControllerTest.php
View File

@ -85,12 +85,4 @@ class PreferencesControllerTest extends TestCase
'This test has not been implemented yet.' 'This test has not been implemented yet.'
); );
} }
/**
* Tears down the fixture, for example, closes a network connection.
* This method is called after a test is executed.
*/
protected function tearDown()
{
}
} }

8
tests/acceptance/Controllers/ProfileControllerTest.php
View File

@ -85,12 +85,4 @@ class ProfileControllerTest extends TestCase
'This test has not been implemented yet.' 'This test has not been implemented yet.'
); );
} }
/**
* Tears down the fixture, for example, closes a network connection.
* This method is called after a test is executed.
*/
protected function tearDown()
{
}
} }

8
tests/acceptance/Controllers/ReportControllerTest.php
View File

@ -109,12 +109,4 @@ class ReportControllerTest extends TestCase
'This test has not been implemented yet.' 'This test has not been implemented yet.'
); );
} }
/**
* Tears down the fixture, for example, closes a network connection.
* This method is called after a test is executed.
*/
protected function tearDown()
{
}
} }

8
tests/acceptance/Controllers/RuleControllerTest.php
View File

@ -169,12 +169,4 @@ class RuleControllerTest extends TestCase
'This test has not been implemented yet.' 'This test has not been implemented yet.'
); );
} }
/**
* Tears down the fixture, for example, closes a network connection.
* This method is called after a test is executed.
*/
protected function tearDown()
{
}
} }

8
tests/acceptance/Controllers/RuleGroupControllerTest.php
View File

@ -145,12 +145,4 @@ class RuleGroupControllerTest extends TestCase
'This test has not been implemented yet.' 'This test has not been implemented yet.'
); );
} }
/**
* Tears down the fixture, for example, closes a network connection.
* This method is called after a test is executed.
*/
protected function tearDown()
{
}
} }

8
tests/acceptance/Controllers/SearchControllerTest.php
View File

@ -37,12 +37,4 @@ class SearchControllerTest extends TestCase
'This test has not been implemented yet.' 'This test has not been implemented yet.'
); );
} }
/**
* Tears down the fixture, for example, closes a network connection.
* This method is called after a test is executed.
*/
protected function tearDown()
{
}
} }

8
tests/acceptance/Controllers/TagControllerTest.php
View File

@ -121,12 +121,4 @@ class TagControllerTest extends TestCase
'This test has not been implemented yet.' 'This test has not been implemented yet.'
); );
} }
/**
* Tears down the fixture, for example, closes a network connection.
* This method is called after a test is executed.
*/
protected function tearDown()
{
}
} }

8
tests/acceptance/Controllers/TransactionControllerTest.php
View File

@ -85,12 +85,4 @@ class TransactionControllerTest extends TestCase
'This test has not been implemented yet.' 'This test has not been implemented yet.'
); );
} }
/**
* Tears down the fixture, for example, closes a network connection.
* This method is called after a test is executed.
*/
protected function tearDown()
{
}
} }