vendor/plugins/rspec/lib/spec/story/step.rb in spree-0.5.1 vs vendor/plugins/rspec/lib/spec/story/step.rb in spree-0.6.0
- old
+ new
@@ -17,15 +17,15 @@
instance.extend(@mod)
instance.__send__(sanitize(@name), *args)
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
def sanitize(a_string_or_regexp)
@@ -58,10 +58,10 @@
%w<? ( ) [ ] { } ^ !>.each {|c| expression.gsub! c, "\\#{c}"}
elsif Regexp === string_or_regexp
expression = string_or_regexp.source
end
while expression =~ PARAM_PATTERN
- expression.gsub!($2, "(.*?)")
+ expression.sub!($2, "(.*?)")
end
@expression = Regexp.new("\\A#{expression}\\Z", Regexp::MULTILINE)
end
end