reqres_rspec 0.1.9 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c88090d6224ca864266ee16045807234402a61b2
-  data.tar.gz: 8b3c73d80dd59bfa22b85680ab1bd8d200686d3b
+  metadata.gz: 7f2ec27b033a00c710b4abfd4fa7ab3c47c6a0aa
+  data.tar.gz: 00a9341f986a1a27c257fa3d47db2d3da8504e05
 SHA512:
-  metadata.gz: d97adfc59a7e962460d8c4e51ef613f1ca187f3572ebcd37197506c30660522b3fb948ad58d7dac5cab28766108389ae74130f0b9bc3dd501c79563cd0e0548a
-  data.tar.gz: 4e87d385978bc62e132b214787b1efcd4bafd93dbef9d878bc97eac63691bc00c56e47d35feecab79e506bbe3c26df6a4c5dfb53b840bf3984019d3bbbd06f49
+  metadata.gz: f9dbaf569367992a11a35ddb821879c35cf8a7b6cc1e668332a4dcca587988cd315ca8b4446710206abac26c84ad67d9378fe67ba5522d46505f14766dbf9e5f
+  data.tar.gz: 89f9a60fbdef96ad578cecbc901f1a2bd9a8040f9eb04cb97aa4a183db05eb5451c644f3a1cf8cb6f3897e5ad940dd99f36ce3144528b9ea394abe3d48351f75

data/CHANGELOG.txt

@@ -1,3 +1,7 @@
+version 0.1.10
+
+fix rendering of html spec in case when query params are empty
+
 version 0.1.9
 
 fix regression with sinatra rspec

data/lib/reqres_rspec.rb

@@ -15,14 +15,15 @@ if defined?(RSpec) && ENV['REQRES_RSPEC'] == '1'
 
   RSpec.configure do |config|
     config.after(:each) do |example|
-      meta_data = self.class.example.metadata
-      if meta_data[:type] == :request && process_example?(meta_data, example)
+      if defined?(Rails) && process_example?(self.class.example.metadata, example)
+        self_request, self_response = self.request, self.response
+      elsif defined?(Sinatra)
+        self_request, self_response = self.last_request, self.last_response
+      end
+
+      if defined?(self_request) && defined?(self_response)
         begin
-          if defined?(Rails)
-            collector.collect(self, example, self.request, self.response)
-          elsif defined?(Sinatra)
-            collector.collect(self, example, self.last_request, self.last_response)
-          end
+          collector.collect(self, example, self_request, self_response)
         rescue Rack::Test::Error
           #
         rescue NameError
@@ -41,6 +42,6 @@ if defined?(RSpec) && ENV['REQRES_RSPEC'] == '1'
   end
 
   def process_example?(meta_data, example)
-    !(meta_data[:skip_reqres] || example.metadata[:skip_reqres])
+    meta_data[:type] == :request && !(meta_data[:skip_reqres] || example.metadata[:skip_reqres])
   end
 end

data/lib/reqres_rspec/formatters/html.rb

@@ -32,6 +32,8 @@ module ReqresRspec
           #{ arguments.map {|k, v| "#{k} = #{v}"}.join("\n") }
           ERB.new(File.open(path(filename)).read).result(binding)
         RUBY
+      rescue Exception => e
+        logger.error "Reqres::Formatters::HTML.render exception #{e.message}"
       end
 
       def save(filename, data)

data/lib/reqres_rspec/templates/spec.erb

@@ -196,7 +196,7 @@
     <code><%= @record[:request][:method] %> <%= @record[:request][:path] %></code>
 
     <h5>Query parameters</h5>
-    <% if @record[:request][:query_parameters].empty? %>
+    <% if @record[:request][:query_parameters].empty? || @record[:request][:query_parameters] == 'not available' %>
       <code>empty</code>
     <% else %>
       <% lines = ::JSON.pretty_generate(@record[:request][:query_parameters]) %>
@@ -210,15 +210,16 @@
 
     <h5>Body</h5>
     <% if @record[:request][:body].present? %>
-      <% lines = begin
-        ::JSON.pretty_generate(
-          ::JSON.parse(
-            @record[:request][:body]
-          )
-        )
-      rescue
-        @record[:request][:body]
-      end %>
+      <% lines =
+           begin
+             ::JSON.pretty_generate(
+               ::JSON.parse(
+                 @record[:request][:body]
+               )
+             )
+           rescue
+             @record[:request][:body]
+           end %>
       <code>
         <%= CodeRay.scan(lines, :json).div(line_numbers: :table) %>
       </code>
@@ -242,15 +243,16 @@
       <% if (@record[:response][:headers]['Content-Type'] == 'application/pdf' rescue true) %>
         <code>PDF document</code>
       <% else %>
-        <% lines = begin
-                     ::JSON.pretty_generate(
-                       ::JSON.parse(
-                         @record[:response][:body]
-                       )
-                     )
-                   rescue
-                     @record[:response][:body]
-                   end
+        <% lines =
+             begin
+               ::JSON.pretty_generate(
+                 ::JSON.parse(
+                   @record[:response][:body]
+                 )
+               )
+             rescue
+               @record[:response][:body]
+             end
         %>
         <code>
           <%= CodeRay.scan(lines, @record[:response][:format]).div(line_numbers: :table) %>

data/lib/reqres_rspec/version.rb

@@ -1,3 +1,3 @@
 module ReqresRspec
-  VERSION = '0.1.9'
+  VERSION = '0.1.10'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reqres_rspec
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors:
 - rilian