From a9ac7329d1d30e7d94a3788e06c4fc78121b5c0b Mon Sep 17 00:00:00 2001 From: Sarah Mei Date: Sat, 5 Nov 2011 20:40:16 -0700 Subject: [PATCH] Add oauth features to travis as a separate build. Combinatoric explosion FTW --- .travis.yml | 2 ++ lib/tasks/ci.rake | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/.travis.yml b/.travis.yml index c7d3ee080..da3d395bf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,8 +9,10 @@ rvm: env: - DB=postgres BUILD_TYPE=cucumber + - DB=postgres BUILD_TYPE=oauth-cucumber - DB=postgres BUILD_TYPE=other - DB=mysql BUILD_TYPE=cucumber + - DB=mysql BUILD_TYPE=oauth-cucumber - DB=mysql BUILD_TYPE=other diff --git a/lib/tasks/ci.rake b/lib/tasks/ci.rake index 19b5bfa0f..956b74daa 100644 --- a/lib/tasks/ci.rake +++ b/lib/tasks/ci.rake @@ -6,6 +6,10 @@ namespace :ci do puts "Running cucumber features..." system("export DISPLAY=:99.0 && bundle exec rake cucumber") raise "Cucumber failed!" unless $?.exitstatus == 0 + elsif ENV['BUILD_TYPE'] == 'oauth-cucumber' + puts "Running oauth cucumber features..." + system("export DISPLAY=:99.0 && CI=true bundle exec rake cucumber") + raise "OAuth cucumber failed!" unless $?.exitstatus == 0 else ["rspec spec", "rake jasmine:ci"].each do |cmd| puts "Starting to run #{cmd}..."