diff --git a/.travis.yml b/.travis.yml index 0d48e2242..09c07f009 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ bundler_args: "--without development production" rvm: - ree -# - 1.9.2 + - 1.9.2 before_script: - "sass --update public/stylesheets/sass/:public/stylesheets/" @@ -9,6 +9,7 @@ before_script: - "rake db:create" - "rake db:schema:load" - "rspec spec --tag fixture" + - "sh -e /etc/init.d/xvfb start" script: "bundle exec rake travis" env: "TRAVIS=true" notifications: diff --git a/lib/tasks/cruise.rake b/lib/tasks/cruise.rake index ebd836f03..d666ef4f0 100644 --- a/lib/tasks/cruise.rake +++ b/lib/tasks/cruise.rake @@ -21,10 +21,8 @@ namespace :cruise do end task :travis do - ["rspec spec", "rake cucumber", "jasmine:ci"].each do |cmd| - system("bundle exec #{cmd}") - raise "#{cmd} failed!" unless $?.exitstatus == 0 - end + system('export DISPLAY=:99.0 && CI=true bundle exec rake') + raise "tests failed!" unless $?.exitstatus == 0 end end task :cruise => "cruise:cruise"