curb_spec.rb in httpi-2.2.0

- old
+ new

@@ -19,11 +19,11 @@
         curb.expects(:header_str).returns("Accept-encoding: utf-8")
         curb.expects(:body_str).returns(Fixture.xml)
       end
 
       it "returns a valid HTTPI::Response" do
-        adapter.request(:get).should match_response(:body => Fixture.xml)
+        expect(adapter.request(:get)).to match_response(:body => Fixture.xml)
       end
     end
 
     describe "#request(:post)" do
       before do
@@ -32,11 +32,11 @@
         curb.expects(:header_str).returns("Accept-encoding: utf-8")
         curb.expects(:body_str).returns(Fixture.xml)
       end
 
       it "returns a valid HTTPI::Response" do
-        adapter.request(:post).should match_response(:body => Fixture.xml)
+        expect(adapter.request(:post)).to match_response(:body => Fixture.xml)
       end
     end
 
     describe "#request(:post)" do
       it "sends the body in the request" do
@@ -54,11 +54,11 @@
         curb.expects(:header_str).returns("Accept-encoding: utf-8")
         curb.expects(:body_str).returns(Fixture.xml)
       end
 
       it "returns a valid HTTPI::Response" do
-        adapter.request(:head).should match_response(:body => Fixture.xml)
+        expect(adapter.request(:head)).to match_response(:body => Fixture.xml)
       end
     end
 
     describe "#request(:put)" do
       before do
@@ -67,11 +67,11 @@
         curb.expects(:header_str).returns("Accept-encoding: utf-8")
         curb.expects(:body_str).returns(Fixture.xml)
       end
 
       it "returns a valid HTTPI::Response" do
-        adapter.request(:put).should match_response(:body => Fixture.xml)
+        expect(adapter.request(:put)).to match_response(:body => Fixture.xml)
       end
     end
 
     describe "#request(:put)" do
       it "sends the body in the request" do
@@ -89,11 +89,11 @@
         curb.expects(:header_str).returns("Accept-encoding: utf-8")
         curb.expects(:body_str).returns("")
       end
 
       it "returns a valid HTTPI::Response" do
-        adapter.request(:delete).should match_response(:body => "")
+        expect(adapter.request(:delete)).to match_response(:body => "")
       end
     end
 
     describe "#request(:custom)" do
       it "raises a NotSupportedError" do
@@ -216,10 +216,46 @@
           curb.expects(:password=).with("password")
           adapter.request(:get)
         end
       end
 
+      context "(for SSL without auth)" do
+        let(:request) do
+          request = HTTPI::Request.new("http://example.com")
+          request.ssl = true
+          request
+        end
+
+        context 'sets ssl_version' do
+          it 'defaults to nil when no ssl_version is specified' do
+            curb.expects(:ssl_version=).with(nil)
+            adapter.request(:get)
+          end
+
+          it 'to 1 when ssl_version is specified as TLSv1' do
+            request.auth.ssl.ssl_version = :TLSv1
+            curb.expects(:ssl_version=).with(1)
+
+            adapter.request(:get)
+          end
+
+          it 'to 2 when ssl_version is specified as SSLv2' do
+            request.auth.ssl.ssl_version = :SSLv2
+            curb.expects(:ssl_version=).with(2)
+
+            adapter.request(:get)
+          end
+
+          it 'to 3 when ssl_version is specified as SSLv3' do
+            request.auth.ssl.ssl_version = :SSLv3
+            curb.expects(:ssl_version=).with(3)
+
+            adapter.request(:get)
+          end
+        end
+      end
+
       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"
@@ -258,37 +294,9 @@
         it "sets the cacert if specified" do
           request.auth.ssl.ca_cert_file = "spec/fixtures/client_cert.pem"
           curb.expects(:cacert=).with(request.auth.ssl.ca_cert_file)
 
           adapter.request(:get)
-        end
-
-        context 'sets ssl_version' do
-          it 'defaults to nil when no ssl_version is specified' do
-            curb.expects(:ssl_version=).with(nil)
-            adapter.request(:get)
-          end
-
-          it 'to 1 when ssl_version is specified as TLSv1' do
-            request.auth.ssl.ssl_version = :TLSv1
-            curb.expects(:ssl_version=).with(1)
-
-            adapter.request(:get)
-          end
-
-          it 'to 2 when ssl_version is specified as SSLv2' do
-            request.auth.ssl.ssl_version = :SSLv2
-            curb.expects(:ssl_version=).with(2)
-
-            adapter.request(:get)
-          end
-
-          it 'to 3 when ssl_version is specified as SSLv3' do
-            request.auth.ssl.ssl_version = :SSLv3
-            curb.expects(:ssl_version=).with(3)
-
-            adapter.request(:get)
-          end
         end
       end
     end
 
   end