Merge d4258ae into 2ae0158

orchestral · Dec 28, 2019 · eef790e · eef790e
2 parents 2ae0158 + d4258ae
commit eef790e
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,10 +5,11 @@ sudo: required
 php:
   - 7.2
   - 7.3
+  - 7.4
 
 env:
   global:
-    - coverage=no
+    - coverage=no phpunit=^8.3
   matrix:
     - setup=basic
     - setup=stable
@@ -27,6 +28,7 @@ before_install:
   - sudo sh -c 'echo 0 > /proc/sys/net/ipv6/conf/all/disable_ipv6'
 
 before_script:
+  - composer require "phpunit/phpunit=${phpunit}" --dev --prefer-dist --no-interaction --no-suggest
   - if [[ $setup = 'basic' ]]; then travis_retry composer install --prefer-dist --no-interaction; fi
   - if [[ $setup = 'stable' ]]; then travis_retry composer update --prefer-dist --no-interaction --prefer-stable; fi
   - if [[ $setup = 'lowest' ]]; then travis_retry composer update --prefer-dist --no-interaction --prefer-lowest --prefer-stable; fi
@@ -44,10 +46,18 @@ after_script:
 
 matrix:
   include:
+    - php: 7.3
+      env: setup=basic phpunit=^9.0
     - php: 7.4
-      env: setup=basic
+      env: setup=basic phpunit=^9.0
+    - php: 7.3
+      env: setup=stable phpunit=^9.0
     - php: 7.4
-      env: setup=stable
+      env: setup=stable phpunit=^9.0
+    - php: 7.3
+      env: setup=lowest phpunit=^9.0
+    - php: 7.4
+      env: setup=lowest phpunit=^9.0
     - php: 7.2
       env: setup=coveralls coverage=yes
   allow_failures:

diff --git a/composer.json b/composer.json
@@ -34,8 +34,7 @@
         "laravel/dusk": "^5.6.3",
         "opis/closure": "^3.1",
         "orchestra/dusk-updater": "^1.1",
-        "orchestra/testbench": "^4.5",
-        "phpunit/phpunit": "^8.3"
+        "orchestra/testbench": "^4.5"
     },
     "require-dev": {
         "laravel/laravel": "dev-master",

diff --git a/tests/Unit/DefaultConfigurationTest.php b/tests/Unit/DefaultConfigurationTest.php
@@ -11,8 +11,8 @@ class DefaultConfigurationTest extends TestbenchDuskTestCase
     /** @test */
     public function it_loads_dusk_service_provider()
     {
-        $this->assertContains(DuskServiceProvider::class, $this->app['config']['app.providers']);
-        $this->assertContains(DuskServiceProvider::class, $this->app->getLoadedProviders());
+        $this->assertContains(DuskServiceProvider::class, array_values($this->app['config']['app.providers']));
+        $this->assertContains(DuskServiceProvider::class, array_keys($this->app->getLoadedProviders()));
     }
 
     /** @test */