@@ -19,11 +19,11 @@ module Spec end def matches?(name) - !(matches = name.match(@expression)).nil? + !(name.strip =~ @expression).nil? end def parse_args(name) - name.match(@expression)[1..-1] + name.strip.match(@expression)[1..-1] end private lib/spec/story/step.rb @@ -2,12 +2,17 @@ require File.dirname(__FILE__) + '/story_helper' module Spec module Story - describe Step, "matching" do + describe Step, "#matching" do it "should match a text string" do step = Step.new("this text") {} step.matches?("this text").should be_true end + it "should match a text string that has additional line returns" do + step = Step.new("this text") {} + step.matches?("this text\n\n").should be_true + end + it "should not match a text string that does not start the same" do step = Step.new("this text") {} step.matches?("Xthis text").should be_false @@ -133,7 +138,7 @@ module Spec end it "should match a multiline regex" do - step = Step.new(/.* should have text.$text/) {} + step = Step.new(/.*should have text.$text/) {} step.matches?(<<TEXT).should be_true should have text this is the text @@ -158,6 +163,18 @@ TEXT end end + describe Step, "#parse_args" do + it "should return an empty array for a text string with no parameters" do + step = Step.new("this text") {} + step.parse_args("this text").should == [] + end + + it "should return an empty array for a text string with additional line returns and no parameters" do + step = Step.new("this text") {} + step.parse_args("this text\n\n").should == [] + end + end + describe Step do it "should be pending with no block" do step = Step.new("foo") spec/spec/story/step_spec.rb 134c0f94e94f89938a941af5d74d9b303036fe08 Ben Mabey ben@benmabey.com http://github.com/dchelimsky/rspec/commit/dc359c78147166bc9688ea49a5ebf237478e6f24 dc359c78147166bc9688ea49a5ebf237478e6f24 2008-07-19T08:03:20-07:00 2008-07-18T22:38:45-07:00 Fix for Story runner that handles the case when plaintext steps are read in with unintentional new lines and the end of them (due to comments) resulting in StepMother not being able to find the step's implementation. 35fc71a9621f27c63ca32fba6169c24d215166b0 David Chelimsky dchelimsky@gmail.com