Merge branch 'feature/vuejs' into feature/vuejs-serverlist

2018-06-02 17:12:45 -07:00 · 2018-06-02 17:12:45 -07:00 · 6b2649ad2c
commit 6b2649ad2c
parent cf07ba5746 6005def7bc
18 changed files with 482 additions and 12 deletions
--- a/composer.json
+++ b/composer.json
@ -48,6 +48,7 @@
        "filp/whoops": "^2.1",
        "friendsofphp/php-cs-fixer": "^2.11.1",
        "fzaninotto/faker": "^1.6",
+        "laravel/dusk": "^3.0",
        "martinlindhe/laravel-vue-i18n-generator": "^0.1.28",
        "mockery/mockery": "^1.0",
        "nunomaduro/collision": "^2.0",
@ -68,6 +69,7 @@
    },
    "autoload-dev": {
        "psr-4": {
+            "Pterodactyl\\Tests\\Browser\\": "tests/Browser",
            "Pterodactyl\\Tests\\Integration\\": "tests/Integration",
            "Tests\\": "tests/"
        }