cucumber 0.2.3 → 0.3.0

data/lib/cucumber/ast/scenario.rb

@@ -8,7 +8,7 @@ module Cucumber
       def initialize(background, comment, tags, line, keyword, name, steps)
         @background, @comment, @tags, @line, @keyword, @name = background, comment, tags, line, keyword, name
         attach_steps(steps)
-        
+
         step_invocations = steps.map{|step| step.step_invocation}
         if @background
           @steps = @background.step_collection(step_invocations)
@@ -22,13 +22,6 @@ module Cucumber
         @background.feature = feature if @background
       end
 
-      def descend?(visitor)
-        visitor.matches_lines?(self) &&
-        visitor.included_by_tags?(self) &&
-        !visitor.excluded_by_tags?(self) &&
-        visitor.matches_scenario_names?(self)
-      end
-
       def accept(visitor)
         visitor.visit_comment(@comment)
         visitor.visit_tags(@tags)

data/lib/cucumber/ast/scenario_outline.rb

@@ -30,16 +30,6 @@ module Cucumber
         @background.feature = feature if @background
       end
 
-      def descend?(visitor)
-        @examples_array.detect { |examples| examples.descend?(visitor) }
-      end
-
-      def matches_tags_and_name?(visitor)
-        visitor.included_by_tags?(self) &&
-        !visitor.excluded_by_tags?(self) &&
-        visitor.matches_scenario_names?(self)
-      end
-
       def accept(visitor)
         visitor.visit_comment(@comment)
         visitor.visit_tags(@tags)
@@ -48,7 +38,7 @@ module Cucumber
 
         skip_invoke! if @background && @background.failed?
         @examples_array.each do |examples|
-          visitor.visit_examples(examples) if examples.descend?(visitor)
+          visitor.visit_examples(examples)
         end
       end
 

data/lib/cucumber/ast/step.rb

@@ -33,13 +33,11 @@ module Cucumber
       def accept(visitor)
         # The only time a Step is visited is when it is in a ScenarioOutline.
         # Otherwise it's always StepInvocation that gest visited instead.
-        visit_step_details(visitor, first_match(visitor), @multiline_arg, :skipped, nil, nil)
+        visit_step_result(visitor, first_match(visitor), @multiline_arg, :skipped, nil, nil)
       end
       
-      def visit_step_details(visitor, step_match, multiline_arg, status, exception, background)
-        visitor.visit_step_name(@keyword, step_match, status, source_indent, background)
-        visitor.visit_multiline_arg(@multiline_arg) if @multiline_arg
-        visitor.visit_exception(exception, status) if exception
+      def visit_step_result(visitor, step_match, multiline_arg, status, exception, background)
+        visitor.visit_step_result(@keyword, step_match, @multiline_arg, status, exception, source_indent, background)
       end
 
       def first_match(visitor)
@@ -58,10 +56,6 @@ module Cucumber
         [:step, @line, @keyword, @name, (@multiline_arg.nil? ? nil : @multiline_arg.to_sexp)].compact
       end
 
-      def matches_lines?(lines)
-        lines.index(@line) || (@multiline_arg && @multiline_arg.matches_lines?(lines))
-      end
-
       def source_indent
         @feature_element.source_indent(text_length)
       end

data/lib/cucumber/ast/step_collection.rb

@@ -41,10 +41,6 @@ module Cucumber
         @steps[i-1]
       end
 
-      def matches_lines?(lines)
-        @steps.detect {|step| step.matches_lines?(lines)}
-      end
-
       def empty?
         @steps.empty?
       end

data/lib/cucumber/ast/step_invocation.rb

@@ -20,7 +20,7 @@ module Cucumber
 
       def accept(visitor)
         invoke(visitor.step_mother, visitor.options)
-        @step.visit_step_details(visitor, @step_match, @multiline_arg, @status, @exception, @background)
+        @step.visit_step_result(visitor, @step_match, @multiline_arg, @status, @exception, @background)
       end
 
       def invoke(step_mother, options)
@@ -68,7 +68,6 @@ module Cucumber
 
       def status!(status)
         @status = status
-        @multiline_arg.status = status if @multiline_arg
         @matched_cells.each do |cell|
           cell.status = status
         end
@@ -86,10 +85,6 @@ module Cucumber
         end
       end
 
-      def matches_lines?(lines)
-        @step.matches_lines?(lines)
-      end
-
       def text_length
         @step.text_length
       end
@@ -98,6 +93,10 @@ module Cucumber
         @step.keyword
       end
 
+      def multiline_arg
+        @step.multiline_arg
+      end
+
       def file_colon_line
         @step.file_colon_line
       end

data/lib/cucumber/ast/table.rb

@@ -12,6 +12,10 @@ module Cucumber
 
       attr_accessor :file
 
+      def self.default_arg_name
+        "table"
+      end
+
       def initialize(raw, conversions = NULL_CONVERSIONS.dup)
         # Verify that it's square
         raw.transpose
@@ -101,10 +105,6 @@ module Cucumber
         cells_rows.each(&proc)
       end
 
-      def matches_lines?(lines)
-        cells_rows.detect{|row| row.matches_lines?(lines)}
-      end
-
       def accept(visitor)
         cells_rows.each do |row|
           visitor.visit_table_row(row)
@@ -112,12 +112,6 @@ module Cucumber
         nil
       end
 
-      def status=(status)
-        cells_rows.each do |row|
-          row.status = status
-        end
-      end
-
       # For testing only
       def to_sexp #:nodoc:
         [:table, *cells_rows.map{|row| row.to_sexp}]
@@ -253,10 +247,6 @@ module Cucumber
           @table, @cells = table, cells
         end
 
-        def matches_lines?(lines)
-          lines.index(line)
-        end
-
         def accept(visitor)
           each do |cell|
             visitor.visit_table_cell(cell)
@@ -266,7 +256,7 @@ module Cucumber
 
         # For testing only
         def to_sexp #:nodoc:
-          [:row, *@cells.map{|cell| cell.to_sexp}]
+          [:row, line, *@cells.map{|cell| cell.to_sexp}]
         end
 
         def to_hash #:nodoc:
@@ -289,12 +279,6 @@ module Cucumber
           "row_#{line}"
         end
 
-        def status=(status)
-          each do |cell|
-            cell.status = status
-          end
-        end
-
         private
 
         def index
@@ -316,7 +300,6 @@ module Cucumber
 
         def initialize(value, table, row, col, line)
           @value, @table, @row, @col, @line = value, table, row, col, line
-          @status = :passed
         end
 
         def accept(visitor)

data/lib/cucumber/ast/tags.rb

@@ -7,24 +7,24 @@ module Cucumber
     # This gets stored internally as <tt>["invoice", "release_2"]</tt>
     #
     class Tags
+      def self.strip_prefix(tag_name)
+        tag_name =~ /^@(.*)/ ? $1 : tag_name
+      end
+    
       def initialize(line, tag_names)
         @line, @tag_names = line, tag_names
       end
 
-      def has_tags?(tags)
-        (@tag_names & tags).any?
-      end
-
-      def matches_lines?(lines)
-        lines.index(@line)
-      end
-
       def accept(visitor)
         @tag_names.each do |tag_name|
           visitor.visit_tag_name(tag_name)
         end
       end
-      
+
+      def accept_hook?(hook)
+        hook.matches_tag_names?(@tag_names)
+      end
+
       def to_sexp
         @tag_names.map{|tag_name| [:tag, tag_name]}
       end

data/lib/cucumber/ast/visitor.rb

@@ -8,25 +8,6 @@ module Cucumber
       def initialize(step_mother)
         @options = {}
         @step_mother = step_mother
-        @current_feature_lines = []
-      end
-
-      def current_feature_lines=(lines)
-        @current_feature_lines = lines
-      end
-
-      def matches_lines?(node)
-        @current_feature_lines.empty? || node.matches_lines?(@current_feature_lines)
-      end
-
-      def included_by_tags?(node)
-        tags = options[:include_tags] || []
-        tags.empty? || node.has_tags?(tags)
-      end
-
-      def excluded_by_tags?(node)
-        tags = options[:exclude_tags] || []
-        tags.any? && node.has_tags?(tags)
       end
 
       def matches_scenario_names?(node)
@@ -93,14 +74,23 @@ module Cucumber
         step.accept(self)
       end
 
-      def visit_step_name(keyword, step_match, status, source_indent, background)
+      def visit_step_result(keyword, step_match, multiline_arg, status, exception, source_indent, background)
+        visit_step_name(keyword, step_match, status, source_indent, background)
+        visit_multiline_arg(multiline_arg) if multiline_arg
+        visit_exception(exception, status) if exception
+      end
+
+      def visit_step_name(keyword, step_match, status, source_indent, background) #:nodoc:
       end
 
-      def visit_multiline_arg(multiline_arg)
+      def visit_multiline_arg(multiline_arg) #:nodoc:
         multiline_arg.accept(self)
       end
 
-      def visit_py_string(string, status)
+      def visit_exception(exception, status) #:nodoc:
+      end
+
+      def visit_py_string(string)
       end
 
       def visit_table_row(table_row)
@@ -114,9 +104,6 @@ module Cucumber
       def visit_table_cell_value(value, width, status)
       end
 
-      def visit_exception(exception, status)
-      end
-
       def announce(announcement)
       end
 

data/lib/cucumber/cli/configuration.rb

@@ -187,8 +187,8 @@ module Cucumber
         excludes = excludes.map{|tag| tag[1..-1]}
 
         # Strip @
-        includes = includes.map{|tag| tag =~ /^@(.*)/ ? $1 : tag}
-        excludes = excludes.map{|tag| tag =~ /^@(.*)/ ? $1 : tag}
+        includes = includes.map{|tag| Ast::Tags.strip_prefix(tag)}
+        excludes = excludes.map{|tag| Ast::Tags.strip_prefix(tag)}
         [includes, excludes]
       end
 
@@ -257,11 +257,11 @@ module Cucumber
 
         potential_feature_files
       end
-    
+
     protected
   
       def feature_dirs
-        feature_files.map { |f| File.directory?(f) ? f : File.dirname(f) }.uniq
+        @paths.map { |f| File.directory?(f) ? f : File.dirname(f) }.uniq
       end
     
       def constantize(camel_cased_word)

data/lib/cucumber/cli/main.rb

@@ -52,8 +52,11 @@ module Cucumber
 
         verbose_log("Features:")
         configuration.feature_files.each do |f|
-          features.add_feature(parser.parse_file(f))
-          verbose_log("  * #{f}")
+          feature = parser.parse_file(f, configuration.options)
+          if feature
+            features.add_feature(feature)
+            verbose_log("  * #{f}")
+          end
         end
         verbose_log("\n"*2)
         features
@@ -89,7 +92,11 @@ module Cucumber
 
       def enable_diffing
         if configuration.diff_enabled? && defined?(::Spec)
-          require 'spec/expectations/differs/default'
+          begin
+            require 'spec/runner/differs/default' # RSpec >=1.2.4
+          rescue ::LoadError
+            require 'spec/expectations/differs/default' # RSpec <=1.2.3
+          end
           options = OpenStruct.new(:diff_format => :unified, :context_lines => 3)
           ::Spec::Expectations.differ = ::Spec::Expectations::Differs::Default.new(options)
         end

data/lib/cucumber/core_ext/instance_exec.rb

@@ -7,12 +7,14 @@ end
 
 class Object
   def cucumber_instance_exec(check_arity, pseudo_method, *args, &block)
-    arity = block.arity
-    arity = 0 if arity == -1
     cucumber_run_with_backtrace_filtering(pseudo_method) do
-      if check_arity && args.length != arity
+      if check_arity && !cucumber_compatible_arity?(args, block)
         instance_exec do
-          raise Cucumber::ArityMismatchError.new("expected #{arity} block argument(s), got #{args.length}")
+          s1 = cucumber_arity(block) == 1 ? "" : "s"
+          s2 = args.length == 1 ? "" : "s"
+          raise Cucumber::ArityMismatchError.new(
+            "Your block takes #{cucumber_arity(block)} argument#{s1}, but the Regexp matched #{args.length} argument#{s2}."
+          )
         end
       else
         instance_exec(*args, &block)
@@ -20,6 +22,17 @@ class Object
     end
   end
   
+  def cucumber_arity(block)
+    a = block.arity
+    Cucumber::RUBY_1_9 ? a : (a == -1 ? 0 : a)
+  end
+  
+  def cucumber_compatible_arity?(args, block)
+    a = cucumber_arity(block)
+    return true if (a == -1) && Cucumber::RUBY_1_9
+    a == args.length
+  end
+  
   def cucumber_run_with_backtrace_filtering(pseudo_method)
     begin
       yield

data/lib/cucumber/formatter/ansicolor.rb

@@ -19,7 +19,7 @@ elsif Cucumber::WINDOWS && Cucumber::JRUBY
   end
 end
 
-Term::ANSIColor.coloring = false if !STDOUT.tty?
+Term::ANSIColor.coloring = false if !STDOUT.tty? and not ENV.has_key?("AUTOTEST")
 
 module Cucumber
   module Formatter

data/lib/cucumber/formatter/console.rb

@@ -74,7 +74,8 @@ module Cucumber
         return if undefined.empty?
         snippets = undefined.map do |step|
           step_name = Undefined === step.exception ? step.exception.step_name : step.name
-          snippet = @step_mother.snippet_text(step.actual_keyword, 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
         end.compact.uniq
 

data/lib/cucumber/formatter/html.rb

@@ -1,3 +1,4 @@
+require 'erb'
 begin
   require 'builder'
 rescue LoadError
@@ -8,6 +9,8 @@ end
 module Cucumber
   module Formatter
     class Html < Ast::Visitor
+      include ERB::Util # for the #h method
+
       def initialize(step_mother, io, options)
         super(step_mother)
         @builder = Builder::XmlMarkup.new(:target => io, :indent => 2)
@@ -74,9 +77,11 @@ module Cucumber
       end
 
       def visit_outline_table(outline_table)
+        @outline_row = 0
         @builder.table do
           super(outline_table)
         end
+        @outline_row = nil
       end
 
       def visit_examples_name(keyword, name)
@@ -91,8 +96,13 @@ module Cucumber
 
       def visit_step(step)
         @step_id = step.dom_id
-        @builder.li(:id => @step_id) do
-          super
+        super
+      end
+
+      def visit_step_result(keyword, step_match, multiline_arg, status, exception, source_indent, background)
+        @status = status
+        @builder.li(:id => @step_id, :class => status) do
+          super(keyword, step_match, multiline_arg, status, exception, source_indent, background)
         end
       end
 
@@ -103,8 +113,8 @@ module Cucumber
 
         unless @skip_step
           step_name = step_match.format_args(lambda{|param| "<span>#{param}</span>"})
-          @builder.div(:class => status) do |div|
-            div << "#{keyword} #{step_name}"
+          @builder.div do |div|
+            div << h("#{keyword} #{step_name}")
           end
         end
       end
@@ -124,8 +134,8 @@ module Cucumber
         end
       end
 
-      def visit_py_string(string, status)
-        @builder.pre(:class => status) do |pre|
+      def visit_py_string(string)
+        @builder.pre(:class => @status) do |pre|
           pre << string
         end
       end
@@ -145,10 +155,14 @@ module Cucumber
             end
           end
         end
+        @outline_row += 1 if @outline_row
       end
 
       def visit_table_cell_value(value, width, status)
-        @builder.td(value, :class => status, :id => "#{@row_id}_#{@col_index}")
+        cell_type = @outline_row == 0 ? :th : :td
+        attributes = {:id => "#{@row_id}_#{@col_index}"}
+        attributes[:class] = status if status
+        @builder.__send__(cell_type, value, attributes)
         @col_index += 1
       end