From dffafc20af7dba8ec41894d27739f84721945b4c Mon Sep 17 00:00:00 2001 From: David Bomba Date: Thu, 25 Oct 2018 21:14:09 +1100 Subject: [PATCH] Fixes for travis (#2467) * fixes for travis --- .env.dusk.local | 28 ++++++++++++++++++++++++++++ .env.travis | 9 +++++---- .travis.yml | 16 ++++++---------- composer.lock | 24 ++++++++++++++---------- config/cache.php | 2 +- 5 files changed, 54 insertions(+), 25 deletions(-) create mode 100644 .env.dusk.local diff --git a/.env.dusk.local b/.env.dusk.local new file mode 100644 index 000000000000..c996df74a0a9 --- /dev/null +++ b/.env.dusk.local @@ -0,0 +1,28 @@ +APP_ENV=local +APP_DEBUG=true +APP_LOCALE=en +APP_URL=http://ninja.test:8000 +APP_KEY=s7epnjtomsdond5zgfqgaqmwhhcjct02 +APP_CIPHER=AES-256-CBC +REQUIRE_HTTPS=false +NINJA_ENVIRONMENT=hosted + +DB_TYPE=mysql +DB_STRICT=false +DB_HOST=localhost +DB_USERNAME=ninja +DB_PASSWORD=ninja + +DB_DATABASE1=ninja1 +DB_DATABASE2=ninja2 +MAIL_DRIVER=smtp +MAIL_PORT=587 +MAIL_ENCRYPTION=tls +MAIL_HOST= +MAIL_USERNAME= +MAIL_FROM_NAME= +MAIL_FROM_ADDRESS= +MAIL_PASSWORD= +MAILGUN_DOMAIN= +MAILGUN_SECRET= +AUTH_PROVIDER=users diff --git a/.env.travis b/.env.travis index 2f147ad04d32..37e9eea244f5 100644 --- a/.env.travis +++ b/.env.travis @@ -1,6 +1,6 @@ -APP_ENV=development +APP_ENV=local APP_DEBUG=false -APP_URL=http://ninja.test +APP_URL=http://127.0.0.1:8000 APP_KEY=SomeRandomStringSomeRandomString APP_CIPHER=AES-256-CBC APP_LOCALE=en @@ -10,8 +10,9 @@ DB_HOST=localhost DB_USERNAME=ninja DB_PASSWORD=ninja -DB_DATABASE1=ninja1 -DB_DATABASE2=ninja2 +DB_CONNECTION=db-ninja-01 +DB_DATABASE1=ninja01 +DB_DATABASE2=ninja02 MAIL_DRIVER=log TRAVIS=true diff --git a/.travis.yml b/.travis.yml index 9aa4ab5f4b68..92637124f084 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,6 +9,7 @@ php: - 7.2 addons: + chrome: stable hosts: - www.ninja.test @@ -29,6 +30,7 @@ before_install: - composer self-update && composer -V # - export USE_ZEND_ALLOC=0 - rvm use 1.9.3 --install --fuzzy + - cp .env.travis .env install: # install Composer dependencies @@ -36,11 +38,10 @@ install: # these providers require referencing git commit's which cause Travis to fail # - sed -i '/mollie/d' composer.json # - sed -i '/2checkout/d' composer.json - - travis_retry composer install --prefer-dist; + - travis_retry composer install --no-interaction --prefer-dist --no-suggest before_script: # copy configuration files - - cp .env.travis .env - php artisan key:generate --no-interaction - sed -i '$a NINJA_DEV=true' .env # create the database and user @@ -52,19 +53,14 @@ before_script: - php artisan migrate --database=db-ninja-01 --seed --no-interaction - php artisan migrate --database=db-ninja-02 --seed --no-interaction - php artisan optimize - # migrate and seed the database # Start webserver on ninja.test:8000 - - php artisan serve --host=www.ninja.test --port=8000 & # '&' allows to run in background - # Start PhantomJS - - phantomjs --webdriver=4444 & # '&' allows to run in background - # Give it some time to start - - sleep 5 - # Make sure the app is up-to-date + - google-chrome-stable --headless --disable-gpu --remote-debugging-port=9222 http://localhost & + - php artisan serve & script: - php ./vendor/bin/phpunit --debug --verbose --coverage-clover=coverage.xml - + - php artisan dusk after_success: - bash <(curl -s https://codecov.io/bash) diff --git a/composer.lock b/composer.lock index 5529d1505a40..25f90aa1baa5 100644 --- a/composer.lock +++ b/composer.lock @@ -862,16 +862,16 @@ }, { "name": "laravel/framework", - "version": "v5.7.10", + "version": "v5.7.11", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "7d748c33b8c409b9b0c96704d6493853de41754d" + "reference": "52ee19c53c4fcd7fea8a83aacae5b8bc212ae19b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/7d748c33b8c409b9b0c96704d6493853de41754d", - "reference": "7d748c33b8c409b9b0c96704d6493853de41754d", + "url": "https://api.github.com/repos/laravel/framework/zipball/52ee19c53c4fcd7fea8a83aacae5b8bc212ae19b", + "reference": "52ee19c53c4fcd7fea8a83aacae5b8bc212ae19b", "shasum": "" }, "require": { @@ -1001,7 +1001,7 @@ "framework", "laravel" ], - "time": "2018-10-23T14:05:19+00:00" + "time": "2018-10-24T12:50:20+00:00" }, { "name": "laravel/socialite", @@ -1068,24 +1068,28 @@ }, { "name": "laravel/telescope", - "version": "v0.1.1", + "version": "v0.1.2", "source": { "type": "git", "url": "https://github.com/laravel/telescope.git", - "reference": "77deb0410a18af3b3dcf64cdc99eec62179db16a" + "reference": "253dde9a80d50e90c7f9d4d6621151acf556d1a1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/telescope/zipball/77deb0410a18af3b3dcf64cdc99eec62179db16a", - "reference": "77deb0410a18af3b3dcf64cdc99eec62179db16a", + "url": "https://api.github.com/repos/laravel/telescope/zipball/253dde9a80d50e90c7f9d4d6621151acf556d1a1", + "reference": "253dde9a80d50e90c7f9d4d6621151acf556d1a1", "shasum": "" }, "require": { "ext-json": "*", + "laravel/framework": "~5.7.7", "moontoast/math": "^1.1", "php": "^7.1.3", "symfony/var-dumper": "^4.1" }, + "require-dev": { + "nunomaduro/larastan": "^0.3.4" + }, "type": "library", "extra": { "branch-alias": { @@ -1122,7 +1126,7 @@ "laravel", "monitoring" ], - "time": "2018-10-23T18:09:26+00:00" + "time": "2018-10-24T11:28:33+00:00" }, { "name": "laravel/tinker", diff --git a/config/cache.php b/config/cache.php index ff4ff996e1e7..6c4629d2c5aa 100644 --- a/config/cache.php +++ b/config/cache.php @@ -15,7 +15,7 @@ return [ | */ - 'default' => env('CACHE_DRIVER', 'redis'), + 'default' => env('CACHE_DRIVER', 'file'), /* |--------------------------------------------------------------------------