Merge branch 'master' of git://github.com/lifo/docrails

2 files changed, 33 insertions, 5 deletions

diff --git a/activeresource/test/cases/format_test.rb b/activeresource/test/cases/format_test.rb
index c3733e13d8..fc1a7b8c6f 100644
--- a/activeresource/test/cases/format_test.rb
+++ b/activeresource/test/cases/format_test.rb
@@ -33,7 +33,7 @@ class FormatTest < Test::Unit::TestCase
         ActiveResource::HttpMock.respond_to.get "/people.#{format}", {'Accept' => ActiveResource::Formats[format].mime_type}, ActiveResource::Formats[format].encode(@programmers)
         remote_programmers = Person.find(:all)
         assert_equal 2, remote_programmers.size
-        assert remote_programmers.select { |p| p.name == 'David' }
+        assert remote_programmers.find { |p| p.name == 'David' }
       end
     end
   end
diff --git a/activeresource/test/cases/http_mock_test.rb b/activeresource/test/cases/http_mock_test.rb
index d90d1e01b8..82b5e60c77 100644
--- a/activeresource/test/cases/http_mock_test.rb
+++ b/activeresource/test/cases/http_mock_test.rb
@@ -69,19 +69,19 @@ class HttpMockTest < ActiveSupport::TestCase
         request(method, "/people/1", FORMAT_HEADER[method] => "application/json")
       end
     end
-    
+
   end
 
   test "allows you to send in pairs directly to the respond_to method" do
     matz  = { :id => 1, :name => "Matz" }.to_xml(:root => "person")
-    
+
     create_matz = ActiveResource::Request.new(:post, '/people.xml', matz, {})
     created_response = ActiveResource::Response.new("", 201, {"Location" => "/people/1.xml"})
     get_matz = ActiveResource::Request.new(:get, '/people/1.xml', nil)
     ok_response = ActiveResource::Response.new(matz, 200, {})
-    
+
     pairs = {create_matz => created_response, get_matz => ok_response}
-    
+
     ActiveResource::HttpMock.respond_to(pairs)
     assert_equal 2, ActiveResource::HttpMock.responses.length
     assert_equal "", ActiveResource::HttpMock.responses.assoc(create_matz)[1].body
@@ -140,6 +140,34 @@ class HttpMockTest < ActiveSupport::TestCase
     assert_equal 2, ActiveResource::HttpMock.responses.length
   end
 
+  test "allows you to replace the existing reponse with the same request" do
+    ActiveResource::HttpMock.respond_to do |mock|
+      mock.send(:get, "/people/1", {}, "XML1")
+    end
+    assert_equal 1, ActiveResource::HttpMock.responses.length
+
+    matz  = { :id => 1, :name => "Matz" }.to_xml(:root => "person")
+    get_matz = ActiveResource::Request.new(:get, '/people/1', nil)
+    ok_response = ActiveResource::Response.new(matz, 200, {})
+
+    ActiveResource::HttpMock.respond_to({get_matz => ok_response}, false)
+
+    assert_equal 1, ActiveResource::HttpMock.responses.length
+  end
+
+  test "do not replace the response with the same path but different method" do
+    ActiveResource::HttpMock.respond_to do |mock|
+      mock.send(:get, "/people/1", {}, "XML1")
+    end
+    assert_equal 1, ActiveResource::HttpMock.responses.length
+
+    put_matz = ActiveResource::Request.new(:put, '/people/1', nil)
+    ok_response = ActiveResource::Response.new("", 200, {})
+
+    ActiveResource::HttpMock.respond_to({put_matz => ok_response}, false)
+    assert_equal 2, ActiveResource::HttpMock.responses.length
+  end
+
   def request(method, path, headers = {}, body = nil)
     if [:put, :post].include? method
       @http.send(method, path, body, headers)