aslakhellesoy-cucumber 0.3.93.1 → 0.3.94

data/features/step_definitions/cucumber_steps.rb

@@ -39,7 +39,6 @@ Given /^I am not running (?:.*) in the background$/ do
   # no-op
 end
 
-
 When /^I run cucumber (.*)$/ do |cucumber_opts|
   run "#{Cucumber::RUBY_BINARY} #{Cucumber::BINARY} --no-color #{cucumber_opts}"
 end
@@ -75,23 +74,17 @@ Then /^the output should be$/ do |text|
   last_stdout.should == text
 end
 
-Then /^"(.*)" should contain XML$/ do |file, xml|
-  t = Tempfile.new('cucumber-junit')
-  t.write(xml)
-  t.flush
-  t.close
-  cmd = "diffxml #{t.path} #{file}"
-  diff = `#{cmd}`
-  if diff =~ /<delta>/m
-    raise diff + "\nXML WAS:\n" + IO.read(file)
-  end
+Then /^"([^\"]*)" should contain$/ do |file, text|
+  strip_duration(IO.read(file)).should == text
 end
 
-Then /^"(.*)" should contain$/ do |file, text|
-  strip_duration(IO.read(file)).should == text
+Then /^"([^\"]*)" with junit duration "([^\"]*)" should contain$/ do |actual_file, duration_replacement, text|
+  actual = IO.read(actual_file)
+  actual = replace_junit_duration(actual, duration_replacement)
+  actual.should == text
 end
 
-Then /^"(.*)" should match$/ do |file, text|
+Then /^"([^\"]*)" should match$/ do |file, text|
   IO.read(file).should =~ Regexp.new(text)
 end
 
@@ -119,7 +112,7 @@ Then /^STDERR should be empty$/ do
   last_stderr.should == ""
 end
 
-Then /^"(.*)" should exist$/ do |file|
+Then /^"([^\"]*)" should exist$/ do |file|
   File.exists?(file).should be_true
   FileUtils.rm(file)
 end

data/features/support/env.rb

@@ -50,6 +50,10 @@ class CucumberWorld
     s.gsub(/\d+m\d+\.\d+s/m, replacement)
   end
 
+  def replace_junit_duration(s, replacement)
+    s.gsub(/\d+\.\d\d+/m, replacement)
+  end
+
   def create_file(file_name, file_content)
     file_content.gsub!("CUCUMBER_LIB", "'#{cucumber_lib_dir}'") # Some files, such as Rakefiles need to use the lib dir
     in_current_dir do
@@ -118,8 +122,3 @@ end
 After do
   terminate_background_jobs
 end
-
-Before('@diffxml') do
-  `diffxml --version`
-  raise "Please install diffxml from http://diffxml.sourceforge.net/" if $? != 0
-end

data/lib/cucumber/ast/feature.rb

@@ -44,6 +44,19 @@ module Cucumber
         "#{@file}:#{line}"
       end
 
+      def tag_count(tag)
+        if @tags.respond_to?(:count)
+          @tags.count(tag) # 1.9
+        else
+          @tags.select{|t| t == tag}.length  # 1.8
+        end
+      end
+
+      def feature_and_children_tag_count(tag)
+        children_tag_count = @feature_elements.inject(0){|count, feature_element| count += feature_element.tag_count(tag)}
+        children_tag_count + tag_count(tag)
+      end
+
       def short_name
         first_line = name.split(/\n/)[0]
         if first_line =~ /#{language.keywords('feature', true)}:(.*)/

data/lib/cucumber/ast/feature_element.rb

@@ -24,7 +24,7 @@ module Cucumber
       if @name.empty?
         [@keyword.jlength]
       else
-        @name.split("\n").enum_for(:each_with_index).map do |line, line_number| 
+        @name.split("\n").enum_for(:each_with_index).map do |line, line_number|
           line_number == 0 ? @keyword.jlength + line.jlength : line.jlength + Ast::Step::INDENT - 1 # We -1 as names which are not keyword lines are missing a space between keyword and name
         end
       end
@@ -32,7 +32,7 @@ module Cucumber
 
     def matches_scenario_names?(scenario_name_regexps)
       scenario_name_regexps.detect{|name| name =~ @name}
-    end 
+    end
 
     def backtrace_line(name = "#{@keyword} #{@name}", line = @line)
       @feature.backtrace_line(name, line) if @feature
@@ -49,9 +49,13 @@ module Cucumber
     def accept_hook?(hook)
       @tags.accept_hook?(hook) || @feature.accept_hook?(hook)
     end
-    
+
+    def tag_count(tag)
+      @feature.tag_count(tag) == 0 ? @tags.count(tag) : @feature.tag_count(tag)
+    end
+
     def language
       @feature.language
     end
-  end
+   end
 end

data/lib/cucumber/ast/features.rb

@@ -30,6 +30,11 @@ module Cucumber
         end
         @duration = Time.now - start
       end
+
+      def tag_count(tag)
+        @features.inject(0){|count, feature| count += feature.feature_and_children_tag_count(tag)}
+      end
+
     end
   end
-end
+end

data/lib/cucumber/ast/table.rb

@@ -126,23 +126,30 @@ module Cucumber
         [:table, *cells_rows.map{|row| row.to_sexp}]
       end
 
-      # Redefines the table headers. This makes it
-      # possible to use prettier header names in the features. Example:
+      # Redefines the table headers. This makes it possible to use
+      # prettier and more flexible header names in the features.  The
+      # keys of +mappings+ are Strings or regular expressions
+      # (anything that responds to #=== will work) that may match
+      # column headings in the table.  The values of +mappings+ are
+      # desired names for the columns.
+      #
+      # Example:
       #
       #   | Phone Number | Address |
       #   | 123456       | xyz     |
       #   | 345678       | abc     |
       #
-      # A StepDefinition receiving this table can then map the columns:
+      # A StepDefinition receiving this table can then map the columns 
+      # with both Regexp and String:
       #
-      #   mapped_table = table.map_columns('Phone Number' => :phone, 'Address' => :address)
-      #   hashes = mapped_table.hashes
+      #   table.map_headers!(/phone( number)?/i => :phone, 'Address' => :address)
+      #   table.hashes
       #   # => [{:phone => '123456', :address => 'xyz'}, {:phone => '345678', :address => 'abc'}]
       #
       def map_headers!(mappings)
         header_cells = cell_matrix[0]
         mappings.each_pair do |pre, post|
-          header_cell = header_cells.detect{|cell| cell.value == pre}
+          header_cell = header_cells.detect{|cell| pre === cell.value}
           header_cell.value = post
           if @conversion_procs.has_key?(pre)
             @conversion_procs[post] = @conversion_procs.delete(pre)

data/lib/cucumber/ast/tags.rb

@@ -10,7 +10,7 @@ module Cucumber
       def self.strip_prefix(tag_name)
         tag_name =~ /^@(.*)/ ? $1 : tag_name
       end
-    
+
       def initialize(line, tag_names)
         @line, @tag_names = line, tag_names
       end
@@ -26,6 +26,14 @@ module Cucumber
         hook.matches_tag_names?(@tag_names)
       end
 
+      def count(tag)
+        if @tag_names.respond_to?(:count)
+          @tag_names.count(tag) # 1.9
+        else
+          @tag_names.select{|t| t == tag}.length  # 1.8
+        end
+      end
+
       def to_sexp
         @tag_names.map{|tag_name| [:tag, tag_name]}
       end

data/lib/cucumber/cli/configuration.rb

@@ -168,7 +168,7 @@ module Cucumber
           tr("-", "_").
           downcase
       end
-
+      
     end
 
   end

data/lib/cucumber/cli/main.rb

@@ -11,6 +11,8 @@ require 'cucumber/cli/drb_client'
 module Cucumber
   module Cli
     class Main
+      FAILURE = 1
+
       class << self
         def step_mother
           @step_mother
@@ -32,7 +34,7 @@ module Cucumber
         @out_stream   = out_stream == STDOUT ? Formatter::ColorIO.new : out_stream
         @error_stream = error_stream
       end
-      
+
       def execute!(step_mother)
         trap_interrupt
         if configuration.drb?
@@ -56,17 +58,32 @@ module Cucumber
         step_mother.visitor = visitor # Needed to support World#announce
         visitor.visit_features(features)
 
-        failure = if configuration.wip?
-          step_mother.scenarios(:passed).any?
-        else
-          step_mother.scenarios(:failed).any? || 
-          (configuration.strict? && step_mother.steps(:undefined).any?)
-        end
+        failure = if exceeded_tag_limts?(features)
+            FAILURE
+          elsif configuration.wip?
+            step_mother.scenarios(:passed).any?
+          else
+            step_mother.scenarios(:failed).any? ||
+            (configuration.strict? && step_mother.steps(:undefined).any?)
+          end
       rescue ProfilesNotDefinedError, YmlLoadError, ProfileNotFound => e
         @error_stream.puts e.message
         true
       end
 
+      def exceeded_tag_limts?(features)
+        exceeded = false
+        configuration.options[:include_tags].each do |tag, limit|
+          unless limit.nil?
+            tag_count = features.tag_count(tag)
+            if tag_count > limit.to_i
+              exceeded = true
+            end
+          end
+        end
+        exceeded
+      end
+
       def load_plain_text_features
         features = Ast::Features.new
 
@@ -85,7 +102,7 @@ module Cucumber
 
       def configuration
         return @configuration if @configuration
-      
+
         @configuration = Configuration.new(@out_stream, @error_stream)
         @configuration.parse!(@args)
         @configuration

data/lib/cucumber/cli/options.rb

@@ -43,6 +43,7 @@ module Cucumber
         @default_profile = options[:default_profile]
         @skip_profile_information = options[:skip_profile_information]
         @profiles = []
+        @overridden_paths = []
         @options        = default_options
       end
 
@@ -66,7 +67,7 @@ module Cucumber
               previous_flag_was_profile = true
               next true
             end
-            arg == DRB_FLAG
+            arg == DRB_FLAG || @overridden_paths.include?(arg)
           end
         )
       end
@@ -122,12 +123,16 @@ module Cucumber
           end
           opts.on("-t TAGS", "--tags TAGS",
             "Only execute the features or scenarios with the specified tags.",
-            "TAGS must be comma-separated without spaces. Prefix tags with ~ to",
-            "exclude features or scenarios having that tag. Tags can be specified",
-            "with or without the @ prefix.") do |v|
+            "TAGS must be comma-separated without spaces. They can be",
+            "specified with or without the @ prefix. Example: --tags dev\n",
+            "Negative tags: Prefix tags with ~ to exclude features or scenarios",
+            "having that tag.\n",
+            "Limit WIP: Positive tags can be given a threshold to limit the",
+            "number of occurrences. Example: --tags qa:3 will fail if there",
+            "are more than 3 occurrences of the @qa tag.") do |v|
             include_tags, exclude_tags = *parse_tags(v)
-            @options[:include_tags] += include_tags
-            @options[:exclude_tags] += exclude_tags
+            @options[:include_tags].merge!(include_tags)
+            @options[:exclude_tags].merge!(exclude_tags)
           end
           opts.on("-n NAME", "--name NAME",
             "Only execute the feature elements which match part of the given name.",
@@ -265,7 +270,16 @@ module Cucumber
         # Strip @
         includes = includes.map{|tag| Ast::Tags.strip_prefix(tag)}
         excludes = excludes.map{|tag| Ast::Tags.strip_prefix(tag)}
-        [includes, excludes]
+        [parse_tag_limits(includes), parse_tag_limits(excludes)]
+      end
+ 
+      def parse_tag_limits(includes)
+        dict = {}
+        includes.each do |tag|
+          tag, limit = tag.split(':')
+          dict[tag] = limit.nil? ? limit : limit.to_i
+        end
+        dict
       end
 
       def disable_profile_loading?
@@ -302,10 +316,14 @@ module Cucumber
       def reverse_merge(other_options)
         @options = other_options.options.merge(@options)
         @options[:require] += other_options[:require]
-        @options[:include_tags] += other_options[:include_tags]
-        @options[:exclude_tags] += other_options[:exclude_tags]
+        @options[:include_tags].merge! other_options[:include_tags]
+        @options[:exclude_tags].merge! other_options[:exclude_tags]
         @options[:env_vars] = other_options[:env_vars].merge(@options[:env_vars])
-        @options[:paths] = other_options[:paths] if @options[:paths].empty?
+        if @options[:paths].empty?
+          @options[:paths] = other_options[:paths]
+        else
+          @overridden_paths += (other_options[:paths] - @options[:paths])
+        end
         @options[:source] &= other_options[:source]
         @options[:snippets] &= other_options[:snippets]
 
@@ -352,8 +370,8 @@ module Cucumber
           :dry_run      => false,
           :formats      => [],
           :excludes     => [],
-          :include_tags => [],
-          :exclude_tags => [],
+          :include_tags => {},
+          :exclude_tags => {},
           :name_regexps => [],
           :env_vars     => {},
           :diff_enabled => true

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