diff --git a/.travis.yml b/.travis.yml index 728e4940..ab7b9b9b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,8 +6,9 @@ php: # - hhvm before_script: - - cp .env.travis .env -# - mysql -e 'create database phpvms_test;' + #- cp .env.travis .env + - cp .env.example .env + #- mysql -e 'create database phpvms_test;' - composer self-update - make build diff --git a/Makefile b/Makefile index 52d6370f..629e7bb0 100644 --- a/Makefile +++ b/Makefile @@ -26,8 +26,7 @@ reset: db: sqlite3 database/testing.sqlite "" - php artisan migrate - php artisan db:seed + php artisan migrate:refresh --seed unittest-db: rm -f database/unittest.sqlite