Update test config for Laravel 5 & 6

Author: ivanvermeyen

.gitignore

@@ -1,3 +1,4 @@
 /vendor
 .idea
 composer.lock
+.phpunit.result.cache

.travis.yml

@@ -1,19 +1,46 @@
 language: php
 
-php:
-  - 7.0
-  - 7.1
-  - 7.2
+matrix:
+    include:
+        - php: 7.0
+          env: ILLUMINATE_VERSION=5.5.* TESTBENCH_VERSION=3.5.*
+        - php: 7.1
+          env: ILLUMINATE_VERSION=5.8.* TESTBENCH_VERSION=3.8.*
+        - php: 7.1
+          env: ILLUMINATE_VERSION=5.7.* TESTBENCH_VERSION=3.7.*
+        - php: 7.1
+          env: ILLUMINATE_VERSION=5.6.* TESTBENCH_VERSION=3.6.*
+        - php: 7.2
+          env: ILLUMINATE_VERSION=6.* TESTBENCH_VERSION=4.*
+        - php: 7.2
+          env: ILLUMINATE_VERSION=5.8.* TESTBENCH_VERSION=3.8.*
+        - php: 7.2
+          env: ILLUMINATE_VERSION=5.7.* TESTBENCH_VERSION=3.7.*
+        - php: 7.2
+          env: ILLUMINATE_VERSION=5.6.* TESTBENCH_VERSION=3.6.*
+        - php: 7.3
+          env: ILLUMINATE_VERSION=6.* TESTBENCH_VERSION=4.*
+        - php: 7.3
+          env: ILLUMINATE_VERSION=5.8.* TESTBENCH_VERSION=3.8.*
+        - php: 7.3
+          env: ILLUMINATE_VERSION=5.7.* TESTBENCH_VERSION=3.7.*
+        - php: 7.3
+          env: ILLUMINATE_VERSION=5.6.* TESTBENCH_VERSION=3.6.*
+
+before_script:
+
+before_install:
+    - travis_retry composer self-update
+    - composer require "orchestra/testbench:${TESTBENCH_VERSION}" --no-update --dev
+    - composer require "illuminate/support:${ILLUMINATE_VERSION}" --no-update
+
+install: composer update --prefer-source --no-interaction
 
 sudo: false
 
 cache:
-  directories:
-    - $HOME/.composer/cache
-
-before_script:
-  - travis_retry composer self-update
-  - travis_retry composer update --no-interaction
+    directories:
+        - $HOME/.composer/cache
 
 script:
-  - vendor/bin/phpunit
+    - vendor/bin/phpunit

composer.json

@@ -15,13 +15,11 @@
         }
     ],
     "require": {
-        "php": ">=7.0.0"
+        "php": ">=7.0"
     },
     "require-dev": {
-        "fzaninotto/faker": "~1.4",
-        "mockery/mockery": "0.9.*",
-        "orchestra/testbench": "~3.5.0",
-        "phpunit/phpunit": "~6.0"
+        "orchestra/testbench": ">=3.5",
+        "phpunit/phpunit": "^6.0|^7.0|^8.0"
     },
     "autoload": {
         "psr-4": {

tests/StageFrontTest.php

@@ -16,21 +16,12 @@ class StageFrontTest extends TestCase
      */
     protected $url;
 
-    public function setUp()
+    /** @test */
+    public function it_redirects_to_a_login_screen_when_stagefront_is_enabled()
     {
-        parent::setUp();
-
-        // Note that changing the URL or middleware config in the tests
-        // has no effect until you call $this->enableStageFront().
-        // It is disabled by default so nothing is loaded by default.
         $this->url = config('stagefront.url');
-
         $this->registerRoute('/page', 'Some Page');
-    }
 
-    /** @test */
-    public function it_redirects_to_a_login_screen_when_stagefront_is_enabled()
-    {
         $this->enableStageFront();
 
         $this->get('/page')->assertRedirect($this->url);
@@ -39,18 +30,27 @@ public function it_redirects_to_a_login_screen_when_stagefront_is_enabled()
     /** @test */
     public function it_does_not_redirect_to_a_login_screen_when_stagefront_is_disabled()
     {
+        $this->url = config('stagefront.url');
+        $this->registerRoute('/page', 'Some Page');
+
         $this->get('/page')->assertStatus(200)->assertSee('Some Page');
     }
 
     /** @test */
     public function the_login_route_does_not_exist_when_stagefront_is_disabled()
     {
+        $this->url = config('stagefront.url');
+        $this->registerRoute('/page', 'Some Page');
+
         $this->get($this->url)->assertStatus(404);
     }
 
     /** @test */
     public function it_redirects_to_the_intended_url_when_you_provide_valid_credentials()
     {
+        $this->url = config('stagefront.url');
+        $this->registerRoute('/page', 'Some Page');
+
         config()->set('stagefront.login', 'tester');
         config()->set('stagefront.password', 'p4ssw0rd');
 
@@ -68,6 +68,9 @@ public function it_redirects_to_the_intended_url_when_you_provide_valid_credenti
     /** @test */
     public function it_does_not_allow_access_when_you_provide_invalid_credentials()
     {
+        $this->url = config('stagefront.url');
+        $this->registerRoute('/page', 'Some Page');
+
         config()->set('stagefront.login', 'tester');
         config()->set('stagefront.password', 'p4ssw0rd');
 
@@ -86,6 +89,9 @@ public function it_does_not_allow_access_when_you_provide_invalid_credentials()
     /** @test */
     public function it_redirects_home_if_you_are_already_logged_in()
     {
+        $this->url = config('stagefront.url');
+        $this->registerRoute('/page', 'Some Page');
+
         $this->enableStageFront();
 
         session()->put('stagefront.unlocked', true);
@@ -96,6 +102,9 @@ public function it_redirects_home_if_you_are_already_logged_in()
     /** @test */
     public function the_password_may_be_stored_encrypted()
     {
+        $this->url = config('stagefront.url');
+        $this->registerRoute('/page', 'Some Page');
+
         config()->set('stagefront.login', 'tester');
         config()->set('stagefront.password', bcrypt('p4ssw0rd'));
         config()->set('stagefront.encrypted', true);
@@ -114,6 +123,9 @@ public function the_password_may_be_stored_encrypted()
     /** @test */
     public function the_users_in_the_database_can_be_used_for_logging_in()
     {
+        $this->url = config('stagefront.url');
+        $this->registerRoute('/page', 'Some Page');
+
         $this->loadLaravelMigrations(['--database' => 'testing']);
 
         User::create([
@@ -141,6 +153,9 @@ public function the_users_in_the_database_can_be_used_for_logging_in()
     /** @test */
     public function you_can_limit_which_database_users_have_access_using_a_comma_separated_string()
     {
+        $this->url = config('stagefront.url');
+        $this->registerRoute('/page', 'Some Page');
+
         $this->loadLaravelMigrations(['--database' => 'testing']);
 
         User::create([
@@ -186,6 +201,9 @@ public function you_can_limit_which_database_users_have_access_using_a_comma_sep
     /** @test */
     public function you_can_limit_which_database_users_have_access_using_an_array()
     {
+        $this->url = config('stagefront.url');
+        $this->registerRoute('/page', 'Some Page');
+
         $this->loadLaravelMigrations(['--database' => 'testing']);
 
         User::create([
@@ -231,6 +249,9 @@ public function you_can_limit_which_database_users_have_access_using_an_array()
     /** @test */
     public function urls_can_be_ignored_so_access_is_not_denied_by_stagefront()
     {
+        $this->url = config('stagefront.url');
+        $this->registerRoute('/page', 'Some Page');
+
         $this->registerRoute('/public', 'Public');
         $this->registerRoute('/public/route', 'Route');
 
@@ -245,6 +266,9 @@ public function urls_can_be_ignored_so_access_is_not_denied_by_stagefront()
     /** @test */
     public function it_throttles_login_attempts()
     {
+        $this->url = config('stagefront.url');
+        $this->registerRoute('/page', 'Some Page');
+
         $faultyCredentials = [
             'login' => 'tester',
             'password' => 'invalid',
@@ -264,6 +288,9 @@ public function it_throttles_login_attempts()
     /** @test */
     public function throttling_login_attempts_can_be_disabled()
     {
+        $this->url = config('stagefront.url');
+        $this->registerRoute('/page', 'Some Page');
+
         $faultyCredentials = [
             'login' => 'tester',
             'password' => 'invalid',

tests/TestCase.php

@@ -3,20 +3,11 @@
 namespace CodeZero\StageFront\Tests;
 
 use CodeZero\StageFront\StageFrontServiceProvider;
+use Illuminate\Support\Str;
 use Orchestra\Testbench\TestCase as BaseTestCase;
 
 abstract class TestCase extends BaseTestCase
 {
-    /**
-     * Setup the test environment.
-     */
-    public function setUp()
-    {
-        parent::setUp();
-
-        config()->set('app.key', str_random(32));
-    }
-
     /**
      * Define environment setup.
      *
@@ -26,6 +17,7 @@ public function setUp()
      */
     protected function getEnvironmentSetUp($app)
     {
+        $app['config']->set('app.key', Str::random(32));
         $app['config']->set('database.default', 'testing');
         $app['config']->set('database.connections.testing', [
             'driver'   => 'sqlite',