Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make rbx-2.1.1 build run on travis #1194

Merged
merged 4 commits into from
Dec 20, 2013
Merged

Make rbx-2.1.1 build run on travis #1194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8805687
add requirements for rbx-2.1.1
twalpole Nov 19, 2013
47bce68
Remove rbx-2.1.0 and allow 2.0.0 to fail
twalpole Nov 19, 2013
ac1cf04
change rspec formatter under jruby so travis will see status
twalpole Nov 19, 2013
892e120
dont run chrome for jruby
twalpole Nov 26, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions Rakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
8 changes: 7 additions & 1 deletion capybara.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why is racc a dependency?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

because nokogiri requires it but rbx doesnt load anything by default - FYI rubinius/rubinius#2632

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
Expand Down
2 changes: 1 addition & 1 deletion spec/selenium_spec_chrome.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ module TestSessions
:response_headers,
:status_code,
:trigger
]
] unless ENV['TRAVIS'] && (RUBY_PLATFORM == 'java')