rspec_html_reporter 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7240b9e71f70c91f66716bee22754445f16fbae8
-  data.tar.gz: e37cbf82007f1b41a48b8a7bdb6f67f038dbb519
+  metadata.gz: 8ae94974550f41e82238d6bfba8d63f7a3ebef71
+  data.tar.gz: 0fa08481d76ff8a9d49d7d8165ae45261373a417
 SHA512:
-  metadata.gz: aa51f6fc85ccfbe9b44c1c4cdf93ad03229432006c8f332203a32630e9d2f83e8dcfc262d6ac92d492306cb79645e6380740a64476cb02dfa519c9c56d3dddb6
-  data.tar.gz: 81c6a409b05e79e70429182d96d6f4b4cf1d6b148fe63a72a9ae28c739a9119b12e33e58563fd8646ec5f5790bfdd0f328b8eee052e083afe028f7dd9b8d7fd1
+  metadata.gz: c1292b7db6d8e7663437b8959cef71e28e4f1c5bd69f8202732a0705859856f878ac842b1e29e55ab164ffbb719fe674ed6977a4af2188552d858ae253863066
+  data.tar.gz: 18d735071425e2d5d7b0eee7496b26b0463aac0aa0f877782b32d0ee76f9e4b86dc34dca9299a5300646b7fbf9814945a5f16c2165fff858894cefdfd296e74d

data/lib/rspec_html_reporter.rb

@@ -12,14 +12,15 @@ I18n.enforce_available_locales = false
 class Oopsy
   attr_reader :klass, :message, :backtrace, :highlighted_source, :explanation, :backtrace_message
 
-  def initialize(exception, file_path)
-    @exception = exception
+  def initialize(example, file_path)
+    @example = example
+    @exception = @example.exception
     @file_path = file_path
     unless @exception.nil?
       @klass = @exception.class
       @message = @exception.message.encode('utf-8')
       @backtrace = @exception.backtrace
-      @backtrace_message = @backtrace.nil? ? '' : @backtrace.select { |r| r.match(@file_path) }.join('').encode('utf-8')
+      @backtrace_message = formatted_backtrace(@example, @exception)
       @highlighted_source = process_source
       @explanation = process_message
     end
@@ -45,8 +46,13 @@ class Oopsy
     )
   end
 
+  def formatted_backtrace(example, exception)
+    formatter = RSpec.configuration.backtrace_formatter
+    formatter.format_backtrace(exception.backtrace, example.metadata)
+  end
+
   def process_source
-    data = @backtrace_message.split(':')
+    data = @backtrace_message.first.split(':')
     unless data.empty?
     if os == :windows
       file_path = data[0] + ':' + data[1]
@@ -76,6 +82,22 @@ end
 
 class Example
 
+  def self.load_spec_comments!(examples)
+    examples.group_by(&:file_path).each do |file_path, file_examples|
+      lines = File.readlines(file_path)
+
+      file_examples.zip(file_examples.rotate).each do |ex, next_ex|
+        lexically_next = next_ex &&
+          next_ex.file_path == ex.file_path &&
+          next_ex.metadata[:line_number] > ex.metadata[:line_number]
+        start_line_idx = ex.metadata[:line_number] - 1
+        next_start_idx = (lexically_next ? next_ex.metadata[:line_number] : lines.size) - 1
+        spec_lines = lines[start_line_idx...next_start_idx].select { |l| l.match(/#->/) }
+        ex.set_spec(spec_lines.join) unless spec_lines.empty?
+      end
+    end
+  end
+
   attr_reader :example_group, :description, :full_description, :run_time, :duration, :status, :exception, :file_path, :metadata, :spec, :screenshots, :screenrecord, :failed_screenshot
 
   def initialize(example)
@@ -88,7 +110,7 @@ class Example
     @status = @execution_result.status.to_s
     @metadata = example.metadata
     @file_path = @metadata[:file_path]
-    @exception = Oopsy.new(example.exception, @file_path)
+    @exception = Oopsy.new(example, @file_path)
     @spec = nil
     @screenshots = @metadata[:screenshots]
     @screenrecord = @metadata[:screenrecord]
@@ -122,8 +144,10 @@ class Example
     !@failed_screenshot.nil?
   end
 
-  def set_spec(spec)
-    @spec = spec
+  def set_spec(spec_text)
+    formatter = Rouge::Formatters::HTML.new(css_class: 'highlight')
+    lexer = Rouge::Lexers::Gherkin.new
+    @spec = formatter.format(lexer.lex(spec_text.gsub('#->', '')))
   end
 
   def klass(prefix='label-')
@@ -133,30 +157,6 @@ class Example
 
 end
 
-class Specify
-
-  def initialize(examples)
-    @examples = examples
-  end
-
-  def process
-    @examples.each_with_index do |e, i|
-      lines = File.readlines(e.file_path)
-      start_line = e.metadata[:line_number]
-      end_line = @examples[i+1].nil? ? lines.size : @examples[i+1].metadata[:line_number] - 1
-      code_block = lines[start_line..end_line]
-      spec = code_block.select { |l| l.match(/#->/) }.join('')
-      if !spec.split.empty?
-        formatter = Rouge::Formatters::HTML.new(css_class: 'highlight')
-        lexer = Rouge::Lexers::Gherkin.new
-        formatted_spec = formatter.format(lexer.lex(spec.gsub('#->', '')))
-        e.set_spec(formatted_spec)
-      end
-    end
-    @examples
-  end
-end
-
 class RspecHtmlReporter < RSpec::Core::Formatters::BaseFormatter
 
   DEFAULT_REPORT_PATH = File.join(Bundler.root, 'reports', Time.now.strftime('%Y%m%d-%H%M%S'))
@@ -181,7 +181,7 @@ class RspecHtmlReporter < RSpec::Core::Formatters::BaseFormatter
   def example_group_started(notification)
     if @group_level == 0
       @example_group = {}
-      @group_examples = []
+      @examples = []
       @group_example_count = 0
       @group_example_success_count = 0
       @group_example_failure_count = 0
@@ -197,17 +197,17 @@ class RspecHtmlReporter < RSpec::Core::Formatters::BaseFormatter
 
   def example_passed(notification)
     @group_example_success_count += 1
-    @group_examples << Example.new(notification.example)
+    @examples << Example.new(notification.example)
   end
 
   def example_failed(notification)
     @group_example_failure_count += 1
-    @group_examples << Example.new(notification.example)
+    @examples << Example.new(notification.example)
   end
 
   def example_pending(notification)
     @group_example_pending_count += 1
-    @group_examples << Example.new(notification.example)
+    @examples << Example.new(notification.example)
   end
 
   def example_group_finished(notification)
@@ -220,7 +220,7 @@ class RspecHtmlReporter < RSpec::Core::Formatters::BaseFormatter
         @failed = @group_example_failure_count
         @pending = @group_example_pending_count
 
-        duration_values = @group_examples.map { |e| e.run_time }
+        duration_values = @examples.map { |e| e.run_time }
 
         duration_keys = duration_values.size.times.to_a
         if duration_values.size < 2 and duration_values.size > 0
@@ -232,7 +232,7 @@ class RspecHtmlReporter < RSpec::Core::Formatters::BaseFormatter
         @durations = duration_keys.zip(duration_values)
 
         @summary_duration = duration_values.inject(0) { |sum, i| sum + i }.to_s(:rounded, precision: 5)
-        @examples = Specify.new(@group_examples).process
+        Example.load_spec_comments!(@examples)
 
         class_map = {passed: 'success', failed: 'danger', pending: 'warning'}
         statuses = @examples.map { |e| e.status }

data/templates/report.erb

@@ -73,10 +73,7 @@
       </div>
     </div>
 
-  <div class="row">
-
     <div class="col-lg-12">
-
       <table class="table table-striped table-hover ">
         <thead>
         <tr>
@@ -155,7 +152,16 @@
                         </div>
                         <div class="panel-body">
                           <%= example.exception.explanation %>
-                          <h5><%= example.exception.backtrace_message %></h5>
+                          <dl>
+                            <dt>Backtrace:</dt>
+                            <dd>
+                              <ol>
+                                <% example.exception.backtrace_message.each do |message| %>
+                                  <li><%= message %></li>
+                                <% end %>
+                              </ol>
+                            </dd>
+                          </dl>
                           <%= example.exception.highlighted_source %>
                         </div>
 
@@ -181,10 +187,8 @@
         <% end %>
         </tbody>
       </table>
-
     </div>
   </div>
-
 </div>
 
 <script type="text/javascript">

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec_html_reporter
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Vishal Banthia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-31 00:00:00.000000000 Z
+date: 2018-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec