Merge branch 'master' into deprecate_visitor

History.txt

@@ -10,6 +10,9 @@ Using this release on a Rails project requires a rerun of script/generate cucumb
 * Added back a way to globally turn off transactions.
 * Renamed @allow_rescue tag to @allow-rescue.
 
+=== Bugfixes
+* Gracefully handle cases when optional regexp groups are not matched. Ex: /should( not)? be flashed '([^']*?)'$/ (Aslak Hellesøy)
+
 == 2009-09-22
 
 This release has some changes in the Rails support, so make sure you run "script/generate cucumber" after you upgrade.

Manifest.txt

@@ -385,13 +385,14 @@ lib/cucumber/rails/test_unit.rb
 lib/cucumber/rails/world.rb
 lib/cucumber/rake/task.rb
 lib/cucumber/rb_support/rb_dsl.rb
-lib/cucumber/rb_support/rb_group.rb
 lib/cucumber/rb_support/rb_hook.rb
 lib/cucumber/rb_support/rb_language.rb
 lib/cucumber/rb_support/rb_step_definition.rb
 lib/cucumber/rb_support/rb_transform.rb
 lib/cucumber/rb_support/rb_world.rb
+lib/cucumber/rb_support/regexp_argument_matcher.rb
 lib/cucumber/rspec_neuter.rb
+lib/cucumber/step_argument.rb
 lib/cucumber/step_match.rb
 lib/cucumber/step_mother.rb
 lib/cucumber/version.rb
@@ -427,7 +428,6 @@ spec/cucumber/cli/main_spec.rb
 spec/cucumber/cli/options_spec.rb
 spec/cucumber/cli/profile_loader_spec.rb
 spec/cucumber/core_ext/proc_spec.rb
-spec/cucumber/core_ext/string_spec.rb
 spec/cucumber/formatter/ansicolor_spec.rb
 spec/cucumber/formatter/color_io_spec.rb
 spec/cucumber/formatter/duration_spec.rb
@@ -436,7 +436,9 @@ spec/cucumber/formatter/progress_spec.rb
 spec/cucumber/parser/feature_parser_spec.rb
 spec/cucumber/parser/table_parser_spec.rb
 spec/cucumber/rb_support/rb_step_definition_spec.rb
+spec/cucumber/rb_support/regexp_argument_matcher_spec.rb
 spec/cucumber/sell_cucumbers.feature
+spec/cucumber/step_match_spec.rb
 spec/cucumber/step_mother_spec.rb
 spec/cucumber/treetop_parser/empty_feature.feature
 spec/cucumber/treetop_parser/empty_scenario.feature

examples/java/README.textile

@@ -11,8 +11,8 @@ h2. Running the scenarios
 
 Open a shell in this directory (java) and execute the following command:
 
-<pre><code>
-ant
-</code></pre>
+<pre>ant</pre>
 
 There is a deliberate error. See if you can fix it!
+
+Also see "Cuke4Duke":http://wiki.github.com/aslakhellesoy/cuke4duke for more powerful JVM and Java support for Cucumber.

lib/cucumber/rb_support/regexp_argument_matcher.rb

@@ -9,7 +9,8 @@ def self.arguments_from(regexp, step_name)
           n = 0
           match.captures.map do |val|
             n += 1
-            StepArgument.new(val, match.offset(n)[0])
+            start = match.offset(n)[0]
+            StepArgument.new(val, start)
           end
         else
           nil

lib/cucumber/step_match.rb

@@ -55,6 +55,7 @@ def replace_arguments(string, step_arguments, format, &proc)
       s = string.dup
       offset = 0
       step_arguments.each do |step_argument|
+        next if step_argument.pos.nil?
         replacement = if block_given?
           proc.call(step_argument.val)
         elsif Proc === format

lib/cucumber/version.rb

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

spec/cucumber/rb_support/regexp_argument_matcher_spec.rb

@@ -8,6 +8,11 @@ module RbSupport
         arguments = RegexpArgumentMatcher.arguments_from(/I (\w+) (\w+)/, "I like fish")
         arguments.map{|argument| [argument.val, argument.pos]}.should == [["like", 2], ["fish", 7]]
       end
+
+      it "should create 2 arguments when first group is optional" do
+        arguments = RegexpArgumentMatcher.arguments_from(/should( not)? be flashed '([^']*?)'$/, "I should be flashed 'Login failed.'")
+        arguments.map{|argument| [argument.val, argument.pos]}.should == [[nil, nil], ["Login failed.", 21]]
+      end
     end
   end
 end

spec/cucumber/step_match_spec.rb

@@ -31,5 +31,10 @@ def stepdef(regexp)
       m = stepdef(/I (\w+) (\d+) (\w+) this (\w+)/).step_match("I ate 1 egg this morning", nil)
       m.format_args(lambda{|m| "<span>#{m}</span>"}).should == "I <span>ate</span> <span>1</span> <span>egg</span> this <span>morning</span>"
     end
+
+    it "should format groups even when first group is optional and not matched" do
+      m = stepdef(/should( not)? be flashed '([^']*?)'$/).step_match("I should be flashed 'Login failed.'", nil)
+      m.format_args("<span>%s</span>").should == "I should be flashed '<span>Login failed.</span>'"
+    end
   end
 end