diff --git a/.travis.yml b/.travis.yml index b2fd014e..6ec3058e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,14 +6,16 @@ rvm: - 2.1 - 2.2 +env: + - DATABASE_URL=mysql2://localhost/tracks_test + - DATABASE_URL=sqlite3:db/test.sqlite3 + bundler_args: --without development --jobs=3 --retry=3 before_script: - - "mysql -e 'create database tracks_test;'" - "export DISPLAY=:99.0" - "sh -e /etc/init.d/xvfb start" - "cp config/site.yml.tmpl config/site.yml" - - "cp config/database.yml.tmpl config/database.yml" script: "bin/rake ci" diff --git a/lib/tasks/continuous_integration.rake b/lib/tasks/continuous_integration.rake index 189d7263..603cbcdf 100644 --- a/lib/tasks/continuous_integration.rake +++ b/lib/tasks/continuous_integration.rake @@ -9,7 +9,7 @@ task :ci do |t| require 'simplecov' SimpleCov.start 'rails' - [:environment, 'test:all', 'cucumber'].each do |t| + [:environment, 'db:create', 'test:all', 'cucumber'].each do |t| Rake::Task[t].invoke end end