rspec-httpd 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63a83e63d887fb7d1a4624719c551449fed53ab9ce4fd737c23b81eca8fbfec9
-  data.tar.gz: 85263b7c0017af759b76ae5f9c8f4b053775b570e741d006388b31075a16565f
+  metadata.gz: 7277e2b07cd04cb4c8a87062b2449244747ba07c032bfaf8b05d3d9b8e0a4761
+  data.tar.gz: c4974c0f457fbbd03c15d55d28408da3d1d6831509f5e56d7c1bb26dd80d2a10
 SHA512:
-  metadata.gz: 97fc5313c1fb71e24622043efd4729bbd155ea4ae32057f5c92c705e3153d91b291156bdabe0780fcfa16804b18fcbf8f05eab802ccdd8a5addd6d961b0ab33e
-  data.tar.gz: d74cb440e90cbc553d66351fab7739fc925e79104514444d998eee79e28ab7c18b69d685d7e4c2e40809c45749288388e86adc447337365f5d7a7415c0dea6d0
+  metadata.gz: 84eed9b38ea95f413ea42b981cb761b32b3e10885a5177fda369a4c2b14ba29ef130c4ad76fa4988c7ade0eecf7c2294f3599ac2cdeff7d1e3a7eec655fa3996
+  data.tar.gz: aeba7bb613f2664b801881377bbac3371eb75aae5a7c04a05f50ee9bb47cf69eea9e346e7f9b0c2d9ca8a6e0b10860cf93f3432be1188c38c5d33bed12eabe80

data/VERSION

@@ -1 +1 @@
-0.0.10
+0.0.11

data/lib/rspec/httpd/expectation_failed.rb

@@ -1,39 +1,20 @@
+# rubocop:disable Metrics/AbcSize
+
 class RSpec::Httpd::ExpectationFailed < RuntimeError
-  attr_reader :original_error, :request
+  attr_reader :original_error, :request, :response
 
-  def initialize(original_error, request)
-    @original_error, @request = original_error, request
+  def initialize(original_error, request:, response:)
+    @original_error, @request, @response = original_error, request, response
   end
 
   def to_s
-    "#{request_info}: #{original_error}"
-  end
-
-  private
-
-  def request_info
-    request_info = "#{request.method} #{request.path}"
-    
-    body = request.body
-    return request_info unless body
-
-    "#{request_info}#{body_info(parsed_body(body) || body)}"
-  end
-
-  def parsed_body(body)
-    JSON.parse(body)
-  rescue StandardError
-    nil
-  end
-
-  def body_info(body)
-    body = parsed_body(body) || body
-
-    case body
-    when Hash
-      body.map { |k, v| "#{k}: #{v.inspect}" }.join(", ")
-    else
-      body.inspect
-    end
+    parts = []
+    parts.push(original_error.to_s)
+    parts.push("=== #{request.method} #{request.path} =====================")
+    parts.push("> " + request.body.gsub("\n", "\n> ")) if request.body
+    parts.push("--- response ------------------------------------")
+    parts.push("< " + response.body.gsub("\n", "\n< ")) if response.body
+    parts.push("==================================================================")
+    parts.join("\n")
   end
 end

data/lib/rspec/httpd.rb

@@ -63,6 +63,8 @@ module RSpec::Httpd
       expected = yield
     end
 
+    expected = stringify_hash(expected) if expected.is_a?(Hash)
+
     client ||= http
 
     # only check status? This lets us write
@@ -83,8 +85,19 @@ module RSpec::Httpd
     begin
       # expect! comes from the expectation gem
       expect! client.result => expected
-    rescue ::Expectation::Matcher::Mismatch
-      raise ExpectationFailed.new($!, client.request)
+    rescue ::Expectation::Matcher::Mismatch => e
+      raise ExpectationFailed.new(e, request: client.request, response: client.response), cause: nil
+    end
+  end
+
+  private
+
+  def stringify_hash(hsh)
+    return unless hsh
+
+    hsh.inject({}) do |r, (k, v)|
+      k = k.to_s if k.is_a?(Symbol)
+      r.update k => v
     end
   end
 end

metadata

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