Skip to content

Commit

Permalink
Sigh.
Browse files Browse the repository at this point in the history
  • Loading branch information
snipe committed Apr 13, 2016
1 parent 454d0da commit 1eeb4d0
Show file tree
Hide file tree
Showing 4 changed files with 76 additions and 6 deletions.
6 changes: 3 additions & 3 deletions .env.testing
Original file line number Diff line number Diff line change
Expand Up @@ -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

# --------------------------------------------
Expand Down
71 changes: 71 additions & 0 deletions .env.testing-ci
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
# --------------------------------------------
# REQUIRED: BASIC APP SETTINGS
# --------------------------------------------
APP_ENV=testing
APP_DEBUG=true
APP_KEY=ChangeMe
APP_URL=http:https://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
[email protected]
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
3 changes: 1 addition & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -36,7 +36,6 @@ before_script:
- sleep 5
- pip install --user codecov
- sleep 5
- composer global update



Expand Down
2 changes: 1 addition & 1 deletion tests/unit.suite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ modules:
enabled:
- \Helper\Unit
- Laravel5:
environment_file: .env.testing
environment_file: .env.testing-ci

0 comments on commit 1eeb4d0

Please sign in to comment.