Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

get cukes passing on JRuby

  • Loading branch information...
commit be7e9b5b48edc7aa46c2befd3d35bd217ae1cddb 1 parent c7f66d7
@mislav mislav authored
Showing with 10 additions and 4 deletions.
  1. +3 −2 Gemfile
  2. +6 −1 features/support/env.rb
  3. +1 −1  lib/hub.rb
View
5 Gemfile
@@ -1,10 +1,11 @@
source 'https://rubygems.org'
-gem 'ronn'
+gem 'ronn', :platform => :mri
gem 'aruba'
gem 'cucumber'
gem 'sinatra'
-gem 'thin'
+gem 'thin', :platform => :mri
gem 'json'
+gem 'jruby-openssl', :platform => :jruby
gemspec
View
7 features/support/env.rb
@@ -40,7 +40,12 @@ def close_streams
FileUtils.mkdir_p ENV['HOME']
- @aruba_io_wait_seconds = 0.02
+ if defined?(RUBY_ENGINE) and RUBY_ENGINE == 'jruby'
+ @aruba_timeout_seconds = 5
+ @aruba_io_wait_seconds = 0.1
+ else
+ @aruba_io_wait_seconds = 0.02
+ end
end
After do
View
2  lib/hub.rb
@@ -1,4 +1,4 @@
-require 'hub/version'
+require 'hub/version' unless defined?(Hub::VERSION)
require 'hub/args'
require 'hub/ssh_config'
require 'hub/github_api'
Please sign in to comment.
Something went wrong with that request. Please try again.