Merge pull request #1194 from twalpole/rbx

Make rbx-2.1.1 build run on travis
This commit is contained in:
Jonas Nicklas 2013-12-20 00:36:27 -08:00
commit 60683d9054
4 changed files with 12 additions and 3 deletions

View File

@ -4,12 +4,13 @@ rvm:
- 2.0.0
- jruby-19mode
- rbx-2.1.1
- rbx-2.1.0
- rbx-2.0.0
gemfile:
- Gemfile
- gemfiles/Gemfile.base-versions
matrix:
allow_failures:
- rvm: rbx-2.0.0
exclude:
# Nokogiri 1.3.3 is not compatible with Rubinius or JRuby
- gemfile: gemfiles/Gemfile.base-versions

View File

@ -10,6 +10,8 @@ end
RSpec::Core::RakeTask.new(:spec_with_chrome) do |t|
t.rspec_opts = %w[--color]
#jruby buffers the progress formatter so travis doesnt see output often enough
t.rspec_opts << '--format documentation' if RUBY_PLATFORM=='java'
t.pattern = './spec{,/*/**}/*{_spec.rb,_spec_chrome.rb}'
end

View File

@ -37,7 +37,13 @@ Gem::Specification.new do |s|
s.add_development_dependency("cucumber", [">= 0.10.5"])
s.add_development_dependency("rake")
s.add_development_dependency("pry")
if RUBY_ENGINE == 'rbx' then
s.add_development_dependency("racc")
s.add_development_dependency("json")
s.add_development_dependency("rubysl")
end
if File.exist?("gem-private_key.pem")
s.signing_key = 'gem-private_key.pem'
end

View File

@ -18,4 +18,4 @@ Capybara::SpecHelper.run_specs TestSessions::Chrome, "selenium_chrome", :skip =>
:response_headers,
:status_code,
:trigger
]
] unless ENV['TRAVIS'] && (RUBY_PLATFORM == 'java')