aslakhellesoy-cucumber 0.3.9.3 → 0.3.9.4

data/features/usage.feature

@@ -113,11 +113,11 @@ Feature: Cucumber command line
        Then the multiline string should be # features/background/multiline_args_background.feature:17
        Then the multiline string should be # features/background/multiline_args_background.feature:27
       /^passing$/    # features/step_definitions/sample_steps.rb:5
-       Given passing # features/sample.feature:10
+       Given passing # features/sample.feature:12
       /^failing expectation$/    # features/step_definitions/sample_steps.rb:62
        Given failing expectation # features/failing_expectation.feature:4
       /^failing$/    # features/step_definitions/sample_steps.rb:8
-       Given failing # features/sample.feature:16
+       Given failing # features/sample.feature:18
       (::) UNUSED (::)
       /^unused$/          # features/step_definitions/sample_steps.rb:66
       /^another unused$/  # features/step_definitions/sample_steps.rb:69

data/lib/cucumber/ast/background.rb

@@ -23,7 +23,7 @@ module Cucumber
       end
 
       def accept(visitor)
-        visitor.visit_comment(@comment)
+        visitor.visit_comment(@comment) unless @comment.empty?
         visitor.visit_background_name(@keyword, @name, file_colon_line(@line), source_indent(first_line_length))
         visitor.step_mother.before(hook_context)
         visitor.visit_steps(@step_invocations)

data/lib/cucumber/ast/comment.rb

@@ -12,6 +12,10 @@ module Cucumber
         @value = value
       end
 
+      def empty?
+        @value.nil? || @value == ""
+      end
+
       def accept(visitor)
         @value.split("\n").each do |line|
           visitor.visit_comment_line(line.strip)

data/lib/cucumber/ast/feature.rb

@@ -4,6 +4,7 @@ module Cucumber
     class Feature
       attr_accessor :file
       attr_writer :features
+      attr_reader :name
 
       def initialize(background, comment, tags, name, feature_elements)
         @background, @comment, @tags, @name, @feature_elements = background, comment, tags, name, feature_elements
@@ -15,7 +16,7 @@ module Cucumber
       end
 
       def accept(visitor)
-        visitor.visit_comment(@comment)
+        visitor.visit_comment(@comment) unless @comment.empty?
         visitor.visit_tags(@tags)
         visitor.visit_feature_name(@name)
         visitor.visit_background(@background) if @background

data/lib/cucumber/ast/outline_table.rb

@@ -70,7 +70,7 @@ module Cucumber
             visitor.step_mother.before_and_after(self) do
               @step_invocations.each do |step_invocation|
                 step_invocation.invoke(visitor.step_mother, visitor.options)
-                @exception ||= step_invocation.exception
+                @exception ||= step_invocation.reported_exception
               end
 
               @cells.each do |cell|
@@ -89,7 +89,7 @@ module Cucumber
               @table.visit_scenario_name(visitor, self)
               @step_invocations.each do |step_invocation|
                 step_invocation.invoke(visitor.step_mother, visitor.options)
-                @exception ||= step_invocation.exception
+                @exception ||= step_invocation.reported_exception
                 step_invocation.visit_step_result(visitor)
               end
             end

data/lib/cucumber/ast/scenario.rb

@@ -21,7 +21,7 @@ module Cucumber
       end
 
       def accept(visitor)
-        visitor.visit_comment(@comment)
+        visitor.visit_comment(@comment) unless @comment.empty?
         visitor.visit_tags(@tags)
         visitor.visit_scenario_name(@keyword, @name, file_colon_line(@line), source_indent(first_line_length))
 

data/lib/cucumber/ast/scenario_outline.rb

@@ -3,6 +3,14 @@ module Cucumber
     class ScenarioOutline
       include FeatureElement
 
+      module ExamplesArray
+        def accept(visitor)
+          each do |examples|
+            visitor.visit_examples(examples)
+          end
+        end
+      end
+
       # The +example_sections+ argument must be an Array where each element is another array representing
       # an Examples section. This array has 3 elements:
       #
@@ -23,20 +31,19 @@ module Cucumber
           examples_table = OutlineTable.new(examples_matrix, self)
           Examples.new(examples_line, examples_keyword, examples_name, examples_table)
         end
+        @examples_array.extend(ExamplesArray)
 
         @background.feature_elements << self if @background
       end
 
       def accept(visitor)
-        visitor.visit_comment(@comment)
+        visitor.visit_comment(@comment) unless @comment.empty?
         visitor.visit_tags(@tags)
         visitor.visit_scenario_name(@keyword, @name, file_colon_line(@line), source_indent(first_line_length))
         visitor.visit_steps(@steps)
 
         skip_invoke! if @background && @background.failed?
-        @examples_array.each do |examples|
-          visitor.visit_examples(examples)
-        end
+        visitor.visit_examples_array(@examples_array) unless @examples_array.empty?
       end
 
       def skip_invoke!

data/lib/cucumber/ast/step_invocation.rb

@@ -2,7 +2,7 @@ module Cucumber
   module Ast
     class StepInvocation
       attr_writer :step_collection, :background
-      attr_reader :name, :matched_cells, :status
+      attr_reader :name, :matched_cells, :status, :reported_exception
       attr_accessor :exception
 
       def initialize(step, name, multiline_arg, matched_cells)
@@ -24,12 +24,12 @@ module Cucumber
       end
 
       def visit_step_result(visitor)
-        visitor.visit_step_result(keyword, @step_match, @multiline_arg, @status, @exception, source_indent, @background)
+        visitor.visit_step_result(keyword, @step_match, @multiline_arg, @status, @reported_exception, source_indent, @background)
       end
 
       def invoke(step_mother, options)
         find_step_match!(step_mother)
-        unless @skip_invoke || options[:dry_run] || exception || @step_collection.exception
+        unless @skip_invoke || options[:dry_run] || @exception || @step_collection.exception
           @skip_invoke = true
           begin
             step_mother.current_world.__cucumber_current_step = self if step_mother.current_world # Nil in Pure Java
@@ -37,13 +37,13 @@ module Cucumber
             step_mother.after_step
             status!(:passed)
           rescue Pending => e
-            failed(e, false)
+            failed(options, e, false)
             status!(:pending)
           rescue Undefined => e
-            failed(e, false)
+            failed(options, e, false)
             status!(:undefined)
           rescue Exception => e
-            failed(e, false)
+            failed(options, e, false)
             status!(:failed)
           end
         end
@@ -54,21 +54,26 @@ module Cucumber
         begin
           @step_match = step_mother.step_match(@name)
         rescue Undefined => e
-          failed(e, true)
+          failed(step_mother.options, e, true)
           status!(:undefined)
           @step_match = NoStepMatch.new(@step, @name)
         rescue Ambiguous => e
-          failed(e, false)
+          failed(step_mother.options, e, false)
           status!(:failed)
           @step_match = NoStepMatch.new(@step, @name)
         end
         step_mother.step_visited(self)
       end
 
-      def failed(exception, clear_backtrace)
-        @exception = exception
-        @exception.set_backtrace([]) if clear_backtrace
-        @exception.backtrace << @step.backtrace_line unless @step.backtrace_line.nil?
+      def failed(options, e, clear_backtrace)
+        e.set_backtrace([]) if clear_backtrace
+        e.backtrace << @step.backtrace_line unless @step.backtrace_line.nil?
+        @exception = e
+        if(options[:strict] || !(Undefined === e) || e.nested?)
+          @reported_exception = e
+        else
+          @reported_exception = nil
+        end
       end
 
       def status!(status)

data/lib/cucumber/ast/visitor.rb

@@ -52,6 +52,10 @@ module Cucumber
       def visit_background_name(keyword, name, file_colon_line, source_indent)
       end
 
+      def visit_examples_array(examples_array)
+        examples_array.accept(self)
+      end
+
       def visit_examples(examples)
         examples.accept(self)
       end

data/lib/cucumber/formatter/console.rb

@@ -66,9 +66,7 @@ module Cucumber
       end
       
       def print_exception(e, status, indent)
-        if @options[:strict] || !(Undefined === e) || e.nested?
-          @io.puts(format_string("#{e.message} (#{e.class})\n#{e.backtrace.join("\n")}".indent(indent), status))
-        end
+        @io.puts(format_string("#{e.message} (#{e.class})\n#{e.backtrace.join("\n")}".indent(indent), status))
       end
 
       def print_snippets(options)

data/lib/cucumber/formatter/html.rb

@@ -15,6 +15,7 @@ module Cucumber
 
       def initialize(step_mother, io, options)
         super(step_mother)
+        @options = options
         @builder = Builder::XmlMarkup.new(:target => io, :indent => 2)
       end
       
@@ -42,7 +43,18 @@ module Cucumber
         end
       end
 
+      def visit_comment(comment)
+        @builder.pre(:class => 'comment') do
+          super
+        end
+      end
+
+      def visit_comment_line(comment_line)
+        @builder.text!(comment_line.strip + "\n")
+      end
+
       def visit_feature(feature)
+        @exceptions = []
         @builder.div(:class => 'feature') do
           super
         end
@@ -54,7 +66,9 @@ module Cucumber
 
       def visit_feature_name(name)
         lines = name.split(/\r?\n/)
-        @builder.h2(lines[0])
+        @builder.h2 do |h2|
+          @builder.span(lines[0], :class => 'val')
+        end
         @builder.p do
           lines[1..-1].each do |line|
             @builder.text!(line.strip)
@@ -65,17 +79,26 @@ module Cucumber
 
       def visit_background(background)
         @builder.div(:class => 'background') do
+          @in_background = true
           super
+          @in_background = nil
         end
       end
 
       def visit_background_name(keyword, name, file_colon_line, source_indent)
         @listing_background = true
-        @builder.h3("#{keyword} #{name}")
+        @builder.h3 do |h3|
+          @builder.span(keyword, :class => 'keyword')
+          @builder.span(name, :class => 'val')
+        end
       end
 
       def visit_feature_element(feature_element)
-        @builder.div(:class => 'scenario') do
+        css_class = {
+          Ast::Scenario        => 'scenario',
+          Ast::ScenarioOutline => 'scenario outline'
+        }[feature_element.class]
+        @builder.div(:class => css_class) do
           super
         end
         @open_step_list = true
@@ -83,7 +106,10 @@ module Cucumber
       
       def visit_scenario_name(keyword, name, file_colon_line, source_indent)
         @listing_background = false
-        @builder.h3("#{keyword} #{name}")
+        @builder.h3 do
+          @builder.span(keyword, :class => 'keyword')
+          @builder.span(name, :class => 'val')
+        end
       end
 
       def visit_outline_table(outline_table)
@@ -94,6 +120,12 @@ module Cucumber
         @outline_row = nil
       end
 
+      def visit_examples(examples)
+        @builder.div(:class => 'examples') do
+          super(examples)
+        end
+      end
+
       def visit_examples_name(keyword, name)
         @builder.h4("#{keyword} #{name}")
       end
@@ -110,6 +142,11 @@ module Cucumber
       end
 
       def visit_step_result(keyword, step_match, multiline_arg, status, exception, source_indent, background)
+        if exception
+          return if @exceptions.index(exception)
+          @exceptions << exception
+        end
+        return if status != :failed && @in_background ^ background
         @status = status
         @builder.li(:id => @step_id, :class => "step #{status}") do
           super(keyword, step_match, multiline_arg, status, exception, source_indent, background)
@@ -143,7 +180,7 @@ module Cucumber
       end
 
       def visit_py_string(string)
-        @builder.pre(:class => @status) do |pre|
+        @builder.pre(:class => 'val') do |pre|
           pre << string
         end
       end
@@ -168,8 +205,8 @@ module Cucumber
 
       def visit_table_cell_value(value, width, status)
         cell_type = @outline_row == 0 ? :th : :td
-        attributes = {:id => "#{@row_id}_#{@col_index}"}
-        attributes[:class] = status if status
+        attributes = {:id => "#{@row_id}_#{@col_index}", :class => 'val'}
+        attributes[:class] += " #{status}" if status
         build_cell(cell_type, value, attributes)
         @col_index += 1
       end
@@ -181,9 +218,12 @@ module Cucumber
       protected
       
       def build_step(keyword, step_match, status)
-        step_name = step_match.format_args(lambda{|param| %{<span class="#{status}_param">#{param}</span>}})
+        step_name = step_match.format_args(lambda{|param| %{<span class="param">#{param}</span>}})
         @builder.div do |div|
-          div << h("#{keyword} #{step_name}").gsub(/&lt;span class=&quot;(.*?)&quot;&gt;/, '<span class="\1">').gsub(/&lt;\/span&gt;/, '</span>')
+          @builder.span(keyword, :class => 'keyword')
+          @builder.span(:class => 'step val') do |name|
+            name << h(step_name).gsub(/&lt;span class=&quot;(.*?)&quot;&gt;/, '<span class="\1">').gsub(/&lt;\/span&gt;/, '</span>')
+          end
         end
       end
       

data/lib/cucumber/formatter/junit.rb

@@ -12,6 +12,7 @@ module Cucumber
       def initialize(step_mother, io, options)
         super(step_mother)
         @reportdir = io
+        @options = options
         raise "You *must* specify --out DIR for the junit formatter" unless @reportdir
         raise "Use --out DIR (not --out FILE) for the junit formatter" if File === @reportdir
       end

data/lib/cucumber/formatter/pretty.rb

@@ -18,8 +18,8 @@ module Cucumber
         @io = io
         @options = options
         @delim = delim
-        @indent = 0
         @exceptions = []
+        @indent = 0
       end
 
       def visit_features(features)
@@ -28,6 +28,7 @@ module Cucumber
       end
 
       def visit_feature(feature)
+        @exceptions = []
         @indent = 0
         if @options[:autoformat]
           file = File.join(@options[:autoformat], feature.file)

data/lib/cucumber/formatter/rerun.rb

@@ -12,6 +12,7 @@ module Cucumber
       def initialize(step_mother, io, options)
         super(step_mother)
         @io = io
+        @options = options
         @file_names = []
         @file_colon_lines = Hash.new{|h,k| h[k] = []}
       end

data/lib/cucumber/formatter/tag_cloud.rb

@@ -5,6 +5,7 @@ module Cucumber
       def initialize(step_mother, io, options)
         super(step_mother)
         @io = io
+        @options = options
         @counts = Hash.new{|h,k| h[k] = 0}
       end
 

data/lib/cucumber/step_match.rb

@@ -1,11 +1,15 @@
 module Cucumber
   class StepMatch
-    attr_reader :step_definition, :args, :step_name
+    attr_reader :step_definition, :args
 
     def initialize(step_definition, step_name, formatted_step_name, args)
       @step_definition, @step_name, @formatted_step_name, @args = step_definition, step_name, formatted_step_name, args
     end
-    
+
+    def name
+      @formatted_step_name
+    end
+
     def invoke(world, multiline_arg)
       all_args = @args.dup
       all_args << multiline_arg if multiline_arg

data/lib/cucumber/step_mother.rb

@@ -100,6 +100,10 @@ module Cucumber
 
     attr_writer :snippet_generator, :options, :visitor
 
+    def options
+      @options ||= {}
+    end
+
     def step_visited(step)
       steps << step unless steps.index(step)
     end
@@ -235,6 +239,13 @@ module Cucumber
       end
     end
     
+    def clear!
+      step_definitions.clear
+      hooks.clear
+      steps.clear
+      scenarios.clear
+    end
+
     def step_definitions
       @step_definitions ||= []
     end
@@ -274,10 +285,6 @@ module Cucumber
       @max_step_definition_length ||= step_definitions.map{|step_definition| step_definition.text_length}.max
     end
 
-    def options
-      @options || {}
-    end
-
     # Creates a new world instance
     def new_world!
       return if options[:dry_run]
@@ -351,9 +358,5 @@ module Cucumber
     def scenario_visited(scenario)
       scenarios << scenario unless scenarios.index(scenario)
     end
-
-    def options
-      @options || {}
-    end
   end
 end