aslakhellesoy-cucumber 0.2.3 → 0.2.3.1

data/History.txt

@@ -1,3 +1,12 @@
+== 0.2.4 (In Git)
+
+=== New features
+* The usage formatter also prints unused step definitions (Aslak Hellesøy)
+* Better exception if a World proc returns nil. (Aslak Hellesøy)
+* Allow Step Definitions to use |*varargs|, but only on Ruby 1.9. (Aslak Hellesøy)
+* Snippets for steps that use Step Tables or Pystrings include block param and object type hint comment (#247 Joseph Wilk)
+* Support description string for Backgrounds (#271 Joseph Wilk)
+
 == 0.2.3 2009-03-30
 
 This release sports 4 updated languages, slightly better help with snippets if you "quote" arguments
@@ -16,7 +25,7 @@ in your steps. Windows/JRuby users can enjoy colours and you get some more sugar
 
 === Bugfixes
 * Fixed step name after step keyword without space (#265 Aslak Hellesøy)
-* Backtrace is back in HTML reports
+* Backtrace is back in HTML reports (Aslak Hellesøy)
 
 == 0.2.2 2009-03-25
 

data/Manifest.txt

@@ -108,6 +108,11 @@ examples/i18n/se/Rakefile
 examples/i18n/se/features/step_definitons/kalkulator_steps.rb
 examples/i18n/se/features/summering.feature
 examples/i18n/se/lib/kalkulator.rb
+examples/i18n/sk/Rakefile
+examples/i18n/sk/features/addition.feature
+examples/i18n/sk/features/division.feature
+examples/i18n/sk/features/step_definitons/calculator_steps.rb
+examples/i18n/sk/lib/calculator.rb
 examples/i18n/zh-CN/Rakefile
 examples/i18n/zh-CN/features/addition.feature
 examples/i18n/zh-CN/features/step_definitons/calculator_steps.rb
@@ -135,6 +140,7 @@ examples/selenium_webrat/features/step_definitons/search_steps.rb
 examples/selenium_webrat/features/support/env.rb
 examples/self_test/README.textile
 examples/self_test/Rakefile
+examples/self_test/features/background/background_with_name.feature
 examples/self_test/features/background/failing_background.feature
 examples/self_test/features/background/failing_background_after_success.feature
 examples/self_test/features/background/multiline_args_background.feature
@@ -151,6 +157,7 @@ examples/self_test/features/step_definitions/sample_steps.rb
 examples/self_test/features/support/env.rb
 examples/self_test/features/support/tag_count_formatter.rb
 examples/self_test/features/tons_of_cukes.feature
+examples/self_test/features/undefined_multiline_args.feature
 examples/sinatra/Rakefile
 examples/sinatra/app.rb
 examples/sinatra/features/add.feature
@@ -191,6 +198,7 @@ features/cucumber_cli_diff_disabled.feature
 features/cucumber_cli_outlines.feature
 features/custom_formatter.feature
 features/report_called_undefined_steps.feature
+features/snippet.feature
 features/step_definitions/cucumber_steps.rb
 features/step_definitions/extra_steps.rb
 features/support/env.rb

data/examples/i18n/sk/Rakefile

@@ -0,0 +1,6 @@
+$:.unshift(File.dirname(__FILE__) + '/../../../lib')
+require 'cucumber/rake/task'
+
+Cucumber::Rake::Task.new do |t|
+  t.cucumber_opts = "--language sk"
+end

data/examples/i18n/sk/features/addition.feature

@@ -0,0 +1,16 @@
+Požiadavka: Sčítavanie
+  Aby som sa vyhol hlúpym chybám
+  Ako matematický idiot
+  Chcem vedieť ako sa sčítavajú dve čísla
+
+  Náčrt Scenáru: Sčítanie dvoch čísel
+    Pokiaľ Zadám číslo <vstup_1> do kalkulačky
+    A Zadám číslo <vstup_2> do kalkulačky
+    Keď Stlačím tlačidlo <tlačidlo>
+    Tak Výsledok by mal byť <výstup>
+
+  Príklady:
+    | vstup_1 | vstup_2 | tlačidlo | výstup |
+    | 20      | 30      | add      | 50     |
+    | 2       | 5       | add      | 7      |
+    | 0       | 40      | add      | 40     |

data/examples/i18n/sk/features/division.feature

@@ -0,0 +1,9 @@
+Požiadavka: Delenie
+  Aby som sa vyhol hlúpym chybám
+  Pokladníci musia vedieť vypočítať podiel
+
+  Scenár: Prirodzené čísla
+    Pokiaľ Zadám číslo 3 do kalkulačky
+    A Zadám číslo 2 do kalkulačky
+    Keď Stlačím tlačidlo divide
+    Tak Výsledok by mal byť 1.5

data/examples/i18n/sk/features/step_definitons/calculator_steps.rb

@@ -0,0 +1,24 @@
+# encoding: utf-8
+require 'spec/expectations'
+$:.unshift(File.dirname(__FILE__) + '/../../lib') # This line is not needed in your own project
+require 'cucumber/formatter/unicode'
+require 'calculator'
+
+Before do
+  @calc = Calculator.new
+end
+
+After do
+end
+
+Given /Zadám číslo (\d+) do kalkulačky/ do |n|
+  @calc.push n.to_i
+end
+
+When /Stlačím tlačidlo (\w+)/ do |op|
+  @result = @calc.send op
+end
+
+Then /Výsledok by mal byť (.*)/ do |result|
+  @result.should == result.to_f
+end

data/examples/i18n/sk/lib/calculator.rb

@@ -0,0 +1,14 @@
+class Calculator
+  def push(n)
+    @args ||= []
+    @args << n
+  end
+  
+  def add
+    @args.inject(0){|n,sum| sum+=n}
+  end
+
+  def divide
+    @args[0].to_f / @args[1].to_f
+  end
+end

data/examples/self_test/features/background/background_with_name.feature

@@ -0,0 +1,7 @@
+Feature: background with name
+  
+  Background: I'm a background and I'm ok
+    Given '10' cukes
+
+  Scenario: example
+    Then I should have '10' cukes

data/examples/self_test/features/step_definitions/sample_steps.rb

@@ -62,3 +62,9 @@ end
 Given /^failing expectation$/ do
   'this'.should == 'that'
 end
+
+Given /^unused$/ do
+end
+
+Given /^another unused$/ do
+end

data/examples/self_test/features/undefined_multiline_args.feature

@@ -0,0 +1,12 @@
+Feature: undefined multiline args
+
+  Scenario: pystring
+    Given a pystring
+    """
+      example
+    """
+
+  Scenario: table
+    Given a table 
+      | table |
+      |example|

data/features/background.feature

@@ -217,5 +217,22 @@ Feature: backgrounds
     
     """
 
+  Scenario: background with name
+    When I run cucumber -q features/background/background_with_name.feature --require features
+    Then it should pass with
+    """
+    Feature: background with name
+
+      Background: I'm a background and I'm ok
+        Given '10' cukes
+
+      Scenario: example
+        Then I should have '10' cukes
+
+    1 scenario
+    2 passed steps
+    
+    """
+
   @josephwilk
   Scenario: run a scenario showing explicit background steps --explicit-background

data/features/cucumber_cli.feature

@@ -229,15 +229,28 @@ Feature: Cucumber command line
             hello
             \"\"\"
 
-      12 scenarios
+      Feature: undefined multiline args
+      
+        Scenario: pystring
+          Given a pystring
+            \"\"\"
+              example
+            \"\"\"
+      
+        Scenario: table
+          Given a table
+            | table   |
+            | example |
+
+      14 scenarios
       12 skipped steps
-      7 undefined steps
+      9 undefined steps
 
       """
 
   Scenario: Multiple formatters and outputs
     When I run cucumber --format progress --out tmp/progress.txt --format pretty --out tmp/pretty.txt  --dry-run features/lots_of_undefined.feature
-    And examples/self_test/tmp/progress.txt should contain
+    And "examples/self_test/tmp/progress.txt" should contain
       """
       UUUUU
 
@@ -245,7 +258,7 @@ Feature: Cucumber command line
       5 undefined steps
 
       """
-    And examples/self_test/tmp/pretty.txt should match
+    And "examples/self_test/tmp/pretty.txt" should match
       """
       Feature: Lots of undefined
 
@@ -362,7 +375,7 @@ Feature: Cucumber command line
 
   Scenario: Reformat files with --autoformat
     When I run cucumber --autoformat tmp/formatted features
-    Then examples/self_test/tmp/formatted/features/sample.feature should contain
+    Then "examples/self_test/tmp/formatted/features/sample.feature" should contain
       """
       @one
       Feature: Sample

data/features/snippet.feature

@@ -0,0 +1,23 @@
+Feature: Snippets
+  In order to help speed up writing step definitions
+  As a feature editor
+  I want snippet suggestions for undefined step definitions
+
+  Scenario: Snippet for undefined step with a pystring
+    When I run cucumber features/undefined_multiline_args.feature:3 -n
+    Then the output should contain
+      """
+      Given /^a pystring$/ do |string|
+        # string is a Cucumber::Ast::PyString
+        pending
+      end
+      """
+  Scenario: Snippet for undefined step with a step table
+    When I run cucumber features/undefined_multiline_args.feature:9 -n
+    Then the output should contain
+      """
+      Given /^a table$/ do |table|
+        # table is a Cucumber::Ast::Table
+        pending
+      end
+      """

data/features/step_definitions/cucumber_steps.rb

@@ -21,10 +21,14 @@ Then /^it should (fail|pass) with$/ do |success, output|
   end
 end
 
-Then /^(.*) should contain$/ do |file, text|
+Then /^the output should contain$/ do |text|
+  @out.should include(text)
+end
+
+Then /^"(.*)" should contain$/ do |file, text|
   IO.read(file).should == text
 end
 
-Then /^(.*) should match$/ do |file, text|
+Then /^"(.*)" should match$/ do |file, text|
   IO.read(file).should =~ Regexp.new(text)
 end

data/features/usage.feature

@@ -19,6 +19,7 @@ Feature: Cucumber command line
       /^call step "(.*)"$/                                              # features/step_definitions/sample_steps.rb:23
        Given call step "a step definition that calls an undefined step" # features/call_undefined_step_from_step_def.feature:7
       /^'(.+)' cukes$/   # features/step_definitions/sample_steps.rb:27
+       Given '10' cukes  # features/background/background_with_name.feature:4
        And '10' cukes    # features/background/failing_background.feature:5
        Given '10' cukes  # features/background/passing_background.feature:4
        Given '10' cukes  # features/background/scenario_outline_passing_background.feature:4
@@ -72,6 +73,7 @@ Feature: Cucumber command line
        Given '2' cukes   # features/tons_of_cukes.feature:51
        Given '2' cukes   # features/tons_of_cukes.feature:52
       /^I should have '(.+)' cukes$/      # features/step_definitions/sample_steps.rb:31
+       Then I should have '10' cukes      # features/background/background_with_name.feature:7
        Then I should have '10' cukes      # features/background/failing_background.feature:8
        Then I should have '10' cukes      # features/background/failing_background.feature:11
        Then I should have '10' cukes      # features/background/passing_background.feature:7
@@ -103,6 +105,9 @@ Feature: Cucumber command line
        Given failing expectation # features/failing_expectation.feature:4
       /^failing$/    # features/step_definitions/sample_steps.rb:8
        Given failing # features/sample.feature:16
+      (::) UNUSED (::)
+      /^unused$/          # features/step_definitions/sample_steps.rb:66
+      /^another unused$/  # features/step_definitions/sample_steps.rb:69
 
       """
 

data/lib/cucumber/ast/background.rb

@@ -6,8 +6,8 @@ module Cucumber
       include FeatureElement
       attr_writer :feature
 
-      def initialize(comment, line, keyword, steps)
-        @comment, @line, @keyword, @steps = comment, line, keyword, StepCollection.new(steps)
+      def initialize(comment, line, keyword, name, steps)
+        @comment, @line, @keyword, @name, @steps = comment, line, keyword, name, StepCollection.new(steps)
         attach_steps(steps)
         @step_invocations = @steps.step_invocations(true)
       end
@@ -23,7 +23,7 @@ module Cucumber
 
       def accept(visitor)
         visitor.visit_comment(@comment)
-        visitor.visit_background_name(@keyword, "", file_colon_line(@line), source_indent(text_length))
+        visitor.visit_background_name(@keyword, @name, file_colon_line(@line), source_indent(text_length))
         visitor.step_mother.before_and_after(self)
         visitor.visit_steps(@step_invocations)
         @failed = @step_invocations.detect{|step_invocation| step_invocation.exception}

data/lib/cucumber/ast/py_string.rb

@@ -17,6 +17,11 @@ module Cucumber
     # Note how the indentation from the source is stripped away.
     #
     class PyString
+
+      def self.default_arg_name
+        "string"
+      end
+
       def initialize(start_line, end_line, string, quotes_indent)
         @start_line, @end_line = start_line, end_line
         @string, @quotes_indent = string.gsub(/\\"/, '"'), quotes_indent
@@ -52,7 +57,6 @@ module Cucumber
       def to_sexp #:nodoc:
         [:py_string, to_s]
       end
-    
     end
   end
 end

data/lib/cucumber/ast/step_invocation.rb

@@ -98,6 +98,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

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/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

@@ -74,9 +74,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)
@@ -145,10 +147,12 @@ 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
+        @builder.__send__(cell_type, value, :class => status, :id => "#{@row_id}_#{@col_index}")
         @col_index += 1
       end
 

data/lib/cucumber/formatter/pretty.rb

@@ -157,10 +157,6 @@ module Cucumber
         @io.flush
       end
 
-      def visit_table_cell(table_cell)
-        super
-      end
-
       def visit_table_cell_value(value, width, status)
         @io.print(' ' + format_string((value.to_s || '').ljust(width), status) + " #{@delim}")
         @io.flush

data/lib/cucumber/formatter/usage.rb

@@ -10,6 +10,7 @@ module Cucumber
         @io = io
         @options = options
         @step_definitions = Hash.new { |h,step_definition| h[step_definition] = [] }
+        @all_step_definitions = step_mother.step_definitions.dup
         @locations = []
       end
 
@@ -32,6 +33,7 @@ module Cucumber
           description = format_step(keyword, step_match, status, nil)
           length = (keyword + step_match.format_args).jlength
           @step_definitions[step_match.step_definition] << [step_match, description, length, location]
+          @all_step_definitions.delete(step_match.step_definition)
         end
       end
 
@@ -63,6 +65,20 @@ module Cucumber
             @io.puts format_string(" # #{file_colon_line}".indent(max_length - length), :comment)
           end
         end
+
+        print_unused_step_definitions
+      end
+
+      def print_unused_step_definitions
+        if @all_step_definitions.any?
+          max_length = @all_step_definitions.map{|step_definition| step_definition.text_length}.max
+
+          @io.puts format_string("(::) UNUSED (::)", :failed)
+          @all_step_definitions.each do |step_definition|
+            @io.print format_string(step_definition.regexp.inspect, :failed)
+            @io.puts format_string("  # #{step_definition.file_colon_line}".indent(max_length - step_definition.text_length), :comment)
+          end
+        end
       end
     end
   end

data/lib/cucumber/parser/feature.rb

@@ -118,12 +118,12 @@ module Cucumber
                       r8 = nil
                     else
                       self.index = i8
-                      r8 = SyntaxNode.new(input, index...index)
+                      r8 = instantiate_node(SyntaxNode,input, index...index)
                     end
                     s7 << r8
                     if r8
                       if index < input_length
-                        r13 = (SyntaxNode).new(input, index...(index + 1))
+                        r13 = instantiate_node(SyntaxNode,input, index...(index + 1))
                         @index += 1
                       else
                         terminal_parse_failure("any character")
@@ -132,7 +132,7 @@ module Cucumber
                       s7 << r13
                     end
                     if s7.last
-                      r7 = (SyntaxNode).new(input, i7...index, s7)
+                      r7 = instantiate_node(SyntaxNode,input, i7...index, s7)
                       r7.extend(Feature0)
                     else
                       self.index = i7
@@ -144,14 +144,14 @@ module Cucumber
                       break
                     end
                   end
-                  r6 = SyntaxNode.new(input, i6...index, s6)
+                  r6 = instantiate_node(SyntaxNode,input, i6...index, s6)
                   s0 << r6
                   if r6
                     r15 = _nt_background
                     if r15
                       r14 = r15
                     else
-                      r14 = SyntaxNode.new(input, index...index)
+                      r14 = instantiate_node(SyntaxNode,input, index...index)
                     end
                     s0 << r14
                     if r14
@@ -162,7 +162,7 @@ module Cucumber
                         if r18
                           r17 = r18
                         else
-                          r17 = SyntaxNode.new(input, index...index)
+                          r17 = instantiate_node(SyntaxNode,input, index...index)
                         end
                         s0 << r17
                       end
@@ -174,7 +174,7 @@ module Cucumber
           end
         end
         if s0.last
-          r0 = (SyntaxNode).new(input, i0...index, s0)
+          r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
           r0.extend(Feature1)
           r0.extend(Feature2)
         else
@@ -254,12 +254,12 @@ module Cucumber
                 self.index = i5
                 r5 = nil
               else
-                r5 = SyntaxNode.new(input, i5...index, s5)
+                r5 = instantiate_node(SyntaxNode,input, i5...index, s5)
               end
               s3 << r5
             end
             if s3.last
-              r3 = (SyntaxNode).new(input, i3...index, s3)
+              r3 = instantiate_node(SyntaxNode,input, i3...index, s3)
               r3.extend(Tags0)
             else
               self.index = i3
@@ -271,11 +271,11 @@ module Cucumber
               break
             end
           end
-          r2 = SyntaxNode.new(input, i2...index, s2)
+          r2 = instantiate_node(SyntaxNode,input, i2...index, s2)
           s0 << r2
         end
         if s0.last
-          r0 = (SyntaxNode).new(input, i0...index, s0)
+          r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
           r0.extend(Tags1)
           r0.extend(Tags2)
         else
@@ -304,7 +304,7 @@ module Cucumber
 
         i0, s0 = index, []
         if input.index('@', index) == index
-          r1 = (SyntaxNode).new(input, index...(index + 1))
+          r1 = instantiate_node(SyntaxNode,input, index...(index + 1))
           @index += 1
         else
           terminal_parse_failure('@')
@@ -315,7 +315,7 @@ module Cucumber
           s2, i2 = [], index
           loop do
             if input.index(Regexp.new('[^@\\r\\n\\t ]'), index) == index
-              r3 = (SyntaxNode).new(input, index...(index + 1))
+              r3 = instantiate_node(SyntaxNode,input, index...(index + 1))
               @index += 1
             else
               r3 = nil
@@ -330,12 +330,12 @@ module Cucumber
             self.index = i2
             r2 = nil
           else
-            r2 = SyntaxNode.new(input, i2...index, s2)
+            r2 = instantiate_node(SyntaxNode,input, i2...index, s2)
           end
           s0 << r2
         end
         if s0.last
-          r0 = (SyntaxNode).new(input, i0...index, s0)
+          r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
           r0.extend(Tag0)
         else
           self.index = i0
@@ -381,7 +381,7 @@ module Cucumber
             s1 << r3
           end
           if s1.last
-            r1 = (SyntaxNode).new(input, i1...index, s1)
+            r1 = instantiate_node(SyntaxNode,input, i1...index, s1)
             r1.extend(Comment0)
           else
             self.index = i1
@@ -393,7 +393,7 @@ module Cucumber
             break
           end
         end
-        r0 = SyntaxNode.new(input, i0...index, s0)
+        r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
         r0.extend(Comment1)
 
         node_cache[:comment][start_index] = r0
@@ -417,7 +417,7 @@ module Cucumber
 
         i0, s0 = index, []
         if input.index('#', index) == index
-          r1 = (SyntaxNode).new(input, index...(index + 1))
+          r1 = instantiate_node(SyntaxNode,input, index...(index + 1))
           @index += 1
         else
           terminal_parse_failure('#')
@@ -429,7 +429,7 @@ module Cucumber
           s0 << r2
         end
         if s0.last
-          r0 = (SyntaxNode).new(input, i0...index, s0)
+          r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
           r0.extend(CommentLine0)
         else
           self.index = i0
@@ -454,8 +454,12 @@ module Cucumber
           elements[2]
         end
 
+        def name
+          elements[4]
+        end
+
         def steps
-          elements[5]
+          elements[6]
         end
       end
 
@@ -464,7 +468,8 @@ module Cucumber
           Ast::Background.new(
             comment.build, 
             background_keyword.line,
-            background_keyword.text_value, 
+            background_keyword.text_value,
+            name.text_value, 
             steps.build
           )
          end
@@ -497,47 +502,56 @@ module Cucumber
                   break
                 end
               end
-              r4 = SyntaxNode.new(input, i4...index, s4)
+              r4 = instantiate_node(SyntaxNode,input, i4...index, s4)
               s0 << r4
               if r4
-                i6 = index
-                s7, i7 = [], index
-                loop do
-                  r8 = _nt_eol
-                  if r8
-                    s7 << r8
-                  else
-                    break
-                  end
-                end
-                if s7.empty?
-                  self.index = i7
-                  r7 = nil
-                else
-                  r7 = SyntaxNode.new(input, i7...index, s7)
-                end
+                r7 = _nt_line_to_eol
                 if r7
                   r6 = r7
                 else
-                  r9 = _nt_eof
-                  if r9
-                    r6 = r9
-                  else
-                    self.index = i6
-                    r6 = nil
-                  end
+                  r6 = instantiate_node(SyntaxNode,input, index...index)
                 end
                 s0 << r6
                 if r6
-                  r10 = _nt_steps
-                  s0 << r10
+                  i8 = index
+                  s9, i9 = [], index
+                  loop do
+                    r10 = _nt_eol
+                    if r10
+                      s9 << r10
+                    else
+                      break
+                    end
+                  end
+                  if s9.empty?
+                    self.index = i9
+                    r9 = nil
+                  else
+                    r9 = instantiate_node(SyntaxNode,input, i9...index, s9)
+                  end
+                  if r9
+                    r8 = r9
+                  else
+                    r11 = _nt_eof
+                    if r11
+                      r8 = r11
+                    else
+                      self.index = i8
+                      r8 = nil
+                    end
+                  end
+                  s0 << r8
+                  if r8
+                    r12 = _nt_steps
+                    s0 << r12
+                  end
                 end
               end
             end
           end
         end
         if s0.last
-          r0 = (SyntaxNode).new(input, i0...index, s0)
+          r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
           r0.extend(Background0)
           r0.extend(Background1)
         else
@@ -585,7 +599,7 @@ module Cucumber
             break
           end
         end
-        r0 = SyntaxNode.new(input, i0...index, s0)
+        r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
         r0.extend(FeatureElements0)
 
         node_cache[:feature_elements][start_index] = r0
@@ -671,7 +685,7 @@ module Cucumber
                     break
                   end
                 end
-                r5 = SyntaxNode.new(input, i5...index, s5)
+                r5 = instantiate_node(SyntaxNode,input, i5...index, s5)
                 s0 << r5
                 if r5
                   r7 = _nt_line_to_eol
@@ -694,7 +708,7 @@ module Cucumber
           end
         end
         if s0.last
-          r0 = (SyntaxNode).new(input, i0...index, s0)
+          r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
           r0.extend(Scenario0)
           r0.extend(Scenario1)
         else
@@ -790,7 +804,7 @@ module Cucumber
                     break
                   end
                 end
-                r5 = SyntaxNode.new(input, i5...index, s5)
+                r5 = instantiate_node(SyntaxNode,input, i5...index, s5)
                 s0 << r5
                 if r5
                   r7 = _nt_line_to_eol
@@ -817,7 +831,7 @@ module Cucumber
           end
         end
         if s0.last
-          r0 = (SyntaxNode).new(input, i0...index, s0)
+          r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
           r0.extend(ScenarioOutline0)
           r0.extend(ScenarioOutline1)
         else
@@ -853,7 +867,7 @@ module Cucumber
             break
           end
         end
-        r0 = SyntaxNode.new(input, i0...index, s0)
+        r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
         r0.extend(Steps0)
 
         node_cache[:steps][start_index] = r0
@@ -918,7 +932,7 @@ module Cucumber
               break
             end
           end
-          r2 = SyntaxNode.new(input, i2...index, s2)
+          r2 = instantiate_node(SyntaxNode,input, i2...index, s2)
           s0 << r2
           if r2
             r4 = _nt_step_keyword
@@ -944,7 +958,7 @@ module Cucumber
                     self.index = i8
                     r8 = nil
                   else
-                    r8 = SyntaxNode.new(input, i8...index, s8)
+                    r8 = instantiate_node(SyntaxNode,input, i8...index, s8)
                   end
                   if r8
                     r7 = r8
@@ -963,7 +977,7 @@ module Cucumber
                     if r12
                       r11 = r12
                     else
-                      r11 = SyntaxNode.new(input, index...index)
+                      r11 = instantiate_node(SyntaxNode,input, index...index)
                     end
                     s0 << r11
                     if r11
@@ -977,7 +991,7 @@ module Cucumber
           end
         end
         if s0.last
-          r0 = (SyntaxNode).new(input, i0...index, s0)
+          r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
           r0.extend(Step0)
           r0.extend(Step1)
         else
@@ -1013,7 +1027,7 @@ module Cucumber
             break
           end
         end
-        r0 = SyntaxNode.new(input, i0...index, s0)
+        r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
         r0.extend(ExamplesSections0)
 
         node_cache[:examples_sections][start_index] = r0
@@ -1067,7 +1081,7 @@ module Cucumber
             break
           end
         end
-        r1 = SyntaxNode.new(input, i1...index, s1)
+        r1 = instantiate_node(SyntaxNode,input, i1...index, s1)
         s0 << r1
         if r1
           r3 = _nt_examples_keyword
@@ -1082,14 +1096,14 @@ module Cucumber
                 break
               end
             end
-            r4 = SyntaxNode.new(input, i4...index, s4)
+            r4 = instantiate_node(SyntaxNode,input, i4...index, s4)
             s0 << r4
             if r4
               r7 = _nt_line_to_eol
               if r7
                 r6 = r7
               else
-                r6 = SyntaxNode.new(input, index...index)
+                r6 = instantiate_node(SyntaxNode,input, index...index)
               end
               s0 << r6
               if r6
@@ -1108,7 +1122,7 @@ module Cucumber
           end
         end
         if s0.last
-          r0 = (SyntaxNode).new(input, i0...index, s0)
+          r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
           r0.extend(Examples0)
           r0.extend(Examples1)
         else
@@ -1168,12 +1182,12 @@ module Cucumber
             r2 = nil
           else
             self.index = i2
-            r2 = SyntaxNode.new(input, index...index)
+            r2 = instantiate_node(SyntaxNode,input, index...index)
           end
           s1 << r2
           if r2
             if index < input_length
-              r4 = (SyntaxNode).new(input, index...(index + 1))
+              r4 = instantiate_node(SyntaxNode,input, index...(index + 1))
               @index += 1
             else
               terminal_parse_failure("any character")
@@ -1182,7 +1196,7 @@ module Cucumber
             s1 << r4
           end
           if s1.last
-            r1 = (SyntaxNode).new(input, i1...index, s1)
+            r1 = instantiate_node(SyntaxNode,input, i1...index, s1)
             r1.extend(LineToEol0)
           else
             self.index = i1
@@ -1194,7 +1208,7 @@ module Cucumber
             break
           end
         end
-        r0 = SyntaxNode.new(input, i0...index, s0)
+        r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
 
         node_cache[:line_to_eol][start_index] = r0
 
@@ -1245,12 +1259,12 @@ module Cucumber
               r4 = nil
             else
               self.index = i4
-              r4 = SyntaxNode.new(input, index...index)
+              r4 = instantiate_node(SyntaxNode,input, index...index)
             end
             s3 << r4
             if r4
               if index < input_length
-                r6 = (SyntaxNode).new(input, index...(index + 1))
+                r6 = instantiate_node(SyntaxNode,input, index...(index + 1))
                 @index += 1
               else
                 terminal_parse_failure("any character")
@@ -1259,7 +1273,7 @@ module Cucumber
               s3 << r6
             end
             if s3.last
-              r3 = (SyntaxNode).new(input, i3...index, s3)
+              r3 = instantiate_node(SyntaxNode,input, i3...index, s3)
               r3.extend(PyString0)
             else
               self.index = i3
@@ -1271,7 +1285,7 @@ module Cucumber
               break
             end
           end
-          r2 = SyntaxNode.new(input, i2...index, s2)
+          r2 = instantiate_node(SyntaxNode,input, i2...index, s2)
           s0 << r2
           if r2
             r7 = _nt_close_py_string
@@ -1279,7 +1293,7 @@ module Cucumber
           end
         end
         if s0.last
-          r0 = (SyntaxNode).new(input, i0...index, s0)
+          r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
           r0.extend(PyString1)
           r0.extend(PyString2)
         else
@@ -1325,7 +1339,7 @@ module Cucumber
         s0 << r1
         if r1
           if input.index('"""', index) == index
-            r2 = (SyntaxNode).new(input, index...(index + 3))
+            r2 = instantiate_node(SyntaxNode,input, index...(index + 3))
             @index += 3
           else
             terminal_parse_failure('"""')
@@ -1342,7 +1356,7 @@ module Cucumber
                 break
               end
             end
-            r3 = SyntaxNode.new(input, i3...index, s3)
+            r3 = instantiate_node(SyntaxNode,input, i3...index, s3)
             s0 << r3
             if r3
               r5 = _nt_eol
@@ -1351,7 +1365,7 @@ module Cucumber
           end
         end
         if s0.last
-          r0 = (SyntaxNode).new(input, i0...index, s0)
+          r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
           r0.extend(OpenPyString0)
           r0.extend(OpenPyString1)
         else
@@ -1405,11 +1419,11 @@ module Cucumber
               break
             end
           end
-          r2 = SyntaxNode.new(input, i2...index, s2)
+          r2 = instantiate_node(SyntaxNode,input, i2...index, s2)
           s0 << r2
           if r2
             if input.index('"""', index) == index
-              r4 = (SyntaxNode).new(input, index...(index + 3))
+              r4 = instantiate_node(SyntaxNode,input, index...(index + 3))
               @index += 3
             else
               terminal_parse_failure('"""')
@@ -1423,7 +1437,7 @@ module Cucumber
           end
         end
         if s0.last
-          r0 = (SyntaxNode).new(input, i0...index, s0)
+          r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
           r0.extend(ClosePyString0)
           r0.extend(ClosePyString1)
         else
@@ -1465,7 +1479,7 @@ module Cucumber
             break
           end
         end
-        r0 = SyntaxNode.new(input, i0...index, s0)
+        r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
 
         node_cache[:white][start_index] = r0
 

data/lib/cucumber/parser/feature.tt

@@ -59,12 +59,13 @@ module Cucumber
       end
 
       rule background
-         comment white background_keyword space* (eol+ / eof) steps {
+         comment white background_keyword space* name:line_to_eol? (eol+ / eof) steps {
            def build
              Ast::Background.new(
                comment.build, 
                background_keyword.line,
-               background_keyword.text_value, 
+               background_keyword.text_value,
+               name.text_value, 
                steps.build
              )
             end

data/lib/cucumber/step_definition.rb

@@ -59,7 +59,7 @@ module Cucumber
     PARAM_PATTERN = /"([^\"]*)"/
     ESCAPED_PARAM_PATTERN = '"([^\\"]*)"'
     
-    def self.snippet_text(step_keyword, step_name)
+    def self.snippet_text(step_keyword, step_name, multiline_arg_class = nil)
       escaped = Regexp.escape(step_name).gsub('\ ', ' ').gsub('/', '\/')
       escaped = escaped.gsub(PARAM_PATTERN, ESCAPED_PARAM_PATTERN)
 
@@ -68,9 +68,11 @@ module Cucumber
         n += 1
         "arg#{n}"
       end
+      block_args << multiline_arg_class.default_arg_name unless multiline_arg_class.nil?
       block_arg_string = block_args.empty? ? "" : " |#{block_args.join(", ")}|"
+      multiline_class_string = multiline_arg_class ? "# #{multiline_arg_class.default_arg_name} is a #{multiline_arg_class.to_s}\n  " : ""
 
-      "#{step_keyword} /^#{escaped}$/ do#{block_arg_string}\n  pending\nend"
+      "#{step_keyword} /^#{escaped}$/ do#{block_arg_string}\n  #{multiline_class_string}pending\nend"
     end
 
     class MissingProc < StandardError

data/lib/cucumber/step_mother.rb

@@ -45,6 +45,12 @@ module Cucumber
     end
   end
 
+  class NilWorld < StandardError
+    def initialize
+      super("World procs should never return nil")
+    end
+  end
+
   # This is the main interface for registering step definitions, which is done
   # from <tt>*_steps.rb</tt> files. This module is included right at the top-level
   # so #register_step_definition (and more interestingly - its aliases) are
@@ -139,8 +145,8 @@ module Cucumber
       @step_definitions ||= []
     end
 
-    def snippet_text(step_keyword, step_name)
-      @snippet_generator.snippet_text(step_keyword, step_name)
+    def snippet_text(step_keyword, step_name, multiline_arg_class)
+      @snippet_generator.snippet_text(step_keyword, step_name, multiline_arg_class)
     end
 
     def before_and_after(scenario, skip=false)
@@ -171,6 +177,15 @@ module Cucumber
       @current_world = Object.new
       (@world_procs ||= []).each do |proc|
         @current_world = proc.call(@current_world)
+        if @current_world.nil?
+          begin
+            raise NilWorld.new
+          rescue NilWorld => e
+            e.backtrace.clear
+            e.backtrace.push(proc.backtrace_line("World"))
+            raise e
+          end
+        end
       end
 
       @current_world.extend(World)

data/lib/cucumber/version.rb

@@ -3,7 +3,7 @@ module Cucumber #:nodoc:
     MAJOR = 0
     MINOR = 2
     TINY  = 3
-    PATCH = nil # Set to nil for official release
+    PATCH = 1 # Set to nil for official release
 
     STRING = [MAJOR, MINOR, TINY, PATCH].compact.join('.')
   end

data/specs/cucumber/ast/background_spec.rb

@@ -26,6 +26,7 @@ module Cucumber
           comment=Comment.new(''),
           line=2,
           keyword="", 
+          name="",
           steps=[
             Step.new(7, "Given", "y is 5")
           ])

data/specs/cucumber/ast/feature_factory.rb

@@ -30,7 +30,7 @@ module Cucumber
           Cucumber sandwich
         }, 10)
         
-        background = Ast::Background.new(Ast::Comment.new(""), 2, "Background:",
+        background = Ast::Background.new(Ast::Comment.new(""), 2, "Background:", "",
           [
             Step.new(3, "Given", "a passing step")
           ]

data/specs/cucumber/core_ext/proc_spec.rb

@@ -2,36 +2,53 @@ require File.dirname(__FILE__) + '/../../spec_helper'
 require 'cucumber/core_ext/instance_exec'
 
 describe Proc do
+  it "should remove extraneous path info for file" do
+    proc = lambda {|a,b|}
+    proc.file_colon_line.should =~ /^specs\/cucumber\/core_ext\/proc_spec\.rb:6/
+  end
+  
   it "should raise ArityMismatchError for too many args (expecting 0)" do
     lambda {
       Object.new.cucumber_instance_exec(true, 'foo', 1) do
       end
-    }.should raise_error(Cucumber::ArityMismatchError, "expected 0 block argument(s), got 1")
+    }.should raise_error(Cucumber::ArityMismatchError, "Your block takes 0 arguments, but the Regexp matched 1 argument.")
   end
 
   it "should raise ArityMismatchError for too many args (expecting 1)" do
     lambda {
       Object.new.cucumber_instance_exec(true, 'foo', 1,2) do |a|
       end
-    }.should raise_error(Cucumber::ArityMismatchError, "expected 1 block argument(s), got 2")
+    }.should raise_error(Cucumber::ArityMismatchError, "Your block takes 1 argument, but the Regexp matched 2 arguments.")
   end
 
   it "should raise ArityMismatchError for too few args (expecting 1)" do
     lambda {
       Object.new.cucumber_instance_exec(true, 'foo') do |a|
       end
-    }.should raise_error(Cucumber::ArityMismatchError, "expected 1 block argument(s), got 0")
+    }.should raise_error(Cucumber::ArityMismatchError, "Your block takes 1 argument, but the Regexp matched 0 arguments.")
   end
 
   it "should raise ArityMismatchError for too few args (expecting 2)" do
     lambda {
       Object.new.cucumber_instance_exec(true, 'foo', 1) do |a,b|
       end
-    }.should raise_error(Cucumber::ArityMismatchError, "expected 2 block argument(s), got 1")
+    }.should raise_error(Cucumber::ArityMismatchError, "Your block takes 2 arguments, but the Regexp matched 1 argument.")
   end
-  
-  it "should remove extraneous path info for file" do
-    proc = lambda {|a,b|}
-    proc.file_colon_line.should == "specs/cucumber/core_ext/proc_spec.rb:34"
+
+  if Cucumber::RUBY_1_9
+    it "should allow varargs" do
+      lambda {
+        Object.new.cucumber_instance_exec(true, 'foo', 1) do |*args|
+        end
+      }.should_not raise_error(Cucumber::ArityMismatchError)
+    end
+  else
+    # Ruby 1.8
+    it "should not allow varargs because Ruby 1.8 reports same arity as with no args, so we can't really tell the difference." do
+      lambda {
+        Object.new.cucumber_instance_exec(true, 'foo', 1) do |*args|
+        end
+      }.should raise_error(Cucumber::ArityMismatchError, "Your block takes 0 arguments, but the Regexp matched 1 argument.")
+    end
   end
 end

data/specs/cucumber/step_mother_spec.rb

@@ -85,5 +85,18 @@ specs/cucumber/step_mother_spec.rb:40:in `/Three cute (.*)/'
         @step_mother.Given(/Three (.*) mice/) {|disability|}
       end.should raise_error(Redundant)
     end
+
+    it "should raise an error if the world is nil" do
+      @step_mother.World do
+      end
+
+      begin
+        @step_mother.before_and_after(nil)
+        raise "Should fail"
+      rescue => e
+        e.message.should == "World procs should never return nil"
+        e.backtrace.should == ["specs/cucumber/step_mother_spec.rb:90:in `World'"]
+      end
+    end
   end
 end

data/specs/spec_helper.rb

@@ -1,21 +1,12 @@
 require 'rubygems'
 gem 'rspec'
-require 'spec/expectations'
+require 'spec'
+require 'spec/autorun'
 
 ENV['CUCUMBER_COLORS']=nil
-$KCODE='u'
 $:.unshift(File.dirname(__FILE__) + '/../lib')
 require 'cucumber'
 Cucumber.load_language('en')
 $:.unshift(File.dirname(__FILE__))
 
 ::Term::ANSIColor.coloring = true
-
-# Open up the tree classes a little for easier inspection.
-module Cucumber
-  module Tree
-    class Feature
-      attr_reader :header, :scenarios
-    end
-  end
-end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: aslakhellesoy-cucumber
 version: !ruby/object:Gem::Version 
-  version: 0.2.3
+  version: 0.2.3.1
 platform: ruby
 authors: 
 - "Aslak Helles\xC3\xB8y"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-30 00:00:00 -07:00
+date: 2009-04-02 00:00:00 -07:00
 default_executable: cucumber
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -195,6 +195,11 @@ files:
 - examples/i18n/se/features/step_definitons/kalkulator_steps.rb
 - examples/i18n/se/features/summering.feature
 - examples/i18n/se/lib/kalkulator.rb
+- examples/i18n/sk/Rakefile
+- examples/i18n/sk/features/addition.feature
+- examples/i18n/sk/features/division.feature
+- examples/i18n/sk/features/step_definitons/calculator_steps.rb
+- examples/i18n/sk/lib/calculator.rb
 - examples/i18n/zh-CN/Rakefile
 - examples/i18n/zh-CN/features/addition.feature
 - examples/i18n/zh-CN/features/step_definitons/calculator_steps.rb
@@ -222,6 +227,7 @@ files:
 - examples/selenium_webrat/features/support/env.rb
 - examples/self_test/README.textile
 - examples/self_test/Rakefile
+- examples/self_test/features/background/background_with_name.feature
 - examples/self_test/features/background/failing_background.feature
 - examples/self_test/features/background/failing_background_after_success.feature
 - examples/self_test/features/background/multiline_args_background.feature
@@ -238,6 +244,7 @@ files:
 - examples/self_test/features/support/env.rb
 - examples/self_test/features/support/tag_count_formatter.rb
 - examples/self_test/features/tons_of_cukes.feature
+- examples/self_test/features/undefined_multiline_args.feature
 - examples/sinatra/Rakefile
 - examples/sinatra/app.rb
 - examples/sinatra/features/add.feature
@@ -278,6 +285,7 @@ files:
 - features/cucumber_cli_outlines.feature
 - features/custom_formatter.feature
 - features/report_called_undefined_steps.feature
+- features/snippet.feature
 - features/step_definitions/cucumber_steps.rb
 - features/step_definitions/extra_steps.rb
 - features/support/env.rb