ugly_face 0.6 → 0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df49f3d36e3bbbffc191e0abdc6161cc97879d17
-  data.tar.gz: 731e3060420000df718a44e9e9b2c71fd0442427
+  metadata.gz: cdf4fc5ccf459f35aca03dc831d12c9bd2f3a884
+  data.tar.gz: b7d131c14ecb22f37924ef2eb5959be2587b854d
 SHA512:
-  metadata.gz: 20c48a5736b927d912f4c92a0f830fec8b97fa9dce2cb2f50d032c65e3feec8aef7340cbbc2399cdbfb2bcdb290be65f4d4ec2ec2d7f346b91a07e57585eca0f
-  data.tar.gz: 14a0546143133e9335a8306ef10b1c88e0f24757427aef387a160c00ec46f855bcce00c074bc00f0b246405aca6ccd16a6cb6c23b741ebf51f3d3f9ce158f620
+  metadata.gz: d57818da887edc12eb0ff9118c683b3febf6dba41a93d4de43956234e117726fffaa8b2ee49f732d71bf154d6f501e05cf42df354acfe7c2dc762ecd28ea5fd7
+  data.tar.gz: 0f4aec1c103918f6ecaa2b06e91a69f70b03af27e476706196961783d87d6409e3d3f71589b4231842a379292c7f3c2c7586175f47fc225f63afb4cce80c6f94

data/ChangeLog

@@ -1,5 +1,8 @@
-=== Release 0.6 / 2015-11-20
-Made the library public friendly. Added support for showing ENV vars in main header & adding debug data to scenarios. 
+=== Release 0.7 / 2015-11-28
+Added Cucumber 2.0 support
+
+=== Release 0.6 / 2015-11-28
+Made the library public friendly. Added support for showing ENV vars in main header & adding debug data to scenarios.
 
 === Release 0.5 / 2015-11-20
 Updated Main ENV var panel

data/lib/ugly_face/formatter/html.rb

@@ -2,10 +2,8 @@ require 'action_view'
 require 'fileutils'
 require 'cucumber/formatter/io'
 require 'cucumber/formatter/duration'
-require 'cucumber/formatter/console'
-require 'cucumber/ast/scenario'
-require 'cucumber/ast/table'
-require 'cucumber/ast/outline_table'
+require 'cucumber/core/ast/scenario'
+require 'cucumber/multiline_argument/data_table'
 require File.join(File.dirname(__FILE__), 'view_helper')
 require File.join(File.dirname(__FILE__), 'report')
 
@@ -19,7 +17,6 @@ module UglyFace
     class Html
       include Cucumber::Formatter::Io
       include Cucumber::Formatter::Duration
-      include Cucumber::Formatter::Console
       include ViewHelper
 
       attr_reader :report, :logo
@@ -90,18 +87,19 @@ module UglyFace
       end
 
       def before_feature_element(feature_element)
-        unless scenario_outline? feature_element
+      #  unless scenario_outline? feature_element
           @report.add_scenario  ReportScenario.new(feature_element)
-        end
+      #  end
       end
 
       def after_feature_element(feature_element)
-        unless scenario_outline?(feature_element)
+      #  unless scenario_outline?(feature_element)
           process_scenario(feature_element)
-        end
+      #  end
       end
 
       def before_table_row(example_row)
+        @before_example_row = example_row
         @report.add_scenario ReportScenario.new(example_row) unless info_row?(example_row)
       end
 
@@ -110,7 +108,7 @@ module UglyFace
           @report.current_scenario.populate(example_row)
           build_scenario_outline_steps(example_row)
         end
-        populate_cells(example_row) if example_row.instance_of? Cucumber::Ast::Table::Cells
+        populate_cells(example_row) if example_row.instance_of? Cucumber::Core::Ast::DataTable
       end
 
       def before_step(step)
@@ -237,7 +235,7 @@ module UglyFace
         report_step = ReportStep.new(step)
         report_step.duration = duration
         report_step.status = status unless status.nil?
-        if step.background?
+        if step.background
           @report.current_feature.background << report_step if @report.processing_background_steps?
         else
           @report.add_step report_step
@@ -246,12 +244,12 @@ module UglyFace
       end
 
       def scenario_outline?(feature_element)
-        feature_element.is_a? Cucumber::Ast::ScenarioOutline
+        feature_element.is_a? Cucumber::Core::Ast::ScenarioOutline
       end
 
       def info_row?(example_row)
         return example_row.scenario_outline.nil? if example_row.respond_to? :scenario_outline
-        return true if example_row.instance_of? Cucumber::Ast::Table::Cells
+        return true if example_row.instance_of? Cucumber::Formatter::LegacyApi::Ast::DataTableRow
         false
       end
 
@@ -261,12 +259,15 @@ module UglyFace
       end
 
       def build_scenario_outline_steps(example_row)
-        si = example_row.instance_variable_get :@step_invocations
+        si = example_row.cells
         si.each do |row|
-          process_step(row, row.status)
+          duration =  Time.now - @step_timer
+          report_step = ReportStep.new(@before_example_row, example_row)
+          report_step.duration = duration
+          @report.add_step report_step
+#          process_step(row, row.status)
         end
       end
-
       def step_error(exception)
         return nil if exception.nil?
         exception.backtrace[-1] =~ /^#{step.file_colon_line}/ ? exception : nil

data/lib/ugly_face/formatter/report.rb

@@ -130,13 +130,15 @@ module UglyFace
       end
 
       def scenario_average_duration
-        durations = scenarios.collect { |scenario| scenario.duration }
+        has_duration = scenarios.reject { |scenario| scenario.duration.nil? }
+        durations = has_duration.collect { |scenario| scenario.duration }
         formatted_duration(durations.reduce(:+).to_f / durations.size)
       end
 
       def step_average_duration
         steps = scenarios.collect { |scenario| scenario.steps }
-        durations = steps.flatten.collect { |step| step.duration }
+        has_duration = steps.flatten.reject { |step| step.duration.nil? }
+        durations = has_duration.collect { |step| step.duration }
         formatted_duration(durations.reduce(:+).to_f / durations.size)
       end
 
@@ -174,14 +176,14 @@ module UglyFace
 
       def populate(scenario)
         @duration = Time.now - @start
-        if scenario.instance_of? Cucumber::Ast::Scenario
+        @status = scenario.status
+        if scenario.instance_of? Cucumber::Formatter::LegacyApi::Ast::Scenario
+          @name = scenario.name
+          @file_colon_line = scenario.line
+        elsif scenario.instance_of? Cucumber::Formatter::LegacyApi::Ast::ExampleTableRow
           @name = scenario.name
-          @file_colon_line = scenario.file_colon_line
-        elsif scenario.instance_of? Cucumber::Ast::OutlineTable::ExampleRow
-          @name = scenario.scenario_outline.name
-          @file_colon_line = scenario.backtrace_line
+          @file_colon_line = scenario.line
         end
-        @status = scenario.status
       end
 
       def has_image?
@@ -192,19 +194,22 @@ module UglyFace
     class ReportStep
       attr_accessor :name, :keyword, :file_colon_line, :status, :duration, :table, :multiline_arg, :error
 
-      def initialize(step)
-        @name = step.name
-        @file_colon_line = step.file_colon_line
-        unless step.instance_of? Cucumber::Ast::Background
-          if step.respond_to? :actual_keyword
-            @keyword = step.actual_keyword
-          else
+      def initialize(step, ast_step=nil)
+        if ast_step
+          @name = ast_step.name
+          @keyword = ast_step.keyword
+          @status = ast_step.status
+          @error = ast_step.exception
+        else
+          @name = step.name
+          unless step.instance_of? Cucumber::Formatter::LegacyApi::Ast::Background
             @keyword = step.keyword
+            @status = step.status
+            @multiline_arg = step.multiline_arg unless step.multiline_arg.instance_of? Cucumber::Core::Ast::EmptyMultilineArgument
+            @error = step.exception
           end
-          @status = step.status
-          @multiline_arg = step.multiline_arg
-          @error = step.exception
         end
+        @file_colon_line = step.file_colon_line
       end
 
       def failed_with_error?
@@ -249,7 +254,7 @@ module UglyFace
         end
 
         def snippet_for(error_line)
-            file, line = file_name_and_line(error_line)
+          file, line = file_name_and_line(error_line)
           if file
             [lines_around(file, line), line, file]
           else

data/lib/ugly_face/formatter/view_helper.rb

@@ -1,4 +1,4 @@
-require 'cucumber/ast/scenario_outline'
+require 'cucumber/core/ast/scenario_outline'
 
 module UglyFace
   module Formatter
@@ -23,13 +23,15 @@ module UglyFace
       def step_average_duration(features)
         scenarios = features.collect { |feature| feature.scenarios }
         steps = scenarios.flatten.collect { |scenario| scenario.steps }
-        durations = steps.flatten.collect { |step| step.duration }
+        has_duration = steps.flatten.reject { |step| step.duration.nil? }
+        durations = has_duration.collect { |step| step.duration }
         format_duration get_average_from_float_array durations
       end
 
       def scenario_average_duration(features)
         scenarios = features.collect { |feature| feature.scenarios }
-        durations = scenarios.flatten.collect { |scenario| scenario.duration }
+        has_duration = scenarios.flatten.reject { |scenario| scenario.duration.nil? }
+        durations = has_duration.collect { |scenario| scenario.duration }
         format_duration get_average_from_float_array durations
       end
 

data/lib/ugly_face/templates/_step.erb

@@ -24,16 +24,21 @@
 	</table>
 <% end %>
 <% if step.failed_with_error? %>
-	<table>
-	  <tr class="error">
-		<td class="message">
-		  <strong><pre><%= "#{step.error.message} (#{step.error.class})" %></pre></strong>
-		</td>
-	  </tr>
-	  <tr>
-		<td>
-		  <%= raw(step.extra_failure_content(step.error.backtrace)) %>
-		</td>
-	  </tr>
-	</table>
+		<table>
+			<tr class="error">
+				<td class="message">
+					<strong><pre><%= "#{step.error.message} (#{step.error.class})" %></pre></strong>
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<%= raw(step.extra_failure_content(step.error.backtrace)) %>
+				</td>
+			</tr>
+			<tr >
+				<td class="detail">
+					<pre><%= step.error.backtrace.join("\n") %></pre>
+				</td>
+			</tr>
+		</table>
 <% end %>

data/lib/ugly_face/version.rb

@@ -1,3 +1,3 @@
 module UglyFace
-  VERSION = "0.6"
+  VERSION = "0.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ugly_face
 version: !ruby/object:Gem::Version
-  version: '0.6'
+  version: '0.7'
 platform: ruby
 authors:
 - Justin Commmu