rspec-httpd 0.0.12 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae68a23828d76493ce80d96bf2b2afee033a14e46da3a3ff6e3c67320bb5d625
-  data.tar.gz: 0bd56b3fa44e20b62f26560fb4fca7b187cab35622c49184292d2378a632b536
+  metadata.gz: c71c6a8e039811020f1c135751a4068adafb8f9e6992833fe2449661060146ce
+  data.tar.gz: 2875628708bf20325ce4323dde9d253f9955493f2e8af2c65828a2054481d421
 SHA512:
-  metadata.gz: 70dde7dd27a7cac04ebeefda0b4f5a1609caa803cff76edaf675a7d5d92a9f701b1feca713d81f1804bf8f4831ef9a5dc7711249d933d923edbf567bbc9cf125
-  data.tar.gz: 3a32fe486726baf2a80a2cefbc3009e874f800e4cee8c927a3bfe85aba897986ab9452c68da952c7321e0775fed6fa863812c202c6d9a9b26a7907e49461b515
+  metadata.gz: b262a9cbcb738a6956c32bafee8b2ab234cee9d8cf1fe218c2006b6d8e19b8b22311f2201253d49b875a9ade93b6da1a529e456db522039c4441e93e583bf9d9
+  data.tar.gz: b834501793639f9c49ff836d7eb1d25f0b170743bfe3c98186f7219fcd0f30705e97e2ffd331aad25fac55dccee6abdd66384a1598479e5d504fa90f85e187b5

data/VERSION

@@ -1 +1 @@
-0.0.12
+0.0.14

data/lib/rspec/httpd.rb

@@ -71,22 +71,20 @@ module RSpec::Httpd
     #
     #    expect_response 201
     #
-    if expected.is_a?(Integer) && status.nil?
-      expect(client.status).to eq(expected)
-      return
-    end
+    expected_status = expected.is_a?(Integer) && status.nil? ? expected : status || 200
+
+    request, response = client.request, client.response
 
-    # do_expect_last_request is implemented in RSpec::Httpd::Expectation, and mixed in
-    # here, because it needs access to the expect() implementation.
+    expect(client.status).to eq(expected_status), 
+      "status should be #{expected_status}, but is #{client.status}, on '#{request.method} #{request.path}'"
 
-    expect(client.status).to eq(status || 200)
-    return if expected.nil?
+    return if expected.nil? || expected.is_a?(Integer)
 
     begin
       # expect! comes from the expectation gem
       expect! client.result => expected
     rescue ::Expectation::Matcher::Mismatch => e
-      raise ExpectationFailed.new(e, request: client.request, response: client.response), cause: nil
+      raise ExpectationFailed.new(e, request: request, response: response), cause: nil
     end
   end
 

data/lib/rspec/httpd/client.rb

@@ -34,6 +34,11 @@ module RSpec::Httpd
       run_request(::Net::HTTP::Get, url, body: nil, headers: headers)
     end
 
+    # A HEAD request
+    def head(url, headers: {})
+      run_request(::Net::HTTP::Head, url, body: nil, headers: headers)
+    end
+
     # A POST request
     def post(url, body, headers: {})
       run_request(::Net::HTTP::Post, url, body: body, headers: headers)
@@ -104,6 +109,8 @@ module RSpec::Httpd
 
     module ResponseParser
       def self.parse(response)
+        return nil if response.body.nil?
+
         content_type = response["content-type"]
 
         result = if content_type&.include?("application/json")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-httpd
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.14
 platform: ruby
 authors:
 - Enrico Thierbach