Merge pull request rsolr#75 from blackwinter/rspec-deprecation

Silence RSpec's deprecation warnings.
bcail · Mar 30, 2014 · b9aff05 · b9aff05
2 parents 6c64406 + b583de9
commit b9aff05
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 17 deletions.
diff --git a/spec/api/connection_spec.rb b/spec/api/connection_spec.rb
@@ -15,9 +15,9 @@
   end
 
   context "read timeout configuration" do
-    let(:client) { mock.as_null_object }
+    let(:client) { double.as_null_object }
 
-    let(:http) { mock(Net::HTTP).as_null_object }
+    let(:http) { double(Net::HTTP).as_null_object }
 
     subject { RSolr::Connection.new } 
 
@@ -37,9 +37,9 @@
   end
 
   context "open timeout configuration" do
-    let(:client) { mock.as_null_object }
+    let(:client) { double.as_null_object }
 
-    let(:http) { mock(Net::HTTP).as_null_object }
+    let(:http) { double(Net::HTTP).as_null_object }
 
     subject { RSolr::Connection.new } 
 
@@ -59,9 +59,9 @@
   end
 
   context "connection refused" do
-    let(:client) { mock.as_null_object }
+    let(:client) { double.as_null_object }
 
-    let(:http) { mock(Net::HTTP).as_null_object }
+    let(:http) { double(Net::HTTP).as_null_object }
     let(:request_context) {
       {:uri => URI.parse("http://localhost/some_uri"), :method => :get, :open_timeout => 42}
     }
@@ -81,7 +81,7 @@
   end
 
   describe "basic auth support" do
-    let(:http) { mock(Net::HTTP).as_null_object }
+    let(:http) { double(Net::HTTP).as_null_object }
 
     before do
       Net::HTTP.stub(:new) { http }
@@ -90,7 +90,7 @@
     it "sets the authorization header" do
       http.should_receive(:request) do |request|
         request.fetch('authorization').should == "Basic #{Base64.encode64("joe:pass")}".strip
-        mock(Net::HTTPResponse).as_null_object
+        double(Net::HTTPResponse).as_null_object
       end
       RSolr::Connection.new.execute nil, :uri => URI.parse("http://joe:pass@localhost:8983/solr"), :method => :get
     end

diff --git a/spec/api/error_spec.rb b/spec/api/error_spec.rb
@@ -10,7 +10,7 @@ def generate_error_with_backtrace(request, response)
     before do
       response_lines = (1..15).to_a.map { |i| "line #{i}" }
 
-      @request  = mock :[] => "mocked"
+      @request  = double :[] => "mocked"
       @response = {
         :body   => "<pre>" + response_lines.join("\n") + "</pre>",
         :status => 400
@@ -34,7 +34,7 @@ def generate_error_with_backtrace(request, response)
     before do
       response_lines = (1..15).to_a.map { |i| "line #{i}" }
 
-      @request  = mock :[] => "mocked"
+      @request  = double :[] => "mocked"
       @response = {
         :body   => response_lines.join("\n"),
         :status => 400

diff --git a/spec/api/xml_spec.rb b/spec/api/xml_spec.rb
@@ -4,12 +4,11 @@
 describe "RSolr::Xml" do
 
   let(:generator){ RSolr::Xml::Generator.new }
-  let(:builder_engines) do
-    { 
-      :builder   => { :val => false, :class => Builder::XmlMarkup, :engine => Builder::XmlMarkup.new(:indent => 0, :margin => 0, :encoding => 'UTF-8') },
-      :nokogiri  => { :val => true,  :class => Nokogiri::XML::Builder, :engine => Nokogiri::XML::Builder.new }
-    }
-  end
+
+  builder_engines = { 
+    :builder   => { :val => false, :class => Builder::XmlMarkup, :engine => Builder::XmlMarkup.new(:indent => 0, :margin => 0, :encoding => 'UTF-8') },
+    :nokogiri  => { :val => true,  :class => Nokogiri::XML::Builder, :engine => Nokogiri::XML::Builder.new }
+  }
 
   [:builder,:nokogiri].each do |engine_name|
     describe engine_name do
@@ -154,4 +153,4 @@
     end
   end
 
-end
+end