From f8c5c1565564dac9a0d4864efdb6381326e70074 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 20 Nov 2016 07:24:18 +0100 Subject: [PATCH] Updated some tests. --- app/Http/Controllers/HomeController.php | 11 ++--- app/Support/Navigation.php | 22 ++++----- routes/web.php | 6 +-- .../Controllers/AccountControllerTest.php | 8 ++-- .../Admin/ConfigurationControllerTest.php | 8 ++-- .../Admin/DomainControllerTest.php | 8 ++-- .../Controllers/Admin/HomeControllerTest.php | 8 ++-- .../Controllers/Admin/UserControllerTest.php | 8 ++-- .../Controllers/AttachmentControllerTest.php | 8 ++-- .../Auth/ConfirmationControllerTest.php | 8 ++-- .../Auth/ForgotPasswordControllerTest.php | 8 ++-- .../Controllers/Auth/LoginControllerTest.php | 8 ++-- .../Auth/PasswordControllerTest.php | 8 ++-- .../Auth/RegisterControllerTest.php | 8 ++-- .../Auth/ResetPasswordControllerTest.php | 8 ++-- .../Auth/TwoFactorControllerTest.php | 8 ++-- .../Controllers/BillControllerTest.php | 8 ++-- .../Controllers/BudgetControllerTest.php | 8 ++-- .../Controllers/CategoryControllerTest.php | 8 ++-- .../Chart/AccountControllerTest.php | 8 ++-- .../Controllers/Chart/BillControllerTest.php | 8 ++-- .../Chart/BudgetControllerTest.php | 8 ++-- .../Chart/CategoryControllerTest.php | 8 ++-- .../Chart/CategoryReportControllerTest.php | 8 ++-- .../Chart/PiggyBankControllerTest.php | 8 ++-- .../Chart/ReportControllerTest.php | 8 ++-- .../acceptance/Controllers/ControllerTest.php | 8 ++-- .../Controllers/CurrencyControllerTest.php | 8 ++-- .../Controllers/ExportControllerTest.php | 8 ++-- .../Controllers/HelpControllerTest.php | 8 ++-- .../Controllers/HomeControllerTest.php | 45 +++++++++++++++++-- .../Controllers/ImportControllerTest.php | 8 ++-- .../Controllers/JsonControllerTest.php | 8 ++-- .../Controllers/NewUserControllerTest.php | 8 ++-- .../Controllers/PiggyBankControllerTest.php | 8 ++-- .../Popup/ReportControllerTest.php | 8 ++-- .../Controllers/PreferencesControllerTest.php | 8 ++-- .../Controllers/ProfileControllerTest.php | 8 ++-- .../Report/AccountControllerTest.php | 8 ++-- .../Report/BalanceControllerTest.php | 8 ++-- .../Report/BudgetControllerTest.php | 8 ++-- .../Report/CategoryControllerTest.php | 8 ++-- .../Report/InOutControllerTest.php | 8 ++-- .../Controllers/ReportControllerTest.php | 8 ++-- .../Controllers/RuleControllerTest.php | 8 ++-- .../Controllers/RuleGroupControllerTest.php | 8 ++-- .../Controllers/SearchControllerTest.php | 8 ++-- .../Controllers/TagControllerTest.php | 8 ++-- .../Transaction/ConvertControllerTest.php | 8 ++-- .../Transaction/MassControllerTest.php | 8 ++-- .../Transaction/SingleControllerTest.php | 8 ++-- .../Transaction/SplitControllerTest.php | 8 ++-- .../Controllers/TransactionControllerTest.php | 8 ++-- 53 files changed, 207 insertions(+), 269 deletions(-) diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index 8bf0a6c6e6..a8109734e9 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -169,8 +169,7 @@ class HomeController extends Controller 'admin.users.domains.block-', 'import.json', 'help.', ]; $routes = Route::getRoutes(); - - echo '
';
+        $return = '
';
 
         /** @var \Illuminate\Routing\Route $route */
         foreach ($routes as $route) {
@@ -178,15 +177,13 @@ class HomeController extends Controller
             $methods = $route->getMethods();
 
             if (!is_null($name) && strlen($name) > 0 && in_array('GET', $methods) && !$this->startsWithAny($ignore, $name)) {
-                echo sprintf('touch %s.md', $name) . "\n";
+                $return .= sprintf('touch %s.md', $name) . "\n";
 
             }
         }
-        echo '
';
+        $return .= '
'; - echo '
'; - - return ' '; + return $return; } /** diff --git a/app/Support/Navigation.php b/app/Support/Navigation.php index 449ac4e6ae..ed24425fbf 100644 --- a/app/Support/Navigation.php +++ b/app/Support/Navigation.php @@ -365,11 +365,12 @@ class Navigation public function updateEndDate(string $range, Carbon $start): Carbon { $functionMap = [ - '1D' => 'endOfDay', - '1W' => 'endOfWeek', - '1M' => 'endOfMonth', - '3M' => 'lastOfQuarter', - '1Y' => 'endOfYear', + '1D' => 'endOfDay', + '1W' => 'endOfWeek', + '1M' => 'endOfMonth', + '3M' => 'lastOfQuarter', + '1Y' => 'endOfYear', + 'custom' => 'startOfMonth', // this only happens in test situations. ]; $end = clone $start; @@ -402,11 +403,12 @@ class Navigation public function updateStartDate(string $range, Carbon $start): Carbon { $functionMap = [ - '1D' => 'startOfDay', - '1W' => 'startOfWeek', - '1M' => 'startOfMonth', - '3M' => 'firstOfQuarter', - '1Y' => 'startOfYear', + '1D' => 'startOfDay', + '1W' => 'startOfWeek', + '1M' => 'startOfMonth', + '3M' => 'firstOfQuarter', + '1Y' => 'startOfYear', + 'custom' => 'startOfMonth', // this only happens in test situations. ]; if (isset($functionMap[$range])) { $function = $functionMap[$range]; diff --git a/routes/web.php b/routes/web.php index 37bae1859b..5fa77bcc3b 100755 --- a/routes/web.php +++ b/routes/web.php @@ -39,9 +39,9 @@ Route::group( */ Route::group( ['middleware' => 'user-simple-auth'], function () { - Route::get('/error', 'HomeController@displayError'); + Route::get('/error', ['uses' => 'HomeController@displayError', 'as' => 'displayError']); Route::any('logout', ['uses' => 'Auth\LoginController@logout', 'as' => 'logout']); - Route::get('/flush', ['uses' => 'HomeController@flush']); + Route::get('/flush', ['uses' => 'HomeController@flush', 'as' => 'flush']); } ); @@ -83,7 +83,7 @@ Route::group( Route::get('/flash', ['uses' => 'HomeController@testFlash', 'as' => 'testFlash']); Route::get('/home', ['uses' => 'HomeController@index', 'as' => 'home']); Route::post('/daterange', ['uses' => 'HomeController@dateRange', 'as' => 'daterange']); - Route::get('/routes', ['uses' => 'HomeController@routes']); + Route::get('/routes', ['uses' => 'HomeController@routes', 'as' => 'allRoutes']); /** * Account Controller */ diff --git a/tests/acceptance/Controllers/AccountControllerTest.php b/tests/acceptance/Controllers/AccountControllerTest.php index 8dfbe9c1f8..3a00136ada 100644 --- a/tests/acceptance/Controllers/AccountControllerTest.php +++ b/tests/acceptance/Controllers/AccountControllerTest.php @@ -2,14 +2,12 @@ /** - * Generated by PHPUnit_SkeletonGenerator on 2016-11-19 at 19:28:38. + * Generated by PHPUnit_SkeletonGenerator on 2016-11-20 at 06:10:26. */ class AccountControllerTest extends TestCase { - /** - * @var AccountController - */ - protected $object; + + /** * Sets up the fixture, for example, opens a network connection. diff --git a/tests/acceptance/Controllers/Admin/ConfigurationControllerTest.php b/tests/acceptance/Controllers/Admin/ConfigurationControllerTest.php index 969d6a1f9f..a00b30beae 100644 --- a/tests/acceptance/Controllers/Admin/ConfigurationControllerTest.php +++ b/tests/acceptance/Controllers/Admin/ConfigurationControllerTest.php @@ -3,14 +3,12 @@ namespace Admin; use TestCase; /** - * Generated by PHPUnit_SkeletonGenerator on 2016-11-19 at 19:28:38. + * Generated by PHPUnit_SkeletonGenerator on 2016-11-20 at 06:10:26. */ class ConfigurationControllerTest extends TestCase { - /** - * @var ConfigurationController - */ - protected $object; + + /** * Sets up the fixture, for example, opens a network connection. diff --git a/tests/acceptance/Controllers/Admin/DomainControllerTest.php b/tests/acceptance/Controllers/Admin/DomainControllerTest.php index 4ab67c980d..faee8052ae 100644 --- a/tests/acceptance/Controllers/Admin/DomainControllerTest.php +++ b/tests/acceptance/Controllers/Admin/DomainControllerTest.php @@ -3,14 +3,12 @@ namespace Admin; use TestCase; /** - * Generated by PHPUnit_SkeletonGenerator on 2016-11-19 at 19:28:38. + * Generated by PHPUnit_SkeletonGenerator on 2016-11-20 at 06:10:26. */ class DomainControllerTest extends TestCase { - /** - * @var DomainController - */ - protected $object; + + /** * Sets up the fixture, for example, opens a network connection. diff --git a/tests/acceptance/Controllers/Admin/HomeControllerTest.php b/tests/acceptance/Controllers/Admin/HomeControllerTest.php index d4adb3629d..8582f47b9c 100644 --- a/tests/acceptance/Controllers/Admin/HomeControllerTest.php +++ b/tests/acceptance/Controllers/Admin/HomeControllerTest.php @@ -3,14 +3,12 @@ namespace Admin; use TestCase; /** - * Generated by PHPUnit_SkeletonGenerator on 2016-11-19 at 19:28:38. + * Generated by PHPUnit_SkeletonGenerator on 2016-11-20 at 06:10:26. */ class HomeControllerTest extends TestCase { - /** - * @var HomeController - */ - protected $object; + + /** * Sets up the fixture, for example, opens a network connection. diff --git a/tests/acceptance/Controllers/Admin/UserControllerTest.php b/tests/acceptance/Controllers/Admin/UserControllerTest.php index 1c5c8aa66b..1bda62a3bc 100644 --- a/tests/acceptance/Controllers/Admin/UserControllerTest.php +++ b/tests/acceptance/Controllers/Admin/UserControllerTest.php @@ -3,14 +3,12 @@ namespace Admin; use TestCase; /** - * Generated by PHPUnit_SkeletonGenerator on 2016-11-19 at 19:28:38. + * Generated by PHPUnit_SkeletonGenerator on 2016-11-20 at 06:10:26. */ class UserControllerTest extends TestCase { - /** - * @var UserController - */ - protected $object; + + /** * Sets up the fixture, for example, opens a network connection. diff --git a/tests/acceptance/Controllers/AttachmentControllerTest.php b/tests/acceptance/Controllers/AttachmentControllerTest.php index a3aa8ba5c3..21e23768f4 100644 --- a/tests/acceptance/Controllers/AttachmentControllerTest.php +++ b/tests/acceptance/Controllers/AttachmentControllerTest.php @@ -2,14 +2,12 @@ /** - * Generated by PHPUnit_SkeletonGenerator on 2016-11-19 at 19:28:38. + * Generated by PHPUnit_SkeletonGenerator on 2016-11-20 at 06:10:26. */ class AttachmentControllerTest extends TestCase { - /** - * @var AttachmentController - */ - protected $object; + + /** * Sets up the fixture, for example, opens a network connection. diff --git a/tests/acceptance/Controllers/Auth/ConfirmationControllerTest.php b/tests/acceptance/Controllers/Auth/ConfirmationControllerTest.php index bcbf659c50..ba14dab239 100644 --- a/tests/acceptance/Controllers/Auth/ConfirmationControllerTest.php +++ b/tests/acceptance/Controllers/Auth/ConfirmationControllerTest.php @@ -3,14 +3,12 @@ namespace Auth; use TestCase; /** - * Generated by PHPUnit_SkeletonGenerator on 2016-11-19 at 19:28:38. + * Generated by PHPUnit_SkeletonGenerator on 2016-11-20 at 06:10:26. */ class ConfirmationControllerTest extends TestCase { - /** - * @var ConfirmationController - */ - protected $object; + + /** * Sets up the fixture, for example, opens a network connection. diff --git a/tests/acceptance/Controllers/Auth/ForgotPasswordControllerTest.php b/tests/acceptance/Controllers/Auth/ForgotPasswordControllerTest.php index 9229664a80..1081139c32 100644 --- a/tests/acceptance/Controllers/Auth/ForgotPasswordControllerTest.php +++ b/tests/acceptance/Controllers/Auth/ForgotPasswordControllerTest.php @@ -3,14 +3,12 @@ namespace Auth; use TestCase; /** - * Generated by PHPUnit_SkeletonGenerator on 2016-11-19 at 19:28:38. + * Generated by PHPUnit_SkeletonGenerator on 2016-11-20 at 06:10:26. */ class ForgotPasswordControllerTest extends TestCase { - /** - * @var ForgotPasswordController - */ - protected $object; + + /** * Sets up the fixture, for example, opens a network connection. diff --git a/tests/acceptance/Controllers/Auth/LoginControllerTest.php b/tests/acceptance/Controllers/Auth/LoginControllerTest.php index 21a46f6015..9f536f4041 100644 --- a/tests/acceptance/Controllers/Auth/LoginControllerTest.php +++ b/tests/acceptance/Controllers/Auth/LoginControllerTest.php @@ -3,14 +3,12 @@ namespace Auth; use TestCase; /** - * Generated by PHPUnit_SkeletonGenerator on 2016-11-19 at 19:28:39. + * Generated by PHPUnit_SkeletonGenerator on 2016-11-20 at 06:10:27. */ class LoginControllerTest extends TestCase { - /** - * @var LoginController - */ - protected $object; + + /** * Sets up the fixture, for example, opens a network connection. diff --git a/tests/acceptance/Controllers/Auth/PasswordControllerTest.php b/tests/acceptance/Controllers/Auth/PasswordControllerTest.php index d2714b9fed..09b82673f1 100644 --- a/tests/acceptance/Controllers/Auth/PasswordControllerTest.php +++ b/tests/acceptance/Controllers/Auth/PasswordControllerTest.php @@ -3,14 +3,12 @@ namespace Auth; use TestCase; /** - * Generated by PHPUnit_SkeletonGenerator on 2016-11-19 at 19:28:39. + * Generated by PHPUnit_SkeletonGenerator on 2016-11-20 at 06:10:27. */ class PasswordControllerTest extends TestCase { - /** - * @var PasswordController - */ - protected $object; + + /** * Sets up the fixture, for example, opens a network connection. diff --git a/tests/acceptance/Controllers/Auth/RegisterControllerTest.php b/tests/acceptance/Controllers/Auth/RegisterControllerTest.php index 47bd7b7b0a..68b0b50054 100644 --- a/tests/acceptance/Controllers/Auth/RegisterControllerTest.php +++ b/tests/acceptance/Controllers/Auth/RegisterControllerTest.php @@ -3,14 +3,12 @@ namespace Auth; use TestCase; /** - * Generated by PHPUnit_SkeletonGenerator on 2016-11-19 at 19:28:39. + * Generated by PHPUnit_SkeletonGenerator on 2016-11-20 at 06:10:27. */ class RegisterControllerTest extends TestCase { - /** - * @var RegisterController - */ - protected $object; + + /** * Sets up the fixture, for example, opens a network connection. diff --git a/tests/acceptance/Controllers/Auth/ResetPasswordControllerTest.php b/tests/acceptance/Controllers/Auth/ResetPasswordControllerTest.php index 33f20a0dde..003025cadc 100644 --- a/tests/acceptance/Controllers/Auth/ResetPasswordControllerTest.php +++ b/tests/acceptance/Controllers/Auth/ResetPasswordControllerTest.php @@ -3,14 +3,12 @@ namespace Auth; use TestCase; /** - * Generated by PHPUnit_SkeletonGenerator on 2016-11-19 at 19:28:39. + * Generated by PHPUnit_SkeletonGenerator on 2016-11-20 at 06:10:27. */ class ResetPasswordControllerTest extends TestCase { - /** - * @var ResetPasswordController - */ - protected $object; + + /** * Sets up the fixture, for example, opens a network connection. diff --git a/tests/acceptance/Controllers/Auth/TwoFactorControllerTest.php b/tests/acceptance/Controllers/Auth/TwoFactorControllerTest.php index a26f0b5bf9..4f89d40917 100644 --- a/tests/acceptance/Controllers/Auth/TwoFactorControllerTest.php +++ b/tests/acceptance/Controllers/Auth/TwoFactorControllerTest.php @@ -3,14 +3,12 @@ namespace Auth; use TestCase; /** - * Generated by PHPUnit_SkeletonGenerator on 2016-11-19 at 19:28:39. + * Generated by PHPUnit_SkeletonGenerator on 2016-11-20 at 06:10:27. */ class TwoFactorControllerTest extends TestCase { - /** - * @var TwoFactorController - */ - protected $object; + + /** * Sets up the fixture, for example, opens a network connection. diff --git a/tests/acceptance/Controllers/BillControllerTest.php b/tests/acceptance/Controllers/BillControllerTest.php index 4d45549939..efe042f57d 100644 --- a/tests/acceptance/Controllers/BillControllerTest.php +++ b/tests/acceptance/Controllers/BillControllerTest.php @@ -2,14 +2,12 @@ /** - * Generated by PHPUnit_SkeletonGenerator on 2016-11-19 at 19:28:39. + * Generated by PHPUnit_SkeletonGenerator on 2016-11-20 at 06:10:27. */ class BillControllerTest extends TestCase { - /** - * @var BillController - */ - protected $object; + + /** * Sets up the fixture, for example, opens a network connection. diff --git a/tests/acceptance/Controllers/BudgetControllerTest.php b/tests/acceptance/Controllers/BudgetControllerTest.php index 9bcd562dcd..8323bf9aac 100644 --- a/tests/acceptance/Controllers/BudgetControllerTest.php +++ b/tests/acceptance/Controllers/BudgetControllerTest.php @@ -2,14 +2,12 @@ /** - * Generated by PHPUnit_SkeletonGenerator on 2016-11-19 at 19:28:39. + * Generated by PHPUnit_SkeletonGenerator on 2016-11-20 at 06:10:28. */ class BudgetControllerTest extends TestCase { - /** - * @var BudgetController - */ - protected $object; + + /** * Sets up the fixture, for example, opens a network connection. diff --git a/tests/acceptance/Controllers/CategoryControllerTest.php b/tests/acceptance/Controllers/CategoryControllerTest.php index 3720334941..2ed594653d 100644 --- a/tests/acceptance/Controllers/CategoryControllerTest.php +++ b/tests/acceptance/Controllers/CategoryControllerTest.php @@ -2,14 +2,12 @@ /** - * Generated by PHPUnit_SkeletonGenerator on 2016-11-19 at 19:28:40. + * Generated by PHPUnit_SkeletonGenerator on 2016-11-20 at 06:10:28. */ class CategoryControllerTest extends TestCase { - /** - * @var CategoryController - */ - protected $object; + + /** * Sets up the fixture, for example, opens a network connection. diff --git a/tests/acceptance/Controllers/Chart/AccountControllerTest.php b/tests/acceptance/Controllers/Chart/AccountControllerTest.php index 94b516b1c9..c7d662f1f2 100644 --- a/tests/acceptance/Controllers/Chart/AccountControllerTest.php +++ b/tests/acceptance/Controllers/Chart/AccountControllerTest.php @@ -3,14 +3,12 @@ namespace Chart; use TestCase; /** - * Generated by PHPUnit_SkeletonGenerator on 2016-11-19 at 19:28:40. + * Generated by PHPUnit_SkeletonGenerator on 2016-11-20 at 06:10:28. */ class AccountControllerTest extends TestCase { - /** - * @var AccountController - */ - protected $object; + + /** * Sets up the fixture, for example, opens a network connection. diff --git a/tests/acceptance/Controllers/Chart/BillControllerTest.php b/tests/acceptance/Controllers/Chart/BillControllerTest.php index c9ceba540e..a6545676c7 100644 --- a/tests/acceptance/Controllers/Chart/BillControllerTest.php +++ b/tests/acceptance/Controllers/Chart/BillControllerTest.php @@ -3,14 +3,12 @@ namespace Chart; use TestCase; /** - * Generated by PHPUnit_SkeletonGenerator on 2016-11-19 at 19:28:40. + * Generated by PHPUnit_SkeletonGenerator on 2016-11-20 at 06:10:28. */ class BillControllerTest extends TestCase { - /** - * @var BillController - */ - protected $object; + + /** * Sets up the fixture, for example, opens a network connection. diff --git a/tests/acceptance/Controllers/Chart/BudgetControllerTest.php b/tests/acceptance/Controllers/Chart/BudgetControllerTest.php index a58fc719eb..36d3c25e55 100644 --- a/tests/acceptance/Controllers/Chart/BudgetControllerTest.php +++ b/tests/acceptance/Controllers/Chart/BudgetControllerTest.php @@ -3,14 +3,12 @@ namespace Chart; use TestCase; /** - * Generated by PHPUnit_SkeletonGenerator on 2016-11-19 at 19:28:40. + * Generated by PHPUnit_SkeletonGenerator on 2016-11-20 at 06:10:28. */ class BudgetControllerTest extends TestCase { - /** - * @var BudgetController - */ - protected $object; + + /** * Sets up the fixture, for example, opens a network connection. diff --git a/tests/acceptance/Controllers/Chart/CategoryControllerTest.php b/tests/acceptance/Controllers/Chart/CategoryControllerTest.php index a9f5708675..769a528888 100644 --- a/tests/acceptance/Controllers/Chart/CategoryControllerTest.php +++ b/tests/acceptance/Controllers/Chart/CategoryControllerTest.php @@ -3,14 +3,12 @@ namespace Chart; use TestCase; /** - * Generated by PHPUnit_SkeletonGenerator on 2016-11-19 at 19:28:40. + * Generated by PHPUnit_SkeletonGenerator on 2016-11-20 at 06:10:28. */ class CategoryControllerTest extends TestCase { - /** - * @var CategoryController - */ - protected $object; + + /** * Sets up the fixture, for example, opens a network connection. diff --git a/tests/acceptance/Controllers/Chart/CategoryReportControllerTest.php b/tests/acceptance/Controllers/Chart/CategoryReportControllerTest.php index bb45625b17..754c0442fb 100644 --- a/tests/acceptance/Controllers/Chart/CategoryReportControllerTest.php +++ b/tests/acceptance/Controllers/Chart/CategoryReportControllerTest.php @@ -3,14 +3,12 @@ namespace Chart; use TestCase; /** - * Generated by PHPUnit_SkeletonGenerator on 2016-11-19 at 19:28:40. + * Generated by PHPUnit_SkeletonGenerator on 2016-11-20 at 06:10:28. */ class CategoryReportControllerTest extends TestCase { - /** - * @var CategoryReportController - */ - protected $object; + + /** * Sets up the fixture, for example, opens a network connection. diff --git a/tests/acceptance/Controllers/Chart/PiggyBankControllerTest.php b/tests/acceptance/Controllers/Chart/PiggyBankControllerTest.php index 38d4a4472f..aa33dbb5df 100644 --- a/tests/acceptance/Controllers/Chart/PiggyBankControllerTest.php +++ b/tests/acceptance/Controllers/Chart/PiggyBankControllerTest.php @@ -3,14 +3,12 @@ namespace Chart; use TestCase; /** - * Generated by PHPUnit_SkeletonGenerator on 2016-11-19 at 19:28:41. + * Generated by PHPUnit_SkeletonGenerator on 2016-11-20 at 06:10:28. */ class PiggyBankControllerTest extends TestCase { - /** - * @var PiggyBankController - */ - protected $object; + + /** * Sets up the fixture, for example, opens a network connection. diff --git a/tests/acceptance/Controllers/Chart/ReportControllerTest.php b/tests/acceptance/Controllers/Chart/ReportControllerTest.php index 93402f3d9d..c354a6f40f 100644 --- a/tests/acceptance/Controllers/Chart/ReportControllerTest.php +++ b/tests/acceptance/Controllers/Chart/ReportControllerTest.php @@ -3,14 +3,12 @@ namespace Chart; use TestCase; /** - * Generated by PHPUnit_SkeletonGenerator on 2016-11-19 at 19:28:41. + * Generated by PHPUnit_SkeletonGenerator on 2016-11-20 at 06:10:29. */ class ReportControllerTest extends TestCase { - /** - * @var ReportController - */ - protected $object; + + /** * Sets up the fixture, for example, opens a network connection. diff --git a/tests/acceptance/Controllers/ControllerTest.php b/tests/acceptance/Controllers/ControllerTest.php index c323b6736d..53c3aebbc0 100644 --- a/tests/acceptance/Controllers/ControllerTest.php +++ b/tests/acceptance/Controllers/ControllerTest.php @@ -2,14 +2,12 @@ /** - * Generated by PHPUnit_SkeletonGenerator on 2016-11-19 at 19:28:41. + * Generated by PHPUnit_SkeletonGenerator on 2016-11-20 at 06:10:29. */ class ControllerTest extends TestCase { - /** - * @var Controller - */ - protected $object; + + /** * Sets up the fixture, for example, opens a network connection. diff --git a/tests/acceptance/Controllers/CurrencyControllerTest.php b/tests/acceptance/Controllers/CurrencyControllerTest.php index 69a9e19ea0..bfdcad48ba 100644 --- a/tests/acceptance/Controllers/CurrencyControllerTest.php +++ b/tests/acceptance/Controllers/CurrencyControllerTest.php @@ -2,14 +2,12 @@ /** - * Generated by PHPUnit_SkeletonGenerator on 2016-11-19 at 19:28:41. + * Generated by PHPUnit_SkeletonGenerator on 2016-11-20 at 06:10:29. */ class CurrencyControllerTest extends TestCase { - /** - * @var CurrencyController - */ - protected $object; + + /** * Sets up the fixture, for example, opens a network connection. diff --git a/tests/acceptance/Controllers/ExportControllerTest.php b/tests/acceptance/Controllers/ExportControllerTest.php index 12bb96391f..3d0b152a95 100644 --- a/tests/acceptance/Controllers/ExportControllerTest.php +++ b/tests/acceptance/Controllers/ExportControllerTest.php @@ -2,14 +2,12 @@ /** - * Generated by PHPUnit_SkeletonGenerator on 2016-11-19 at 19:28:41. + * Generated by PHPUnit_SkeletonGenerator on 2016-11-20 at 06:10:29. */ class ExportControllerTest extends TestCase { - /** - * @var ExportController - */ - protected $object; + + /** * Sets up the fixture, for example, opens a network connection. diff --git a/tests/acceptance/Controllers/HelpControllerTest.php b/tests/acceptance/Controllers/HelpControllerTest.php index b850723126..e43f03b38c 100644 --- a/tests/acceptance/Controllers/HelpControllerTest.php +++ b/tests/acceptance/Controllers/HelpControllerTest.php @@ -2,14 +2,12 @@ /** - * Generated by PHPUnit_SkeletonGenerator on 2016-11-19 at 19:28:41. + * Generated by PHPUnit_SkeletonGenerator on 2016-11-20 at 06:10:29. */ class HelpControllerTest extends TestCase { - /** - * @var HelpController - */ - protected $object; + + /** * Sets up the fixture, for example, opens a network connection. diff --git a/tests/acceptance/Controllers/HomeControllerTest.php b/tests/acceptance/Controllers/HomeControllerTest.php index 7d4abdcdc8..75e109e2a2 100755 --- a/tests/acceptance/Controllers/HomeControllerTest.php +++ b/tests/acceptance/Controllers/HomeControllerTest.php @@ -30,19 +30,28 @@ class HomeControllerTest extends TestCase 'end' => '2012-04-01', ]; - // if date range is > 50, should have flash. - $this->call('POST', '/daterange', $args); + $this->call('POST', route('daterange'), $args); $this->assertResponseStatus(200); $this->assertSessionHas('warning', '91 days of data may take a while to load.'); } + /** + * @covers FireflyIII\Http\Controllers\HomeController::displayError + */ + public function testDisplayError() + { + $this->be($this->user()); + $this->call('GET', route('displayError')); + $this->assertResponseStatus(500); + } + /** * @covers FireflyIII\Http\Controllers\HomeController::flush */ public function testFlush() { $this->be($this->user()); - $this->call('GET', '/flush'); + $this->call('GET', route('flush')); $this->assertResponseStatus(302); } @@ -57,7 +66,35 @@ class HomeControllerTest extends TestCase { $this->be($this->user()); $this->changeDateRange($this->user(), $range); - $this->call('GET', '/'); + $this->call('GET', route('index')); $this->assertResponseStatus(200); } + + /** + * @covers FireflyIII\Http\Controllers\HomeController::routes + * @dataProvider dateRangeProvider + * + * @param string $range + */ + public function testRoutes(string $range) + { + $this->be($this->user()); + $this->changeDateRange($this->user(), $range); + $this->call('GET', route('allRoutes')); + $this->assertResponseStatus(200); + } + + /** + * @covers FireflyIII\Http\Controllers\HomeController::testFlash + */ + public function testTestFlash() + { + $this->be($this->user()); + $this->call('GET', route('testFlash')); + $this->assertResponseStatus(302); + $this->assertSessionHas('success'); + $this->assertSessionHas('info'); + $this->assertSessionHas('warning'); + $this->assertSessionHas('error'); + } } diff --git a/tests/acceptance/Controllers/ImportControllerTest.php b/tests/acceptance/Controllers/ImportControllerTest.php index 2c19894ec8..4cb4357466 100644 --- a/tests/acceptance/Controllers/ImportControllerTest.php +++ b/tests/acceptance/Controllers/ImportControllerTest.php @@ -2,14 +2,12 @@ /** - * Generated by PHPUnit_SkeletonGenerator on 2016-11-19 at 19:28:41. + * Generated by PHPUnit_SkeletonGenerator on 2016-11-20 at 06:10:29. */ class ImportControllerTest extends TestCase { - /** - * @var ImportController - */ - protected $object; + + /** * Sets up the fixture, for example, opens a network connection. diff --git a/tests/acceptance/Controllers/JsonControllerTest.php b/tests/acceptance/Controllers/JsonControllerTest.php index dc628321d1..1807dbaafe 100644 --- a/tests/acceptance/Controllers/JsonControllerTest.php +++ b/tests/acceptance/Controllers/JsonControllerTest.php @@ -2,14 +2,12 @@ /** - * Generated by PHPUnit_SkeletonGenerator on 2016-11-19 at 19:28:42. + * Generated by PHPUnit_SkeletonGenerator on 2016-11-20 at 06:10:29. */ class JsonControllerTest extends TestCase { - /** - * @var JsonController - */ - protected $object; + + /** * Sets up the fixture, for example, opens a network connection. diff --git a/tests/acceptance/Controllers/NewUserControllerTest.php b/tests/acceptance/Controllers/NewUserControllerTest.php index 051ee41cbb..1d9438465d 100644 --- a/tests/acceptance/Controllers/NewUserControllerTest.php +++ b/tests/acceptance/Controllers/NewUserControllerTest.php @@ -2,14 +2,12 @@ /** - * Generated by PHPUnit_SkeletonGenerator on 2016-11-19 at 19:28:42. + * Generated by PHPUnit_SkeletonGenerator on 2016-11-20 at 06:10:29. */ class NewUserControllerTest extends TestCase { - /** - * @var NewUserController - */ - protected $object; + + /** * Sets up the fixture, for example, opens a network connection. diff --git a/tests/acceptance/Controllers/PiggyBankControllerTest.php b/tests/acceptance/Controllers/PiggyBankControllerTest.php index 8255486f97..5b7e5922ea 100644 --- a/tests/acceptance/Controllers/PiggyBankControllerTest.php +++ b/tests/acceptance/Controllers/PiggyBankControllerTest.php @@ -2,14 +2,12 @@ /** - * Generated by PHPUnit_SkeletonGenerator on 2016-11-19 at 19:28:42. + * Generated by PHPUnit_SkeletonGenerator on 2016-11-20 at 06:10:30. */ class PiggyBankControllerTest extends TestCase { - /** - * @var PiggyBankController - */ - protected $object; + + /** * Sets up the fixture, for example, opens a network connection. diff --git a/tests/acceptance/Controllers/Popup/ReportControllerTest.php b/tests/acceptance/Controllers/Popup/ReportControllerTest.php index 35c673e0a3..897e6f3604 100644 --- a/tests/acceptance/Controllers/Popup/ReportControllerTest.php +++ b/tests/acceptance/Controllers/Popup/ReportControllerTest.php @@ -3,14 +3,12 @@ namespace Popup; use TestCase; /** - * Generated by PHPUnit_SkeletonGenerator on 2016-11-19 at 19:28:42. + * Generated by PHPUnit_SkeletonGenerator on 2016-11-20 at 06:10:30. */ class ReportControllerTest extends TestCase { - /** - * @var ReportController - */ - protected $object; + + /** * Sets up the fixture, for example, opens a network connection. diff --git a/tests/acceptance/Controllers/PreferencesControllerTest.php b/tests/acceptance/Controllers/PreferencesControllerTest.php index 25ea2d911c..b74fee6265 100644 --- a/tests/acceptance/Controllers/PreferencesControllerTest.php +++ b/tests/acceptance/Controllers/PreferencesControllerTest.php @@ -2,14 +2,12 @@ /** - * Generated by PHPUnit_SkeletonGenerator on 2016-11-19 at 19:28:42. + * Generated by PHPUnit_SkeletonGenerator on 2016-11-20 at 06:10:31. */ class PreferencesControllerTest extends TestCase { - /** - * @var PreferencesController - */ - protected $object; + + /** * Sets up the fixture, for example, opens a network connection. diff --git a/tests/acceptance/Controllers/ProfileControllerTest.php b/tests/acceptance/Controllers/ProfileControllerTest.php index d238bf741b..d374aa9449 100644 --- a/tests/acceptance/Controllers/ProfileControllerTest.php +++ b/tests/acceptance/Controllers/ProfileControllerTest.php @@ -2,14 +2,12 @@ /** - * Generated by PHPUnit_SkeletonGenerator on 2016-11-19 at 19:28:42. + * Generated by PHPUnit_SkeletonGenerator on 2016-11-20 at 06:10:31. */ class ProfileControllerTest extends TestCase { - /** - * @var ProfileController - */ - protected $object; + + /** * Sets up the fixture, for example, opens a network connection. diff --git a/tests/acceptance/Controllers/Report/AccountControllerTest.php b/tests/acceptance/Controllers/Report/AccountControllerTest.php index 5d8f09e4af..59e20540eb 100644 --- a/tests/acceptance/Controllers/Report/AccountControllerTest.php +++ b/tests/acceptance/Controllers/Report/AccountControllerTest.php @@ -3,14 +3,12 @@ namespace Report; use TestCase; /** - * Generated by PHPUnit_SkeletonGenerator on 2016-11-19 at 19:28:42. + * Generated by PHPUnit_SkeletonGenerator on 2016-11-20 at 06:10:31. */ class AccountControllerTest extends TestCase { - /** - * @var AccountController - */ - protected $object; + + /** * Sets up the fixture, for example, opens a network connection. diff --git a/tests/acceptance/Controllers/Report/BalanceControllerTest.php b/tests/acceptance/Controllers/Report/BalanceControllerTest.php index bff80f9e00..0d4b2e3b60 100644 --- a/tests/acceptance/Controllers/Report/BalanceControllerTest.php +++ b/tests/acceptance/Controllers/Report/BalanceControllerTest.php @@ -3,14 +3,12 @@ namespace Report; use TestCase; /** - * Generated by PHPUnit_SkeletonGenerator on 2016-11-19 at 19:28:43. + * Generated by PHPUnit_SkeletonGenerator on 2016-11-20 at 06:10:32. */ class BalanceControllerTest extends TestCase { - /** - * @var BalanceController - */ - protected $object; + + /** * Sets up the fixture, for example, opens a network connection. diff --git a/tests/acceptance/Controllers/Report/BudgetControllerTest.php b/tests/acceptance/Controllers/Report/BudgetControllerTest.php index 6d596982a8..940c0a8379 100644 --- a/tests/acceptance/Controllers/Report/BudgetControllerTest.php +++ b/tests/acceptance/Controllers/Report/BudgetControllerTest.php @@ -3,14 +3,12 @@ namespace Report; use TestCase; /** - * Generated by PHPUnit_SkeletonGenerator on 2016-11-19 at 19:28:43. + * Generated by PHPUnit_SkeletonGenerator on 2016-11-20 at 06:10:32. */ class BudgetControllerTest extends TestCase { - /** - * @var BudgetController - */ - protected $object; + + /** * Sets up the fixture, for example, opens a network connection. diff --git a/tests/acceptance/Controllers/Report/CategoryControllerTest.php b/tests/acceptance/Controllers/Report/CategoryControllerTest.php index 4bb0759a95..b56c517109 100644 --- a/tests/acceptance/Controllers/Report/CategoryControllerTest.php +++ b/tests/acceptance/Controllers/Report/CategoryControllerTest.php @@ -3,14 +3,12 @@ namespace Report; use TestCase; /** - * Generated by PHPUnit_SkeletonGenerator on 2016-11-19 at 19:28:43. + * Generated by PHPUnit_SkeletonGenerator on 2016-11-20 at 06:10:32. */ class CategoryControllerTest extends TestCase { - /** - * @var CategoryController - */ - protected $object; + + /** * Sets up the fixture, for example, opens a network connection. diff --git a/tests/acceptance/Controllers/Report/InOutControllerTest.php b/tests/acceptance/Controllers/Report/InOutControllerTest.php index 862d7f307a..2998f583c2 100644 --- a/tests/acceptance/Controllers/Report/InOutControllerTest.php +++ b/tests/acceptance/Controllers/Report/InOutControllerTest.php @@ -3,14 +3,12 @@ namespace Report; use TestCase; /** - * Generated by PHPUnit_SkeletonGenerator on 2016-11-19 at 19:28:43. + * Generated by PHPUnit_SkeletonGenerator on 2016-11-20 at 06:10:32. */ class InOutControllerTest extends TestCase { - /** - * @var InOutController - */ - protected $object; + + /** * Sets up the fixture, for example, opens a network connection. diff --git a/tests/acceptance/Controllers/ReportControllerTest.php b/tests/acceptance/Controllers/ReportControllerTest.php index ebd94ed67e..b0a60cade1 100644 --- a/tests/acceptance/Controllers/ReportControllerTest.php +++ b/tests/acceptance/Controllers/ReportControllerTest.php @@ -2,14 +2,12 @@ /** - * Generated by PHPUnit_SkeletonGenerator on 2016-11-19 at 19:28:43. + * Generated by PHPUnit_SkeletonGenerator on 2016-11-20 at 06:10:33. */ class ReportControllerTest extends TestCase { - /** - * @var ReportController - */ - protected $object; + + /** * Sets up the fixture, for example, opens a network connection. diff --git a/tests/acceptance/Controllers/RuleControllerTest.php b/tests/acceptance/Controllers/RuleControllerTest.php index 990fb6d8ca..98e2adfb9a 100644 --- a/tests/acceptance/Controllers/RuleControllerTest.php +++ b/tests/acceptance/Controllers/RuleControllerTest.php @@ -2,14 +2,12 @@ /** - * Generated by PHPUnit_SkeletonGenerator on 2016-11-19 at 19:28:43. + * Generated by PHPUnit_SkeletonGenerator on 2016-11-20 at 06:10:33. */ class RuleControllerTest extends TestCase { - /** - * @var RuleController - */ - protected $object; + + /** * Sets up the fixture, for example, opens a network connection. diff --git a/tests/acceptance/Controllers/RuleGroupControllerTest.php b/tests/acceptance/Controllers/RuleGroupControllerTest.php index a8d5063a26..f45dc3e1e8 100644 --- a/tests/acceptance/Controllers/RuleGroupControllerTest.php +++ b/tests/acceptance/Controllers/RuleGroupControllerTest.php @@ -2,14 +2,12 @@ /** - * Generated by PHPUnit_SkeletonGenerator on 2016-11-19 at 19:28:43. + * Generated by PHPUnit_SkeletonGenerator on 2016-11-20 at 06:10:33. */ class RuleGroupControllerTest extends TestCase { - /** - * @var RuleGroupController - */ - protected $object; + + /** * Sets up the fixture, for example, opens a network connection. diff --git a/tests/acceptance/Controllers/SearchControllerTest.php b/tests/acceptance/Controllers/SearchControllerTest.php index d0a4948e8a..61219feabd 100644 --- a/tests/acceptance/Controllers/SearchControllerTest.php +++ b/tests/acceptance/Controllers/SearchControllerTest.php @@ -2,14 +2,12 @@ /** - * Generated by PHPUnit_SkeletonGenerator on 2016-11-19 at 19:28:43. + * Generated by PHPUnit_SkeletonGenerator on 2016-11-20 at 06:10:33. */ class SearchControllerTest extends TestCase { - /** - * @var SearchController - */ - protected $object; + + /** * Sets up the fixture, for example, opens a network connection. diff --git a/tests/acceptance/Controllers/TagControllerTest.php b/tests/acceptance/Controllers/TagControllerTest.php index 91b4472267..24bad8e4e9 100644 --- a/tests/acceptance/Controllers/TagControllerTest.php +++ b/tests/acceptance/Controllers/TagControllerTest.php @@ -2,14 +2,12 @@ /** - * Generated by PHPUnit_SkeletonGenerator on 2016-11-19 at 19:28:44. + * Generated by PHPUnit_SkeletonGenerator on 2016-11-20 at 06:10:33. */ class TagControllerTest extends TestCase { - /** - * @var TagController - */ - protected $object; + + /** * Sets up the fixture, for example, opens a network connection. diff --git a/tests/acceptance/Controllers/Transaction/ConvertControllerTest.php b/tests/acceptance/Controllers/Transaction/ConvertControllerTest.php index 1ab037b16b..8c05269b10 100644 --- a/tests/acceptance/Controllers/Transaction/ConvertControllerTest.php +++ b/tests/acceptance/Controllers/Transaction/ConvertControllerTest.php @@ -3,14 +3,12 @@ namespace Transaction; use TestCase; /** - * Generated by PHPUnit_SkeletonGenerator on 2016-11-19 at 19:28:44. + * Generated by PHPUnit_SkeletonGenerator on 2016-11-20 at 06:10:33. */ class ConvertControllerTest extends TestCase { - /** - * @var ConvertController - */ - protected $object; + + /** * Sets up the fixture, for example, opens a network connection. diff --git a/tests/acceptance/Controllers/Transaction/MassControllerTest.php b/tests/acceptance/Controllers/Transaction/MassControllerTest.php index aef64ec4d8..6d1e24a08c 100644 --- a/tests/acceptance/Controllers/Transaction/MassControllerTest.php +++ b/tests/acceptance/Controllers/Transaction/MassControllerTest.php @@ -3,14 +3,12 @@ namespace Transaction; use TestCase; /** - * Generated by PHPUnit_SkeletonGenerator on 2016-11-19 at 19:28:44. + * Generated by PHPUnit_SkeletonGenerator on 2016-11-20 at 06:10:34. */ class MassControllerTest extends TestCase { - /** - * @var MassController - */ - protected $object; + + /** * Sets up the fixture, for example, opens a network connection. diff --git a/tests/acceptance/Controllers/Transaction/SingleControllerTest.php b/tests/acceptance/Controllers/Transaction/SingleControllerTest.php index d5bbe3831e..a0ae1a7faa 100644 --- a/tests/acceptance/Controllers/Transaction/SingleControllerTest.php +++ b/tests/acceptance/Controllers/Transaction/SingleControllerTest.php @@ -3,14 +3,12 @@ namespace Transaction; use TestCase; /** - * Generated by PHPUnit_SkeletonGenerator on 2016-11-19 at 19:28:44. + * Generated by PHPUnit_SkeletonGenerator on 2016-11-20 at 06:10:34. */ class SingleControllerTest extends TestCase { - /** - * @var SingleController - */ - protected $object; + + /** * Sets up the fixture, for example, opens a network connection. diff --git a/tests/acceptance/Controllers/Transaction/SplitControllerTest.php b/tests/acceptance/Controllers/Transaction/SplitControllerTest.php index 9045f772af..7700848e0f 100644 --- a/tests/acceptance/Controllers/Transaction/SplitControllerTest.php +++ b/tests/acceptance/Controllers/Transaction/SplitControllerTest.php @@ -3,14 +3,12 @@ namespace Transaction; use TestCase; /** - * Generated by PHPUnit_SkeletonGenerator on 2016-11-19 at 19:28:44. + * Generated by PHPUnit_SkeletonGenerator on 2016-11-20 at 06:10:34. */ class SplitControllerTest extends TestCase { - /** - * @var SplitController - */ - protected $object; + + /** * Sets up the fixture, for example, opens a network connection. diff --git a/tests/acceptance/Controllers/TransactionControllerTest.php b/tests/acceptance/Controllers/TransactionControllerTest.php index 20c347a934..5930944614 100644 --- a/tests/acceptance/Controllers/TransactionControllerTest.php +++ b/tests/acceptance/Controllers/TransactionControllerTest.php @@ -2,14 +2,12 @@ /** - * Generated by PHPUnit_SkeletonGenerator on 2016-11-19 at 19:28:44. + * Generated by PHPUnit_SkeletonGenerator on 2016-11-20 at 06:10:34. */ class TransactionControllerTest extends TestCase { - /** - * @var TransactionController - */ - protected $object; + + /** * Sets up the fixture, for example, opens a network connection.