Skip to content
This repository
Browse code

Will this pass tests in JRuby on Travis?

  • Loading branch information...
commit ca7d5e2fcc2e81bfa9c32acae53b9ca7c67b2e33 1 parent 8f6f989
Bartosz Blimke authored March 16, 2012
1  spec/acceptance/excon/excon_spec_helper.rb
@@ -3,6 +3,7 @@
3 3
 module ExconSpecHelper
4 4
 
5 5
   def http_request(method, uri, options = {}, &block)
  6
+    Excon.defaults[:ssl_verify_peer] = false
6 7
     uri      = Addressable::URI.heuristic_parse(uri)
7 8
     uri      = uri.omit(:userinfo).to_s.gsub(' ', '+')
8 9
 
2  spec/acceptance/net_http/net_http_spec_helper.rb
@@ -23,7 +23,7 @@ def http_request(method, uri, options = {}, &block)
23 23
     if uri.scheme == "https"
24 24
       http.use_ssl = true
25 25
       #1.9.1 has a bug with ssl_timeout
26  
-      http.ssl_timeout = 20 unless RUBY_VERSION == "1.9.1"
  26
+      http.ssl_timeout = 20 if http.respond_to?("ssl_timeout=")
27 27
       http.open_timeout = 60
28 28
       http.read_timeout = 60
29 29
     end

0 notes on commit ca7d5e2

Please sign in to comment.
Something went wrong with that request. Please try again.