Merge pull request bblimke#184 from jonleighton/dont_mutate_uri

Clone the URI before mutating it.
ryansch · May 21, 2012 · 887bf32 · 887bf32
2 parents d083e68 + 6927943
commit 887bf32
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 6 deletions.
diff --git a/lib/webmock/http_lib_adapters/em_http_request/em_http_request_1_x.rb b/lib/webmock/http_lib_adapters/em_http_request/em_http_request_1_x.rb
@@ -153,7 +153,7 @@ def build_request_signature
         end
 
         method = @req.method
-        uri = @req.uri
+        uri = @req.uri.clone
         auth = @req.proxy[:authorization] if @req.proxy
         query = @req.query
 

diff --git a/spec/acceptance/em_http_request/em_http_request_spec.rb b/spec/acceptance/em_http_request/em_http_request_spec.rb
@@ -141,26 +141,41 @@ def response(resp)
     end
 
     describe "mocking EM::HttpClient API" do
+      let(:uri) { "http://www.example.com/" }
+
       before do
-        stub_request(:get, "www.example.com/")
+        stub_request(:get, uri)
         WebMock::HttpLibAdapters::EmHttpRequestAdapter.enable!
       end
-      subject do
+
+      def client(uri, options = {})
         client = nil
         EM.run do
-          client = EventMachine::HttpRequest.new('http://www.example.com/').get
+          client = EventMachine::HttpRequest.new(uri).get(options)
           client.callback { EM.stop }
           client.errback { failed }
         end
         client
       end
 
+      subject { client(uri) }
+
       it 'should support #uri' do
-        subject.uri.should == Addressable::URI.parse('http://www.example.com/')
+        subject.uri.should == Addressable::URI.parse(uri)
       end
 
       it 'should support #last_effective_url' do
-        subject.last_effective_url.should == Addressable::URI.parse('http://www.example.com/')
+        subject.last_effective_url.should == Addressable::URI.parse(uri)
+      end
+
+      context "with a query" do
+        let(:uri) { "http://www.example.com/?a=1&b=2" }
+        subject { client("http://www.example.com/?a=1", :query => { 'b' => 2 }) }
+
+        it "#request_signature doesn't mutate the original uri" do
+          subject.uri.should == Addressable::URI.parse("http://www.example.com/?a=1")
+          subject.request_signature.uri.should == Addressable::URI.parse(uri)
+        end
       end
     end