Skip to content

Commit

Permalink
Merge pull request cucumber#596 from brasmusson/wip-jruby-fix
Browse files Browse the repository at this point in the history
Trying to fix the failing JRuby builds on Travis
  • Loading branch information
os97673 committed Nov 15, 2013
2 parents ab427d0 + 1fab8ef commit 3e2266a
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions cucumber.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
rerun = File.file?('rerun.txt') ? IO.read('rerun.txt') : ""
rerun_opts = rerun.to_s.strip.empty? ? "--format progress features" : "--format pretty #{rerun}"
std_opts = "--format progress features --tags ~@wip --tag ~@wip-new-core -r features --strict"
std_opts << " --tags ~@drb" if defined?(JRUBY_VERSION)
std_opts << " --tags ~@drb --tags ~@wip-jruby" if defined?(JRUBY_VERSION)
begin
require 'rspec/expectations'
std_opts << ' --tags ~@rspec1'
rescue LoadError
# rspec 1
std_opts << ' --tags ~@rspec2'
end
wip_opts = "--color --tags @wip:3,@wip-new-core -r features"
wip_opts = "--color -r features --tags @wip:3,@wip-new-core"
wip_opts << ",@wip-jruby:3" if defined?(JRUBY_VERSION)
legacy_opts = ''
Expand Down

0 comments on commit 3e2266a

Please sign in to comment.