diff --git a/composer.lock b/composer.lock index 586213e57..df7b80289 100644 --- a/composer.lock +++ b/composer.lock @@ -4,21 +4,21 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "27dd30e92f700ea9a8c2a0a2327d4f9f", + "hash": "625ae196ac4c457c3aaff34235acbc4d", "content-hash": "e851e9fd06efac8362604c39b0a17542", "packages": [ { "name": "aws/aws-sdk-php", - "version": "3.21.4", + "version": "3.21.6", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "6408a4904a04eca44461a65ba4a0fae53f80417b" + "reference": "b51512a4ad4aa080ab963942a1e234265771fcde" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/6408a4904a04eca44461a65ba4a0fae53f80417b", - "reference": "6408a4904a04eca44461a65ba4a0fae53f80417b", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/b51512a4ad4aa080ab963942a1e234265771fcde", + "reference": "b51512a4ad4aa080ab963942a1e234265771fcde", "shasum": "" }, "require": { @@ -85,7 +85,7 @@ "s3", "sdk" ], - "time": "2017-01-25 00:43:08" + "time": "2017-01-27 00:34:55" }, { "name": "barryvdh/laravel-debugbar", @@ -799,16 +799,16 @@ }, { "name": "intervention/image", - "version": "2.3.9", + "version": "2.3.11", "source": { "type": "git", "url": "https://github.com/Intervention/image.git", - "reference": "2bce9a59c43b868300b02a7d31a1e4aa67a200ae" + "reference": "e8881fd99b9804b29e02d6d1c2c15ee459335cf1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Intervention/image/zipball/2bce9a59c43b868300b02a7d31a1e4aa67a200ae", - "reference": "2bce9a59c43b868300b02a7d31a1e4aa67a200ae", + "url": "https://api.github.com/repos/Intervention/image/zipball/e8881fd99b9804b29e02d6d1c2c15ee459335cf1", + "reference": "e8881fd99b9804b29e02d6d1c2c15ee459335cf1", "shasum": "" }, "require": { @@ -857,7 +857,7 @@ "thumbnail", "watermark" ], - "time": "2017-01-10 14:15:56" + "time": "2017-02-04 10:37:19" }, { "name": "knplabs/knp-snappy", @@ -973,16 +973,16 @@ }, { "name": "laravel/framework", - "version": "v5.4.3", + "version": "v5.4.9", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "9fa94bf77272ea7f920292c6f016b0f6e0853f98" + "reference": "600330ae1d218919b3b307e0578461a2df248663" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/9fa94bf77272ea7f920292c6f016b0f6e0853f98", - "reference": "9fa94bf77272ea7f920292c6f016b0f6e0853f98", + "url": "https://api.github.com/repos/laravel/framework/zipball/600330ae1d218919b3b307e0578461a2df248663", + "reference": "600330ae1d218919b3b307e0578461a2df248663", "shasum": "" }, "require": { @@ -1098,20 +1098,20 @@ "framework", "laravel" ], - "time": "2017-01-25 16:40:49" + "time": "2017-02-03 19:47:35" }, { "name": "laravel/socialite", - "version": "v3.0.2", + "version": "v3.0.3", "source": { "type": "git", "url": "https://github.com/laravel/socialite.git", - "reference": "d3aaffa5e122395e54eb2c26062fde3a848c40fd" + "reference": "01588748beef55ad5dd4f172d235548d3a6be79a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/socialite/zipball/d3aaffa5e122395e54eb2c26062fde3a848c40fd", - "reference": "d3aaffa5e122395e54eb2c26062fde3a848c40fd", + "url": "https://api.github.com/repos/laravel/socialite/zipball/01588748beef55ad5dd4f172d235548d3a6be79a", + "reference": "01588748beef55ad5dd4f172d235548d3a6be79a", "shasum": "" }, "require": { @@ -1152,20 +1152,20 @@ "laravel", "oauth" ], - "time": "2017-01-25 17:58:13" + "time": "2017-02-01 13:43:56" }, { "name": "league/flysystem", - "version": "1.0.33", + "version": "1.0.34", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem.git", - "reference": "5c7f98498b12d47f9de90ec9186a90000125777c" + "reference": "469ad53c13ea19a0e54e3e5d70f61227ddcc0299" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/5c7f98498b12d47f9de90ec9186a90000125777c", - "reference": "5c7f98498b12d47f9de90ec9186a90000125777c", + "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/469ad53c13ea19a0e54e3e5d70f61227ddcc0299", + "reference": "469ad53c13ea19a0e54e3e5d70f61227ddcc0299", "shasum": "" }, "require": { @@ -1235,7 +1235,7 @@ "sftp", "storage" ], - "time": "2017-01-23 10:32:09" + "time": "2017-01-30 17:41:17" }, { "name": "league/flysystem-aws-s3-v3", @@ -2237,7 +2237,7 @@ }, { "name": "symfony/css-selector", - "version": "v3.1.9", + "version": "v3.1.10", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", @@ -2347,16 +2347,16 @@ }, { "name": "symfony/dom-crawler", - "version": "v3.1.9", + "version": "v3.1.10", "source": { "type": "git", "url": "https://github.com/symfony/dom-crawler.git", - "reference": "a950260ebc947578fba82a3222e2085d90682376" + "reference": "7eede2a901a19928494194f7d1815a77b9a473a0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/a950260ebc947578fba82a3222e2085d90682376", - "reference": "a950260ebc947578fba82a3222e2085d90682376", + "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/7eede2a901a19928494194f7d1815a77b9a473a0", + "reference": "7eede2a901a19928494194f7d1815a77b9a473a0", "shasum": "" }, "require": { @@ -2399,7 +2399,7 @@ ], "description": "Symfony DomCrawler Component", "homepage": "https://symfony.com", - "time": "2017-01-02 20:31:54" + "time": "2017-01-21 17:13:55" }, { "name": "symfony/event-dispatcher", @@ -3268,16 +3268,16 @@ }, { "name": "myclabs/deep-copy", - "version": "1.5.5", + "version": "1.6.0", "source": { "type": "git", "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "399c1f9781e222f6eb6cc238796f5200d1b7f108" + "reference": "5a5a9fc8025a08d8919be87d6884d5a92520cefe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/399c1f9781e222f6eb6cc238796f5200d1b7f108", - "reference": "399c1f9781e222f6eb6cc238796f5200d1b7f108", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/5a5a9fc8025a08d8919be87d6884d5a92520cefe", + "reference": "5a5a9fc8025a08d8919be87d6884d5a92520cefe", "shasum": "" }, "require": { @@ -3306,7 +3306,7 @@ "object", "object graph" ], - "time": "2016-10-31 17:19:45" + "time": "2017-01-26 22:05:40" }, { "name": "phpdocumentor/reflection-common", @@ -3763,16 +3763,16 @@ }, { "name": "phpunit/phpunit", - "version": "5.7.6", + "version": "5.7.10", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "caf8141b89691498d91aaac6c82e9cd5f685ae86" + "reference": "bf0804199f516fe80ffcc48ac6d4741c49baeb6e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/caf8141b89691498d91aaac6c82e9cd5f685ae86", - "reference": "caf8141b89691498d91aaac6c82e9cd5f685ae86", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/bf0804199f516fe80ffcc48ac6d4741c49baeb6e", + "reference": "bf0804199f516fe80ffcc48ac6d4741c49baeb6e", "shasum": "" }, "require": { @@ -3789,11 +3789,11 @@ "phpunit/php-text-template": "~1.2", "phpunit/php-timer": "^1.0.6", "phpunit/phpunit-mock-objects": "^3.2", - "sebastian/comparator": "~1.2.2", + "sebastian/comparator": "^1.2.4", "sebastian/diff": "~1.2", "sebastian/environment": "^1.3.4 || ^2.0", "sebastian/exporter": "~2.0", - "sebastian/global-state": "^1.0 || ^2.0", + "sebastian/global-state": "^1.1", "sebastian/object-enumerator": "~2.0", "sebastian/resource-operations": "~1.0", "sebastian/version": "~1.0|~2.0", @@ -3841,7 +3841,7 @@ "testing", "xunit" ], - "time": "2017-01-22 08:39:59" + "time": "2017-02-04 09:03:53" }, { "name": "phpunit/phpunit-mock-objects", @@ -3949,16 +3949,16 @@ }, { "name": "sebastian/comparator", - "version": "1.2.2", + "version": "1.2.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/comparator.git", - "reference": "6a1ed12e8b2409076ab22e3897126211ff8b1f7f" + "reference": "2b7424b55f5047b47ac6e5ccb20b2aea4011d9be" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/6a1ed12e8b2409076ab22e3897126211ff8b1f7f", - "reference": "6a1ed12e8b2409076ab22e3897126211ff8b1f7f", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/2b7424b55f5047b47ac6e5ccb20b2aea4011d9be", + "reference": "2b7424b55f5047b47ac6e5ccb20b2aea4011d9be", "shasum": "" }, "require": { @@ -4009,7 +4009,7 @@ "compare", "equality" ], - "time": "2016-11-19 09:18:40" + "time": "2017-01-29 09:50:25" }, { "name": "sebastian/diff", diff --git a/database/seeds/DummyContentSeeder.php b/database/seeds/DummyContentSeeder.php index c64ca2a8c..efcda4220 100644 --- a/database/seeds/DummyContentSeeder.php +++ b/database/seeds/DummyContentSeeder.php @@ -11,14 +11,14 @@ class DummyContentSeeder extends Seeder */ public function run() { - $user = factory(BookStack\User::class, 1)->create(); + $user = factory(\BookStack\User::class)->create(); $role = \BookStack\Role::getRole('editor'); $user->attachRole($role); - $books = factory(BookStack\Book::class, 20)->create(['created_by' => $user->id, 'updated_by' => $user->id]) + $books = factory(\BookStack\Book::class, 20)->create(['created_by' => $user->id, 'updated_by' => $user->id]) ->each(function($book) use ($user) { - $chapters = factory(BookStack\Chapter::class, 5)->create(['created_by' => $user->id, 'updated_by' => $user->id]) + $chapters = factory(\BookStack\Chapter::class, 5)->create(['created_by' => $user->id, 'updated_by' => $user->id]) ->each(function($chapter) use ($user, $book){ $pages = factory(\BookStack\Page::class, 5)->make(['created_by' => $user->id, 'updated_by' => $user->id, 'book_id' => $book->id]); $chapter->pages()->saveMany($pages); diff --git a/tests/TestCase.php b/tests/TestCase.php index d52e991e3..d64aef3db 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -4,11 +4,13 @@ use BookStack\Book; use BookStack\Chapter; use BookStack\Repos\EntityRepo; use BookStack\Role; +use Illuminate\Foundation\Testing\DatabaseTransactions; use Illuminate\Foundation\Testing\TestCase as BaseTestCase; abstract class TestCase extends BaseTestCase { use CreatesApplication; + use DatabaseTransactions; protected $admin;