Laravel 5.4 support

jeroennoten · Jan 26, 2017 · cbb9b70 · cbb9b70
1 parent b86a60b
commit cbb9b70
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/composer.json b/composer.json
@@ -20,16 +20,18 @@
         ]
     },
     "require": {
-        "laravel/framework": "~5.2.0|~5.3.0",
+        "laravel/framework": "~5.2.0|~5.3.0|~5.4.0",
         "jeroennoten/laravel-package-helper": "^3.1",
         "league/flysystem": "^1.0.8",
         "intervention/image": "^2.3"
     },
     "require-dev": {
         "phpunit/phpunit": "~4.8.20",
-        "orchestra/testbench": "~3.2.4|~3.3.0",
+        "orchestra/database": "~3.2.0|~3.3.0|~3.4.0-dev",
+        "orchestra/testbench": "~3.2.4|~3.3.0|~3.4.0-dev",
         "mockery/mockery": "^0.9.5",
         "hamcrest/hamcrest-php": "~1.2",
-        "league/flysystem-aws-s3-v3": "^1.0.1"
+        "league/flysystem-aws-s3-v3": "^1.0.1",
+        "laravel/browser-kit-testing": "^1.0"
     }
 }
diff --git a/tests/ServiceProviderTest.php b/tests/ServiceProviderTest.php
@@ -26,6 +26,7 @@ public function testDefaultDisk()
     public function testCloudDisk()
     {
         $this->app['config']['ckeditor.disk'] = 's3';
+        $this->app['config']['filesystems.disks.s3.region'] = 'your-region';
 
         /** @var ImageUploader $imageUploader */
         $imageUploader = $this->app->make(ImageUploader::class);

diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -3,6 +3,9 @@
 
 class TestCase extends \Orchestra\Testbench\TestCase
 {
+    use \Laravel\BrowserKitTesting\Concerns\MakesHttpRequests;
+    use \Laravel\BrowserKitTesting\Concerns\InteractsWithSession;
+
     /** @before */
     public function injectDependencies()
     {