Merge branch 'master' into feature/only-use-old-in-forms-when-errors

.travis.yml

@@ -16,6 +16,9 @@ matrix:
       env: LARAVEL='5.8.*'
   fast_finish: true
 
+services:
+  - xvfb
+
 addons:
   chrome: stable
 
@@ -29,8 +32,7 @@ install:
 before_script:
   - if [[ $COVERAGE == "" ]]; then phpenv config-rm xdebug.ini; fi
   - composer config discard-changes true
-  - export DISPLAY=:99.0
-  - sh -e /etc/init.d/xvfb start
+  - ./vendor/bin/dusk-updater update
   - ./vendor/laravel/dusk/bin/chromedriver-linux &
   - google-chrome-stable --headless --disable-gpu --remote-debugging-port=9222 http://localhost &
 

DEVELOPMENT.md

@@ -41,6 +41,13 @@ See `.travis.yml` for details.
 - `composer show -D -o` can be used to check how far behind latest version the currently installed dependencies are.
 - `composer update` will install the latest versions of dependencies.
 
+### Troubleshooting tests
+
+#### Chrome versions
+
+If tests report wrong Chrome versions, run `./vendor/bin/dusk-updater update`
+to set it right before running tests again.
+
 ## Following PSR2
 
 This project can be checked against configured coding standards using `composer phpcs` from the project directory.

composer.json

@@ -6,10 +6,8 @@
     "laravel/framework": "5.7.*|5.8.*"
   },
   "require-dev": {
-    "laravel/dusk": ">=3.0.8",
     "mockery/mockery": "^1.2",
-    "orchestra/testbench": "^3.7",
-    "orchestra/testbench-dusk": "^3.5.6|3.7.x-dev|3.8.x-dev",
+    "orchestra/testbench-dusk": "~3.7.1 || ^3.8.1",
     "squizlabs/php_codesniffer": "^3.3",
     "timacdonald/log-fake": "^1.0"
   },