diff --git a/.gitignore b/.gitignore index 963d53d..bba460a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ **/*/tmp **/*/log **/*/*.gem -**.*/*.sqlite +**.*/*.sqlite3 diff --git a/.travis.yml b/.travis.yml index ece1d2e..b38d980 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,4 +6,5 @@ env: - "RAILS_VERSION=4.2.0" - "RAILS_VERSION=5.0.0" cache: bundler +install: bundle install script: ./ci/test.sh diff --git a/ci/test.sh b/ci/test.sh index 21e841d..77249bc 100755 --- a/ci/test.sh +++ b/ci/test.sh @@ -3,8 +3,6 @@ ROOT_PATH=$PWD set -e # abort if anything fails -bundle check || bundle - echo '####################' echo 'Unit Tests' echo '####################' @@ -29,7 +27,7 @@ echo '' echo '##### test-app #####' cd $ROOT_PATH/test-app -bundle exec rake db:setup +bundle exec rake db:migrate db:test:prepare bundle exec rspec # Cleanup diff --git a/test-app/db/test.sqlite3 b/test-app/db/test.sqlite3 deleted file mode 100644 index 43f9a33..0000000 Binary files a/test-app/db/test.sqlite3 and /dev/null differ