cucumber 1.2.1 → 1.2.2

data/lib/cucumber/formatter/console.rb

@@ -4,15 +4,32 @@ require 'cucumber/formatter/summary'
 
 module Cucumber
   module Formatter
-    # This module contains helper methods that are used by formatters
-    # that print output to the terminal.
+
+    # This module contains helper methods that are used by formatters that
+    # print output to the terminal.
+    #
+    # FORMAT is a hash of Proc objects, keyed by step-definition types, e.g.
+    # "FORMAT[:passed]".  The Proc is called for each line of the step's
+    # output.
+    #
+    # format_step calls format_string, format_string calls format_for to obtain
+    # the formatting Proc.
+    #
+    # Example:
+    #
+    # The ANSI color console formatter defines a map of step-type to output
+    # color (e.g. "passed" to "green"), then builds methods named for the
+    # step-types (e.g. "def passed"), which themselves wrap the corresponding
+    # color-named methods provided by Term::ANSIColor (e.g. "def red").
+    #
+    # During output, each line is processed by passing it to the formatter Proc
+    # which returns the formatted (e.g. colored) string.
+
     module Console
       extend ANSIColor
       include Duration
       include Summary
 
-      FORMATS = Hash.new{|hash, format| hash[format] = method(format).to_proc}
-
       def format_step(keyword, step_match, status, source_indent)
         comment = if source_indent
           c = (' # ' + step_match.file_colon_line).indent(source_indent)
@@ -38,7 +55,7 @@ module Cucumber
       end
 
       def print_steps(status)
-        print_elements(step_mother.steps(status), status, 'steps')
+        print_elements(runtime.steps(status), status, 'steps')
       end
 
       def print_elements(elements, status, kind)
@@ -60,10 +77,10 @@ module Cucumber
       end
 
       def print_stats(features, options)
-        @failures = step_mother.scenarios(:failed).select { |s| s.is_a?(Cucumber::Ast::Scenario) || s.is_a?(Cucumber::Ast::OutlineTable::ExampleRow) }
+        @failures = runtime.scenarios(:failed).select { |s| s.is_a?(Cucumber::Ast::Scenario) || s.is_a?(Cucumber::Ast::OutlineTable::ExampleRow) }
         @failures.collect! { |s| (s.is_a?(Cucumber::Ast::OutlineTable::ExampleRow)) ? s.scenario_outline : s }
 
-        if !@failures.empty?          
+        if !@failures.empty?
           @io.puts format_string("Failing Scenarios:", :failed)
           @failures.each do |failure|
             profiles_string = options.custom_profiles.empty? ? '' : (options.custom_profiles.map{|profile| "-p #{profile}" }).join(' ') + ' '
@@ -73,8 +90,8 @@ module Cucumber
           @io.puts
         end
 
-        @io.puts scenario_summary(step_mother) {|status_count, status| format_string(status_count, status)}
-        @io.puts step_summary(step_mother) {|status_count, status| format_string(status_count, status)}
+        @io.puts scenario_summary(runtime) {|status_count, status| format_string(status_count, status)}
+        @io.puts step_summary(runtime) {|status_count, status| format_string(status_count, status)}
 
         @io.puts(format_duration(features.duration)) if features && features.duration
 
@@ -90,22 +107,22 @@ module Cucumber
         string = "#{message}\n#{e.backtrace.join("\n")}".indent(indent)
         @io.puts(format_string(string, status))
       end
-      
-      # http://blade.nagaokaut.ac.jp/cgi-bin/scat.rb/ruby/ruby-talk/10655 
+
+      # http://blade.nagaokaut.ac.jp/cgi-bin/scat.rb/ruby/ruby-talk/10655
       def linebreaks(s, max)
         s.gsub(/.{1,#{max}}(?:\s|\Z)/){($& + 5.chr).gsub(/\n\005/,"\n").gsub(/\005/,"\n")}.rstrip
       end
 
       def print_snippets(options)
         return unless options[:snippets]
-        undefined = step_mother.steps(:undefined)
+        undefined = runtime.steps(:undefined)
         return if undefined.empty?
-        
-        unknown_programming_language = step_mother.unknown_programming_language?
+
+        unknown_programming_language = runtime.unknown_programming_language?
         snippets = undefined.map do |step|
           step_name = Undefined === step.exception ? step.exception.step_name : step.name
           step_multiline_class = step.multiline_arg ? step.multiline_arg.class : nil
-          snippet = @step_mother.snippet_text(step.actual_keyword, step_name, step_multiline_class)
+          snippet = @runtime.snippet_text(step.actual_keyword, step_name, step_multiline_class)
           snippet
         end.compact.uniq
 
@@ -114,9 +131,9 @@ module Cucumber
         @io.puts format_string(text, :undefined)
 
         if unknown_programming_language
-          @io.puts format_string("\nIf you want snippets in a different programming language,\n" +
-                  "just make sure a file with the appropriate file extension\n" +
-                  "exists where cucumber looks for step definitions.", :failed)
+          @io.puts format_string("\nIf you want snippets in a different programming language," +
+                                 "\njust make sure a file with the appropriate file extension" +
+                                 "\nexists where cucumber looks for step definitions.", :failed)
         end
 
         @io.puts
@@ -125,7 +142,7 @@ module Cucumber
 
       def print_passing_wip(options)
         return unless options[:wip]
-        passed = step_mother.scenarios(:passed)
+        passed = runtime.scenarios(:passed)
         if passed.any?
           @io.puts format_string("\nThe --wip switch was used, so I didn't expect anything to pass. These scenarios passed:", :failed)
           print_elements(passed, :passed, "scenarios")
@@ -177,12 +194,15 @@ module Cucumber
 
     private
 
-      def format_for(*keys)
-        key = keys.join('_').to_sym
-        fmt = FORMATS[key]
-        raise "No format for #{key.inspect}: #{FORMATS.inspect}" if fmt.nil?
-        fmt
-      end
+    FORMATS = Hash.new{ |hash, format| hash[format] = method(format).to_proc }
+
+    def format_for(*keys)
+      key = keys.join('_').to_sym
+      fmt = FORMATS[key]
+      raise "No format for #{key.inspect}: #{FORMATS.inspect}" if fmt.nil?
+      fmt
+    end
+
     end
   end
 end

data/lib/cucumber/formatter/debug.rb

@@ -4,30 +4,30 @@ require 'cucumber/step_definition_light'
 module Cucumber
   module Formatter
     class Debug
-      def initialize(step_mother, io, options)
+      def initialize(runtime, io, options)
         @io = io
         @indent = 0
       end
-      
+
       def respond_to?(*args)
         true
       end
-      
+
       def method_missing(name, *args)
         @indent -= 2 if name.to_s =~ /^after/
         print(name)
         @indent += 2 if name.to_s =~ /^before/
       end
-      
+
     private
-      
+
       def print(text)
         @io.puts "#{indent}#{text}"
       end
-      
+
       def indent
         (' ' * @indent)
       end
     end
   end
-end
+end

data/lib/cucumber/formatter/duration.rb

@@ -6,7 +6,7 @@ module Cucumber
       # <tt>time</tt> format.
       def format_duration(seconds)
         m, s = seconds.divmod(60)
-        "#{m}m#{'%.3f' % s}s" 
+        "#{m}m#{'%.3f' % s}s"
       end
     end
   end

data/lib/cucumber/formatter/gherkin_formatter_adapter.rb

@@ -44,6 +44,7 @@ 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)
@@ -66,6 +67,12 @@ module Cucumber
       def before_examples(examples)
         @gf.examples(examples.gherkin_statement)
       end
+      
+      #used for capturing duration
+      def after_step(step)
+        step_finish = (Time.now - @step_time)
+        @gf.append_duration(step_finish)
+      end
 
       def after_feature(feature)
         @gf.eof

data/lib/cucumber/formatter/gpretty.rb

@@ -9,7 +9,7 @@ module Cucumber
     class Gpretty < GherkinFormatterAdapter
       include Io
 
-      def initialize(step_mother, io, options)
+      def initialize(runtime, io, options)
         @io = ensure_io(io, "json")
         super(Gherkin::Formatter::PrettyFormatter.new(@io, false), true)
       end

data/lib/cucumber/formatter/html.rb

@@ -10,9 +10,9 @@ module Cucumber
       include Duration
       include Io
 
-      def initialize(step_mother, path_or_io, options)
+      def initialize(runtime, path_or_io, options)
         @io = ensure_io(path_or_io, "html")
-        @step_mother = step_mother
+        @runtime = runtime
         @options = options
         @buffer = {}
         @builder = create_builder(@io)
@@ -47,15 +47,15 @@ module Cucumber
         # <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
         @builder.declare!(
           :DOCTYPE,
-          :html, 
-          :PUBLIC, 
+          :html,
+          :PUBLIC,
           '-//W3C//DTD XHTML 1.0 Strict//EN',
           'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'
         )
 
         @builder << '<html xmlns ="http://www.w3.org/1999/xhtml">'
           @builder.head do
-          @builder.meta(:content => 'text/html;charset=utf-8')
+          @builder.meta('http-equiv' => 'Content-Type', :content => 'text/html;charset=utf-8')
           @builder.title 'Cucumber'
           inline_css
           inline_js
@@ -93,7 +93,7 @@ module Cucumber
       def after_feature(feature)
         @builder << '</div>'
       end
-  
+
       def before_comment(comment)
         @builder << '<pre class="comment">'
       end
@@ -101,22 +101,22 @@ module Cucumber
       def after_comment(comment)
         @builder << '</pre>'
       end
-  
+
       def comment_line(comment_line)
         @builder.text!(comment_line)
         @builder.br
       end
-  
+
       def after_tags(tags)
         @tag_spacer = nil
       end
-  
+
       def tag_name(tag_name)
         @builder.text!(@tag_spacer) if @tag_spacer
         @tag_spacer = ' '
         @builder.span(tag_name, :class => 'tag')
       end
-  
+
       def feature_name(keyword, name)
         lines = name.split(/\r?\n/)
         return if lines.empty?
@@ -130,17 +130,17 @@ module Cucumber
           end
         end
       end
-  
+
       def before_background(background)
         @in_background = true
         @builder << '<div class="background">'
       end
-  
+
       def after_background(background)
         @in_background = nil
         @builder << '</div>'
       end
-  
+
       def background_name(keyword, name, file_colon_line, source_indent)
         @listing_background = true
         @builder.h3(:id => "background_#{@scenario_number}") do |h3|
@@ -156,7 +156,7 @@ module Cucumber
         css_class = {
           Ast::Scenario        => 'scenario',
           Ast::ScenarioOutline => 'scenario outline'
-        }[feature_element.class]      
+        }[feature_element.class]
         @builder << "<div class='#{css_class}'>"
       end
 
@@ -176,21 +176,21 @@ module Cucumber
           @builder.span(name, :class => 'val')
         end
       end
-  
+
       def before_outline_table(outline_table)
         @outline_row = 0
         @builder << '<table>'
       end
-  
+
       def after_outline_table(outline_table)
         @builder << '</table>'
         @outline_row = nil
       end
-      
+
       def before_examples(examples)
          @builder << '<div class="examples">'
       end
-      
+
       def after_examples(examples)
         @builder << '</div>'
       end
@@ -202,11 +202,11 @@ module Cucumber
           @builder.span(name, :class => 'val')
         end
       end
-  
+
       def before_steps(steps)
         @builder << '<ol>'
       end
-  
+
       def after_steps(steps)
         @builder << '</ol>'
       end
@@ -237,17 +237,18 @@ module Cucumber
         end
         @status = status
         return if @hide_this_step
-        set_scenario_color(status)      
-        @builder << "<li id='#{@step_id}' class='step #{status}'>"            
+        set_scenario_color(status)
+        @builder << "<li id='#{@step_id}' class='step #{status}'>"
       end
 
       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
         if status == :undefined
+          keyword = @step.actual_keyword if @step.respond_to?(:actual_keyword)
           step_multiline_class = @step.multiline_arg ? @step.multiline_arg.class : nil
           @builder.pre do |pre|
-            pre << @step_mother.snippet_text(@step.actual_keyword,step_match.instance_variable_get("@name") || '',step_multiline_class)
+            pre << @runtime.snippet_text(keyword,step_match.instance_variable_get("@name") || '',step_multiline_class)
           end
         end
         @builder << '</li>'
@@ -255,10 +256,8 @@ module Cucumber
       end
 
       def step_name(keyword, step_match, status, source_indent, background, file_colon_line)
-        @step_matches ||= []
         background_in_scenario = background && !@listing_background
-        @skip_step = @step_matches.index(step_match) || background_in_scenario
-        @step_matches << step_match
+        @skip_step = background_in_scenario
 
         unless @skip_step
           build_step(keyword, step_match, status)
@@ -280,7 +279,7 @@ module Cucumber
           @builder << '<table>'
         end
       end
-  
+
       def after_multiline_arg(multiline_arg)
         return if @hide_this_step || @skip_step
         if Ast::Table === multiline_arg
@@ -294,15 +293,15 @@ module Cucumber
           @builder << h(string).gsub("\n", '&#x000A;')
         end
       end
-  
-  
+
+
       def before_table_row(table_row)
         @row_id = table_row.dom_id
         @col_index = 0
         return if @hide_this_step
         @builder << "<tr class='step' id='#{@row_id}'>"
       end
-  
+
       def after_table_row(table_row)
         return if @hide_this_step
         print_table_row_messages
@@ -326,7 +325,7 @@ module Cucumber
 
       def table_cell_value(value, status)
         return if @hide_this_step
-        
+
         @cell_type = @outline_row == 0 ? :th : :td
         attributes = {:id => "#{@row_id}_#{@col_index}", :class => 'step'}
         attributes[:class] += " #{status}" if status
@@ -339,10 +338,10 @@ module Cucumber
         @delayed_messages << message
         #@builder.pre(message, :class => 'message')
       end
-      
+
       def print_messages
         return if @delayed_messages.empty?
-        
+
         #@builder.ol do
           @delayed_messages.each do |ann|
             @builder.li(:class => 'step message') do
@@ -352,16 +351,16 @@ module Cucumber
         #end
         empty_messages
       end
-      
+
       def print_table_row_messages
         return if @delayed_messages.empty?
-        
+
         @builder.td(:class => 'message') do
           @builder << @delayed_messages.join(", ")
         end
         empty_messages
       end
-      
+
       def empty_messages
         @delayed_messages = []
       end
@@ -383,7 +382,7 @@ module Cucumber
             message = "#{message} (#{exception.class})"
           end
 
-          @builder.pre do 
+          @builder.pre do
             @builder.text!(message)
           end
         end
@@ -406,7 +405,7 @@ module Cucumber
           set_scenario_color_failed
         end
       end
-      
+
       def set_scenario_color_failed
         @builder.script do
           @builder.text!("makeRed('cucumber-header');") unless @header_red
@@ -415,12 +414,12 @@ module Cucumber
           @scenario_red = true
         end
       end
-      
+
       def set_scenario_color_pending
         @builder.script do
           @builder.text!("makeYellow('cucumber-header');") unless @header_red
           @builder.text!("makeYellow('scenario_#{@scenario_number}');") unless @scenario_red
-        end         
+        end
       end
 
       def get_step_count(features)
@@ -468,16 +467,16 @@ module Cucumber
           @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
-        
+
         step_file = step_match.file_colon_line
         step_file.gsub(/^([^:]*\.rb):(\d*)/) do
           if ENV['TM_PROJECT_DIRECTORY']
             step_file = "<a href=\"txmt://open?url=file://#{File.expand_path($1)}&line=#{$2}\">#{$1}:#{$2}</a> "
           end
         end
-        
+
         @builder.div(:class => 'step_file') do |div|
           @builder.span do
             @builder << step_file
@@ -509,29 +508,29 @@ module Cucumber
       def inline_jquery
         File.read(File.dirname(__FILE__) + '/jquery-min.js')
       end
-      
+
       def inline_js_content
         <<-EOF
 
   SCENARIOS = "h3[id^='scenario_'],h3[id^=background_]";
-  
+
   $(document).ready(function() {
     $(SCENARIOS).css('cursor', 'pointer');
     $(SCENARIOS).click(function() {
       $(this).siblings().toggle(250);
     });
-    
+
     $("#collapser").css('cursor', 'pointer');
     $("#collapser").click(function() {
       $(SCENARIOS).siblings().hide();
     });
-    
+
     $("#expander").css('cursor', 'pointer');
     $("#expander").click(function() {
       $(SCENARIOS).siblings().show();
     });
   })
-  
+
   function moveProgressBar(percentDone) {
     $("cucumber-header").css('width', percentDone +"%");
   }
@@ -543,7 +542,7 @@ module Cucumber
     $('#'+element_id).css('background', '#FAF834');
     $('#'+element_id).css('color', '#000000');
   }
-  
+
         EOF
       end
 
@@ -580,12 +579,12 @@ module Cucumber
 
       def print_stat_string(features)
         string = String.new
-        string << dump_count(@step_mother.scenarios.length, "scenario")
-        scenario_count = print_status_counts{|status| @step_mother.scenarios(status)}
+        string << dump_count(@runtime.scenarios.length, "scenario")
+        scenario_count = print_status_counts{|status| @runtime.scenarios(status)}
         string << scenario_count if scenario_count
         string << "<br />"
-        string << dump_count(@step_mother.steps.length, "step")
-        step_count = print_status_counts{|status| @step_mother.steps(status)}
+        string << dump_count(@runtime.steps.length, "step")
+        step_count = print_status_counts{|status| @runtime.steps(status)}
         string << step_count if step_count
       end