Differentiate between oauth features and non-oauth features for travis.
This commit is contained in:
parent
a9ac7329d1
commit
ac065e1706
3 changed files with 4 additions and 4 deletions
|
|
@ -1,4 +1,4 @@
|
|||
@javascript @no-ci
|
||||
@javascript @oauth-group
|
||||
Feature: oauth
|
||||
Exchanging oauth credentials
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ namespace :ci do
|
|||
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")
|
||||
system("export DISPLAY=:99.0 && GROUP=oauth bundle exec rake cucumber")
|
||||
raise "OAuth cucumber failed!" unless $?.exitstatus == 0
|
||||
else
|
||||
["rspec spec", "rake jasmine:ci"].each do |cmd|
|
||||
|
|
|
|||
|
|
@ -19,8 +19,8 @@ begin
|
|||
t.fork = true # You may get faster startup if you set this to false
|
||||
t.profile = 'default'
|
||||
cucumber_opts = ""
|
||||
cucumber_opts << " -f pretty" unless ENV["CI"] || ENV["TRAVIS"]
|
||||
cucumber_opts << " --tags ~@no-ci" if ENV["CI"] || ENV["TRAVIS"]
|
||||
cucumber_opts << " -f pretty" unless ENV["TRAVIS"]
|
||||
cucumber_opts << ((ENV["GROUP"] == "oauth") ? " --tags @oauth-group" : " --tags ~@oauth-group")
|
||||
t.cucumber_opts = cucumber_opts
|
||||
end
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue