Fixed CI db stuff

This commit is contained in:
snipe 2016-04-13 01:08:02 -07:00
parent 91c9a08d29
commit 62b3653e7c
2 changed files with 3 additions and 9 deletions

View file

@ -12,7 +12,7 @@ FILESYSTEM_DISK=local
# -------------------------------------------- # --------------------------------------------
# REQUIRED: DATABASE SETTINGS # REQUIRED: DATABASE SETTINGS
# -------------------------------------------- # --------------------------------------------
DB_CONNECTION=sqlite_testing DB_CONNECTION=mysql
DB_HOST=localhost DB_HOST=localhost
DB_DATABASE=snipeit_unit DB_DATABASE=snipeit_unit
DB_USERNAME=travis DB_USERNAME=travis

View file

@ -14,12 +14,6 @@ php:
# execute any number of scripts before the test run, custom env's are available as variables # execute any number of scripts before the test run, custom env's are available as variables
before_script: before_script:
# - php -S localhost:8000 &
# - mkdir travis-phantomjs
# - wget https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-2.1.1-linux-x86_64.tar.bz2 -O $PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2
# - tar -xvf $PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2 -C $PWD/travis-phantomjs
# - export PATH=$PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64/bin:$PATH
- phantomjs --webdriver=4444 & - phantomjs --webdriver=4444 &
- sleep 10 - sleep 10
- mysql -e "create database IF NOT EXISTS snipeit_unit;" -utravis - mysql -e "create database IF NOT EXISTS snipeit_unit;" -utravis
@ -27,10 +21,10 @@ before_script:
- composer install -n --prefer-source - composer install -n --prefer-source
- cp .env.testing-ci .env - cp .env.testing-ci .env
- chmod -R 777 storage - chmod -R 777 storage
- php artisan migrate --force - php artisan migrate --database=mysql --force
- ./vendor/bin/codecept build - ./vendor/bin/codecept build
- php artisan key:generate - php artisan key:generate
- php artisan db:seed --force - php artisan db:seed --database=mysql --force
- php artisan admin:create --first_name=Alison --last_name=Foobar --email=me@example.com --username=snipe --password=password - php artisan admin:create --first_name=Alison --last_name=Foobar --email=me@example.com --username=snipe --password=password
- php artisan serve --port=8000 --host=localhost & - php artisan serve --port=8000 --host=localhost &
- sleep 5 - sleep 5