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

Conflicts: spec/httparty/ssl_spec.rb spec/support/ssl_test_helper.rb
jerry · Apr 16, 2012 · d51884c · d51884c
2 parents 9d7667f + 5f76a2b
commit d51884c
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/spec/support/ssl_test_helper.rb b/spec/support/ssl_test_helper.rb
@@ -3,7 +3,17 @@
 module HTTParty
   module SSLTestHelper
     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
         test_server = SSLTestServer.new(
             :rsa_key => File.read(File.expand_path("../../fixtures/ssl/generated/server.key", __FILE__)),