Merge pull request #113 from tjarratt/transpec

Rewrite specs using new rspec syntax
savonrb · May 22, 2014 · 15eb7a7 · 15eb7a7
2 parents 9af8f7a + 55030c5
commit 15eb7a7
Show file tree

Hide file tree

Showing 22 changed files with 265 additions and 265 deletions.
diff --git a/httpi.gemspec b/httpi.gemspec
@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'rubyntlm', '~> 0.3.2'
   s.add_development_dependency 'rake',     '~> 10.0'
-  s.add_development_dependency 'rspec',    '~> 2.12'
+  s.add_development_dependency 'rspec',    '~> 2.14'
   s.add_development_dependency 'mocha',    '~> 0.13'
   s.add_development_dependency 'puma',     '~> 2.3.2'
 

diff --git a/spec/httpi/adapter/curb_spec.rb b/spec/httpi/adapter/curb_spec.rb
@@ -21,7 +21,7 @@
       end
 
       it "returns a valid HTTPI::Response" do
-        adapter.request(:get).should match_response(:body => Fixture.xml)
+        expect(adapter.request(:get)).to match_response(:body => Fixture.xml)
       end
     end
 
@@ -34,7 +34,7 @@
       end
 
       it "returns a valid HTTPI::Response" do
-        adapter.request(:post).should match_response(:body => Fixture.xml)
+        expect(adapter.request(:post)).to match_response(:body => Fixture.xml)
       end
     end
 
@@ -56,7 +56,7 @@
       end
 
       it "returns a valid HTTPI::Response" do
-        adapter.request(:head).should match_response(:body => Fixture.xml)
+        expect(adapter.request(:head)).to match_response(:body => Fixture.xml)
       end
     end
 
@@ -69,7 +69,7 @@
       end
 
       it "returns a valid HTTPI::Response" do
-        adapter.request(:put).should match_response(:body => Fixture.xml)
+        expect(adapter.request(:put)).to match_response(:body => Fixture.xml)
       end
     end
 
@@ -91,7 +91,7 @@
       end
 
       it "returns a valid HTTPI::Response" do
-        adapter.request(:delete).should match_response(:body => "")
+        expect(adapter.request(:delete)).to match_response(:body => "")
       end
     end
 

diff --git a/spec/httpi/adapter/em_http_spec.rb b/spec/httpi/adapter/em_http_spec.rb
@@ -24,7 +24,7 @@
           with(:query => nil, :head => {}, :body => nil).
           returns(http_message)
 
-        adapter.request(:get).should match_response(:body => Fixture.xml)
+        expect(adapter.request(:get)).to match_response(:body => Fixture.xml)
       end
     end
 
@@ -35,7 +35,7 @@
           returns(http_message)
 
         request.body = Fixture.xml
-        adapter.request(:post).should match_response(:body => Fixture.xml)
+        expect(adapter.request(:post)).to match_response(:body => Fixture.xml)
       end
     end
 
@@ -45,7 +45,7 @@
           with(:query => nil, :head => {}, :body => nil).
           returns(http_message)
 
-        adapter.request(:head).should match_response(:body => Fixture.xml)
+        expect(adapter.request(:head)).to match_response(:body => Fixture.xml)
       end
     end
 
@@ -56,7 +56,7 @@
           returns(http_message)
 
         request.body = Fixture.xml
-        adapter.request(:put).should match_response(:body => Fixture.xml)
+        expect(adapter.request(:put)).to match_response(:body => Fixture.xml)
       end
     end
 
@@ -66,7 +66,7 @@
           with(:query => nil, :head => {}, :body => nil).
           returns(http_message(""))
 
-        adapter.request(:delete).should match_response(:body => "")
+        expect(adapter.request(:delete)).to match_response(:body => "")
       end
     end
 
@@ -76,7 +76,7 @@
           with(:query => nil, :head => {}, :body => nil).
           returns(http_message(""))
 
-        adapter.request(:custom).should match_response(:body => "")
+        expect(adapter.request(:custom)).to match_response(:body => "")
       end
     end
 

diff --git a/spec/httpi/adapter/excon_spec.rb b/spec/httpi/adapter/excon_spec.rb
@@ -19,45 +19,45 @@
       request.headers["X-Header"] = "HTTPI"
 
       response = HTTPI.get(request, adapter)
-      response.body.should include("HTTPI")
+      expect(response.body).to include("HTTPI")
     end
 
     it "executes GET requests" do
       response = HTTPI.get(@server.url, adapter)
-      response.body.should eq("get")
-      response.headers["Content-Type"].should eq("text/plain")
+      expect(response.body).to eq("get")
+      expect(response.headers["Content-Type"]).to eq("text/plain")
     end
 
     it "executes POST requests" do
       response = HTTPI.post(@server.url, "<some>xml</some>", adapter)
-      response.body.should eq("post")
-      response.headers["Content-Type"].should eq("text/plain")
+      expect(response.body).to eq("post")
+      expect(response.headers["Content-Type"]).to eq("text/plain")
     end
 
     it "executes HEAD requests" do
       response = HTTPI.head(@server.url, adapter)
-      response.code.should == 200
-      response.headers["Content-Type"].should eq("text/plain")
+      expect(response.code).to eq(200)
+      expect(response.headers["Content-Type"]).to eq("text/plain")
     end
 
     it "executes PUT requests" do
       response = HTTPI.put(@server.url, "<some>xml</some>", adapter)
-      response.body.should eq("put")
-      response.headers["Content-Type"].should eq("text/plain")
+      expect(response.body).to eq("put")
+      expect(response.headers["Content-Type"]).to eq("text/plain")
     end
 
     it "executes DELETE requests" do
       response = HTTPI.delete(@server.url, adapter)
-      response.body.should eq("delete")
-      response.headers["Content-Type"].should eq("text/plain")
+      expect(response.body).to eq("delete")
+      expect(response.headers["Content-Type"]).to eq("text/plain")
     end
 
     it "supports basic authentication" do
       request = HTTPI::Request.new(@server.url + "basic-auth")
       request.auth.basic("admin", "secret")
 
       response = HTTPI.get(request, adapter)
-      response.body.should eq("basic-auth")
+      expect(response.body).to eq("basic-auth")
     end
 
     it "does not support ntlm authentication" do

diff --git a/spec/httpi/adapter/httpclient_spec.rb b/spec/httpi/adapter/httpclient_spec.rb
@@ -13,7 +13,7 @@
   describe "#request(:get)" do
     it "returns a valid HTTPI::Response" do
       httpclient_expects(:get)
-      adapter.request(:get).should match_response(:body => Fixture.xml)
+      expect(adapter.request(:get)).to match_response(:body => Fixture.xml)
     end
   end
 
@@ -22,14 +22,14 @@
       request.body = Fixture.xml
       httpclient_expects(:post)
 
-      adapter.request(:post).should match_response(:body => Fixture.xml)
+      expect(adapter.request(:post)).to match_response(:body => Fixture.xml)
     end
   end
 
   describe "#request(:head)" do
     it "returns a valid HTTPI::Response" do
       httpclient_expects(:head)
-      adapter.request(:head).should match_response(:body => Fixture.xml)
+      expect(adapter.request(:head)).to match_response(:body => Fixture.xml)
     end
   end
 
@@ -38,21 +38,21 @@
       request.body = Fixture.xml
       httpclient_expects(:put)
 
-      adapter.request(:put).should match_response(:body => Fixture.xml)
+      expect(adapter.request(:put)).to match_response(:body => Fixture.xml)
     end
   end
 
   describe "#request(:delete)" do
     it "returns a valid HTTPI::Response" do
       httpclient_expects(:delete)
-      adapter.request(:delete).should match_response(:body => Fixture.xml)
+      expect(adapter.request(:delete)).to match_response(:body => Fixture.xml)
     end
   end
 
   describe "#request(:custom)" do
     it "returns a valid HTTPI::Response" do
       httpclient_expects(:custom)
-      adapter.request(:custom).should match_response(:body => Fixture.xml)
+      expect(adapter.request(:custom)).to match_response(:body => Fixture.xml)
     end
   end
 

diff --git a/spec/httpi/adapter/net_http_persistent_spec.rb b/spec/httpi/adapter/net_http_persistent_spec.rb
@@ -19,45 +19,45 @@
       request.headers["X-Header"] = "HTTPI"
 
       response = HTTPI.get(request, adapter)
-      response.body.should include("HTTPI")
+      expect(response.body).to include("HTTPI")
     end
 
     it "executes GET requests" do
       response = HTTPI.get(@server.url, adapter)
-      response.body.should eq("get")
-      response.headers["Content-Type"].should eq("text/plain")
+      expect(response.body).to eq("get")
+      expect(response.headers["Content-Type"]).to eq("text/plain")
     end
 
     it "executes POST requests" do
       response = HTTPI.post(@server.url, "<some>xml</some>", adapter)
-      response.body.should eq("post")
-      response.headers["Content-Type"].should eq("text/plain")
+      expect(response.body).to eq("post")
+      expect(response.headers["Content-Type"]).to eq("text/plain")
     end
 
     it "executes HEAD requests" do
       response = HTTPI.head(@server.url, adapter)
-      response.code.should == 200
-      response.headers["Content-Type"].should eq("text/plain")
+      expect(response.code).to eq(200)
+      expect(response.headers["Content-Type"]).to eq("text/plain")
     end
 
     it "executes PUT requests" do
       response = HTTPI.put(@server.url, "<some>xml</some>", adapter)
-      response.body.should eq("put")
-      response.headers["Content-Type"].should eq("text/plain")
+      expect(response.body).to eq("put")
+      expect(response.headers["Content-Type"]).to eq("text/plain")
     end
 
     it "executes DELETE requests" do
       response = HTTPI.delete(@server.url, adapter)
-      response.body.should eq("delete")
-      response.headers["Content-Type"].should eq("text/plain")
+      expect(response.body).to eq("delete")
+      expect(response.headers["Content-Type"]).to eq("text/plain")
     end
 
     it "supports basic authentication" do
       request = HTTPI::Request.new(@server.url + "basic-auth")
       request.auth.basic("admin", "secret")
 
       response = HTTPI.get(request, adapter)
-      response.body.should eq("basic-auth")
+      expect(response.body).to eq("basic-auth")
     end
 
     it "does not support ntlm authentication" do

diff --git a/spec/httpi/adapter/net_http_spec.rb b/spec/httpi/adapter/net_http_spec.rb
@@ -19,45 +19,45 @@
       request.headers["X-Header"] = "HTTPI"
 
       response = HTTPI.get(request, adapter)
-      response.body.should include("HTTPI")
+      expect(response.body).to include("HTTPI")
     end
 
     it "executes GET requests" do
       response = HTTPI.get(@server.url, adapter)
-      response.body.should eq("get")
-      response.headers["Content-Type"].should eq("text/plain")
+      expect(response.body).to eq("get")
+      expect(response.headers["Content-Type"]).to eq("text/plain")
     end
 
     it "executes POST requests" do
       response = HTTPI.post(@server.url, "<some>xml</some>", adapter)
-      response.body.should eq("post")
-      response.headers["Content-Type"].should eq("text/plain")
+      expect(response.body).to eq("post")
+      expect(response.headers["Content-Type"]).to eq("text/plain")
     end
 
     it "executes HEAD requests" do
       response = HTTPI.head(@server.url, adapter)
-      response.code.should == 200
-      response.headers["Content-Type"].should eq("text/plain")
+      expect(response.code).to eq(200)
+      expect(response.headers["Content-Type"]).to eq("text/plain")
     end
 
     it "executes PUT requests" do
       response = HTTPI.put(@server.url, "<some>xml</some>", adapter)
-      response.body.should eq("put")
-      response.headers["Content-Type"].should eq("text/plain")
+      expect(response.body).to eq("put")
+      expect(response.headers["Content-Type"]).to eq("text/plain")
     end
 
     it "executes DELETE requests" do
       response = HTTPI.delete(@server.url, adapter)
-      response.body.should eq("delete")
-      response.headers["Content-Type"].should eq("text/plain")
+      expect(response.body).to eq("delete")
+      expect(response.headers["Content-Type"]).to eq("text/plain")
     end
 
     it "supports basic authentication" do
       request = HTTPI::Request.new(@server.url + "basic-auth")
       request.auth.basic("admin", "secret")
 
       response = HTTPI.get(request, adapter)
-      response.body.should eq("basic-auth")
+      expect(response.body).to eq("basic-auth")
     end
 
     it "does not support digest authentication" do
@@ -73,7 +73,7 @@
       request.auth.ntlm("tester", "vReqSoafRe5O")
 
       response = HTTPI.get(request, adapter)
-      response.body.should eq("ntlm-auth")
+      expect(response.body).to eq("ntlm-auth")
     end
 
     it 'fatal logs when net/ntlm is not available, but ntlm authentication was requested' do
@@ -84,7 +84,7 @@
       HTTPI.logger.expects(:fatal)
 
       response = HTTPI.get(request, adapter)
-      response.body.should eq("ntlm-auth")
+      expect(response.body).to eq("ntlm-auth")
     end
   end
 

diff --git a/spec/httpi/adapter/rack_spec.rb b/spec/httpi/adapter/rack_spec.rb
@@ -18,37 +18,37 @@
       request.headers["X-Header"] = "HTTPI"
 
       response = HTTPI.get(request, adapter)
-      response.body.should include("HTTPI")
+      expect(response.body).to include("HTTPI")
     end
 
     it "executes GET requests" do
       response = HTTPI.get(@url, adapter)
-      response.body.should eq("get")
-      response.headers["Content-Type"].should eq("text/plain")
+      expect(response.body).to eq("get")
+      expect(response.headers["Content-Type"]).to eq("text/plain")
     end
 
     it "executes POST requests" do
       response = HTTPI.post(@url, "<some>xml</some>", adapter)
-      response.body.should eq("post")
-      response.headers["Content-Type"].should eq("text/plain")
+      expect(response.body).to eq("post")
+      expect(response.headers["Content-Type"]).to eq("text/plain")
     end
 
     it "executes HEAD requests" do
       response = HTTPI.head(@url, adapter)
-      response.code.should == 200
-      response.headers["Content-Type"].should eq("text/plain")
+      expect(response.code).to eq(200)
+      expect(response.headers["Content-Type"]).to eq("text/plain")
     end
 
     it "executes PUT requests" do
       response = HTTPI.put(@url, "<some>xml</some>", adapter)
-      response.body.should eq("put")
-      response.headers["Content-Type"].should eq("text/plain")
+      expect(response.body).to eq("put")
+      expect(response.headers["Content-Type"]).to eq("text/plain")
     end
 
     it "executes DELETE requests" do
       response = HTTPI.delete(@url, adapter)
-      response.body.should eq("delete")
-      response.headers["Content-Type"].should eq("text/plain")
+      expect(response.body).to eq("delete")
+      expect(response.headers["Content-Type"]).to eq("text/plain")
     end
 
     describe "settings:" do