From 2268cd204cfe73c105e91a10b6a6217e885892f9 Mon Sep 17 00:00:00 2001 From: Sarah Mei Date: Sat, 30 Oct 2010 13:52:52 -0700 Subject: [PATCH] Taking jasmine out of CI for now - selenium server isn't reliably starting up during jasmine:ci --- lib/tasks/cruise.rake | 2 +- lib/tasks/default.rake | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/tasks/cruise.rake b/lib/tasks/cruise.rake index 382f87c78..219f735f0 100644 --- a/lib/tasks/cruise.rake +++ b/lib/tasks/cruise.rake @@ -2,7 +2,7 @@ namespace :cruise do desc "Run all specs and features" task :cruise => :environment do system('/etc/init.d/xvfb start') - system('export DISPLAY=:99.0 && bundle exec rake') + system('export DISPLAY=:99.0 && bundle exec rake no-jasmine') exit_status = $?.exitstatus system('/etc/init.d/xvfb stop') raise "tests failed!" unless exit_status == 0 diff --git a/lib/tasks/default.rake b/lib/tasks/default.rake index 586ec88a7..dff9339e0 100644 --- a/lib/tasks/default.rake +++ b/lib/tasks/default.rake @@ -1 +1,3 @@ -task :default => [:cucumber, :spec, :'jasmine:ci'] \ No newline at end of file +task :default => [:cucumber, :spec, :'jasmine:ci'] + +task :'no-jasmine' => [:cucumber, :spec] \ No newline at end of file