Commit 2a606a4a4366ce305fcfc05f4ed7cd4d41931f76
- Date: Tue Mar 25 02:14:30 +0000 2008
- Committer: David Chelimsky (dchelimsky@gmail.com)
- Author: David Chelimsky (dchelimsky@gmail.com)
- Commit SHA1: 2a606a4a4366ce305fcfc05f4ed7cd4d41931f76
- Tree SHA1: fce2afb6655aca5243be3914740339b53c302e2f
rename default matcher symbol
Commit diff
| |   |
| 27 | 27 | # |
| 28 | 28 | # NOTE that this does NOT support receiver.should != expected. |
| 29 | 29 | # Instead, use receiver.should_not == expected |
| 30 | | def should(matcher = :default_parameter, &block) |
| 30 | def should(matcher=:use_operator_matcher, &block) |
| 31 | 31 | ExpectationMatcherHandler.handle_matcher(self, matcher, &block) |
| 32 | 32 | end |
| 33 | 33 | |
| … | … | |
| 50 | 50 | # => Passes unless (receiver =~ regexp) |
| 51 | 51 | # |
| 52 | 52 | # See Spec::Matchers for more information about matchers |
| 53 | | def should_not(matcher = :default_parameter, &block) |
| 53 | def should_not(matcher=:use_operator_matcher, &block) |
| 54 | 54 | NegativeExpectationMatcherHandler.handle_matcher(self, matcher, &block) |
| 55 | 55 | end |
| 56 | 56 | |
| toggle raw diff |
--- a/rspec/lib/spec/expectations/extensions/object.rb
+++ b/rspec/lib/spec/expectations/extensions/object.rb
@@ -27,7 +27,7 @@ module Spec
#
# NOTE that this does NOT support receiver.should != expected.
# Instead, use receiver.should_not == expected
- def should(matcher = :default_parameter, &block)
+ def should(matcher=:use_operator_matcher, &block)
ExpectationMatcherHandler.handle_matcher(self, matcher, &block)
end
@@ -50,7 +50,7 @@ module Spec
# => Passes unless (receiver =~ regexp)
#
# See Spec::Matchers for more information about matchers
- def should_not(matcher = :default_parameter, &block)
+ def should_not(matcher=:use_operator_matcher, &block)
NegativeExpectationMatcherHandler.handle_matcher(self, matcher, &block)
end
|
| |   |
| 12 | 12 | class << self |
| 13 | 13 | include MatcherHandlerHelper |
| 14 | 14 | def handle_matcher(actual, matcher, &block) |
| 15 | | if :default_parameter == matcher |
| 15 | if :use_operator_matcher == matcher |
| 16 | 16 | return Spec::Matchers::PositiveOperatorMatcher.new(actual) |
| 17 | 17 | end |
| 18 | 18 | |
| … | … | |
| 31 | 31 | class << self |
| 32 | 32 | include MatcherHandlerHelper |
| 33 | 33 | def handle_matcher(actual, matcher, &block) |
| 34 | | if :default_parameter == matcher |
| 34 | if :use_operator_matcher == matcher |
| 35 | 35 | return Spec::Matchers::NegativeOperatorMatcher.new(actual) |
| 36 | 36 | end |
| 37 | 37 | |
| toggle raw diff |
--- a/rspec/lib/spec/expectations/handler.rb
+++ b/rspec/lib/spec/expectations/handler.rb
@@ -12,7 +12,7 @@ module Spec
class << self
include MatcherHandlerHelper
def handle_matcher(actual, matcher, &block)
- if :default_parameter == matcher
+ if :use_operator_matcher == matcher
return Spec::Matchers::PositiveOperatorMatcher.new(actual)
end
@@ -31,7 +31,7 @@ module Spec
class << self
include MatcherHandlerHelper
def handle_matcher(actual, matcher, &block)
- if :default_parameter == matcher
+ if :use_operator_matcher == matcher
return Spec::Matchers::NegativeOperatorMatcher.new(actual)
end
|