webmock 1.7.10 → 1.8.0

data/spec/acceptance/shared/complex_cross_concern_behaviors.rb

@@ -0,0 +1,21 @@
+shared_context "complex cross-concern behaviors" do |*adapter_info|
+  it 'allows a response with multiple values for the same header to be recorded and played back exactly as-is' do
+    WebMock.allow_net_connect!
+
+    recorded_response = nil
+    WebMock.after_request { |_,r| recorded_response = r }
+    real_response = http_request(:get, webmock_server_url)
+
+    stub_request(:get, webmock_server_url).to_return(
+      :status => recorded_response.status,
+      :body => recorded_response.body,
+      :headers => recorded_response.headers
+    )
+
+    played_back_response = http_request(:get, webmock_server_url)
+
+    played_back_response.headers.keys.should include('Set-Cookie')
+    played_back_response.should == real_response
+  end
+end
+

data/spec/acceptance/shared/enabling_and_disabling_webmock.rb

@@ -1,4 +1,4 @@
-shared_context "enabled and disabled webmock" do
+shared_context "enabled and disabled webmock" do |*adapter_info|
   describe "when webmock is disabled" do
     before(:each) do
       WebMock.disable!
@@ -41,28 +41,27 @@ end
 
 shared_context "disabled WebMock" do
   it "should not register executed requests" do
-    http_request(:get, "http://www.example.com/")
-    a_request(:get, "http://www.example.com/").should_not have_been_made
+    http_request(:get, webmock_server_url)
+    a_request(:get, webmock_server_url).should_not have_been_made
   end
 
   it "should not block unstubbed requests" do
     lambda {
-      http_request(:get, "http://www.example.com/")
+      http_request(:get, webmock_server_url)
     }.should_not raise_error
   end
 
   it "should return real response even if there are stubs" do
     stub_request(:get, /.*/).to_return(:body => "x")
-    http_request(:get, "http://www.example.com/").
-      status.should == "302"
+    http_request(:get, webmock_server_url).body.should == "hello world"
   end
 
   it "should not invoke any callbacks" do
     WebMock.reset_callbacks
-    stub_request(:get, "http://www.example.com/")
+    stub_request(:get, webmock_server_url)
     @called = nil
     WebMock.after_request { @called = 1 }
-    http_request(:get, "http://www.example.com/")
+    http_request(:get, webmock_server_url)
     @called.should == nil
   end
 end
@@ -70,8 +69,8 @@ end
 shared_context "enabled WebMock" do
   it "should register executed requests" do
     WebMock.allow_net_connect!
-    http_request(:get, "http://www.example.com/")
-    a_request(:get, "http://www.example.com/").should have_been_made
+    http_request(:get, webmock_server_url)
+    a_request(:get, webmock_server_url).should have_been_made
   end
 
   it "should block unstubbed requests" do
@@ -90,7 +89,7 @@ shared_context "enabled WebMock" do
     WebMock.reset_callbacks
     @called = nil
     WebMock.after_request { @called = 1 }
-    http_request(:get, "http://www.example.com/")
+    http_request(:get, webmock_server_url)
     @called.should == 1
   end
 end

data/spec/acceptance/shared/precedence_of_stubs.rb

@@ -1,4 +1,4 @@
-shared_context "precedence of stubs" do
+shared_context "precedence of stubs" do |*adapter_info|
   describe "when choosing a matching request stub" do
     it "should use the last declared matching request stub" do
       stub_request(:get, "www.example.com").to_return(:body => "abc")

data/spec/acceptance/shared/request_expectations.rb

@@ -1,4 +1,4 @@
-shared_context "request expectations" do
+shared_context "request expectations" do |*adapter_info|
   describe "when request expectations are set" do
     describe "when net connect is not allowed" do
       before(:each) do
@@ -150,6 +150,13 @@ shared_context "request expectations" do
             a_request(:get, "www.example.com/?x=3").with(:query => {"a" => ["b", "c"]}).should have_been_made
           }.should_not raise_error
         end
+
+        it "should satisfy expectation if the request was executed with only part query params declared as a hash in a query option" do
+          lambda {
+            http_request(:get, "http://www.example.com/?a[]=b&a[]=c&b=1")
+            a_request(:get, "www.example.com").with(:query => hash_including({"a" => ["b", "c"]})).should have_been_made
+          }.should_not raise_error
+        end
       end
 
       it "should fail if request was made more times than expected" do
@@ -209,7 +216,7 @@ shared_context "request expectations" do
 
       describe "when expected reqest body is declared as a hash" do
         let(:body_hash) { {:a => '1', :b => 'five', 'c' => {'d' => ['e', 'f']}} }
-        let(:fail_message) {%r(The request POST http://www.example.com/ with body \{"a"=>"1", "b"=>"five", "c"=>\{"d"=>\["e", "f"\]\}\} was expected to execute 1 time but it executed 0 times)}
+        let(:fail_message) {%r(The request POST http://www.example.com/ with body .+ was expected to execute 1 time but it executed 0 times)}
 
         describe "when request is made with url encoded body matching hash" do
           it "should satisfy expectation" do
@@ -290,6 +297,26 @@ shared_context "request expectations" do
         end
       end
 
+      describe "when expected reqest body is declared as a partial hash matcher" do
+        let(:body_hash) { hash_including({:a => '1', 'c' => {'d' => ['e', 'f']}}) }
+        let(:fail_message) {%r(The request POST http://www.example.com/ with body hash_including(.+) was expected to execute 1 time but it executed 0 times)}
+
+        describe "when request is made with url encoded body matching hash" do
+          it "should satisfy expectation" do
+            lambda {
+              http_request(:post, "http://www.example.com/", :body => 'a=1&c[d][]=e&c[d][]=f&b=five')
+              a_request(:post, "www.example.com").with(:body => body_hash).should have_been_made
+            }.should_not raise_error
+          end
+
+          it "should fail if request is executed with url encoded body not matching hash" do
+            lambda {
+              http_request(:post, "http://www.example.com/", :body => 'c[d][]=f&a=1&c[d][]=e')
+              a_request(:post, "www.example.com").with(:body => body_hash).should have_been_made
+            }.should fail_with(fail_message)
+          end
+        end
+      end
 
       describe "when request with headers is expected" do
         it "should satisfy expectation if request was executed with the same headers" do
@@ -410,7 +437,7 @@ shared_context "request expectations" do
         end
       end
 
-      describe "with authentication" do
+      describe "with authentication", :unless => (adapter_info.include?(:no_url_auth)) do
         before(:each) do
           stub_request(:any, "http://user:pass@www.example.com")
           stub_request(:any, "http://user:pazz@www.example.com")
@@ -541,6 +568,25 @@ shared_context "request expectations" do
           }.should fail_with(%r(The request POST http://www.example.com/ with given block was expected to execute 1 time but it executed 0 times))
         end
       end
+
+      describe "when expectation is declared using assert_requested" do
+        it "should satisfy expectation if requests was made" do
+          stub_http = stub_http_request(:get, "http://www.example.com")
+          lambda {
+            http_request(:get, "http://www.example.com/")
+            assert_requested(stub_http, :times => 1)
+            assert_requested(stub_http)
+          }.should_not raise_error
+        end
+
+        it "should fail if request expected not to be made was not wade" do
+          stub_http = stub_http_request(:get, "http://www.example.com")
+          lambda {
+            http_request(:get, "http://www.example.com/")
+            assert_not_requested(stub_http)
+          }.should fail_with(%r(The request GET http://www.example.com/ was expected to execute 0 times but it executed 1 time))
+        end
+      end
     end
 
 

data/spec/acceptance/shared/returning_declared_responses.rb

@@ -1,6 +1,6 @@
 class MyException < StandardError; end;
 
-shared_context "declared responses" do
+shared_context "declared responses" do |*adapter_info|
   describe "when request stub declares that request should raise exception" do
     it "should raise exception" do
       stub_request(:get, "www.example.com").to_raise(MyException)
@@ -72,13 +72,10 @@ shared_context "declared responses" do
       http_request(:get, "http://www.example.com/").status.should == "500"
     end
 
-    it "should return response with declared status message" do
+    it "should return response with declared status message", :unless => (adapter_info.include?(:no_status_message)) do
       stub_request(:get, "www.example.com").to_return(:status => [500, "Internal Server Error"])
       response = http_request(:get, "http://www.example.com/")
-      # not supported by em-http-request, it always returns "unknown" for http_reason
-      unless http_library == :em_http_request
-        response.message.should == "Internal Server Error"
-      end
+      response.message.should == "Internal Server Error"
     end
 
     it "should return response with a default status code" do
@@ -86,13 +83,10 @@ shared_context "declared responses" do
       http_request(:get, "http://www.example.com/").status.should == "200"
     end
 
-    it "should return default response with empty message if response was not declared" do
+    it "should return default response with empty message if response was not declared", :unless => (adapter_info.include?(:no_status_message)) do
       stub_request(:get, "www.example.com")
       response = http_request(:get, "http://www.example.com/")
-      # not supported by em-http-request, it always returns "unknown" for http_reason
-      unless http_library == :em_http_request
-        response.message.should == ""
-      end
+      response.message.should == ""
     end
 
     describe "when response body was declared as IO" do
@@ -186,11 +180,8 @@ shared_context "declared responses" do
         @response.status.should == "202"
       end
 
-      it "should return recorded status message" do
-        # not supported by em-http-request, it always returns "unknown" for http_reason
-        unless http_library == :em_http_request
-          @response.message.should == "OK"
-        end
+      it "should return recorded status message", :unless => (adapter_info.include?(:no_status_message)) do
+        @response.message.should == "OK"
       end
 
       it "should ensure file is closed" do
@@ -223,11 +214,8 @@ shared_context "declared responses" do
         @response.status.should == "202"
       end
 
-      it "should return recorded status message" do
-        # not supported by em-http-request, it always returns "unknown" for http_reason
-        unless http_library == :em_http_request
-          @response.message.should == "OK"
-        end
+      it "should return recorded status message", :unless => (adapter_info.include?(:no_status_message)) do
+        @response.message.should == "OK"
       end
     end
 

data/spec/acceptance/shared/stubbing_requests.rb

@@ -1,4 +1,4 @@
-shared_examples_for "stubbing requests" do
+shared_examples_for "stubbing requests" do |*adapter_info|
   describe "when requests are stubbed" do
     describe "based on uri" do
       it "should return stubbed response even if request have escaped parameters" do
@@ -32,6 +32,11 @@ shared_examples_for "stubbing requests" do
         stub_request(:get, "www.example.com/?x=3").with(:query => {"a" => ["b", "c"]}).to_return(:body => "abc")
         http_request(:get, "http://www.example.com/?x=3&a[]=b&a[]=c").body.should == "abc"
       end
+
+      it "should return stubbed response when stub expects only part of query params" do
+        stub_request(:get, "www.example.com").with(:query => hash_including({"a" => ["b", "c"]})).to_return(:body => "abc")
+        http_request(:get, "http://www.example.com/?a[]=b&a[]=c&b=1").body.should == "abc"
+      end
     end
 
     describe "based on method" do
@@ -111,7 +116,7 @@ shared_examples_for "stubbing requests" do
             lambda {
               http_request(
                 :post, "http://www.example.com/",
-              :body => 'c[d][]=f&a=1&c[d][]=e').status.should == "200"
+              :body => 'c[d][]=f&a=1&c[d][]=e')
             }.should raise_error(WebMock::NetConnectNotAllowedError, %r(Real HTTP connections are disabled. Unregistered request: POST http://www.example.com/ with body 'c\[d\]\[\]=f&a=1&c\[d\]\[\]=e'))
           end
         end
@@ -169,6 +174,37 @@ shared_examples_for "stubbing requests" do
           end
         end
       end
+
+      describe "when body is declared as partial hash matcher" do
+        before(:each) do
+          stub_request(:post, "www.example.com").
+            with(:body => hash_including({:a => '1', 'c' => {'d' => ['e', 'f']} }))
+        end
+
+        describe "for request with url encoded body" do
+          it "should match request if hash matches body" do
+            http_request(
+              :post, "http://www.example.com/",
+            :body => 'a=1&c[d][]=e&c[d][]=f&b=five').status.should == "200"
+          end
+
+          it "should not match if hash doesn't match url encoded body" do
+            lambda {
+              http_request(
+                :post, "http://www.example.com/",
+              :body => 'c[d][]=f&a=1&c[d][]=e').status
+            }.should raise_error
+          end
+        end
+
+        describe "for request with json body and content type is set to json" do
+          it "should match if hash matches body" do
+            http_request(
+              :post, "http://www.example.com/", :headers => {'Content-Type' => 'application/json'},
+            :body => "{\"a\":\"1\",\"c\":{\"d\":[\"e\",\"f\"]},\"b\":\"five\"}").status.should == "200"
+          end
+        end
+      end
     end
 
     describe "based on headers" do
@@ -259,7 +295,7 @@ shared_examples_for "stubbing requests" do
       end
     end
 
-    describe "when stubbing request with basic authentication" do
+    describe "when stubbing request with basic authentication", :unless => (adapter_info.include?(:no_url_auth)) do
       it "should match if credentials are the same" do
         stub_request(:get, "user:pass@www.example.com")
         http_request(:get, "http://user:pass@www.example.com/").status.should == "200"
@@ -289,7 +325,7 @@ shared_examples_for "stubbing requests" do
 
     describe "when stubbing request with a global hook" do
       after(:each) do
-        WebMock::StubRegistry.instance.global_stub = nil
+        WebMock::StubRegistry.instance.global_stubs.clear
       end
 
       it 'returns the response returned by the hook' do
@@ -335,6 +371,46 @@ shared_examples_for "stubbing requests" do
         http_request(:get, "http://www.example.com/")
         call_count.should == 1
       end
+
+      it 'supports multiple global stubs; the first registered one that returns a non-nil value determines the stub' do
+        stub_invocation_order = []
+        WebMock.globally_stub_request do |request|
+          stub_invocation_order << :nil_stub
+          nil
+        end
+
+        WebMock.globally_stub_request do |request|
+          stub_invocation_order << :hash_stub
+          { :body => "global stub body" }
+        end
+
+        http_request(:get, "http://www.example.com/").body.should == "global stub body"
+        stub_invocation_order.should eq([:nil_stub, :hash_stub])
+      end
+
+      [:before, :after].each do |before_or_after|
+        context "when there is also a non-global registered stub #{before_or_after} the global stub" do
+          def stub_non_globally
+            stub_request(:get, "www.example.com").to_return(:body => 'non-global stub body')
+          end
+
+          define_method :register_stubs do |block|
+            stub_non_globally if before_or_after == :before
+            WebMock.globally_stub_request(&block)
+            stub_non_globally if before_or_after == :after
+          end
+
+          it 'uses the response from the global stub if the block returns a non-nil value' do
+            register_stubs(lambda { |req| { :body => 'global stub body' } })
+            http_request(:get, "http://www.example.com/").body.should == "global stub body"
+          end
+
+          it 'uses the response from the non-global stub if the block returns a nil value' do
+            register_stubs(lambda { |req| nil })
+            http_request(:get, "http://www.example.com/").body.should == "non-global stub body"
+          end
+        end
+      end
     end
 
     describe "when stubbing request with a block evaluated on request" do

data/spec/acceptance/typhoeus/typhoeus_hydra_spec_helper.rb

@@ -11,7 +11,7 @@ module TyphoeusHydraSpecHelper
         :method  => method,
         :body    => options[:body],
         :headers => options[:headers],
-        :timeout => 15000 # milliseconds
+        :timeout => 25000 # milliseconds
       }
     )
     raise FakeTyphoeusHydraError.new if response.code.to_s == "0"

data/spec/acceptance/webmock_shared.rb

@@ -6,6 +6,7 @@ require 'acceptance/shared/request_expectations'
 require 'acceptance/shared/stubbing_requests'
 require 'acceptance/shared/allowing_and_disabling_net_connect'
 require 'acceptance/shared/precedence_of_stubs'
+require 'acceptance/shared/complex_cross_concern_behaviors'
 
 unless defined? SAMPLE_HEADERS
   SAMPLE_HEADERS = { "Content-Length" => "8888", "Accept" => "application/json" }
@@ -13,7 +14,7 @@ unless defined? SAMPLE_HEADERS
   NOT_ESCAPED_PARAMS = "z='Stop!' said Fred&x=ab c"
 end
 
-shared_examples "with WebMock" do
+shared_examples "with WebMock" do |*adapter_info|
   describe "with WebMock" do
     let(:webmock_server_url) {"http://#{WebMockServer.instance.host_with_port}/"}
     before(:each) do
@@ -21,18 +22,20 @@ shared_examples "with WebMock" do
       WebMock.reset!
     end
 
-    include_context "allowing and disabling net connect"
+    include_context "allowing and disabling net connect", *adapter_info
 
-    include_context "stubbing requests"
+    include_context "stubbing requests", *adapter_info
 
-    include_context "declared responses"
+    include_context "declared responses", *adapter_info
 
-    include_context "precedence of stubs"
+    include_context "precedence of stubs", *adapter_info
 
-    include_context "request expectations"
+    include_context "request expectations", *adapter_info
 
-    include_context "callbacks"
+    include_context "callbacks", *adapter_info
 
-    include_context "enabled and disabled webmock"
+    include_context "enabled and disabled webmock", *adapter_info
+
+    include_context "complex cross-concern behaviors", *adapter_info
   end
 end

data/spec/spec_helper.rb

@@ -30,11 +30,11 @@ RSpec.configure do |config|
 
   config.filter_run_excluding :without_webmock => true
 
-  config.before(:all) do
-    WebMockServer.instance.start
+  config.before(:suite) do
+    WebMockServer.instance.start unless WebMockServer.instance.started
   end
 
-  config.after(:all) do
+  config.after(:suite) do
     WebMockServer.instance.stop
   end
 

data/spec/support/my_rack_app.rb

@@ -1,6 +1,17 @@
 require 'rack'
 
 class MyRackApp
+  class NonArrayResponse
+    # The rack response body need not implement #join, 
+    # but it must implement #each.  It need not be an Array.
+    # ActionDispatch::Response, for example, exercises that fact.
+    # See: http://rack.rubyforge.org/doc/SPEC.html
+
+    def each(*args, &blk)
+      ["This is not in an array!"].each(*args, &blk)
+    end
+  end
+
   def self.call(env)
     case env.values_at('REQUEST_METHOD', 'PATH_INFO')
       when ['GET', '/']
@@ -8,6 +19,10 @@ class MyRackApp
       when ['GET', '/greet']
         name = env['QUERY_STRING'][/name=([^&]*)/, 1] || "World"
         [200, {}, ["Hello, #{name}"]]
+      when ['GET', '/non_array_response']
+        [200, {}, NonArrayResponse.new]
+      when ['GET', '/locked']
+        [200, {}, ["Single threaded response."]]
       when ['POST', '/greet']
         name = env["rack.input"].read[/name=([^&]*)/, 1] || "World"
         [200, {}, ["Good to meet you, #{name}!"]]
@@ -15,4 +30,13 @@ class MyRackApp
         [404, {}, ['']]
     end
   end
-end
+end
+
+class MyLockedRackApp
+  MUTEX = Mutex.new
+
+  def self.call(env)
+    lock = Rack::Lock.new(MyRackApp, MUTEX)
+    lock.call(env)
+  end
+end