aslakhellesoy-cucumber 0.1.99.23 → 0.1.100.1

data/lib/cucumber/cli/language_help_formatter.rb

@@ -18,7 +18,7 @@ http://wiki.github.com/aslakhellesoy/cucumber/spoken-languages
           [lang, Cucumber::LANGUAGES[lang]['name'], Cucumber::LANGUAGES[lang]['native']]
         end
         table = Ast::Table.new(raw)
-        new(nil, io, {:check_lang=>true}, '').visit_multiline_arg(table, :passed)
+        new(nil, io, {:check_lang=>true}, '').visit_multiline_arg(table)
       end
 
       def self.list_keywords(io, lang)
@@ -26,17 +26,17 @@ http://wiki.github.com/aslakhellesoy/cucumber/spoken-languages
           [key, Cucumber::LANGUAGES[lang][key]]
         end
         table = Ast::Table.new(raw)
-        new(nil, io, {:incomplete => Cucumber.language_incomplete?(lang)}, '').visit_multiline_arg(table, :passed)
+        new(nil, io, {:incomplete => Cucumber.language_incomplete?(lang)}, '').visit_multiline_arg(table)
       end
 
-      def visit_multiline_arg(table, status)
+      def visit_multiline_arg(table)
         if @options[:incomplete]
           @io.puts(format_string(INCOMPLETE, :failed))
         end
         super
       end
 
-      def visit_table_row(table_row, status)
+      def visit_table_row(table_row)
         @col = 1
         super
       end

data/lib/cucumber/cli/main.rb

@@ -45,8 +45,10 @@ module Cucumber
 
         visitor = configuration.build_formatter_broadcaster(step_mother)
         visitor.visit_features(features)
-      
-        failure = features.steps[:failed].any? || (configuration.strict? && features.steps[:undefined].any?)
+
+        failure = step_mother.steps(:failed).any? || 
+          (configuration.strict? && step_mother.steps(:undefined).any?)
+
         Kernel.exit(failure ? 1 : 0)
       end
 
@@ -75,8 +77,7 @@ module Cucumber
       end
 
       def load_plain_text_features
-        filter = configuration.ast_filter
-        features = Ast::Features.new(filter)
+        features = Ast::Features.new
         parser = Parser::FeatureParser.new
 
         verbose_log("Features:")

data/lib/cucumber/core_ext/proc.rb

@@ -3,7 +3,7 @@ class Proc
   PROC_PATTERN = /[\d\w]+@(.*):(.*)>/
   
   if Proc.new{}.to_s =~ PROC_PATTERN
-    def to_backtrace_line(name)
+    def backtrace_line(name)
       "#{file_colon_line}:in `#{name}'"
     end
 
@@ -22,7 +22,7 @@ class Proc
     # This Ruby implementation doesn't implement Proc#to_s correctly
     STDERR.puts "*** THIS RUBY IMPLEMENTATION DOESN'T REPORT FILE AND LINE FOR PROCS ***"
     
-    def to_backtrace_line
+    def backtrace_line
       nil
     end
 

data/lib/cucumber/formatter/ansicolor.rb

@@ -70,7 +70,6 @@ module Cucumber
         'pending'   => 'yellow',
         'failed'    => 'red',
         'passed'    => 'green',
-        'thead'     => 'cyan',
         'outline'   => 'cyan',
         'skipped'   => 'cyan',
         'comment'   => 'grey',

data/lib/cucumber/formatter/console.rb

@@ -6,21 +6,16 @@ module Cucumber
       extend ANSIColor
       FORMATS = Hash.new{|hash, format| hash[format] = method(format).to_proc}
 
-      def format_step(keyword, step_name, status, step_definition, source_indent)
-        comment = if source_indent && step_definition
-          c = (' # ' + step_definition.file_colon_line).indent(source_indent)
+      def format_step(keyword, step_match, status, source_indent)
+        comment = if source_indent
+          c = (' # ' + step_match.file_colon_line).indent(source_indent)
           format_string(c, :comment)
         else
           ''
         end
 
-        begin
-          line = keyword + " " + step_definition.format_args(step_name, format_for(status, :param)) + comment
-        rescue
-          # It didn't match. This often happens for :outline steps
-          line = keyword + " " + step_name + comment
-        end
-
+        format = format_for(status, :param)
+        line = keyword + " " + step_match.format_args(format) + comment
         format_string(line, status)
       end
 
@@ -33,13 +28,8 @@ module Cucumber
         end
       end
 
-      def print_undefined_scenarios(features)
-        elements = features.scenarios.select{|scenario| scenario.undefined?}
-        print_elements(elements, :undefined, 'scenarios')
-      end
-
-      def print_steps(features, status)
-        print_elements(features.steps[status], status, 'steps')
+      def print_steps(status)
+        print_elements(step_mother.steps(status), status, 'steps')
       end
 
       def print_elements(elements, status, kind)
@@ -51,7 +41,7 @@ module Cucumber
 
         elements.each_with_index do |element, i|
           if status == :failed
-            print_exception(element.exception, 0)
+            print_exception(element.exception, status, 0)
           else
             @io.puts(format_string(element.backtrace_line, status))
           end
@@ -60,26 +50,27 @@ module Cucumber
         end
       end
 
-      def print_counts(features)
-        @io.puts dump_count(features.scenarios.length, "scenario")
+      def print_counts
+        @io.puts dump_count(step_mother.scenarios.length, "scenario")
 
         [:failed, :skipped, :undefined, :pending, :passed].each do |status|
-          if features.steps[status].any?
-            count_string = dump_count(features.steps[status].length, "step", status.to_s)
+          if step_mother.steps(status).any?
+            count_string = dump_count(step_mother.steps(status).length, "step", status.to_s)
             @io.puts format_string(count_string, status)
             @io.flush
           end
         end
       end
 
-      def print_exception(e, indent)
-        status = Cucumber::EXCEPTION_STATUS[e.class]
-        @io.puts(format_string("#{e.message} (#{e.class})\n#{e.backtrace.join("\n")}".indent(indent), status))
+      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
       end
 
-      def print_snippets(features, options)
+      def print_snippets(options)
         return unless options[:snippets]
-        undefined = features.steps[:undefined]
+        undefined = step_mother.steps(:undefined)
         return if undefined.empty?
         snippets = undefined.map do |step|
           step_name = Undefined === step.exception ? step.exception.step_name : step.name
@@ -97,13 +88,6 @@ module Cucumber
 
     private
 
-      def with_color
-        c = Term::ANSIColor.coloring?
-        Term::ANSIColor.coloring = @io.tty?
-        yield
-        Term::ANSIColor.coloring = c
-      end
-
       def dump_count(count, what, state=nil)
         [count, state, "#{what}#{count == 1 ? '' : 's'}"].compact.join(" ")
       end

data/lib/cucumber/formatter/html.rb

@@ -54,12 +54,14 @@ module Cucumber
 
       def visit_background(background)
         @builder.div(:class => 'background') do
-          @builder.ol do
-            super
-          end
+          super
         end
       end
 
+      def visit_background_name(keyword, name, file_colon_line, source_indent)
+        @builder.h3("#{keyword} #{name}")
+      end
+
       def visit_feature_element(feature_element)
         @builder.div(:class => 'scenario') do
           super
@@ -67,7 +69,7 @@ module Cucumber
         @open_step_list = true
       end
       
-      def visit_scenario_name(keyword, name, file_line, source_indent)
+      def visit_scenario_name(keyword, name, file_colon_line, source_indent)
         @builder.h3("#{keyword} #{name}")
       end
 
@@ -87,25 +89,26 @@ module Cucumber
         end
       end
 
-      def visit_step_name(keyword, step_name, status, step_definition, source_indent)
+      def visit_step_name(keyword, step_match, status, source_indent, background)
+        step_name = step_match.format_args(lambda{|param| "<span>#{param}</span>"})
         @builder.li("#{keyword} #{step_name}", :class => status)
       end
 
-      def visit_multiline_arg(multiline_arg, status)
+      def visit_multiline_arg(multiline_arg)
         if Ast::Table === multiline_arg
           @builder.table do
-            super(multiline_arg, status)
+            super
           end
         else
           @builder.p do
-            super(multiline_arg, status)
+            super
           end
         end
       end
 
-      def visit_table_row(table_row, status)
+      def visit_table_row(table_row)
         @builder.tr do
-          super(table_row, status)
+          super
         end
       end
 

data/lib/cucumber/formatter/pretty.rb

@@ -23,7 +23,7 @@ module Cucumber
 
       def visit_features(features)
         super
-        print_summary(features) unless @options[:autoformat]
+        print_summary unless @options[:autoformat]
       end
 
       def visit_feature(feature)
@@ -34,14 +34,10 @@ module Cucumber
           mkdir_p(dir) unless File.directory?(dir)
           File.open(file, Cucumber.file_mode('w')) do |io|
             @io = io
-            with_color do
-              feature.accept(self)
-            end
+            super
           end
         else
-          with_color do
-            feature.accept(self)
-          end
+          super
         end
       end
 
@@ -79,21 +75,22 @@ module Cucumber
 
       def visit_feature_element(feature_element)
         @indent = 2
-        @last_undefined = feature_element.undefined?
-        feature_element.accept(self)
+        super
         @io.puts
         @io.flush
       end
 
-     def visit_background(background)
+      def visit_background(background)
         @indent = 2
-        background_already_visible = background.already_visited_steps?
-        background.accept(self)
-        @io.puts unless background_already_visible
+        @in_background = true
+        super
+        @in_background = nil
+        @io.puts
+        @io.flush
       end
 
-      def visit_examples(examples)
-        examples.accept(self)
+      def visit_background_name(keyword, name, file_colon_line, source_indent)
+        visit_feature_element_name(keyword, name, file_colon_line, source_indent)
       end
 
       def visit_examples_name(keyword, name)
@@ -102,12 +99,15 @@ module Cucumber
         @indent = 4
       end
 
-      def visit_scenario_name(keyword, name, file_line, source_indent)
+      def visit_scenario_name(keyword, name, file_colon_line, source_indent)
+        visit_feature_element_name(keyword, name, file_colon_line, source_indent)
+      end
+
+      def visit_feature_element_name(keyword, name, file_colon_line, source_indent)
         line = "  #{keyword} #{name}"
-        line = format_string(line, :undefined) if @last_undefined
         @io.print(line)
         if @options[:source]
-          line_comment = " # #{file_line}".indent(source_indent)
+          line_comment = " # #{file_colon_line}".indent(source_indent)
           @io.print(format_string(line_comment, :comment))
         end
         @io.puts
@@ -116,27 +116,39 @@ module Cucumber
 
       def visit_step(step)
         @indent = 6
-        exception = step.accept(self)
-        print_exception(exception, @indent) if exception
+        super
       end
 
-      def visit_step_name(keyword, step_name, status, step_definition, source_indent)
-        source_indent = nil unless @options[:source]
-        formatted_step_name = format_step(keyword, step_name, status, step_definition, source_indent)
-        @io.puts("    " + formatted_step_name)
-        @io.flush
+      def visit_step_name(keyword, step_match, status, source_indent, background)
+        @step_matches ||= []
+        
+        non_failed_background_step_outside_background = !@in_background && background && (status != :failed)
+        @skip_step = @step_matches.index(step_match) || non_failed_background_step_outside_background
+        
+        unless(@skip_step)
+          source_indent = nil unless @options[:source]
+          formatted_step_name = format_step(keyword, step_match, status, source_indent)
+          @io.puts("    " + formatted_step_name)
+        end
+        @step_matches << step_match
+      end
+
+      def visit_multiline_arg(multiline_arg)
+        return if @options[:no_multiline] || @skip_step
+        super
       end
 
-      def visit_multiline_arg(multiline_arg, status)
-        return if @options[:no_multiline]
-        multiline_arg.accept(self, status)
+      def visit_exception(exception, status)
+        return if @skip_step
+        print_exception(exception, status, @indent)
+        @io.flush
       end
 
-      def visit_table_row(table_row, status)
+      def visit_table_row(table_row)
         @io.print @delim.indent(@indent)
-        exception = table_row.accept(self, status)
+        super
         @io.puts
-        print_exception(exception, 6) if exception
+        print_exception(table_row.exception, :failed, @indent) if table_row.exception
       end
 
       def visit_py_string(string, status)
@@ -146,8 +158,8 @@ module Cucumber
         @io.flush
       end
 
-      def visit_table_cell(table_cell, status)
-        table_cell.accept(self, status)
+      def visit_table_cell(table_cell)
+        super
       end
 
       def visit_table_cell_value(value, width, status)
@@ -157,9 +169,9 @@ module Cucumber
 
       private
 
-      def print_summary(features)
-        print_counts(features)
-        print_snippets(features, @options)
+      def print_summary
+        print_counts
+        print_snippets(@options)
       end
 
     end

data/lib/cucumber/formatter/profile.rb

@@ -17,17 +17,17 @@ module Cucumber
         super
       end
 
-      def visit_step_name(keyword, step_name, status, step_definition, source_indent)
+      def visit_step_name(keyword, step_match, status, source_indent, background)
         duration = Time.now - @step_duration
         super
 
-        if step_definition # nil for outline steps
-          description = format_step(keyword, step_name, status, step_definition, nil)
-          @step_definition_durations[step_definition] << [duration, description, @step.file_line]
+        if step_match.step_definition
+          description = format_step(keyword, step_match, status, nil)
+          @step_definition_durations[step_match.step_definition] << [duration, description, @step.file_colon_line]
         end
       end
 
-      def print_summary(features)
+      def print_summary
         super
         @io.puts "\n\nTop #{NUMBER_OF_STEP_DEFINITONS_TO_SHOW} average slowest steps with #{NUMBER_OF_STEP_INVOCATIONS_TO_SHOW} slowest matches:\n"
 
@@ -60,7 +60,7 @@ module Cucumber
 
       def print_step_definition(step_definition, mean_duration)
         duration = sprintf("%.7f",  mean_duration)
-        @io.puts format_string("#{duration} #{step_definition.to_backtrace_line}", :failed)
+        @io.puts format_string("#{duration} #{step_definition.backtrace_line}", :failed)
       end
 
       def print_step_definitions(duration_description_location, step_definition)

data/lib/cucumber/formatter/progress.rb

@@ -12,26 +12,19 @@ module Cucumber
       end
 
       def visit_features(features)
-        with_color do
-          super
-          @io.puts
-          @io.puts
-          print_summary(features)
-        end
+        super
+        @io.puts
+        @io.puts
+        print_summary
       end
 
-      def visit_multiline_arg(multiline_arg, status)
+      def visit_multiline_arg(multiline_arg)
         @multiline_arg = true
         super
         @multiline_arg = false
       end
 
-      def visit_feature_element(feature_element)
-        progress(:undefined) if feature_element.undefined?
-        super
-      end
-
-      def visit_step_name(keyword, step_name, status, step_definition, source_indent)
+      def visit_step_name(keyword, step_match, status, source_indent, background)
         progress(status) unless status == :outline
       end
 
@@ -41,12 +34,11 @@ module Cucumber
       
       private
 
-      def print_summary(features)
-        print_undefined_scenarios(features)
-        print_steps(features, :pending)
-        print_steps(features, :failed)
-        print_counts(features)
-        print_snippets(features, @options)
+      def print_summary
+        print_steps(:pending)
+        print_steps(:failed)
+        print_counts
+        print_snippets(@options)
       end
 
       CHARS = {
@@ -54,7 +46,7 @@ module Cucumber
         :failed    => 'F',
         :undefined => 'U',
         :pending   => 'P',
-        :skipped   => 'S'
+        :skipped   => '-'
       }
 
       def progress(status)