httpi 0.9.3 → 0.9.4

data/spec/httpi/adapter/httpclient_spec.rb

@@ -10,14 +10,14 @@ describe HTTPI::Adapter::HTTPClient do
   let(:ssl_config) { HTTPClient::SSLConfig.any_instance }
 
   describe "#get" do
-    it "should return a valid HTTPI::Response" do
+    it "returns a valid HTTPI::Response" do
       httpclient.expects(:get).with(basic_request.url, nil, basic_request.headers).returns(http_message)
       adapter.get(basic_request).should match_response(:body => Fixture.xml)
     end
   end
 
   describe "#post" do
-    it "should return a valid HTTPI::Response" do
+    it "returns a valid HTTPI::Response" do
       request = HTTPI::Request.new :url => "http://example.com", :body => Fixture.xml
       httpclient.expects(:post).with(request.url, request.body, request.headers).returns(http_message)
 
@@ -26,14 +26,14 @@ describe HTTPI::Adapter::HTTPClient do
   end
 
   describe "#head" do
-    it "should return a valid HTTPI::Response" do
+    it "returns a valid HTTPI::Response" do
       httpclient.expects(:head).with(basic_request.url, nil, basic_request.headers).returns(http_message)
       adapter.head(basic_request).should match_response(:body => Fixture.xml)
     end
   end
 
   describe "#put" do
-    it "should return a valid HTTPI::Response" do
+    it "returns a valid HTTPI::Response" do
       request = HTTPI::Request.new :url => "http://example.com", :body => Fixture.xml
       httpclient.expects(:put).with(request.url, request.body, request.headers).returns(http_message)
 
@@ -42,7 +42,7 @@ describe HTTPI::Adapter::HTTPClient do
   end
 
   describe "#delete" do
-    it "should return a valid HTTPI::Response" do
+    it "returns a valid HTTPI::Response" do
       httpclient.expects(:delete).with(basic_request.url, basic_request.headers).returns(http_message(""))
       adapter.delete(basic_request).should match_response(:body => "")
     end
@@ -52,16 +52,16 @@ describe HTTPI::Adapter::HTTPClient do
     before { httpclient.stubs(:get).returns(http_message) }
 
     describe "proxy" do
-      it "should have specs"
+      it "have should specs"
     end
 
     describe "connect_timeout" do
-      it "should not be set if not specified" do
+      it "is not set unless specified" do
         httpclient.expects(:connect_timeout=).never
         adapter.get(basic_request)
       end
 
-      it "should be set if specified" do
+      it "is set if specified" do
         request = basic_request { |request| request.open_timeout = 30 }
 
         httpclient.expects(:connect_timeout=).with(30)
@@ -70,12 +70,12 @@ describe HTTPI::Adapter::HTTPClient do
     end
 
     describe "receive_timeout" do
-      it "should not be set if not specified" do
+      it "is not set unless specified" do
         httpclient.expects(:receive_timeout=).never
         adapter.get(basic_request)
       end
 
-      it "should be set if specified" do
+      it "is set if specified" do
         request = basic_request { |request| request.read_timeout = 30 }
 
         httpclient.expects(:receive_timeout=).with(30)
@@ -84,14 +84,14 @@ describe HTTPI::Adapter::HTTPClient do
     end
 
     describe "set_auth" do
-      it "should be set for HTTP basic auth" do
+      it "is set for HTTP basic auth" do
         request = basic_request { |request| request.auth.basic "username", "password" }
 
         httpclient.expects(:set_auth).with(request.url, *request.auth.credentials)
         adapter.get(request)
       end
 
-      it "should be set for HTTP digest auth" do
+      it "is set for HTTP digest auth" do
         request = basic_request { |request| request.auth.digest "username", "password" }
 
         httpclient.expects(:set_auth).with(request.url, *request.auth.credentials)
@@ -115,7 +115,7 @@ describe HTTPI::Adapter::HTTPClient do
         adapter.get(ssl_auth_request)
       end
 
-      it "should set the client_ca if specified" do
+      it "sets the client_ca if specified" do
         ssl_auth_request.auth.ssl.ca_cert_file = "spec/fixtures/client_cert.pem"
         ssl_config.expects(:client_ca=).with(ssl_auth_request.auth.ssl.ca_cert)
 
@@ -136,15 +136,15 @@ describe HTTPI::Adapter::HTTPClient do
         adapter.get(ssl_auth_request)
       end
 
-      it "should not set client_cert and client_key "do
+      it "does not set client_cert and client_key "do
         ssl_config.expects(:client_cert=).never
         ssl_config.expects(:client_key=).never
 
         adapter.get(ssl_auth_request)
       end
 
-      it "should raise an exception" do
-        lambda { adapter.get(ssl_auth_request)  }.should_not raise_error
+      it "does not raise an exception" do
+        expect { adapter.get(ssl_auth_request) }.to_not raise_error
       end
     end
   end

data/spec/httpi/adapter_spec.rb

@@ -1,40 +1,54 @@
 require "spec_helper"
 require "httpi/adapter"
 
-
 describe HTTPI::Adapter do
   let(:adapter) { HTTPI::Adapter }
 
   describe ".use" do
-    it "should set the adapter to use" do
-      adapter.use.should_not == :curb
+    around do |example|
+      adapter.use = nil
+      example.run
+      adapter.use = nil
+    end
 
-      adapter.use = :curb
-      adapter.use.should == :curb
+    it "sets the adapter to use" do
+      adapter.use.should_not == :net_http
 
-      adapter.use = nil  # reset
+      adapter.use = :net_http
+      adapter.use.should == :net_http
     end
 
-    it "should default to use the HTTPClient adapter" do
+    it "defaults to use the HTTPClient adapter" do
       adapter.use.should == :httpclient
     end
 
-    it "should raise an ArgumentError in case of an invalid adapter" do
-      lambda { adapter.use = :unknown }.should raise_error(ArgumentError)
+    it "loads the adapter's client library" do
+      adapter.expects(:require).with("httpclient")
+      adapter.use = :httpclient
+    end
+
+    it "raises an ArgumentError in case of an invalid adapter" do
+      expect { adapter.use = :unknown }.to raise_error(ArgumentError)
     end
   end
 
   describe ".load" do
-    it "should return the adapter name and it's class for a given adapter" do
-      adapter.load(:curb).should == [:curb, HTTPI::Adapter::Curb]
+    context "called with a valid adapter" do
+      it "returns the adapter's name and class" do
+        adapter.load(:curb).should == [:curb, HTTPI::Adapter::Curb]
+      end
     end
 
-    it "should return the HTTPClient adapter name and it's class by default" do
-      adapter.load.should == [:httpclient, HTTPI::Adapter::HTTPClient]
+    context "called with nil" do
+      it "returns the default adapter's name and class" do
+        adapter.load(nil).should == [:httpclient, HTTPI::Adapter::HTTPClient]
+      end
     end
 
-    it "should raise an ArgumentError in case of an invalid adapter" do
-      lambda { adapter.use = :unknown }.should raise_error(ArgumentError)
+    context "called with an invalid adapter" do
+      it "raises an ArgumentError" do
+        expect { adapter.use = :unknown }.to raise_error(ArgumentError)
+      end
     end
   end
 

data/spec/httpi/auth/config_spec.rb

@@ -9,7 +9,7 @@ describe HTTPI::Auth::Config do
       auth.basic "username", "password"
       auth.basic.should == ["username", "password"]
     end
-   
+
     it "also accepts an Array of credentials" do
       auth.basic ["username", "password"]
       auth.basic.should == ["username", "password"]
@@ -22,11 +22,11 @@ describe HTTPI::Auth::Config do
   end
 
   describe "#basic?" do
-    it "should default to return false" do
+    it "defaults to return false" do
       auth.should_not be_basic
     end
 
-    it "should return true for HTTP basic auth" do
+    it "returns true for HTTP basic auth" do
       auth.basic "username", "password"
       auth.should be_basic
     end
@@ -37,7 +37,7 @@ describe HTTPI::Auth::Config do
       auth.digest "username", "password"
       auth.digest.should == ["username", "password"]
     end
-   
+
     it "also accepts an Array of credentials" do
       auth.digest ["username", "password"]
       auth.digest.should == ["username", "password"]
@@ -50,65 +50,65 @@ describe HTTPI::Auth::Config do
   end
 
   describe "#digest?" do
-    it "should default to return false" do
+    it "defaults to return false" do
       auth.should_not be_digest
     end
 
-    it "should return true for HTTP digest auth" do
+    it "returns true for HTTP digest auth" do
       auth.digest "username", "password"
       auth.should be_digest
     end
   end
 
   describe "#http?" do
-    it "should default to return false" do
+    it "defaults to return false" do
       auth.should_not be_http
     end
 
-    it "should return true for HTTP basic auth" do
+    it "returns true for HTTP basic auth" do
       auth.basic "username", "password"
       auth.should be_http
     end
 
-    it "should return true for HTTP digest auth" do
+    it "returns true for HTTP digest auth" do
       auth.digest "username", "password"
       auth.should be_http
     end
   end
 
   describe "#ssl" do
-    it "should return the HTTPI::Auth::SSL object" do
+    it "returns the HTTPI::Auth::SSL object" do
       auth.ssl.should be_a(HTTPI::Auth::SSL)
     end
   end
 
   describe "#ssl?" do
-    it "should default to return false" do
+    it "defaults to return false" do
       auth.should_not be_ssl
     end
 
-    it "should return true for SSL client auth" do
+    it "returns true for SSL client auth" do
       auth.ssl.cert_key_file = "spec/fixtures/client_key.pem"
       auth.ssl.cert_file = "spec/fixtures/client_cert.pem"
-      
+
       auth.should be_ssl
     end
   end
 
   describe "#type" do
-    it "should return the authentication type" do
+    it "returns the authentication type" do
       auth.basic "username", "password"
       auth.type.should == :basic
     end
   end
 
   describe "#credentials" do
-    it "return the credentials for HTTP basic auth" do
+    it "returns the credentials for HTTP basic auth" do
       auth.basic "username", "basic"
       auth.credentials.should == ["username", "basic"]
     end
 
-    it "return the credentials for HTTP digest auth" do
+    it "returns the credentials for HTTP digest auth" do
       auth.digest "username", "digest"
       auth.credentials.should == ["username", "digest"]
     end

data/spec/httpi/auth/ssl_spec.rb

@@ -4,36 +4,36 @@ require "httpi/auth/ssl"
 describe HTTPI::Auth::SSL do
 
   describe "VERIFY_MODES" do
-    it "should contain the supported SSL verify modes" do
+    it "contains the supported SSL verify modes" do
       HTTPI::Auth::SSL::VERIFY_MODES.should == [:none, :peer, :fail_if_no_peer_cert, :client_once]
     end
   end
 
   describe "#present?" do
-    it "should default to return false" do
+    it "defaults to return false" do
       ssl = HTTPI::Auth::SSL.new
       ssl.should_not be_present
     end
 
-    it "should return false if only a client key was specified" do
+    it "returns false if only a client key was specified" do
       ssl = HTTPI::Auth::SSL.new
       ssl.cert_key_file = "spec/fixtures/client_key.pem"
 
       ssl.should_not be_present
     end
 
-    it "should return false if only a client key was specified" do
+    it "returns false if only a client key was specified" do
       ssl = HTTPI::Auth::SSL.new
       ssl.cert_file = "spec/fixtures/client_cert.pem"
 
       ssl.should_not be_present
     end
 
-    it "should return true if both client key and cert are present" do
+    it "returns true if both client key and cert are present" do
       ssl.should be_present
     end
 
-    it "should return true of the verify_mode is :none" do
+    it "returns true of the verify_mode is :none" do
       ssl = HTTPI::Auth::SSL.new
       ssl.verify_mode = :none
       ssl.should be_present
@@ -41,46 +41,46 @@ describe HTTPI::Auth::SSL do
   end
 
   describe "#verify_mode" do
-    it "should default to return :peer" do
+    it "defaults to return :peer" do
       ssl.verify_mode.should == :peer
     end
 
-    it "should set the verify mode to use" do
+    it "sets the verify mode to use" do
       ssl = HTTPI::Auth::SSL.new
 
       ssl.verify_mode = :none
       ssl.verify_mode.should == :none
     end
 
-    it "should raise an ArgumentError if the given mode is not supported" do
-      lambda { ssl.verify_mode = :invalid }.should raise_error(ArgumentError)
+    it "raises an ArgumentError if the given mode is not supported" do
+      expect { ssl.verify_mode = :invalid }.to raise_error(ArgumentError)
     end
   end
 
   describe "#cert" do
-    it "should return an OpenSSL::X509::Certificate for the given cert_file" do
+    it "returns an OpenSSL::X509::Certificate for the given cert_file" do
       ssl.cert.should be_a(OpenSSL::X509::Certificate)
     end
 
-    it "should return nil if no cert_file was given" do
+    it "returns nil if no cert_file was given" do
       ssl = HTTPI::Auth::SSL.new
       ssl.cert.should be_nil
     end
   end
 
   describe "#cert_key" do
-    it "should return a OpenSSL::PKey::RSA for the given cert_key" do
+    it "returns a OpenSSL::PKey::RSA for the given cert_key" do
       ssl.cert_key.should be_a(OpenSSL::PKey::RSA)
     end
 
-    it "should return nil if no cert_key_file was given" do
+    it "returns nil if no cert_key_file was given" do
       ssl = HTTPI::Auth::SSL.new
       ssl.cert_key.should be_nil
     end
   end
 
   describe "#ca_cert" do
-    it "should return an OpenSSL::X509::Certificate for the given ca_cert_file" do
+    it "returns an OpenSSL::X509::Certificate for the given ca_cert_file" do
       ssl = HTTPI::Auth::SSL.new
 
       ssl.ca_cert_file = "spec/fixtures/client_cert.pem"
@@ -89,28 +89,28 @@ describe HTTPI::Auth::SSL do
   end
 
   describe "#openssl_verify_mode" do
-    it "should return the OpenSSL verify mode for :none" do
+    it "returns the OpenSSL verify mode for :none" do
       ssl = HTTPI::Auth::SSL.new
 
       ssl.verify_mode = :none
       ssl.openssl_verify_mode.should == OpenSSL::SSL::VERIFY_NONE
     end
 
-    it "should return the OpenSSL verify mode for :peer" do
+    it "returns the OpenSSL verify mode for :peer" do
       ssl = HTTPI::Auth::SSL.new
 
       ssl.verify_mode = :peer
       ssl.openssl_verify_mode.should == OpenSSL::SSL::VERIFY_PEER
     end
 
-    it "should return the OpenSSL verify mode for :fail_if_no_peer_cert" do
+    it "returns the OpenSSL verify mode for :fail_if_no_peer_cert" do
       ssl = HTTPI::Auth::SSL.new
 
       ssl.verify_mode = :fail_if_no_peer_cert
       ssl.openssl_verify_mode.should == OpenSSL::SSL::VERIFY_FAIL_IF_NO_PEER_CERT
     end
 
-    it "should return the OpenSSL verify mode for :client_once" do
+    it "returns the OpenSSL verify mode for :client_once" do
       ssl = HTTPI::Auth::SSL.new
 
       ssl.verify_mode = :client_once

data/spec/httpi/httpi_spec.rb

@@ -7,7 +7,7 @@ describe HTTPI do
   let(:curb) { HTTPI::Adapter.load(:curb)[1] }
 
   describe ".get(request)" do
-    it "should execute an HTTP GET request using the default adapter" do
+    it "executes a GET request using the default adapter" do
       request = HTTPI::Request.new
       httpclient.any_instance.expects(:get).with(request)
 
@@ -16,7 +16,7 @@ describe HTTPI do
   end
 
   describe ".get(request, adapter)" do
-    it "should execute an HTTP GET request using the given adapter" do
+    it "executes a GET request using the given adapter" do
       request = HTTPI::Request.new
       curb.any_instance.expects(:get).with(request)
 
@@ -25,7 +25,7 @@ describe HTTPI do
   end
 
   describe ".get(url)" do
-    it "should execute an HTTP GET request using the default adapter" do
+    it "executes a GET request using the default adapter" do
       HTTPI::Request.any_instance.expects(:url=).with("http://example.com")
       httpclient.any_instance.expects(:get).with(instance_of(HTTPI::Request))
 
@@ -34,7 +34,7 @@ describe HTTPI do
   end
 
   describe ".get(url, adapter)" do
-    it "should execute an HTTP GET request using the given adapter" do
+    it "executes a GET request using the given adapter" do
       HTTPI::Request.any_instance.expects(:url=).with("http://example.com")
       curb.any_instance.expects(:get).with(instance_of(HTTPI::Request))
 
@@ -43,7 +43,7 @@ describe HTTPI do
   end
 
   describe ".post(request)" do
-    it "should execute an HTTP POST request using the default adapter" do
+    it "executes a POST request using the default adapter" do
       request = HTTPI::Request.new
       httpclient.any_instance.expects(:post).with(request)
 
@@ -52,7 +52,7 @@ describe HTTPI do
   end
 
   describe ".post(request, adapter)" do
-    it "should execute an HTTP POST request using the given adapter" do
+    it "executes a POST request using the given adapter" do
       request = HTTPI::Request.new
       curb.any_instance.expects(:post).with(request)
 
@@ -61,7 +61,7 @@ describe HTTPI do
   end
 
   describe ".post(url, body)" do
-    it "should execute an HTTP POST request using the default adapter" do
+    it "executes a POST request using the default adapter" do
       HTTPI::Request.any_instance.expects(:url=).with("http://example.com")
       HTTPI::Request.any_instance.expects(:body=).with("<some>xml</some>")
       httpclient.any_instance.expects(:post).with(instance_of(HTTPI::Request))
@@ -71,7 +71,7 @@ describe HTTPI do
   end
 
   describe ".post(url, body, adapter)" do
-    it "should execute an HTTP POST request using the given adapter" do
+    it "executes a POST request using the given adapter" do
       HTTPI::Request.any_instance.expects(:url=).with("http://example.com")
       HTTPI::Request.any_instance.expects(:body=).with("<some>xml</some>")
       curb.any_instance.expects(:post).with(instance_of(HTTPI::Request))
@@ -81,7 +81,7 @@ describe HTTPI do
   end
 
   describe ".head(request)" do
-    it "should execute an HTTP HEAD request using the default adapter" do
+    it "executes a HEAD request using the default adapter" do
       request = HTTPI::Request.new
       httpclient.any_instance.expects(:head).with(request)
 
@@ -90,7 +90,7 @@ describe HTTPI do
   end
 
   describe ".head(request, adapter)" do
-    it "should execute an HTTP HEAD request using the given adapter" do
+    it "executes a HEAD request using the given adapter" do
       request = HTTPI::Request.new
       curb.any_instance.expects(:head).with(request)
 
@@ -99,7 +99,7 @@ describe HTTPI do
   end
 
   describe ".head(url)" do
-    it "should execute an HTTP HEAD request using the default adapter" do
+    it "executes a HEAD request using the default adapter" do
       HTTPI::Request.any_instance.expects(:url=).with("http://example.com")
       httpclient.any_instance.expects(:head).with(instance_of(HTTPI::Request))
 
@@ -108,7 +108,7 @@ describe HTTPI do
   end
 
   describe ".head(url, adapter)" do
-    it "should execute an HTTP HEAD request using the given adapter" do
+    it "executes a HEAD request using the given adapter" do
       HTTPI::Request.any_instance.expects(:url=).with("http://example.com")
       curb.any_instance.expects(:head).with(instance_of(HTTPI::Request))
 
@@ -117,7 +117,7 @@ describe HTTPI do
   end
 
   describe ".put(request)" do
-    it "should execute an HTTP PUT request using the default adapter" do
+    it "executes a PUT request using the default adapter" do
       request = HTTPI::Request.new
       httpclient.any_instance.expects(:put).with(request)
 
@@ -126,7 +126,7 @@ describe HTTPI do
   end
 
   describe ".put(request, adapter)" do
-    it "should execute an HTTP PUT request using the given adapter" do
+    it "executes a PUT request using the given adapter" do
       request = HTTPI::Request.new
       curb.any_instance.expects(:put).with(request)
 
@@ -135,7 +135,7 @@ describe HTTPI do
   end
 
   describe ".put(url, body)" do
-    it "should execute an HTTP PUT request using the default adapter" do
+    it "executes a PUT request using the default adapter" do
       HTTPI::Request.any_instance.expects(:url=).with("http://example.com")
       HTTPI::Request.any_instance.expects(:body=).with("<some>xml</some>")
       httpclient.any_instance.expects(:put).with(instance_of(HTTPI::Request))
@@ -145,7 +145,7 @@ describe HTTPI do
   end
 
   describe ".put(url, body, adapter)" do
-    it "should execute an HTTP PUT request using the given adapter" do
+    it "executes a PUT request using the given adapter" do
       HTTPI::Request.any_instance.expects(:url=).with("http://example.com")
       HTTPI::Request.any_instance.expects(:body=).with("<some>xml</some>")
       curb.any_instance.expects(:put).with(instance_of(HTTPI::Request))
@@ -155,7 +155,7 @@ describe HTTPI do
   end
 
   describe ".delete(request)" do
-    it "should execute an HTTP DELETE request using the default adapter" do
+    it "executes a DELETE request using the default adapter" do
       request = HTTPI::Request.new
       httpclient.any_instance.expects(:delete).with(request)
 
@@ -164,7 +164,7 @@ describe HTTPI do
   end
 
   describe ".delete(request, adapter)" do
-    it "should execute an HTTP DELETE request using the given adapter" do
+    it "executes a DELETE request using the given adapter" do
       request = HTTPI::Request.new
       curb.any_instance.expects(:delete).with(request)
 
@@ -173,7 +173,7 @@ describe HTTPI do
   end
 
   describe ".delete(url)" do
-    it "should execute an HTTP DELETE request using the default adapter" do
+    it "executes a DELETE request using the default adapter" do
       HTTPI::Request.any_instance.expects(:url=).with("http://example.com")
       httpclient.any_instance.expects(:delete).with(instance_of(HTTPI::Request))
 
@@ -182,7 +182,7 @@ describe HTTPI do
   end
 
   describe ".delete(url, adapter)" do
-    it "should execute an HTTP DELETE request using the given adapter" do
+    it "executes a DELETE request using the given adapter" do
       HTTPI::Request.any_instance.expects(:url=).with("http://example.com")
       curb.any_instance.expects(:delete).with(instance_of(HTTPI::Request))
 
@@ -191,14 +191,21 @@ describe HTTPI do
   end
 
   describe ".request" do
-    it "should raise an ArgumentError in case of an invalid request method" do
-      lambda { client.request :invalid, HTTPI::Request.new }.should raise_error(ArgumentError)
+    it "raises an ArgumentError in case of an invalid request method" do
+      expect { client.request :invalid, HTTPI::Request.new }.to raise_error(ArgumentError)
+    end
+  end
+
+  describe ".adapter=" do
+    it "sets the default adapter to use" do
+      HTTPI::Adapter.expects(:use=).with(:net_http)
+      HTTPI.adapter = :net_http
     end
   end
 
   HTTPI::REQUEST_METHODS.each do |method|
     describe ".request(#{method}, request, adapter)" do
-      it "should delegate to the .#{method} method" do
+      it "delegates to the .#{method} method" do
         HTTPI.expects(method)
         client.request method, HTTPI::Request.new
       end
@@ -207,15 +214,15 @@ describe HTTPI do
     describe ".#{method}" do
       let(:request) { HTTPI::Request.new :url => "http://example.com" }
 
-      it "should raise an ArgumentError in case of an invalid adapter" do
-        lambda { client.request method, request, :invalid }.should raise_error(ArgumentError)
+      it "raises an ArgumentError in case of an invalid adapter" do
+        expect { client.request method, request, :invalid }.to raise_error(ArgumentError)
       end
 
-      it "should raise an ArgumentError in case of an invalid request" do
-        lambda { client.request method, "invalid" }.should raise_error(ArgumentError)
+      it "raises an ArgumentError in case of an invalid request" do
+        expect { client.request method, "invalid" }.to raise_error(ArgumentError)
       end
 
-      HTTPI::Adapter::ADAPTERS.each do |adapter, adapter_class|
+      HTTPI::Adapter::ADAPTERS.each do |adapter, opts|
         client_class = {
           :httpclient => lambda { HTTPClient },
           :curb       => lambda { Curl::Easy },
@@ -223,15 +230,15 @@ describe HTTPI do
         }
 
         context "using #{adapter}" do
-          before { adapter_class.any_instance.expects(method) }
+          before { opts[:class].any_instance.expects(method) }
 
-          it "should log that we're executing an HTTP request" do
+          it "logs that we're executing a request" do
             HTTPI.expects(:log).with(:debug, "HTTPI executes HTTP #{method.to_s.upcase} using the #{adapter} adapter")
             client.request method, request, adapter
           end
 
-          it "should yield the HTTP client instance used for the request" do
-            block = lambda { |http| http.should be_a(client_class[adapter].call) }
+          it "yields the HTTP client instance used for the request" do
+            block = lambda { |http| http.be_a(client_class[adapter].call) }
             client.request(method, request, adapter, &block)
           end
         end
@@ -239,7 +246,7 @@ describe HTTPI do
     end
   end
 
-  context "with resetting the defaults" do
+  context "(with reset)" do
     before { HTTPI.reset_config! }
 
     after do
@@ -248,41 +255,25 @@ describe HTTPI do
     end
 
     describe ".log" do
-      it "should default to true" do
+      it "defaults to true" do
         HTTPI.log?.should be_true
       end
-
-      it "should set whether to log" do
-        HTTPI.log = false
-        HTTPI.log?.should be_false
-      end
     end
 
     describe ".logger" do
-      it "should default to Logger writing to STDOUT" do
+      it "defaults to Logger writing to STDOUT" do
         HTTPI.logger.should be_a(Logger)
       end
-
-      it "should set the logger to use" do
-        MyLogger = Class.new
-        HTTPI.logger = MyLogger
-        HTTPI.logger.should == MyLogger
-      end
     end
 
     describe ".log_level" do
-      it "should default to :warn" do
+      it "defaults to :warn" do
         HTTPI.log_level.should == :warn
       end
-
-      it "should set the log level to use" do
-        HTTPI.log_level = :info
-        HTTPI.log_level.should == :info
-      end
     end
 
     describe ".log" do
-      it "should log given messages" do
+      it "logs the given messages" do
         HTTPI.log_level = :debug
         HTTPI.logger.expects(:debug).with("Log this")
         HTTPI.log "Log", "this"