aslakhellesoy-cucumber 0.1.99.23 → 0.1.100.1

data/lib/cucumber/formatter/rerun.rb

@@ -5,13 +5,13 @@ module Cucumber
         super(step_mother)
         @io = io
         @file_names = []
-        @file_lines = Hash.new{|h,k| h[k] = []}
+        @file_colon_lines = Hash.new{|h,k| h[k] = []}
       end
 
       def visit_features(features)
         super
         files = @file_names.uniq.map do |file|
-          lines = @file_lines[file]
+          lines = @file_colon_lines[file]
           "#{file}:#{lines.join(':')}"
         end
         @io.puts files.join(' ')
@@ -21,13 +21,13 @@ module Cucumber
         @rerun = false
         super
         if @rerun
-          file, line = *feature_element.file_line.split(':')
-          @file_lines[file] << line
+          file, line = *feature_element.file_colon_line.split(':')
+          @file_colon_lines[file] << line
           @file_names << file
         end
       end
 
-      def visit_step_name(keyword, step_name, status, step_definition, source_indent)
+      def visit_step_name(keyword, step_match, status, source_indent)
         @rerun = true if [:failed].index(status)
       end
     end

data/lib/cucumber/jbehave.rb

@@ -23,65 +23,60 @@ if defined?(JRUBY_VERSION)
         def initialize(jbehave_steps, jbehave_candidate_step)
           @jbehave_steps = jbehave_steps
           @jbehave_candidate_step = jbehave_candidate_step
+          @regexp = Regexp.new(jbehave_candidate_step.pattern.pattern)
         end
-      
-        def match(step_name)
-          full_text = "Given #{step_name}" # JBehave doesn't distinguish GWT internally :-)
-          @jbehave_candidate_step.matches(full_text)
+
+        def step_match(name_to_match, name_to_report)
+          if(match = name_to_match.match(@regexp))
+            StepMatch.new(self, name_to_match, name_to_report, match.captures)
+          else
+            nil
+          end
         end
-      
+
         def file_colon_line
           @jbehave_steps.java_class.name
         end
 
         def format_args(step_name, format)
-          java_pattern = @jbehave_candidate_step.pattern.pattern
-          regexp = Regexp.new(java_pattern)
-          step_name.gzub(regexp, format)
+          step_name.gzub(@regexp, format)
         end
 
-        def matched_args(step_name)
-          java_pattern = @jbehave_candidate_step.pattern.pattern
-          regexp = Regexp.new(java_pattern)
-          step_name.match(regexp).captures
-        end
+        def invoke(world, args, step_name)
+          step = @jbehave_candidate_step.createFrom("Given #{step_name}") # JBehave doesn't care about the adverb.
+          step = @jbehave_candidate_step.__send__(:createStep, "Given #{step_name}", args) # JBehave doesn't care about the adverb.
 
-        def execute(step_name, world, *args)
-          step = @jbehave_candidate_step.createFrom("Given #{step_name}")
           result = step.perform
-          result.describeTo(JBehave::REPORTER)
+          result.describeTo(Reporter)
         end
       end
 
-      class JBehaveException < Exception
-      end
-
       # Implements the org.jbehave.scenario.reporters.ScenarioReporter methods
       class Reporter
-        def successful(step_text)
+        def self.successful(step_text)
           # noop
         end
 
-        def failed(step, java_exception)
+        def self.failed(step, java_exception)
           raise java_exception_to_ruby_exception(java_exception)
         end
 
         private
       
-        def java_exception_to_ruby_exception(java_exception)
+        def self.java_exception_to_ruby_exception(java_exception)
           # OK, this is a little funky - JRuby weirdness
           ruby_exception = org.jruby.NativeException.new(JRuby.runtime, JBehaveException, java_exception)
           ruby_exception.set_backtrace([]) # work around backtrace bug in jruby
-        
-          exception = JBehaveException.new(java_exception.getMessage)
+          exception = JBehaveException.new("#{java_exception.getClass.getName}: #{java_exception.getMessage}")
           bt = ruby_exception.backtrace
           Exception.cucumber_strip_backtrace!(bt, nil, nil)
           exception.set_backtrace(bt)
           exception
         end
       end
-    
-      REPORTER = Reporter.new
+
+      class JBehaveException < Exception
+      end
 
       def self.snippet_text(step_keyword, step_name)
         camel = step_name.gsub(/(\s.)/) {$1.upcase.strip}

data/lib/cucumber/parser/feature.rb

@@ -45,7 +45,7 @@ module Cucumber
           elements[5]
         end
 
-        def background
+        def bg
           elements[6]
         end
 
@@ -57,11 +57,14 @@ module Cucumber
 
       module Feature2
         def build
-          if background.respond_to?(:build)
-            Ast::Feature.new(comment.build, tags.build, header.text_value, feature_elements.build, background.build)
-          else
-            Ast::Feature.new(comment.build, tags.build, header.text_value, feature_elements.build)
-          end
+          background = bg.respond_to?(:build) ? bg.build : nil
+          Ast::Feature.new(
+            background, 
+            comment.build, 
+            tags.build, 
+            header.text_value, 
+            feature_elements.build(background)
+          )
         end
       end
 
@@ -311,7 +314,7 @@ module Cucumber
         if r1
           s2, i2 = [], index
           loop do
-            if input.index(Regexp.new('[^@\\n\\t ]'), index) == index
+            if input.index(Regexp.new('[^@\\r\\n\\t ]'), index) == index
               r3 = (SyntaxNode).new(input, index...(index + 1))
               @index += 1
             else
@@ -548,8 +551,8 @@ module Cucumber
       end
 
       module FeatureElements0
-        def build
-          elements.map{|s| s.build}
+        def build(background)
+          elements.map{|s| s.build(background)}
         end
       end
 
@@ -611,6 +614,10 @@ module Cucumber
           elements[5]
         end
 
+        def white
+          elements[6]
+        end
+
         def steps
           elements[7]
         end
@@ -621,8 +628,9 @@ module Cucumber
       end
 
       module Scenario1
-        def build
+        def build(background)
           Ast::Scenario.new(
+            background,
             comment.build, 
             tags.build,
             scenario_keyword.line,
@@ -669,26 +677,14 @@ module Cucumber
                   r7 = _nt_line_to_eol
                   s0 << r7
                   if r7
-                    i8 = index
-                    r9 = _nt_white
-                    if r9
-                      r8 = r9
-                    else
-                      r10 = _nt_eof
-                      if r10
-                        r8 = r10
-                      else
-                        self.index = i8
-                        r8 = nil
-                      end
-                    end
+                    r8 = _nt_white
                     s0 << r8
                     if r8
-                      r11 = _nt_steps
-                      s0 << r11
-                      if r11
-                        r12 = _nt_white
-                        s0 << r12
+                      r9 = _nt_steps
+                      s0 << r9
+                      if r9
+                        r10 = _nt_white
+                        s0 << r10
                       end
                     end
                   end
@@ -750,8 +746,9 @@ module Cucumber
       end
 
       module ScenarioOutline1
-        def build
+        def build(background)
           Ast::ScenarioOutline.new(
+            background,
             comment.build, 
             tags.build,
             scenario_outline_keyword.line, 

data/lib/cucumber/parser/feature.tt

@@ -17,15 +17,18 @@ module Cucumber
         tags 
         white 
         header:(!(scenario_outline / scenario / background) .)* 
-        background:(background)? 
+        bg:background? 
         feature_elements
         comment? {
           def build
-            if background.respond_to?(:build)
-              Ast::Feature.new(comment.build, tags.build, header.text_value, feature_elements.build, background.build)
-            else
-              Ast::Feature.new(comment.build, tags.build, header.text_value, feature_elements.build)
-            end
+            background = bg.respond_to?(:build) ? bg.build : nil
+            Ast::Feature.new(
+              background, 
+              comment.build, 
+              tags.build, 
+              header.text_value, 
+              feature_elements.build(background)
+            )
           end
         }
       end
@@ -40,7 +43,7 @@ module Cucumber
       end
 
       rule tag
-        '@' tag_name:([^@\n\t ])+
+        '@' tag_name:([^@\r\n\t ])+
       end
 
       rule comment
@@ -70,16 +73,17 @@ module Cucumber
 
       rule feature_elements
         (scenario / scenario_outline)* {
-          def build
-            elements.map{|s| s.build}
+          def build(background)
+            elements.map{|s| s.build(background)}
           end
         }
       end
 
       rule scenario
-        comment tags white scenario_keyword space* name:line_to_eol (white / eof) steps white {
-          def build
+        comment tags white scenario_keyword space* name:line_to_eol white steps white {
+          def build(background)
             Ast::Scenario.new(
+              background,
               comment.build, 
               tags.build,
               scenario_keyword.line,
@@ -93,8 +97,9 @@ module Cucumber
 
       rule scenario_outline
         comment tags white scenario_outline_keyword space* name:line_to_eol white steps examples_sections white {
-          def build
+          def build(background)
             Ast::ScenarioOutline.new(
+              background,
               comment.build, 
               tags.build,
               scenario_outline_keyword.line, 

data/lib/cucumber/parser/treetop_ext.rb

@@ -13,11 +13,11 @@ end
 module Cucumber
   module Parser
     module TreetopExt
-      FILE_LINE_PATTERN = /^([\w\W]*?):([\d:]+)$/
+      FILE_COLON_LINE_PATTERN = /^([\w\W]*?):([\d:]+)$/
 
       # Parses a file and returns a Cucumber::Ast
       def parse_file(file)
-        _, path, lines = *FILE_LINE_PATTERN.match(file)
+        _, path, lines = *FILE_COLON_LINE_PATTERN.match(file)
         if path
           lines = lines.split(':').map { |line| line.to_i }
         else
@@ -35,6 +35,17 @@ module Cucumber
         feature.lines = lines
         feature
       end
+
+      def parse_or_fail(s, file=nil, line_offset=0)
+        parse_tree = parse(s)
+        if parse_tree.nil?
+          raise Cucumber::Parser::SyntaxError.new(self, file, line_offset)
+        else
+          ast = parse_tree.build
+          ast.file = file
+          ast
+        end
+      end
     end
 
     class SyntaxError < StandardError
@@ -59,17 +70,6 @@ module Treetop
     
     class CompiledParser
       include Cucumber::Parser::TreetopExt
-      
-      def parse_or_fail(s, file=nil, line=0)
-        parse_tree = parse(s)
-        if parse_tree.nil?
-          raise Cucumber::Parser::SyntaxError.new(self, file, line)
-        else
-          ast = parse_tree.build
-          ast.file = file
-          ast
-        end
-      end
     end
   end
 end

data/lib/cucumber/platform.rb

@@ -14,5 +14,4 @@ module Cucumber
   RAILS         = defined?(Rails)
   RUBY_BINARY   = File.join(Config::CONFIG['bindir'], Config::CONFIG['ruby_install_name'])
   RUBY_1_9      = RUBY_VERSION =~ /^1\.9/
-  EXCEPTION_STATUS = Hash.new(:failed)
 end

data/lib/cucumber/rails/world.rb

@@ -11,8 +11,8 @@ 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_with_rescue
-    perform_action_without_rescue
+  def rescue_action(exception)
+    raise exception
   end
 end
 ActionController::Dispatcher.class_eval do

data/lib/cucumber/rake/task.rb

@@ -14,7 +14,6 @@ module Cucumber
     # To further configure the task, you can pass a block:
     #
     #   Cucumber::Rake::Task.new do |t|
-    #     t.libs << 'lib'
     #     t.cucumber_opts = "--format progress"
     #   end
     #

data/lib/cucumber/step_definition.rb

@@ -1,3 +1,4 @@
+require 'cucumber/step_match'
 require 'cucumber/core_ext/string'
 require 'cucumber/core_ext/proc'
 
@@ -27,12 +28,30 @@ module Cucumber
     def initialize(pattern, &proc)
       raise MissingProc if proc.nil?
       if String === pattern
-        p = pattern.gsub(/\$\w+/, '(.*)')
+        p = pattern.gsub(/\$\w+/, '(.*)') # Replace $var with (.*)
         pattern = Regexp.new("^#{p}$") 
       end
       @regexp, @proc = pattern, proc
     end
 
+    def step_match(name_to_match, name_to_report)
+      if(match = name_to_match.match(@regexp))
+        StepMatch.new(self, name_to_match, name_to_report, match.captures)
+      else
+        nil
+      end
+    end
+
+    def invoke(world, args, step_name)
+      args = args.map{|arg| Ast::PyString === arg ? arg.to_s : arg}
+      begin
+        world.cucumber_instance_exec(true, @regexp.inspect, *args, &@proc)
+      rescue Cucumber::ArityMismatchError => e
+        e.backtrace.unshift(self.backtrace_line)
+        raise e
+      end
+    end
+
     #:stopdoc:
 
     def match(step_name)
@@ -65,17 +84,7 @@ module Cucumber
       step_name.match(@regexp).captures
     end
 
-    def execute(step_name, world, *args)
-      args = args.map{|arg| Ast::PyString === arg ? arg.to_s : arg}
-      begin
-        world.cucumber_instance_exec(true, @regexp.inspect, *args, &@proc)
-      rescue Cucumber::ArityMismatchError => e
-        e.backtrace.unshift(self.to_backtrace_line)
-        raise e
-      end
-    end
-
-    def to_backtrace_line
+    def backtrace_line
       "#{file_colon_line}:in `#{@regexp.inspect}'"
     end
 

data/lib/cucumber/step_match.rb

@@ -0,0 +1,49 @@
+module Cucumber
+  class StepMatch
+    attr_reader :step_definition
+    attr_reader :args
+    
+    def initialize(step_definition, step_name, formatted_step_name, args)
+      @step_definition, @step_name, @formatted_step_name, @args = step_definition, step_name, formatted_step_name, args
+    end
+    
+    def invoke(world, multiline_arg)
+      all_args = @args.dup
+      all_args << multiline_arg if multiline_arg
+      @step_definition.invoke(world, all_args, @step_name)
+    end
+
+    def format_args(format)
+      @formatted_step_name || @step_definition.format_args(@step_name, format)
+    end
+    
+    def file_colon_line
+      @step_definition.file_colon_line
+    end
+
+    def backtrace_line
+      @step_definition.backtrace_line
+    end
+  end
+  
+  class NoStepMatch
+    attr_reader :step_definition
+
+    def initialize(step)
+      @step = step
+    end
+    
+    def format_args(format)
+      @step.name
+    end
+
+    def file_colon_line
+      raise "No file:line for #{@step}" unless @step.file_colon_line
+      @step.file_colon_line
+    end
+
+    def backtrace_line
+      @step.backtrace_line
+    end
+  end
+end