mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-02-25 18:45:27 -06:00
Fixed tests [skip ci]
This commit is contained in:
James Cole
parent
c2241567e4
commit
0587d96474
104
composer.lock
generated
104
composer.lock
generated
@ -943,16 +943,16 @@
|
||||
},
|
||||
{
|
||||
"name": "laravel/framework",
|
||||
"version": "v5.0.32",
|
||||
"version": "v5.0.33",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/laravel/framework.git",
|
||||
"reference": "85f12207cf45cc288e9e6b9b5d184aad5f08e2ca"
|
||||
"reference": "b11c8ab88245f920b30e5f30e16b141ac8d461d3"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/laravel/framework/zipball/85f12207cf45cc288e9e6b9b5d184aad5f08e2ca",
|
||||
"reference": "85f12207cf45cc288e9e6b9b5d184aad5f08e2ca",
|
||||
"url": "https://api.github.com/repos/laravel/framework/zipball/b11c8ab88245f920b30e5f30e16b141ac8d461d3",
|
||||
"reference": "b11c8ab88245f920b30e5f30e16b141ac8d461d3",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -1065,7 +1065,7 @@
|
||||
"framework",
|
||||
"laravel"
|
||||
],
|
||||
"time": "2015-05-29 18:56:49"
|
||||
"time": "2015-06-09 13:12:19"
|
||||
},
|
||||
{
|
||||
"name": "league/commonmark",
|
||||
@ -1128,19 +1128,20 @@
|
||||
},
|
||||
{
|
||||
"name": "league/flysystem",
|
||||
"version": "1.0.3",
|
||||
"version": "1.0.4",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/thephpleague/flysystem.git",
|
||||
"reference": "3c2400a99ccc3be6884d40361890010449c6b447"
|
||||
"reference": "56862959b45131ad33e5a7727a25db19f2cf090b"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/thephpleague/flysystem/zipball/3c2400a99ccc3be6884d40361890010449c6b447",
|
||||
"reference": "3c2400a99ccc3be6884d40361890010449c6b447",
|
||||
"url": "https://api.github.com/repos/thephpleague/flysystem/zipball/56862959b45131ad33e5a7727a25db19f2cf090b",
|
||||
"reference": "56862959b45131ad33e5a7727a25db19f2cf090b",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"ext-mbstring": "*",
|
||||
"php": ">=5.4.0"
|
||||
},
|
||||
"require-dev": {
|
||||
@ -1207,7 +1208,7 @@
|
||||
"sftp",
|
||||
"storage"
|
||||
],
|
||||
"time": "2015-03-29 14:01:43"
|
||||
"time": "2015-06-07 21:27:37"
|
||||
},
|
||||
{
|
||||
"name": "monolog/monolog",
|
||||
@ -1593,23 +1594,23 @@
|
||||
},
|
||||
{
|
||||
"name": "swiftmailer/swiftmailer",
|
||||
"version": "v5.4.0",
|
||||
"version": "v5.4.1",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/swiftmailer/swiftmailer.git",
|
||||
"reference": "31454f258f10329ae7c48763eb898a75c39e0a9f"
|
||||
"reference": "0697e6aa65c83edf97bb0f23d8763f94e3f11421"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/31454f258f10329ae7c48763eb898a75c39e0a9f",
|
||||
"reference": "31454f258f10329ae7c48763eb898a75c39e0a9f",
|
||||
"url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/0697e6aa65c83edf97bb0f23d8763f94e3f11421",
|
||||
"reference": "0697e6aa65c83edf97bb0f23d8763f94e3f11421",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"php": ">=5.3.3"
|
||||
},
|
||||
"require-dev": {
|
||||
"mockery/mockery": "~0.9.1"
|
||||
"mockery/mockery": "~0.9.1,<0.9.4"
|
||||
},
|
||||
"type": "library",
|
||||
"extra": {
|
||||
@ -1638,10 +1639,11 @@
|
||||
"description": "Swiftmailer, free feature-rich PHP mailer",
|
||||
"homepage": "http://swiftmailer.org",
|
||||
"keywords": [
|
||||
"email",
|
||||
"mail",
|
||||
"mailer"
|
||||
],
|
||||
"time": "2015-03-14 06:06:39"
|
||||
"time": "2015-06-06 14:19:39"
|
||||
},
|
||||
{
|
||||
"name": "symfony/console",
|
||||
@ -2355,16 +2357,16 @@
|
||||
},
|
||||
{
|
||||
"name": "twig/twig",
|
||||
"version": "v1.18.1",
|
||||
"version": "v1.18.2",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/twigphp/Twig.git",
|
||||
"reference": "9f70492f44398e276d1b81c1b43adfe6751c7b7f"
|
||||
"reference": "e8e6575abf6102af53ec283f7f14b89e304fa602"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/twigphp/Twig/zipball/9f70492f44398e276d1b81c1b43adfe6751c7b7f",
|
||||
"reference": "9f70492f44398e276d1b81c1b43adfe6751c7b7f",
|
||||
"url": "https://api.github.com/repos/twigphp/Twig/zipball/e8e6575abf6102af53ec283f7f14b89e304fa602",
|
||||
"reference": "e8e6575abf6102af53ec283f7f14b89e304fa602",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -2408,7 +2410,7 @@
|
||||
"keywords": [
|
||||
"templating"
|
||||
],
|
||||
"time": "2015-04-19 08:30:27"
|
||||
"time": "2015-06-06 23:31:24"
|
||||
},
|
||||
{
|
||||
"name": "vlucas/phpdotenv",
|
||||
@ -2582,20 +2584,20 @@
|
||||
"packages-dev": [
|
||||
{
|
||||
"name": "barryvdh/laravel-debugbar",
|
||||
"version": "v2.0.3",
|
||||
"version": "v2.0.4",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/barryvdh/laravel-debugbar.git",
|
||||
"reference": "77be5170f3777e2e899ec98105ce5686cd4aa63b"
|
||||
"reference": "3edaea0e8056edde00f7d0af13ed0d406412182d"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/77be5170f3777e2e899ec98105ce5686cd4aa63b",
|
||||
"reference": "77be5170f3777e2e899ec98105ce5686cd4aa63b",
|
||||
"url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/3edaea0e8056edde00f7d0af13ed0d406412182d",
|
||||
"reference": "3edaea0e8056edde00f7d0af13ed0d406412182d",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"illuminate/support": "5.0.x",
|
||||
"illuminate/support": "~5.0.17|5.1.*",
|
||||
"maximebf/debugbar": "~1.10.2",
|
||||
"php": ">=5.4.0",
|
||||
"symfony/finder": "~2.6"
|
||||
@ -2632,28 +2634,28 @@
|
||||
"profiler",
|
||||
"webprofiler"
|
||||
],
|
||||
"time": "2015-03-07 15:15:23"
|
||||
"time": "2015-06-07 07:19:29"
|
||||
},
|
||||
{
|
||||
"name": "barryvdh/laravel-ide-helper",
|
||||
"version": "v2.0.3",
|
||||
"version": "v2.0.5",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/barryvdh/laravel-ide-helper.git",
|
||||
"reference": "d8d5517f2cc55d534a7fc8f50ff62cb55115e1aa"
|
||||
"reference": "541b9508e205cbfcf0d456900d28dec58e24d64b"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/d8d5517f2cc55d534a7fc8f50ff62cb55115e1aa",
|
||||
"reference": "d8d5517f2cc55d534a7fc8f50ff62cb55115e1aa",
|
||||
"url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/541b9508e205cbfcf0d456900d28dec58e24d64b",
|
||||
"reference": "541b9508e205cbfcf0d456900d28dec58e24d64b",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"illuminate/console": "5.0.x",
|
||||
"illuminate/filesystem": "5.0.x",
|
||||
"illuminate/support": "5.0.x",
|
||||
"illuminate/console": "5.0.x|5.1.x",
|
||||
"illuminate/filesystem": "5.0.x|5.1.x",
|
||||
"illuminate/support": "5.0.x|5.1.x",
|
||||
"php": ">=5.4.0",
|
||||
"phpdocumentor/reflection-docblock": "2.0.x",
|
||||
"phpdocumentor/reflection-docblock": "2.0.4",
|
||||
"symfony/class-loader": "~2.3"
|
||||
},
|
||||
"require-dev": {
|
||||
@ -2695,7 +2697,7 @@
|
||||
"phpstorm",
|
||||
"sublime"
|
||||
],
|
||||
"time": "2015-03-17 08:00:28"
|
||||
"time": "2015-06-11 14:11:52"
|
||||
},
|
||||
{
|
||||
"name": "codeclimate/php-test-reporter",
|
||||
@ -3401,16 +3403,16 @@
|
||||
},
|
||||
{
|
||||
"name": "phpunit/php-code-coverage",
|
||||
"version": "2.1.3",
|
||||
"version": "2.1.5",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/sebastianbergmann/php-code-coverage.git",
|
||||
"reference": "28a6b34e91d789b2608072ab3c82eaae7cdb973c"
|
||||
"reference": "be2286cb8c7e1773eded49d9719219e6f74f9e3e"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/28a6b34e91d789b2608072ab3c82eaae7cdb973c",
|
||||
"reference": "28a6b34e91d789b2608072ab3c82eaae7cdb973c",
|
||||
"url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/be2286cb8c7e1773eded49d9719219e6f74f9e3e",
|
||||
"reference": "be2286cb8c7e1773eded49d9719219e6f74f9e3e",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -3459,7 +3461,7 @@
|
||||
"testing",
|
||||
"xunit"
|
||||
],
|
||||
"time": "2015-06-03 07:01:01"
|
||||
"time": "2015-06-09 13:05:42"
|
||||
},
|
||||
{
|
||||
"name": "phpunit/php-file-iterator",
|
||||
@ -3647,16 +3649,16 @@
|
||||
},
|
||||
{
|
||||
"name": "phpunit/phpunit",
|
||||
"version": "4.7.0",
|
||||
"version": "4.7.3",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/sebastianbergmann/phpunit.git",
|
||||
"reference": "c2241b8d3381be3e4c6125ae347687d59f286784"
|
||||
"reference": "41fea1e84ed84d373f5ac099a1276c4358c90708"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c2241b8d3381be3e4c6125ae347687d59f286784",
|
||||
"reference": "c2241b8d3381be3e4c6125ae347687d59f286784",
|
||||
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/41fea1e84ed84d373f5ac099a1276c4358c90708",
|
||||
"reference": "41fea1e84ed84d373f5ac099a1276c4358c90708",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -3715,20 +3717,20 @@
|
||||
"testing",
|
||||
"xunit"
|
||||
],
|
||||
"time": "2015-06-05 04:14:02"
|
||||
"time": "2015-06-11 16:20:25"
|
||||
},
|
||||
{
|
||||
"name": "phpunit/phpunit-mock-objects",
|
||||
"version": "2.3.3",
|
||||
"version": "2.3.4",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
|
||||
"reference": "253c005852591fd547fc18cd5b7b43a1ec82d8f7"
|
||||
"reference": "92408bb1968a81b3217a6fdf6c1a198da83caa35"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/253c005852591fd547fc18cd5b7b43a1ec82d8f7",
|
||||
"reference": "253c005852591fd547fc18cd5b7b43a1ec82d8f7",
|
||||
"url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/92408bb1968a81b3217a6fdf6c1a198da83caa35",
|
||||
"reference": "92408bb1968a81b3217a6fdf6c1a198da83caa35",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -3770,7 +3772,7 @@
|
||||
"mock",
|
||||
"xunit"
|
||||
],
|
||||
"time": "2015-05-29 05:19:18"
|
||||
"time": "2015-06-11 15:55:48"
|
||||
},
|
||||
{
|
||||
"name": "satooshi/php-coveralls",
|
||||
|
||||
@ -30,7 +30,7 @@ return [
|
||||
'create_new_bill' => 'Create new bill',
|
||||
|
||||
// currencies:
|
||||
'create_currency' => 'Create new currency',
|
||||
'create_currency' => 'Create a new currency',
|
||||
'edit_currency' => 'Edit currency ":name"',
|
||||
|
||||
// new user:
|
||||
@ -62,7 +62,7 @@ return [
|
||||
|
||||
// bills:
|
||||
'delete_bill' => 'Delete bill ":name"',
|
||||
'edit_bill' => 'Delete bill ":name"',
|
||||
'edit_bill' => 'Edit bill ":name"',
|
||||
|
||||
// accounts:
|
||||
'details_for_asset' => 'Details for asset account ":name"',
|
||||
@ -104,7 +104,7 @@ return [
|
||||
|
||||
// categories:
|
||||
'new_category' => 'New category',
|
||||
'create_new_category' => 'New category',
|
||||
'create_new_category' => 'Create a new category',
|
||||
'without_category' => 'Without a category',
|
||||
'update_category' => 'Wijzig categorie',
|
||||
'categories' => 'Categories',
|
||||
|
||||
@ -103,7 +103,7 @@ class BillControllerTest extends TestCase
|
||||
Amount::shouldReceive('getCurrencyCode')->andReturn('X');
|
||||
|
||||
$this->call('GET', '/bills/edit/' . $bill->id);
|
||||
$this->assertViewHas('subTitle', 'Edit "' . e($bill->name) . '"');
|
||||
$this->assertViewHas('subTitle', 'Edit bill "' . e($bill->name) . '"');
|
||||
$this->assertResponseOk();
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user