@@ -10,21 +10,21 @@ module Spec # # result.should be_close(3.0, 0.5) def be_close(expected, delta) - Matcher.new :be_close, expected, delta do |expected, delta| + Matcher.new :be_close, expected, delta do |_expected_, _delta_| match do |actual| - (actual - expected).abs < delta + (actual - _expected_).abs < _delta_ end failure_message_for_should do |actual| - "expected #{expected} +/- (< #{delta}), got #{actual}" + "expected #{_expected_} +/- (< #{_delta_}), got #{actual}" end failure_message_for_should_not do |actual| - "expected #{expected} +/- (< #{delta}), got #{actual}" + "expected #{_expected_} +/- (< #{_delta_}), got #{actual}" end description do - "be close to #{expected} (within +- #{delta})" + "be close to #{_expected_} (within +- #{_delta_})" end end end lib/spec/matchers/be_close.rb @@ -14,9 +14,9 @@ module Spec # 5.should_not be_instance_of(Numeric) # 5.should_not be_instance_of(Float) def be_an_instance_of(expected) - Matcher.new :be_an_instance_of, expected do |expected| + Matcher.new :be_an_instance_of, expected do |_expected_| match do |actual| - actual.instance_of?(expected) + actual.instance_of?(_expected_) end end end lib/spec/matchers/be_instance_of.rb @@ -14,9 +14,9 @@ module Spec # 5.should be_kind_of(Numeric) # 5.should_not be_kind_of(Float) def be_a_kind_of(expected) - Matcher.new :be_a_kind_of, expected do |expected| + Matcher.new :be_a_kind_of, expected do |_expected_| match do |actual| - actual.kind_of?(expected) + actual.kind_of?(_expected_) end end end lib/spec/matchers/be_kind_of.rb @@ -13,15 +13,15 @@ module Spec # 5.should eql(5) # 5.should_not eql(3) def eql(expected) - Matcher.new :eql, expected do |expected| + Matcher.new :eql, expected do |_expected_| match do |actual| - actual.eql?(expected) + actual.eql?(_expected_) end failure_message_for_should do |actual| <<-MESSAGE -expected #{expected.inspect} +expected #{_expected_.inspect} got #{actual.inspect} (compared using eql?) @@ -31,7 +31,7 @@ MESSAGE failure_message_for_should_not do |actual| <<-MESSAGE -expected #{actual.inspect} not to equal #{expected.inspect} +expected #{actual.inspect} not to equal #{_expected_.inspect} (compared using eql?) MESSAGE lib/spec/matchers/eql.rb @@ -14,15 +14,15 @@ module Spec # 5.should equal(5) #Fixnums are equal # "5".should_not equal("5") #Strings that look the same are not the same object def equal(expected) - Matcher.new :equal, expected do |expected| + Matcher.new :equal, expected do |_expected_| match do |actual| - actual.equal?(expected) + actual.equal?(_expected_) end failure_message_for_should do |actual| <<-MESSAGE -expected #{expected.inspect} +expected #{_expected_.inspect} got #{actual.inspect} (compared using equal?) @@ -32,7 +32,7 @@ MESSAGE failure_message_for_should_not do |actual| <<-MESSAGE -expected #{actual.inspect} not to equal #{expected.inspect} +expected #{actual.inspect} not to equal #{_expected_.inspect} (compared using equal?) MESSAGE lib/spec/matchers/equal.rb @@ -17,13 +17,13 @@ module Spec # "spread".should include("read") # "spread".should_not include("red") def include(*expected) - Matcher.new :include, *expected do |*expecteds| + Matcher.new :include, *expected do |*_expected_| match do |actual| - helper(actual, *expecteds) + helper(actual, *_expected_) end - def helper(actual, *expecteds) - expecteds.each do |expected| + def helper(actual, *_expected_) + _expected_.each do |expected| if actual.is_a?(Hash) if expected.is_a?(Hash) expected.each_pair do |k,v| lib/spec/matchers/include.rb @@ -10,9 +10,9 @@ module Spec # # email.should match(/^([^\s]+)((?:[-a-z0-9]+\.)+[a-z]{2,})$/i) def match(expected) - Matcher.new :match, expected do |expected| + Matcher.new :match, expected do |_expected_| match do |actual| - actual =~ expected + actual =~ _expected_ end end end lib/spec/matchers/match.rb 681c622ccacf5c2eda4a1b2f75ca8677b837946a David Chelimsky dchelimsky@gmail.com http://github.com/dchelimsky/rspec/commit/17c854902d7a200d9296eaa66e158f66bcd1a14c 17c854902d7a200d9296eaa66e158f66bcd1a14c 2009-04-15T18:32:31-07:00 2009-04-15T18:32:31-07:00 don't shadow local vars in blocks in matchers feb8319862a4694e34520b0a0d6384b98f105b81 David Chelimsky dchelimsky@gmail.com