webmock 1.3.5 → 1.4.0

data/spec/request_registry_spec.rb

@@ -1,30 +1,30 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
-describe RequestRegistry do
+describe WebMock::RequestRegistry do
 
   before(:each) do
-    RequestRegistry.instance.reset_webmock
-    @request_pattern = RequestPattern.new(:get, "www.example.com")
-    @request_signature = RequestSignature.new(:get, "www.example.com")
-    @request_stub = RequestStub.new(:get, "www.example.com")
+    WebMock::RequestRegistry.instance.reset_webmock
+    @request_pattern = WebMock::RequestPattern.new(:get, "www.example.com")
+    @request_signature = WebMock::RequestSignature.new(:get, "www.example.com")
+    @request_stub = WebMock::RequestStub.new(:get, "www.example.com")
   end
 
   describe "reset_webmock" do
     before(:each) do
-      RequestRegistry.instance.register_request_stub(@request_stub)
-      RequestRegistry.instance.requested_signatures.put(@request_signature)
+      WebMock::RequestRegistry.instance.register_request_stub(@request_stub)
+      WebMock::RequestRegistry.instance.requested_signatures.put(@request_signature)
     end
 
     it "should clean request stubs" do
-      RequestRegistry.instance.registered_request?(@request_signature).should == @request_stub
-      RequestRegistry.instance.reset_webmock
-      RequestRegistry.instance.registered_request?(@request_signature).should == nil
+      WebMock::RequestRegistry.instance.registered_request?(@request_signature).should == @request_stub
+      WebMock::RequestRegistry.instance.reset_webmock
+      WebMock::RequestRegistry.instance.registered_request?(@request_signature).should == nil
     end
 
     it "should clean list of executed requests" do
-      RequestRegistry.instance.times_executed(@request_pattern).should == 1
-      RequestRegistry.instance.reset_webmock
-      RequestRegistry.instance.times_executed(@request_pattern).should == 0
+      WebMock::RequestRegistry.instance.times_executed(@request_pattern).should == 1
+      WebMock::RequestRegistry.instance.reset_webmock
+      WebMock::RequestRegistry.instance.times_executed(@request_pattern).should == 0
     end
 
   end
@@ -32,16 +32,16 @@ describe RequestRegistry do
   describe "registering and reporting registered requests" do
 
     it "should return registered stub" do
-      RequestRegistry.instance.register_request_stub(@request_stub).should == @request_stub
+      WebMock::RequestRegistry.instance.register_request_stub(@request_stub).should == @request_stub
     end
 
     it "should report if request stub is not registered" do
-      RequestRegistry.instance.registered_request?(@request_signature).should == nil
+      WebMock::RequestRegistry.instance.registered_request?(@request_signature).should == nil
     end
 
     it "should register and report registered stib" do
-      RequestRegistry.instance.register_request_stub(@request_stub)
-      RequestRegistry.instance.registered_request?(@request_signature).should == @request_stub
+      WebMock::RequestRegistry.instance.register_request_stub(@request_stub)
+      WebMock::RequestRegistry.instance.registered_request?(@request_signature).should == @request_stub
     end
 
 
@@ -51,40 +51,42 @@ describe RequestRegistry do
 
     it "should report registered evaluated response for request pattern" do
       @request_stub.to_return(:body => "abc")
-      RequestRegistry.instance.register_request_stub(@request_stub)
-      RequestRegistry.instance.response_for_request(@request_signature).should == Response.new(:body => "abc")
+      WebMock::RequestRegistry.instance.register_request_stub(@request_stub)
+      WebMock::RequestRegistry.instance.response_for_request(@request_signature).
+        should == WebMock::Response.new(:body => "abc")
     end
 
     it "should report evaluated response" do
       @request_stub.to_return {|request| {:body => request.method.to_s} }
-      RequestRegistry.instance.register_request_stub(@request_stub)
-      response1 = RequestRegistry.instance.response_for_request(@request_signature)
-      response1.should == Response.new(:body => "get")
+      WebMock::RequestRegistry.instance.register_request_stub(@request_stub)
+      response1 = WebMock::RequestRegistry.instance.response_for_request(@request_signature)
+      response1.should == WebMock::Response.new(:body => "get")
     end
 
     it "should report clone of theresponse" do
       @request_stub.to_return {|request| {:body => request.method.to_s} }
-      RequestRegistry.instance.register_request_stub(@request_stub)
-      response1 = RequestRegistry.instance.response_for_request(@request_signature)
-      response2 = RequestRegistry.instance.response_for_request(@request_signature)
+      WebMock::RequestRegistry.instance.register_request_stub(@request_stub)
+      response1 = WebMock::RequestRegistry.instance.response_for_request(@request_signature)
+      response2 = WebMock::RequestRegistry.instance.response_for_request(@request_signature)
       response1.should_not be(response2)
     end
 
     it "should report nothing if no response for request is registered" do
-      RequestRegistry.instance.response_for_request(@request_signature).should == nil
+      WebMock::RequestRegistry.instance.response_for_request(@request_signature).should == nil
     end
 
     it "should always return last registered matching response" do
-      @request_stub1 = RequestStub.new(:get, "www.example.com")
+      @request_stub1 = WebMock::RequestStub.new(:get, "www.example.com")
       @request_stub1.to_return(:body => "abc")
-      @request_stub2 = RequestStub.new(:get, "www.example.com")
+      @request_stub2 = WebMock::RequestStub.new(:get, "www.example.com")
       @request_stub2.to_return(:body => "def")
-      @request_stub3 = RequestStub.new(:get, "www.example.org")
+      @request_stub3 = WebMock::RequestStub.new(:get, "www.example.org")
       @request_stub3.to_return(:body => "ghj")
-      RequestRegistry.instance.register_request_stub(@request_stub1)
-      RequestRegistry.instance.register_request_stub(@request_stub2)
-      RequestRegistry.instance.register_request_stub(@request_stub3)
-      RequestRegistry.instance.response_for_request(@request_signature).should == Response.new(:body => "def")
+      WebMock::RequestRegistry.instance.register_request_stub(@request_stub1)
+      WebMock::RequestRegistry.instance.register_request_stub(@request_stub2)
+      WebMock::RequestRegistry.instance.register_request_stub(@request_stub3)
+      WebMock::RequestRegistry.instance.response_for_request(@request_signature).
+        should == WebMock::Response.new(:body => "def")
     end
 
   end
@@ -98,24 +100,24 @@ describe RequestRegistry do
     end
 
     before(:each) do
-      @request_stub1 = RequestStub.new(:get, "www.example.com")
-      @request_stub2 = RequestStub.new(:get, "www.example.net")
-      @request_stub3 = RequestStub.new(:get, "www.example.org")
-      RequestRegistry.instance.requested_signatures.put(RequestSignature.new(:get, "www.example.com"))
-      RequestRegistry.instance.requested_signatures.put(RequestSignature.new(:get, "www.example.com"))
-      RequestRegistry.instance.requested_signatures.put(RequestSignature.new(:get, "www.example.org"))
+      @request_stub1 = WebMock::RequestStub.new(:get, "www.example.com")
+      @request_stub2 = WebMock::RequestStub.new(:get, "www.example.net")
+      @request_stub3 = WebMock::RequestStub.new(:get, "www.example.org")
+      WebMock::RequestRegistry.instance.requested_signatures.put(WebMock::RequestSignature.new(:get, "www.example.com"))
+      WebMock::RequestRegistry.instance.requested_signatures.put(WebMock::RequestSignature.new(:get, "www.example.com"))
+      WebMock::RequestRegistry.instance.requested_signatures.put(WebMock::RequestSignature.new(:get, "www.example.org"))
     end
 
     it "should report 0 if no request matching pattern was requested" do
-      RequestRegistry.instance.times_executed(RequestPattern.new(:get, "www.example.net")).should == 0
+      WebMock::RequestRegistry.instance.times_executed(WebMock::RequestPattern.new(:get, "www.example.net")).should == 0
     end
 
     it "should report number of times matching pattern was requested" do
-      RequestRegistry.instance.times_executed(RequestPattern.new(:get, "www.example.com")).should == 2
+      WebMock::RequestRegistry.instance.times_executed(WebMock::RequestPattern.new(:get, "www.example.com")).should == 2
     end
 
     it "should report number of times all matching pattern were requested" do
-      RequestRegistry.instance.times_executed(RequestPattern.new(:get, /.*example.*/)).should == 3
+     WebMock::RequestRegistry.instance.times_executed(WebMock::RequestPattern.new(:get, /.*example.*/)).should == 3
     end
 
 

data/spec/request_signature_spec.rb

@@ -1,35 +1,35 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
-describe RequestSignature do
+describe WebMock::RequestSignature do
   
   describe "initialization" do
 
     it "should have assigned normalized uri" do
       WebMock::Util::URI.should_receive(:normalize_uri).and_return("www.example.kom")
-      signature = RequestSignature.new(:get, "www.example.com")
+      signature = WebMock::RequestSignature.new(:get, "www.example.com")
       signature.uri.should == "www.example.kom"
     end
 
     it "should have assigned uri without normalization if uri is URI" do
       WebMock::Util::URI.should_not_receive(:normalize_uri)
       uri = Addressable::URI.parse("www.example.com")
-      signature = RequestSignature.new(:get, uri)
+      signature = WebMock::RequestSignature.new(:get, uri)
       signature.uri.should == uri
     end
 
     it "should have assigned normalized headers" do
       WebMock::Util::Headers.should_receive(:normalize_headers).with('A' => 'a').and_return('B' => 'b')
-      RequestSignature.new(:get, "www.example.com", :headers => {'A' => 'a'}).headers.should == {'B' => 'b'}
+      WebMock::RequestSignature.new(:get, "www.example.com", :headers => {'A' => 'a'}).headers.should == {'B' => 'b'}
     end
 
     it "should have assigned body" do
-      RequestSignature.new(:get, "www.example.com", :body => "abc").body.should == "abc"
+      WebMock::RequestSignature.new(:get, "www.example.com", :body => "abc").body.should == "abc"
     end
 
   end
 
   it "should report string describing itself" do
-    RequestSignature.new(:get, "www.example.com",
+    WebMock::RequestSignature.new(:get, "www.example.com",
       :body => "abc", :headers => {'A' => 'a', 'B' => 'b'}).to_s.should ==
     "GET http://www.example.com/ with body 'abc' with headers {'A'=>'a', 'B'=>'b'}"
   end

data/spec/request_stub_spec.rb

@@ -1,9 +1,9 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
-describe RequestStub do
+describe WebMock::RequestStub do
 
   before(:each) do
-    @request_stub = RequestStub.new(:get, "www.example.com")
+    @request_stub = WebMock::RequestStub.new(:get, "www.example.com")
   end
 
   it "should have request pattern with method and uri" do
@@ -18,18 +18,18 @@ describe RequestStub do
 
     it "should assign body to request pattern" do
       @request_stub.with(:body => "abc")
-      @request_stub.request_pattern.to_s.should == RequestPattern.new(:get, "www.example.com", :body => "abc").to_s
+      @request_stub.request_pattern.to_s.should == WebMock::RequestPattern.new(:get, "www.example.com", :body => "abc").to_s
     end
 
     it "should assign normalized headers to request pattern" do
       @request_stub.with(:headers => {'A' => 'a'})
       @request_stub.request_pattern.to_s.should == 
-        RequestPattern.new(:get, "www.example.com", :headers => {'A' => 'a'}).to_s
+        WebMock::RequestPattern.new(:get, "www.example.com", :headers => {'A' => 'a'}).to_s
     end
 
     it "should assign given block to request profile" do
       @request_stub.with { |req| req.body == "abc" }
-      @request_stub.request_pattern.matches?(RequestSignature.new(:get, "www.example.com", :body => "abc")).should be_true
+      @request_stub.request_pattern.matches?(WebMock::RequestSignature.new(:get, "www.example.com", :body => "abc")).should be_true
     end
 
   end

data/spec/response_spec.rb

@@ -1,34 +1,34 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
-describe ResponseFactory do
+describe WebMock::ResponseFactory do
 
   describe "response_for" do
 
     it "should create response with options passed as arguments" do
       options = {:body => "abc", :headers => {:a => :b}}
-      Response.should_receive(:new).with(options).and_return(@response = mock(Response))
-      ResponseFactory.response_for(options).should == @response
+      WebMock::Response.should_receive(:new).with(options).and_return(@response = mock(WebMock::Response))
+      WebMock::ResponseFactory.response_for(options).should == @response
     end
 
 
     it "should create dynamic response for argument responding to call" do
       callable = mock(:call => {:body => "abc"})
-      DynamicResponse.should_receive(:new).with(callable).and_return(@response = mock(Response))
-      ResponseFactory.response_for(callable).should == @response
+      WebMock::DynamicResponse.should_receive(:new).with(callable).and_return(@response = mock(WebMock::Response))
+      WebMock::ResponseFactory.response_for(callable).should == @response
     end
 
   end
 
 end
 
-describe Response do
+describe WebMock::Response do
   before(:each) do
-    @response = Response.new(:headers => {'A' => 'a'})
+    @response = WebMock::Response.new(:headers => {'A' => 'a'})
   end
 
   it "should report normalized headers" do
-    Util::Headers.should_receive(:normalize_headers).with('A' => 'a').and_return('B' => 'b')
-    @response = Response.new(:headers => {'A' => 'a'})
+    WebMock::Util::Headers.should_receive(:normalize_headers).with('A' => 'a').and_return('B' => 'b')
+    @response = WebMock::Response.new(:headers => {'A' => 'a'})
     @response.headers.should == {'B' => 'b'}
   end
 
@@ -39,12 +39,12 @@ describe Response do
     end
 
     it "should return assigned status" do
-      @response = Response.new(:status => 500)
+      @response = WebMock::Response.new(:status => 500)
       @response.status.should == [500, ""]
     end
 
     it "should return assigned message" do
-      @response = Response.new(:status => [500, "Internal Server Error"])
+      @response = WebMock::Response.new(:status => [500, "Internal Server Error"])
       @response.status.should == [500, "Internal Server Error"]
     end
 
@@ -53,21 +53,21 @@ describe Response do
   describe "raising error" do
 
     it "should raise error if any assigned" do
-      @response = Response.new(:exception => ArgumentError)
+      @response = WebMock::Response.new(:exception => ArgumentError)
       lambda {
         @response.raise_error_if_any
       }.should raise_error(ArgumentError, "Exception from WebMock")
     end
     
     it "should raise error if any assigned as instance" do
-      @response = Response.new(:exception => ArgumentError.new("hello world"))
+      @response = WebMock::Response.new(:exception => ArgumentError.new("hello world"))
       lambda {
         @response.raise_error_if_any
       }.should raise_error(ArgumentError, "hello world")
     end
     
     it "should raise error if any assigned as string" do
-      @response = Response.new(:exception => "hello world")
+      @response = WebMock::Response.new(:exception => "hello world")
       lambda {
         @response.raise_error_if_any
       }.should raise_error("hello world")
@@ -82,12 +82,12 @@ describe Response do
   describe "timeout" do
 
     it "should know if it should timeout" do
-      @response = Response.new(:should_timeout => true)
+      @response = WebMock::Response.new(:should_timeout => true)
       @response.should_timeout.should be_true
     end
 
     it "should not timeout by default" do
-      @response = Response.new
+      @response = WebMock::Response.new
       @response.should_timeout.should be_false
     end
 
@@ -100,22 +100,22 @@ describe Response do
     end
 
     it "should report body if assigned" do
-      @response = Response.new(:body => "abc")
+      @response = WebMock::Response.new(:body => "abc")
       @response.body.should == "abc"
     end
 
     it "should report string even if existing file path was provided" do
-      @response = Response.new(:body => __FILE__)
+      @response = WebMock::Response.new(:body => __FILE__)
       @response.body.should == __FILE__
     end
 
     it "should report content of a IO object if provided" do
-      @response = Response.new(:body => File.new(__FILE__))
+      @response = WebMock::Response.new(:body => File.new(__FILE__))
       @response.body.should == File.new(__FILE__).read
     end
 
     it "should report many times content of a IO object if provided" do
-      @response = Response.new(:body => File.new(__FILE__))
+      @response = WebMock::Response.new(:body => File.new(__FILE__))
       @response.body.should == File.new(__FILE__).read
       @response.body.should == File.new(__FILE__).read
     end
@@ -127,7 +127,7 @@ describe Response do
     describe "when input is IO" do
       before(:each) do
         @file = File.new(File.expand_path(File.dirname(__FILE__)) + "/example_curl_output.txt")
-        @response = Response.new(@file)
+        @response = WebMock::Response.new(@file)
       end
 
 
@@ -158,7 +158,7 @@ describe Response do
     describe "when input is String" do
       before(:each) do
         @input = File.new(File.expand_path(File.dirname(__FILE__)) + "/example_curl_output.txt").read
-        @response = Response.new(@input)
+        @response = WebMock::Response.new(@input)
       end
 
       it "should read status" do
@@ -181,7 +181,7 @@ describe Response do
 
       it "should work with transfer-encoding set to chunked" do
         @input.gsub!("Content-Length: 438", "Transfer-Encoding: chunked")
-        @response = Response.new(@input)
+        @response = WebMock::Response.new(@input)
         @response.body.size.should == 438
       end
 
@@ -190,21 +190,21 @@ describe Response do
     describe "with dynamically evaluated options" do
 
       before(:each) do
-        @request_signature = RequestSignature.new(:post, "www.example.com", :body => "abc", :headers => {'A' => 'a'})
+        @request_signature = WebMock::RequestSignature.new(:post, "www.example.com", :body => "abc", :headers => {'A' => 'a'})
       end
 
       it "should have evaluated body" do
-        @response = Response.new(:body => lambda {|request| request.body})
+        @response = WebMock::Response.new(:body => lambda {|request| request.body})
         @response.evaluate!(@request_signature).body.should == "abc"
       end
 
       it "should have evaluated headers" do
-        @response = Response.new(:headers => lambda {|request| request.headers})
+        @response = WebMock::Response.new(:headers => lambda {|request| request.headers})
         @response.evaluate!(@request_signature).headers.should == {'A' => 'a'}
       end
 
       it "should have evaluated status" do
-        @response = Response.new(:status => lambda {|request| 302})
+        @response = WebMock::Response.new(:status => lambda {|request| 302})
         @response.evaluate!(@request_signature).status.should == [302, ""]
       end
 
@@ -212,13 +212,13 @@ describe Response do
 
   end
 
-  describe DynamicResponse do
+  describe WebMock::DynamicResponse do
 
     describe "evaluating response options" do
 
       it "should have evaluated options" do
-        request_signature = RequestSignature.new(:post, "www.example.com", :body => "abc", :headers => {'A' => 'a'})
-        response = DynamicResponse.new(lambda {|request|
+        request_signature = WebMock::RequestSignature.new(:post, "www.example.com", :body => "abc", :headers => {'A' => 'a'})
+        response = WebMock::DynamicResponse.new(lambda {|request|
           {
             :body => request.body,
             :headers => request.headers,
@@ -232,10 +232,10 @@ describe Response do
       end
 
       it "should be equal to static response after evaluation" do
-        request_signature = RequestSignature.new(:post, "www.example.com", :body => "abc")
-        response = DynamicResponse.new(lambda {|request| {:body => request.body}})
+        request_signature = WebMock::RequestSignature.new(:post, "www.example.com", :body => "abc")
+        response = WebMock::DynamicResponse.new(lambda {|request| {:body => request.body}})
         response.evaluate!(request_signature)
-        response.should == Response.new(:body => "abc")
+        response.should == WebMock::Response.new(:body => "abc")
       end
 
     end

data/spec/spec_helper.rb

@@ -1,6 +1,7 @@
 require 'rubygems'
 require 'httpclient'
 unless RUBY_PLATFORM =~ /java/
+  require 'curb'
   require 'patron' 
   require 'em-http'
 end
@@ -14,10 +15,8 @@ require 'webmock/rspec'
 
 require 'json'
 
-include WebMock
-
 Spec::Runner.configure do |config|
-   config.include WebMock
+   config.include WebMock::API
 end
 
 def fail()