aslakhellesoy-cucumber 0.1.12 → 0.1.13

data/lib/cucumber/formatters/pretty_formatter.rb

@@ -6,7 +6,6 @@ module Cucumber
       include ANSIColor
 
       INDENT = "\n      "
-      BACKTRACE_FILTER_PATTERNS = [/vendor\/rails/, /vendor\/plugins\/cucumber/, /spec\/expectations/, /spec\/matchers/]
 
       def initialize(io, step_mother, options={})
         @io = (io == STDOUT) ? Kernel : io
@@ -18,6 +17,8 @@ module Cucumber
         @pending_steps      = []
         @skipped            = []
         @last_executed_was_row = false
+        @pending_messages = {}
+        @forced_pending_step_count = 0
       end
 
       def feature_executing(feature)
@@ -40,17 +41,23 @@ module Cucumber
       end
 
       def scenario_executing(scenario)
+        scenario_or_scenario_outline_keyword = scenario.outline? ? Cucumber.language['scenario_outline'] : Cucumber.language['scenario']
+        
         @scenario_failed = false
         @io.puts if @last_executed_was_row && !scenario.row?
         if scenario.row?
           @last_executed_was_row = true
           @io.print "    |"
         else
+          scenario_text = "#{scenario_or_scenario_outline_keyword}: #{scenario.name}"
+          
           if scenario.pending?
             @pending_scenarios << scenario
-            @io.print pending("  #{Cucumber.language['scenario']}: #{scenario.name}")
+            @io.print pending("  #{scenario_text}")
+          elsif scenario.outline?
+            @io.print skipped("  #{scenario_text}")
           else
-            @io.print passed("  #{Cucumber.language['scenario']}: #{scenario.name}")
+            @io.print passed("  #{scenario_text}")
           end
           @last_executed_was_row = false
 
@@ -78,6 +85,7 @@ module Cucumber
 
       def step_passed(step, regexp, args)
         if step.row?
+          args = step.visible_args if step.outline?
           @passed << step
           print_passed_args(args)
         else
@@ -93,6 +101,7 @@ module Cucumber
 
       def step_failed(step, regexp, args)
         if step.row?
+          args = step.visible_args if step.outline?
           @failed << step
           @scenario_failed = true
           print_failed_args(args)
@@ -112,12 +121,17 @@ module Cucumber
       def step_skipped(step, regexp, args)
         @skipped << step
         if step.row?
+          args = step.visible_args if step.outline?
           print_skipped_args(args)
         else
           @io.print skipped("    #{step.keyword} #{step.format(regexp){|param| skipped_param(param) << skipped}}")
           if @options[:source]
             @io.print padding_spaces(step)
-            @io.print source_comment(step)
+            if step.outline?
+              @io.print comment("# #{step.file}:#{step.line}")
+            else
+              @io.print source_comment(step)
+            end
           end
           @io.puts
         end
@@ -125,6 +139,7 @@ module Cucumber
 
       def step_pending(step, regexp, args)
         if step.row?
+          args = step.visible_args if step.outline?
           @pending_steps << step
           print_pending_args(args)
         else
@@ -136,38 +151,61 @@ module Cucumber
           end
           @io.puts
         end
+        if step.forced_to_pending?
+          @pending_messages[regexp.inspect] ||= "#{step.keyword} #{regexp.inspect} (#{step.error.message}) #{source_comment(step)}" 
+          @forced_pending_step_count += 1
+        end
+      end
+
+      def step_traced(step, regexp, args)
+        @io.print skipped("    #{step.keyword} #{step.format(regexp){|param| skipped_param(param) << skipped}}")
+        if @options[:source]
+          @io.print padding_spaces(step)
+          @io.print comment("# #{step.file}:#{step.line}")
+        end
+        @io.puts
       end
 
       def output_failing_step(step)
-        backtrace = step.error.backtrace || []
-        clean_backtrace = backtrace.map {|b| b.split("\n") }.flatten.reject do |line|
-          BACKTRACE_FILTER_PATTERNS.detect{|p| line =~ p}
-        end.map { |line| line.strip }
         @io.puts failed("      #{step.error.message.split("\n").join(INDENT)} (#{step.error.class})")
-        @io.puts failed("      #{clean_backtrace.join(INDENT)}")
+        @io.puts failed("      #{step.error.cucumber_backtrace.join(INDENT)}")
       end
 
       def dump
         @io.puts
 
+        print_pending_messages if @pending_messages.any?
+
         @io.puts pending("#{@pending_scenarios.length} scenarios pending") if @pending_scenarios.any?
 
         @io.puts passed("#{@passed.length} steps passed")           if @passed.any?
         @io.puts failed("#{@failed.length} steps failed")           if @failed.any?
         @io.puts skipped("#{@skipped.length} steps skipped")        if @skipped.any?
-        @io.puts pending("#{@pending_steps.length} steps pending")  if @pending_steps.any?
+        if @pending_steps.any?
+          @io.print pending("#{@pending_steps.length} steps pending") 
+          @io.print pending(" (#{number_of_unimplemented_steps} with no step definition)") if number_of_unimplemented_steps > 0
+          @io.puts
+        end
 
         @io.print reset
 
         print_snippets if @options[:snippets]
       end
 
+      def print_pending_messages
+        @io.puts "Pending Notes:"
+        @pending_messages.each_value do |message|
+          @io.puts message
+        end
+        @io.puts
+      end
+
       def print_snippets
         snippets = @pending_steps
         snippets.delete_if {|snippet| snippet.row? || @step_mother.has_step_definition?(snippet.name)}
 
         unless snippets.empty?
-          @io.puts "\nYou can use these snippets to implement pending steps:\n\n"
+          @io.puts "\nYou can use these snippets to implement pending steps which have no step definition:\n\n"
 
           prev_keyword = nil
           snippets = snippets.map do |step|
@@ -184,6 +222,10 @@ module Cucumber
 
       private
 
+      def number_of_unimplemented_steps
+        @pending_steps.length - @forced_pending_step_count
+      end
+
       def escape_regexp_characters(string)
         Regexp.escape(string).gsub('\ ', ' ').gsub('/', '\/') unless string.nil?
       end
@@ -204,7 +246,7 @@ module Cucumber
         @current_column
       end
 
-      def print_row row_args, &colorize_proc
+      def print_row(row_args, &colorize_proc)
         colorize_proc = Proc.new{|row_element| row_element} unless colorize_proc
 
         row_args.each do |row_arg|
@@ -214,19 +256,19 @@ module Cucumber
         end
       end
 
-      def print_passed_args args
+      def print_passed_args(args)
         print_row(args) {|arg| passed(arg)}
       end
 
-      def print_skipped_args args
+      def print_skipped_args(args)
         print_row(args) {|arg| skipped(arg)}
       end
 
-      def print_failed_args args
+      def print_failed_args(args)
         print_row(args) {|arg| failed(arg)}
       end
 
-      def print_pending_args args
+      def print_pending_args(args)
         print_row(args) {|arg| pending(arg)}
       end
     end

data/lib/cucumber/formatters/progress_formatter.rb

@@ -36,6 +36,9 @@ module Cucumber
         @io.print skipped('_')
       end
 
+      def step_traced(step, regexp, args)
+      end
+
       def dump
         @io.puts pending
         @io.puts "\nPending Scenarios:\n\n" if @pending_scenarios.any?

data/lib/cucumber/formatters/unicode.rb

@@ -0,0 +1,27 @@
+# Require this file if you need Unicode support.
+require 'cucumber/platform'
+require 'cucumber/formatters/ansicolor'
+
+$KCODE='u'
+
+if $CUCUMBER_WINDOWS_MRI && `chcp` =~ /Active code page: (\d+)/
+  codepage = $1.to_i
+  codepages = (1251..1252)
+
+  if codepages.include?(codepage)
+    $CUCUMBER_CODEPAGE = "cp#{codepage}"
+  
+    require 'iconv'
+    module Kernel
+      alias cucumber_print print
+      def print(*a)
+        cucumber_print *Iconv.iconv($CUCUMBER_CODEPAGE, "UTF-8", *a)
+      end
+
+      alias cucumber_puts puts
+      def puts(*a)
+        cucumber_puts *Iconv.iconv($CUCUMBER_CODEPAGE, "UTF-8", *a)
+      end
+    end
+  end
+end

data/lib/cucumber/languages.yml

@@ -7,6 +7,8 @@
 "en":
   feature: Feature
   scenario: Scenario
+  scenario_outline: Scenario Outline
+  examples: Examples
   more_examples: More Examples
   given_scenario: GivenScenario
   given: Given
@@ -108,11 +110,11 @@
   but: Kuid
 # French
 "fr":
-  feature: Fonction
-  scenario: Scenario
+  feature: Fonctionnalité
+  scenario: Scénario
   more_examples: Plus d'exemples
-  given_scenario: SoitScenario
-  given: Soit
+  given_scenario: Soit le Scénario
+  given: Etant donné
   when: Lorsque
   then: Alors
   and: Et

data/lib/cucumber/platform.rb

@@ -7,3 +7,4 @@ $CUCUMBER_IRONRUBY    = Config::CONFIG['sitedir'] =~ /IronRuby/
 $CUCUMBER_WINDOWS     = Config::CONFIG['host_os'] =~ /mswin|mingw/
 $CUCUMBER_WINDOWS_MRI = $CUCUMBER_WINDOWS && !$CUCUMBER_JRUBY && !$CUCUMBER_IRONRUBY
 $CUCUMBER_RAILS       = defined?(Rails)
+$CUCUMBER_RUBY        = File.join(Config::CONFIG['bindir'], Config::CONFIG['ruby_install_name'])

data/lib/cucumber/rails/world.rb

@@ -11,7 +11,7 @@ require 'test/unit/testresult'
 
 # These allow exceptions to come through as opposed to being caught and having non-helpful responses returned.
 ActionController::Base.class_eval do
-  def perform_action
+  def perform_action_with_rescue
     perform_action_without_rescue
   end
 end
@@ -24,7 +24,7 @@ end
 # So that Test::Unit doesn't launch at the end - makes it think it has already been run.
 Test::Unit.run = true if Test::Unit.respond_to?(:run=)
 
-$main = self
+$cucumber_toplevel = self
 
 module Cucumber #:nodoc:
   module Rails
@@ -44,22 +44,22 @@ module Cucumber #:nodoc:
     def self.use_transactional_fixtures
       World.use_transactional_fixtures = true
       if defined?(ActiveRecord::Base)
-        $main.Before do
+        $cucumber_toplevel.Before do
           if ActiveRecord::Base.connection.respond_to?(:increment_open_transactions)
             ActiveRecord::Base.connection.increment_open_transactions
           else
-            ActiveRecord::Base.send :increment_open_transactions
+            ActiveRecord::Base.__send__(:increment_open_transactions)
           end
           ActiveRecord::Base.connection.begin_db_transaction
           ActionMailer::Base.deliveries = [] if defined?(ActionMailer::Base)
         end
         
-        $main.After do
+        $cucumber_toplevel.After do
           ActiveRecord::Base.connection.rollback_db_transaction
           if ActiveRecord::Base.connection.respond_to?(:decrement_open_transactions)
             ActiveRecord::Base.connection.decrement_open_transactions
           else
-            ActiveRecord::Base.send :decrement_open_transactions
+            ActiveRecord::Base.__send__(:decrement_open_transactions)
           end
         end
       end

data/lib/cucumber/step_mother.rb

@@ -4,6 +4,9 @@ module Cucumber
   class Pending < StandardError
   end
 
+  class ForcedPending < Pending
+  end
+
   class Duplicate < StandardError
   end
 

data/lib/cucumber/tree/feature.rb

@@ -19,11 +19,23 @@ module Cucumber
         scenario
       end
 
+      def add_scenario_outline(name, line, &proc)
+        scenario = ScenarioOutline.new(self, name, line, &proc)
+        @scenarios << scenario
+        scenario
+      end
+
       def add_row_scenario(template_scenario, values, line)
         scenario = RowScenario.new(self, template_scenario, values, line)
         @scenarios << scenario
         scenario
       end
+            
+      def add_row_scenario_outline(template_scenario, values, line)
+        scenario = RowScenarioOutline.new(self, template_scenario, values, line)
+        @scenarios << scenario
+        scenario
+      end
 
       def scenario_named(name)
         @scenarios.find {|s| s.name == name}
@@ -38,26 +50,40 @@ module Cucumber
         add_scenario(name, line, &proc)
       end
 
+      def ScenarioOutline(name, &proc)
+        line = caller[0] =~ /:(\d+)$/ ? $1 : nil
+        add_scenario_outline(name, line, &proc)
+      end
+
       def Table(matrix = [], &proc)
         table = Table.new(matrix)
         proc.call(table)
+  
         template_scenario = @scenarios.last
         template_scenario.table_header = matrix[0]
+
         matrix[1..-1].each do |row|
-          add_row_scenario(template_scenario, row, row.line)
+          if template_scenario.outline?
+            add_row_scenario_outline(template_scenario, row, row.line)
+          else
+            add_row_scenario(template_scenario, row, row.line)
+          end
         end
       end
 
       def accept(visitor)
         visitor.visit_header(@header)
         @scenarios.each do |scenario|
-          if scenario.row?
+          if scenario.outline? && !scenario.row?
+            visitor.visit_scenario_outline(scenario)
+          elsif scenario.row?
             visitor.visit_row_scenario(scenario)
           else
             visitor.visit_regular_scenario(scenario)
           end
         end
       end
+      
     end
   end
 end

data/lib/cucumber/tree/scenario.rb

@@ -9,7 +9,9 @@ module Cucumber
 
       def accept(visitor)
         steps.each do |step|
-          if step.row?
+          if step.outline? && !step.row?
+            visitor.visit_step_outline(step)
+          elsif step.row?
             visitor.visit_row_step(step)
           else
             visitor.visit_regular_step(step)
@@ -31,6 +33,10 @@ module Cucumber
         steps.empty?
       end
       
+      def outline?
+        false
+      end
+      
     end
 
     class Scenario < BaseScenario
@@ -129,6 +135,22 @@ module Cucumber
 
     end
 
+    class ScenarioOutline < Scenario
+      def outline?
+        true
+      end
+
+      def length
+        @length ||= Cucumber.language['scenario_outline'].jlength + 2 + (@name.nil? ? 0 : @name.jlength)
+      end
+      
+      def create_step(keyword, name, line)
+        step = StepOutline.new(self, keyword, name, line)
+        @steps_and_given_scenarios << step
+        step
+      end
+    end
+
     class RowScenario < BaseScenario
       attr_reader :line
 
@@ -171,5 +193,44 @@ module Cucumber
       end
       
     end
+    
+    class RowScenarioOutline < RowScenario
+      def outline?
+        true
+      end
+
+      def steps
+        @processed_placeholders = []
+        @steps ||= @template_scenario.steps.map do |template_step|
+          build_row_step_outline(template_step)
+        end
+      end
+
+      private
+
+      def build_row_step_outline(template_step)
+        step_name = template_step.name
+        placeholder_values = []
+
+        @template_scenario.table_header.each_with_index do |column_name, column_number|
+
+          if step_name =~ placeholder_regexp(column_name)
+            step_name = step_name.gsub(placeholder_regexp(column_name), @values[column_number])
+            
+            unless @processed_placeholders.include?(column_name)
+              placeholder_values << @values[column_number]
+              @processed_placeholders << column_name
+            end
+          end
+
+        end
+        RowStepOutline.new(self, template_step, step_name, placeholder_values, @line)
+      end
+      
+      def placeholder_regexp(string)
+        /#{Regexp.escape("<#{string}>")}/
+      end
+    end
+    
   end
 end

data/lib/cucumber/tree/step.rb

@@ -90,6 +90,14 @@ module Cucumber
       def padding_length
         @scenario.step_padding_length(self)
       end
+
+      def forced_to_pending?
+        @error.kind_of?(ForcedPending)
+      end
+      
+      def outline?
+        false
+      end
     end
     
     class Step < BaseStep
@@ -102,7 +110,7 @@ module Cucumber
 
       def initialize(scenario, keyword, name, line)
         @scenario, @keyword, @name, @line = scenario, keyword, name, line
-        @extra_args = []
+        @extra_args ||= []
         @arity = 0
       end
 
@@ -117,6 +125,12 @@ module Cucumber
       end
     end
 
+    class StepOutline < Step
+      def outline?
+        true
+      end
+    end
+
     class RowStep < BaseStep
       attr_reader :keyword
 
@@ -138,5 +152,22 @@ module Cucumber
       end
     end
 
+    class RowStepOutline < Step
+      attr_reader :visible_args
+      
+      def initialize(scenario, step, name, visible_args, line)
+        @visible_args = visible_args
+        @extra_args = step.extra_args
+        super(scenario, keyword, name, line)
+      end
+
+      def row?
+        true
+      end
+
+      def outline?
+        true
+      end
+    end
   end
 end

data/lib/cucumber/treetop_parser/feature.treetop.erb

@@ -13,23 +13,27 @@ grammar Feature
   end
   
   rule header
-    (!(scenario_keyword / comment_to_eol) .)+
+    (!(scenario_keyword / scenario_outline_keyword / comment_to_eol) .)+
   end
   
   rule scenario_sequence
-    head:scenario? tail:(space scenario_or_table)* {
+    head:scenario_outline_or_scenario? tail:(space scenario_or_scenario_outline_or_table)* {
       def compile(feature)
-        ([head] + tail).each do |scenario_or_table|
-          scenario_or_table.compile(feature) if scenario_or_table.respond_to?(:compile)
+        ([head] + tail).each do |scenario_or_scenario_outline_or_table|
+          scenario_or_scenario_outline_or_table.compile(feature) if scenario_or_scenario_outline_or_table.respond_to?(:compile)
         end
       end
       
       def tail
-        super.elements.map { |elt| elt.scenario_or_table }
+        super.elements.map { |elt| elt.scenario_or_scenario_outline_or_table }
       end
     }
   end
 
+  rule scenario_outline_or_scenario
+    scenario_outline / scenario
+  end
+
   rule scenario
     scenario_keyword space? name:line_to_eol steps:(space step_sequence)? {
       def compile(feature)
@@ -42,9 +46,29 @@ grammar Feature
       end
     }
   end
+
+  rule scenario_outline
+    scenario_outline_keyword space? name:line_to_eol outline_body:(steps_and_optional_examples)? {
+      def compile(feature)
+        line = input.line_of(interval.first)
+        scenario = feature.add_scenario_outline(name.text_value.strip, line)
+        Feature.last_scenario = scenario
+        outline_body.compile(feature, scenario) if outline_body.respond_to?(:compile)
+      end
+    }
+  end
   
-  rule scenario_or_table
-    scenario / more_examples
+  rule scenario_or_scenario_outline_or_table
+    scenario_outline / (scenario / more_examples)
+  end
+  
+  rule steps_and_optional_examples
+    steps:(space step_sequence) table:(space examples)? {
+      def compile(feature, scenario)
+        steps.step_sequence.compile(scenario) if steps.respond_to?(:step_sequence)
+        table.examples.compile(feature, scenario) if table.respond_to?(:examples) && table.examples.respond_to?(:compile)
+      end
+    }
   end
   
   rule more_examples
@@ -55,6 +79,14 @@ grammar Feature
     }
   end
   
+  rule examples
+    examples_keyword table {
+      def compile(feature, scenario)
+        table.compile_examples(feature, scenario)
+      end
+    }
+  end
+  
   rule table
     space head:table_line body:(blank* eol space? table_line)* {
       def compile(feature)
@@ -64,6 +96,13 @@ grammar Feature
         end
       end
       
+      def compile_examples(feature, scenario)
+        scenario.table_header = head.cell_values
+        body.each do |table_line|
+          feature.add_row_scenario_outline(scenario, table_line.cell_values, table_line.line)
+        end
+      end
+      
       def matrix
         ([head] + body).map do |table_line|
           table_line.cell_values # We're losing the line - we'll get it back when we make our own class
@@ -192,10 +231,18 @@ grammar Feature
     "<%= words['scenario'] %>" ":"?
   end
   
+  rule scenario_outline_keyword
+    "<%= words['scenario_outline'] %>" ":"?
+  end
+    
   rule more_examples_keyword
     "<%= words['more_examples'] %>" ":"?
   end
   
+  rule examples_keyword
+    "<%= words['examples'] %>" ":"?
+  end
+    
   rule given_scenario_keyword
     "<%= words['given_scenario'] %>" ":"?
   end