cucumber 2.0.0.beta.3 → 2.0.0

data/lib/cucumber/formatter/gherkin_formatter_adapter.rb

@@ -21,12 +21,10 @@ module Cucumber
 
       def before_background(background)
         @outline = false
-        @before_steps = true
         @gf.background(background.gherkin_statement)
       end
 
       def before_feature_element(feature_element)
-        @before_steps = true
         case(feature_element)
         when Core::Ast::Scenario
           @outline = false
@@ -44,6 +42,10 @@ module Cucumber
         end
       end
 
+      def before_test_case(test_case)
+        @delay_output = true
+      end
+
       def scenario_name(keyword, name, file_colon_line, source_indent)
         if @outline and @options[:expand]
           return if not @in_instantiated_scenario
@@ -70,10 +72,11 @@ module Cucumber
         unless @outline and @options[:expand]
           @gf.step(step.gherkin_statement)
           pass_delayed_output
-          @before_steps = false
+          @delay_output = false
         else 
           if @in_instantiated_scenario
             @current_step_hash = to_hash(step.gherkin_statement)
+            @delay_output = true
           end
         end
         if @print_empty_match
@@ -84,7 +87,6 @@ module Cucumber
           end
           @gf.match(match)
         end
-        @step_time = Time.now
       end
 
       def before_step_result(keyword, step_match, multiline_arg, status, exception, source_indent, background, file_colon_line)
@@ -121,7 +123,7 @@ module Cucumber
               @current_step_hash['rows'],
               @current_step_hash['doc_string']))
           pass_delayed_output
-          @before_steps = false
+          @delay_output = false
           @gf.match(@current_match)
           @gf.result(@current_result)
         end
@@ -139,9 +141,8 @@ module Cucumber
 
       #used for capturing duration
       def after_step(step)
-        step_finish = (Time.now - @step_time)
         unless @outline and @options[:expand] and not @in_instantiated_scenario
-          @gf.append_duration(step_finish)
+          step.duration.tap { |duration| @gf.append_duration(duration.nanoseconds / 10 ** 9.0) }
         end
       end
 
@@ -167,7 +168,7 @@ module Cucumber
         if defined?(JRUBY_VERSION)
           data = data.to_java_bytes
         end
-        unless @before_steps
+        unless @delay_output
           @gf.embedding(mime_type, data)
         else
           @delayed_embeddings.push [mime_type, data]
@@ -175,7 +176,7 @@ module Cucumber
       end
 
       def puts(message)
-        unless @before_steps
+        unless @delay_output
           @gf.write(message)
         else
           @delayed_messages.push message

data/lib/cucumber/formatter/html.rb

@@ -2,6 +2,7 @@ require 'erb'
 require 'builder'
 require 'cucumber/formatter/duration'
 require 'cucumber/formatter/io'
+require 'pathname'
 
 module Cucumber
   module Formatter
@@ -12,7 +13,7 @@ module Cucumber
         Cucumber::Core::Ast::Scenario        => 'scenario',
         Cucumber::Core::Ast::ScenarioOutline => 'scenario outline'
       }
-      AST_DATA_TABLE = Cucumber::Reports::Legacy::Ast::MultilineArg::DataTable
+      AST_DATA_TABLE = LegacyApi::Ast::MultilineArg::DataTable
 
       include ERB::Util # for the #h method
       include Duration
@@ -32,6 +33,7 @@ module Cucumber
         @img_id = 0
         @text_id = 0
         @inside_outline = false
+        @previous_step_keyword = nil
       end
 
       def embed(src, mime_type, label)
@@ -50,6 +52,10 @@ module Cucumber
       def embed_image(src, label)
         id = "img_#{@img_id}"
         @img_id += 1
+        if @io.respond_to?(:path) and File.file?(src)
+          out_dir = Pathname.new(File.dirname(File.absolute_path(@io.path)))
+          src = Pathname.new(File.absolute_path(src)).relative_path_from(out_dir)
+        end        
         @builder.span(:class => 'embed') do |pre|
           pre << %{<a href="" onclick="img=document.getElementById('#{id}'); img.style.display = (img.style.display == 'none' ? 'block' : 'none');return false">#{label}</a><br>&nbsp;
           <img id="#{id}" style="display: none" src="#{src}"/>}
@@ -155,6 +161,10 @@ module Cucumber
         end
       end
 
+      def before_test_case(test_case)
+        @previous_step_keyword = nil
+      end
+
       def before_background(background)
         @in_background = true
         @builder << '<div class="background">'
@@ -179,11 +189,16 @@ module Cucumber
         @scenario_red = false
         css_class = AST_CLASSES[feature_element.class]
         @builder << "<div class='#{css_class}'>"
+        @in_scenario_outline = feature_element.class == Cucumber::Core::Ast::ScenarioOutline
       end
 
       def after_feature_element(feature_element)
+        unless @in_scenario_outline
+          print_messages
+          @builder << '</ol>'
+        end
         @builder << '</div>'
-        @open_step_list = true
+        @in_scenario_outline = nil
       end
 
       def scenario_name(keyword, name, file_colon_line, source_indent)
@@ -211,7 +226,7 @@ module Cucumber
       end
 
       def before_examples(examples)
-         @builder << '<div class="examples">'
+        @builder << '<div class="examples">'
       end
 
       def after_examples(examples)
@@ -231,10 +246,12 @@ module Cucumber
       end
 
       def after_steps(steps)
-        @builder << '</ol>'
+        print_messages
+        @builder << '</ol>' if @in_background or @in_scenario_outline
       end
 
       def before_step(step)
+        print_messages
         @step_id = step.dom_id
         @step_number += 1
         @step = step
@@ -267,8 +284,11 @@ module Cucumber
       def after_step_result(keyword, step_match, multiline_arg, status, exception, source_indent, background, file_colon_line)
         return if @hide_this_step
         # print snippet for undefined steps
+        unless outline_step?(@step)
+          keyword = @step.actual_keyword(@previous_step_keyword)
+          @previous_step_keyword = keyword
+        end
         if status == :undefined
-          keyword = @step.actual_keyword if @step.respond_to?(:actual_keyword)
           @builder.pre do |pre|
             # TODO: snippet text should be an event sent to the formatter so we don't 
             # have this couping to the runtime.
@@ -290,6 +310,7 @@ module Cucumber
 
       def exception(exception, status)
         return if @hide_this_step
+        print_messages
         build_exception_detail(exception)
       end
 
@@ -554,7 +575,7 @@ module Cucumber
       end
 
       def backtrace_line(line)
-        line.gsub(/\A([^:]*\.(?:rb|feature|haml)):(\d*).*\z/) do
+        line.gsub(/^([^:]*\.(?:rb|feature|haml)):(\d*).*$/) do
           if ENV['TM_PROJECT_DIRECTORY']
             "<a href=\"txmt://open?url=file://#{File.expand_path($1)}&line=#{$2}\">#{$1}:#{$2}</a> "
           else
@@ -595,6 +616,10 @@ module Cucumber
         Builder::XmlMarkup.new(:target => io, :indent => 0)
       end
 
+      def outline_step?(step)
+        not @step.step.respond_to?(:actual_keyword)
+      end
+
       class SnippetExtractor #:nodoc:
         class NullConverter; def convert(code, pre); code; end; end #:nodoc:
         begin; require 'syntax/convertors/html'; @@converter = Syntax::Convertors::HTML.for_syntax "ruby"; rescue LoadError => e; @@converter = NullConverter.new; end

data/lib/cucumber/formatter/ignore_missing_messages.rb

@@ -0,0 +1,20 @@
+module Cucumber
+  module Formatter
+
+    class IgnoreMissingMessages < BasicObject
+      def initialize(receiver)
+        @receiver = receiver
+      end
+
+      def method_missing(message, *args)
+        @receiver.send(message, *args) if @receiver.respond_to?(message)
+      end
+
+      def respond_to_missing?(name, include_private = false)
+        @receiver.respond_to?(name, include_private)
+      end
+    end
+
+  end
+end
+

data/lib/cucumber/formatter/junit.rb

@@ -9,8 +9,8 @@ module Cucumber
     class Junit
 
       # TODO: remove coupling to types
-      AST_SCENARIO_OUTLINE = Cucumber::Core::Ast::ScenarioOutline
-      AST_EXAMPLE_ROW = Reports::LegacyExampleTableRow
+      AST_SCENARIO_OUTLINE = Core::Ast::ScenarioOutline
+      AST_EXAMPLE_ROW = LegacyApi::Ast::ExampleTableRow
 
       include Io
 
@@ -129,6 +129,34 @@ module Cucumber
         @header_row = false if @header_row
       end
 
+      def before_test_case(test_case)
+        if @options[:expand] and test_case.keyword == "Scenario Outline"
+          @exception = nil
+        end
+      end
+
+      def after_step_result(keyword, step_match, multiline_arg, status, exception, source_indent, background, file_colon_line)
+        if @options[:expand] and @in_examples
+          if not @exception and exception
+            @exception = exception
+          end
+        end
+      end
+
+      def after_test_case(test_case, result)
+        if @options[:expand] and test_case.keyword == "Scenario Outline"
+          test_case_name = NameBuilder.new(test_case)
+          @scenario = test_case_name.outline_name
+          @output = "#{test_case.keyword}: #{@scenario}\n\n"
+          if result.failed?
+            @output += "Example row: #{test_case_name.row_name}\n"
+            @output += "\nMessage:\n"
+          end
+          test_case_result = ResultBuilder.new(result)
+          build_testcase(test_case_result.test_case_duration, test_case_result.status, @exception, test_case_name.name_suffix)
+        end
+      end
+
       private
 
       def build_testcase(duration, status, exception = nil, suffix = "")
@@ -176,5 +204,72 @@ module Cucumber
       end
       
     end
+
+    class NameBuilder
+      attr_reader :outline_name, :name_suffix, :row_name
+
+      def initialize(test_case)
+        test_case.describe_source_to self
+      end
+
+      def feature(*)
+        self
+      end
+
+      def scenario(*)
+        self
+      end
+
+      def scenario_outline(outline)
+        @outline_name = outline.name
+        self
+      end
+
+      def examples_table(*)
+        self
+      end
+
+      def examples_table_row(row)
+        @row_name = '| ' + row.values.join(' | ') + ' |'
+        @name_suffix = " (outline example : #{@row_name})"
+        self
+      end
+    end
+
+    class ResultBuilder
+      attr_reader :status, :test_case_duration
+      def initialize(result)
+        @test_case_duration = 0
+        result.describe_to(self)
+      end
+
+      def passed
+        @status = :passed
+      end
+
+      def failed
+        @status = :failed
+      end
+
+      def undefined
+        @status = :undefined
+      end
+
+      def skipped
+        @status = :skipped
+      end
+
+      def pending(*)
+        @status = :pending
+      end
+
+      def exception(*)
+      end
+
+      def duration(duration, *)
+        duration.tap { |duration| @test_case_duration = duration.nanoseconds / 10 ** 9.0 }
+      end
+    end
+
   end
 end