@@ -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. History.txt @@ -2,11 +2,11 @@ Gem::Specification.new do |s| s.name = %q{cucumber} - s.version = "0.3.102.1" + s.version = "0.3.102.2" s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.authors = ["Aslak Helles\303\270y"] - s.date = %q{2009-09-23} + s.date = %q{2009-09-24} s.default_executable = %q{cucumber} s.description = %q{Executable Feature scenarios} s.email = ["aslak.hellesoy@gmail.com"] cucumber.gemspec @@ -9,7 +9,8 @@ module Cucumber 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/rb_support/regexp_argument_matcher.rb @@ -55,6 +55,7 @@ module Cucumber 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/step_match.rb @@ -3,7 +3,7 @@ module Cucumber #:nodoc: MAJOR = 0 MINOR = 3 TINY = 102 - PATCH = 1 # Set to nil for official release + PATCH = 2 # Set to nil for official release STRING = [MAJOR, MINOR, TINY, PATCH].compact.join('.') end lib/cucumber/version.rb @@ -8,6 +8,11 @@ module Cucumber 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/rb_support/regexp_argument_matcher_spec.rb @@ -31,5 +31,10 @@ module Cucumber 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 \ No newline at end of file spec/cucumber/step_match_spec.rb 479670956d9b1ec878793c9c76d44ec43a670e78 Aslak Hellesøy aslak.hellesoy@gmail.com http://github.com/aslakhellesoy/cucumber/commit/a6370585c43efd43fa26332d05cca9e57e49bd48 a6370585c43efd43fa26332d05cca9e57e49bd48 2009-09-23T15:42:45-07:00 2009-09-23T15:42:45-07:00 Release 0.3.102.2 920696325b60fb990dcddf4cded928efe2920874 Aslak Hellesøy aslak.hellesoy@gmail.com