nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Differentiate between oauth features and non-oauth features for travis.

Browse source
This commit is contained in:
Sarah Mei 2011-11-05 21:09:56 -07:00
parent a9ac7329d1
commit ac065e1706
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
features/oauth.feature
View file

@ -1,4 +1,4 @@
@javascript @no-ci @javascript @oauth-group
Feature: oauth Feature: oauth
Exchanging oauth credentials Exchanging oauth credentials

2
lib/tasks/ci.rake
View file

@ -8,7 +8,7 @@ namespace :ci do
raise "Cucumber failed!" unless $?.exitstatus == 0 raise "Cucumber failed!" unless $?.exitstatus == 0
elsif ENV['BUILD_TYPE'] == 'oauth-cucumber' elsif ENV['BUILD_TYPE'] == 'oauth-cucumber'
puts "Running oauth cucumber features..." puts "Running oauth cucumber features..."
system("export DISPLAY=:99.0 && CI=true bundle exec rake cucumber") system("export DISPLAY=:99.0 && GROUP=oauth bundle exec rake cucumber")
raise "OAuth cucumber failed!" unless $?.exitstatus == 0 raise "OAuth cucumber failed!" unless $?.exitstatus == 0
else else
["rspec spec", "rake jasmine:ci"].each do |cmd| ["rspec spec", "rake jasmine:ci"].each do |cmd|

4
lib/tasks/cucumber.rake
View file

@ -19,8 +19,8 @@ begin
t.fork = true # You may get faster startup if you set this to false t.fork = true # You may get faster startup if you set this to false
t.profile = 'default' t.profile = 'default'
cucumber_opts = "" cucumber_opts = ""
cucumber_opts << " -f pretty" unless ENV["CI"] || ENV["TRAVIS"] cucumber_opts << " -f pretty" unless ENV["TRAVIS"]
cucumber_opts << " --tags ~@no-ci" if ENV["CI"] || ENV["TRAVIS"] cucumber_opts << ((ENV["GROUP"] == "oauth") ? " --tags @oauth-group" : " --tags ~@oauth-group")
t.cucumber_opts = cucumber_opts t.cucumber_opts = cucumber_opts
end end