cucumber 0.3.93 → 0.3.94

data/lib/cucumber/filter.rb

@@ -2,8 +2,9 @@ module Cucumber
   class Filter
     def initialize(lines, options)
       @lines = lines
-      @include_tags = options[:include_tags] || []
-      @exclude_tags = options[:exclude_tags] || []
+
+      @include_tags = options[:include_tags] ? options[:include_tags].keys : []
+      @exclude_tags = options[:exclude_tags] ? options[:exclude_tags].keys : []
       @name_regexps = options[:name_regexps] || []
     end
 
@@ -14,7 +15,7 @@ module Cucumber
     end
 
     def accept_example?(syntax_node, outline)
-      (at_line?(syntax_node) || outline_at_line?(outline)) && 
+      (at_line?(syntax_node) || outline_at_line?(outline)) &&
       (matches_names?(syntax_node) || outline_matches_names?(outline))
     end
     

data/lib/cucumber/formatter/ansicolor.rb

@@ -60,15 +60,6 @@ module Cucumber
     module ANSIColor
       include Term::ANSIColor
 
-      # Not supported in Term::ANSIColor
-      def grey(m)
-        if ::Term::ANSIColor.coloring?
-          "\e[90m#{m}\e[0m"
-        else
-          m
-        end
-      end
-
       ALIASES = Hash.new do |h,k|
         if k.to_s =~ /(.*)_param/
           h[$1] + ',bold'
@@ -105,6 +96,48 @@ module Cucumber
           eval(code)
         end
       end
+      
+      def self.define_grey
+        begin
+          gem 'genki-ruby-terminfo'
+          require 'terminfo'
+          puts TermInfo.default_object.tigetnum("colors")
+          case TermInfo.default_object.tigetnum("colors")
+          when 0
+            raise "Your terminal doesn't support colours"
+          when 1
+            ::Term::ANSIColor.coloring = false
+            alias grey white
+          when 2..8
+            alias grey white
+          else
+            define_real_grey
+          end
+        rescue Exception => e
+          if e.class.name == 'TermInfo::TermInfoError'
+            STDERR.puts "*** WARNING ***"
+            STDERR.puts "You have the genki-ruby-terminfo gem installed, but you haven't set your TERM variable."
+            STDERR.puts "Try setting it to TERM=xterm-256color to get grey colour in output"
+            STDERR.puts "\n"
+            alias grey white
+          else
+            define_real_grey
+          end
+        end
+      end
+      
+      def self.define_real_grey
+        def grey(m)
+          if ::Term::ANSIColor.coloring?
+            "\e[90m#{m}\e[0m"
+          else
+            m
+          end
+        end
+      end
+      
+      define_grey
+      
     end
   end
 end

data/lib/cucumber/formatter/console.rb

@@ -6,7 +6,7 @@ module Cucumber
     module Console
       extend ANSIColor
       include Duration
-      
+
       FORMATS = Hash.new{|hash, format| hash[format] = method(format).to_proc}
 
       def format_step(keyword, step_match, status, source_indent)
@@ -59,9 +59,9 @@ module Cucumber
       end
 
       def print_stats(features)
-        
+
         @failures = step_mother.scenarios(:failed).select { |s| s.is_a?(Cucumber::Ast::Scenario) }
-        
+
         if !@failures.empty?
           @io.puts format_string("Failing Scenarios:", :failed)
           @failures.each do |failure|
@@ -70,7 +70,7 @@ module Cucumber
           end
           @io.puts
         end
-        
+
         @io.print dump_count(step_mother.scenarios.length, "scenario")
         print_status_counts{|status| step_mother.scenarios(status)}
 
@@ -81,7 +81,7 @@ module Cucumber
 
         @io.flush
       end
-      
+
       def print_exception(e, status, indent)
         @io.puts(format_string("#{e.message} (#{e.class})\n#{e.backtrace.join("\n")}".indent(indent), status))
       end
@@ -114,6 +114,29 @@ module Cucumber
         end
       end
 
+      def print_tag_limit_warnings(options)
+        return unless tag_limit_breached?(options, @tag_occurences)
+        @io.puts
+        @io.puts format_string("Failed due to exceeding the tag limit", :failed)
+        options[:include_tags].each do |tag_name, limit|
+          tag_frequnecy = @tag_occurences[tag_name].size
+          if limit && tag_frequnecy > limit
+            @io.puts format_string("@#{tag_name} occurred:#{tag_frequnecy} limit:#{limit}", :failed)
+            @tag_occurences[tag_name].each {|location| @io.puts format_string("  #{location}", :failed)}
+            @io.flush
+          end
+        end
+      end
+
+      def record_tag_occurrences(feature_element, options)
+        @tag_occurences ||= Hash.new{|k,v| k[v] = []}
+        options[:include_tags].each do |tag_name, limit|
+          if feature_element.tag_count(tag_name) > 0
+            @tag_occurences[tag_name] << feature_element.file_colon_line
+          end
+        end
+      end
+
       def announce(announcement)
         @io.puts
         @io.puts(format_string(announcement, :tag))
@@ -144,6 +167,15 @@ module Cucumber
         raise "No format for #{key.inspect}: #{FORMATS.inspect}" if fmt.nil?
         fmt
       end
+
+      def tag_limit_breached?(options, tag_occurences)
+        return if tag_occurences.nil?
+        tag_limit_breached = false
+        options[:include_tags].each do |tag_name, limit|
+          tag_limit_breached ||= limit && (tag_occurences[tag_name].size > limit)
+        end
+        tag_limit_breached
+      end
     end
   end
-end
+end

data/lib/cucumber/formatter/html.rb

@@ -1,10 +1,4 @@
-require 'erb'
-begin
-  require 'builder'
-rescue LoadError
-  gem 'builder'
-  require 'builder'
-end
+require 'cucumber/formatter/ordered_xml_markup'
 require 'cucumber/formatter/duration'
 
 module Cucumber
@@ -20,7 +14,7 @@ module Cucumber
       end
       
       def create_builder(io)
-        Builder::XmlMarkup.new(:target => io, :indent => 0)
+        OrderedXmlMarkup.new(:target => io, :indent => 0)
       end
       
       def visit_features(features)

data/lib/cucumber/formatter/junit.rb

@@ -1,9 +1,4 @@
-begin
-  require 'builder'
-rescue LoadError
-  gem 'builder'
-  require 'builder'
-end
+require 'cucumber/formatter/ordered_xml_markup'
 
 module Cucumber
   module Formatter
@@ -18,16 +13,18 @@ module Cucumber
 
       def visit_feature(feature)
         @failures = @errors = @tests = 0
-        @builder = Builder::XmlMarkup.new( :indent => 2 )
+        @builder = OrderedXmlMarkup.new( :indent => 2 )
+        @time = 0
         super
 
-        @testsuite = Builder::XmlMarkup.new( :indent => 2 )
+        @testsuite = OrderedXmlMarkup.new( :indent => 2 )
         @testsuite.instruct!
         @testsuite.testsuite(
           :failures => @failures,
           :errors => @errors,
           :tests => @tests,
-          :name => @feature_name ) do
+          :time => "%.6f" % @time,
+        :name => @feature_name ) do
           @testsuite << @builder.target!
         end
 
@@ -36,40 +33,84 @@ module Cucumber
         File.open(feature_filename, 'w') { |file| file.write(@testsuite.target!) }
       end
 
+      def visit_background(name)
+        @in_background = true
+        super
+        @in_background = false
+      end
+
       def visit_feature_name(name)
         lines = name.split(/\r?\n/)
         @feature_name = lines[0].sub(/Feature\:/, '').strip
       end
 
       def visit_scenario_name(keyword, name, file_colon_line, source_indent)
-        @scenario = name
+        scenario_name = name.strip
+        scenario_name = "Unnamed scenario" if name == ""
+        @scenario = scenario_name
+        @outline = keyword.include?('Scenario Outline')
+        @output = "Scenario#{ " outline" if @outline}: #{@scenario}\n\n"
       end
 
       def visit_steps(steps)
-        @steps_failed = false
+        return if @in_background
+        start = Time.now
         super
-        @failures += 1 if @steps_failed
-        @tests += 1
+        duration = Time.now - start
+        unless @outline
+          if steps.failed?
+            steps.each { |step| @output += "#{step.keyword} #{step.name}\n" }
+            @output += "\nMessage:\n"
+          end
+          build_testcase(duration, steps.status, steps.exception)
+        end
+      end
+
+      def visit_outline_table(outline_table)
+        @header_row = true
+        super(outline_table)
       end
 
-      def visit_step_result(keyword, step_match, multiline_arg, status, exception, source_indent, background)
-        step_name = keyword + " " + step_match.format_args(lambda{|param| "*#{param}*"})
-        @builder.testcase(:classname => "#{@feature_name}.#{@scenario}", :name => step_name) do
-          if status != :passed
-            @builder.failure(:message => step_name) do
-              @builder.text!(format_exception(exception)) if exception
+      def visit_table_row(table_row)
+        if @outline
+          start = Time.now
+          super(table_row)
+          duration = Time.now - start
+          unless @header_row
+            name_suffix = " (outline example : #{table_row.name})"
+            if table_row.failed?
+              @output += "Example row: #{table_row.name}\n"
+              @output += "\nMessage:\n"
             end
-            @steps_failed = true
+            build_testcase(duration, table_row.status, table_row.exception,  name_suffix)
           end
+        else
+          super(table_row)
         end
+        @header_row = false
       end
 
       private
 
-      def format_exception(exception)
-        (["#{exception.message} (#{exception.class})"] + exception.backtrace).join("\n")
-      end
-    end
+        def build_testcase(duration, status, exception = nil, suffix = "")
+          @time += duration
+          classname = "#{@feature_name}.#{@scenario}"
+          name = "#{@scenario}#{suffix}"
+          @builder.testcase(:classname => classname, :name => name, :time => "%.6f" % duration) do
+            if status != :passed
+              @builder.failure(:message => "#{status.to_s} #{name}", :type => status.to_s) do
+                @builder.text! @output
+                @builder.text!(format_exception(exception)) if exception
+              end
+              @failures += 1
+            end
+          end
+          @tests += 1
+        end
 
+        def format_exception(exception)
+          (["#{exception.message} (#{exception.class})"] + exception.backtrace).join("\n")
+        end
+    end
   end
 end

data/lib/cucumber/formatter/ordered_xml_markup.rb

@@ -0,0 +1,24 @@
+begin
+  require 'builder'
+rescue LoadError
+  gem 'builder'
+  require 'builder'
+end
+
+module Cucumber
+  module Formatter
+    # Emits attributes ordered alphabetically, so that we can predicatbly test output.
+    class OrderedXmlMarkup < Builder::XmlMarkup
+      def _insert_attributes(attrs, order=[])
+        return if attrs.nil?
+        keys = attrs.keys.map{|k| k.to_s}
+        keys.sort!
+        keys.reverse! if (attrs.keys - [:version, :encoding] == []) #HACK to ensure the 'version' attribute is first in xml declaration.
+        keys.each do |k|
+          v = attrs[k.to_sym] || attrs[k]
+          @target << %{ #{k}="#{_attr_value(v)}"} if v
+        end
+      end
+    end
+  end
+end

data/lib/cucumber/formatter/pretty.rb

@@ -48,14 +48,14 @@ module Cucumber
       end
 
       def visit_comment_line(comment_line)
-        @io.puts(comment_line.indent(@indent)) 
+        @io.puts(comment_line.indent(@indent))
         @io.flush
       end
 
       def visit_tags(tags)
         tags.accept(self)
         if @indent == 1
-          @io.puts 
+          @io.puts
           @io.flush
         end
       end
@@ -74,6 +74,7 @@ module Cucumber
       end
 
       def visit_feature_element(feature_element)
+        record_tag_occurrences(feature_element, @options)
         @indent = 2
         @scenario_indent = 2
         super
@@ -160,7 +161,7 @@ module Cucumber
         super
         @io.puts
         if table_row.exception && !@exceptions.index(table_row.exception)
-          print_exception(table_row.exception, :failed, @indent) 
+          print_exception(table_row.exception, :failed, @indent)
         end
       end
 
@@ -187,7 +188,10 @@ module Cucumber
       end
 
       private
-      
+      def cell_prefix(status)
+        @prefixes[status]
+      end
+
       def cell_prefix(status)
         @prefixes[status]
       end
@@ -196,6 +200,7 @@ module Cucumber
         print_stats(features)
         print_snippets(@options)
         print_passing_wip(@options)
+        print_tag_limit_warnings(@options)
       end
 
     end

data/lib/cucumber/formatter/progress.rb

@@ -18,6 +18,11 @@ module Cucumber
         print_summary(features)
       end
 
+      def visit_feature_element(feature_element)
+        record_tag_occurrences(feature_element, @options)
+        super
+      end
+
       def visit_step_result(keyword, step_match, multiline_arg, status, exception, source_indent, background)
         progress(status)
         @status = status
@@ -36,6 +41,7 @@ module Cucumber
         print_stats(features)
         print_snippets(@options)
         print_passing_wip(@options)
+        print_tag_limit_warnings(@options)
       end
 
       CHARS = {
@@ -51,7 +57,7 @@ module Cucumber
         @io.print(format_string(char, status))
         @io.flush
       end
-      
+
       def table_header_cell?(status)
         status == :skipped_param
       end

data/lib/cucumber/rake/task.rb

@@ -8,8 +8,8 @@ module Cucumber
     #
     #   Cucumber::Rake::Task.new
     #
-    # This will create a task named 'features' described as 'Run Features with 
-    # Cucumber'. It will use steps from 'features/**/*.rb' and features in 'features/**/*.feature'.
+    # This will create a task named 'cucumber' described as 'Run Cucumber features'. 
+    # It will use steps from 'features/**/*.rb' and features in 'features/**/*.feature'.
     #
     # To further configure the task, you can pass a block:
     #
@@ -148,7 +148,7 @@ module Cucumber
       end
 
       # Define Cucumber Rake task
-      def initialize(task_name = "features", desc = "Run Features with Cucumber")
+      def initialize(task_name = "cucumber", desc = "Run Cucumber features")
         @task_name, @desc = task_name, desc
         @fork = true
         @libs = ['lib']