curb_spec.rb in httpi-2.4.2

- old
+ new

@@ -18,11 +18,11 @@
     end
 
     it "supports ntlm authentication" do
       request = HTTPI::Request.new(@server.url + "ntlm-auth")
       adapter = HTTPI::Adapter::Curb.new(request)
-      
+
       request.auth.ntlm("tester", "vReqSoafRe5O")
       expect(adapter.request(:get).body).to eq("ntlm-auth")
     end
   end
 
@@ -255,12 +255,12 @@
 
             adapter.request(:get)
           end
 
           it 'to 2 when ssl_version is specified as SSLv2/SSLv23' do
-            version = OpenSSL::SSL::SSLContext::METHODS.reject { |method| method.match /server|client/ }
-            version = version.select { |method| method.to_s.match /SSLv2|SSLv23/ }.first
+            version = OpenSSL::SSL::SSLContext::METHODS.reject { |method| method.match(/server|client/) }
+            version = version.select { |method| method.to_s.match(/SSLv2|SSLv23/) }.first
             request.auth.ssl.ssl_version = version
             curb.expects(:ssl_version=).with(2)
 
             adapter.request(:get)
           end
@@ -277,24 +277,27 @@
       context "(for SSL client auth)" do
         let(:request) do
           request = HTTPI::Request.new("http://example.com")
           request.auth.ssl.cert_key_file = "spec/fixtures/client_key.pem"
           request.auth.ssl.cert_file = "spec/fixtures/client_cert.pem"
+          request.auth.ssl.cert_key_password = 'example'
           request
         end
 
         it "send certificate regardless of state of SSL verify mode" do
           request.auth.ssl.verify_mode = :none
           curb.expects(:ssl_verify_host=).with(0) # avoid "SSL peer certificate" error
           curb.expects(:cert_key=).with(request.auth.ssl.cert_key_file)
           curb.expects(:cert=).with(request.auth.ssl.cert_file)
+          curb.expects(:certpassword=).with(request.auth.ssl.cert_key_password)
 
           adapter.request(:get)
         end
 
         it "cert_key, cert and ssl_verify_peer should be set" do
           curb.expects(:cert_key=).with(request.auth.ssl.cert_key_file)
           curb.expects(:cert=).with(request.auth.ssl.cert_file)
+          curb.expects(:certpassword=).with(request.auth.ssl.cert_key_password)
           curb.expects(:ssl_verify_peer=).with(true)
           curb.expects(:certtype=).with(request.auth.ssl.cert_type.to_s.upcase)
 
           adapter.request(:get)
         end