kotovalexarian-likes-github/httparty
1
0
Fork 0
mirror of https://github.com/jnunemaker/httparty synced 2023-03-27 23:23:07 -04:00
Code Releases Activity

Merge branch 'master' of github.com:isaacsanders/httparty

Browse source 
Conflicts:
	spec/httparty/ssl_spec.rb
	spec/support/ssl_test_helper.rb
This commit is contained in:
Isaac Sanders 2012-04-16 09:19:57 -05:00
commit d51884c6fe
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
spec/support/ssl_test_helper.rb
View file

@ -3,7 +3,17 @@ require 'pathname'
module HTTParty module HTTParty
module SSLTestHelper module SSLTestHelper
def ssl_verify_test(mode, ca_basename, server_cert_filename) def ssl_verify_test(mode, ca_basename, server_cert_filename)
test_server = nil options = {
:format => :json,
:timeout => 30,
}
if mode
ca_path = File.expand_path("../../fixtures/ssl/generated/#{ca_basename}", __FILE__)
raise ArgumentError.new("#{ca_path} does not exist") unless File.exist?(ca_path)
options[mode] = ca_path
end
begin begin
test_server = SSLTestServer.new( test_server = SSLTestServer.new(
:rsa_key => File.read(File.expand_path("../../fixtures/ssl/generated/server.key", __FILE__)), :rsa_key => File.read(File.expand_path("../../fixtures/ssl/generated/server.key", __FILE__)),