diff --git a/.env.testing b/.env.testing index 2d7946b2e938..f38ea7f626ea 100644 --- a/.env.testing +++ b/.env.testing @@ -12,10 +12,10 @@ FILESYSTEM_DISK=local # -------------------------------------------- # REQUIRED: DATABASE SETTINGS # -------------------------------------------- -DB_CONNECTION=mysql +DB_CONNECTION=sqlite_testing DB_HOST=localhost -DB_DATABASE=snipeit_unit -DB_USERNAME=travis +DB_DATABASE=testing.sqlite +DB_USERNAME=null DB_PASSWORD=null # -------------------------------------------- diff --git a/.env.testing-ci b/.env.testing-ci new file mode 100644 index 000000000000..ca9f62ca79d6 --- /dev/null +++ b/.env.testing-ci @@ -0,0 +1,71 @@ +# -------------------------------------------- +# REQUIRED: BASIC APP SETTINGS +# -------------------------------------------- +APP_ENV=testing +APP_DEBUG=true +APP_KEY=ChangeMe +APP_URL=http://localhost:8000 +APP_TIMEZONE='US/Pacific' +APP_LOCALE=en +FILESYSTEM_DISK=local + +# -------------------------------------------- +# REQUIRED: DATABASE SETTINGS +# -------------------------------------------- +DB_CONNECTION=sqlite_testing +DB_HOST=localhost +DB_DATABASE=snipeit_unit +DB_USERNAME=travis +DB_PASSWORD=null + +# -------------------------------------------- +# REQUIRED: OUTGOING MAIL SERVER SETTINGS +# -------------------------------------------- +MAIL_DRIVER=smtp +MAIL_HOST=email-smtp.us-west-2.amazonaws.com +MAIL_PORT=587 +MAIL_USERNAME=YOURUSERNAME +MAIL_PASSWORD=YOURPASSWORD +MAIL_ENCRYPTION=null +MAIL_FROM_ADDR=you@example.com +MAIL_FROM_NAME=Snipe-IT + +# -------------------------------------------- +# REQUIRED: IMAGE LIBRARY +# This should be gd or imagick +# -------------------------------------------- +IMAGE_LIB=gd + + +# -------------------------------------------- +# OPTIONAL: AWS S3 SETTINGS +# -------------------------------------------- +AWS_SECRET=null +AWS_KEY=null +AWS_REGION=null +AWS_BUCKET=null + + +# -------------------------------------------- +# OPTIONAL: CACHE SETTINGS +# -------------------------------------------- +CACHE_DRIVER=file +SESSION_DRIVER=file +QUEUE_DRIVER=sync + + +# -------------------------------------------- +# OPTIONAL: SESSION SETTINGS +# -------------------------------------------- +SESSION_LIFETIME=12000 +EXPIRE_ON_CLOSE=false +ENCRYPT=false +COOKIE_NAME=snipeit_session +COOKIE_DOMAIN=null +SECURE_COOKIES=false + + +# -------------------------------------------- +# OPTIONAL: APP LOG FORMAT +# -------------------------------------------- +APP_LOG=single diff --git a/.travis.yml b/.travis.yml index f443ad37c589..0d01cf8423b1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,7 +25,7 @@ before_script: - mysql -e "create database IF NOT EXISTS snipeit_unit;" -utravis - composer self-update - composer install -n --prefer-source - - cp .env.testing .env + - cp .env.testing-ci .env - chmod -R 777 storage - php artisan migrate --force - ./vendor/bin/codecept build @@ -36,7 +36,6 @@ before_script: - sleep 5 - pip install --user codecov - sleep 5 - - composer global update diff --git a/tests/unit.suite.yml b/tests/unit.suite.yml index aac1c5007abb..d8b3ebb9ccda 100644 --- a/tests/unit.suite.yml +++ b/tests/unit.suite.yml @@ -6,4 +6,4 @@ modules: enabled: - \Helper\Unit - Laravel5: - environment_file: .env.testing + environment_file: .env.testing-ci