summaryrefslogtreecommitdiff
path: root/spec/mspec
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-05-16 13:57:18 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-05-16 13:57:18 +0000
commitff88c2a9d38215dcade39f423bb6b49928b4fb70 (patch)
treed9b1c014b13c7c34c852b7ee4f5bd9c65bff4358 /spec/mspec
parent9bb63a50f5472621869ed39b18dae3588cb27efb (diff)
Use raise_error block
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@58754 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'spec/mspec')
-rw-r--r--spec/mspec/lib/mspec/matchers/raise_error.rb9
1 files changed, 3 insertions, 6 deletions
diff --git a/spec/mspec/lib/mspec/matchers/raise_error.rb b/spec/mspec/lib/mspec/matchers/raise_error.rb
index b8ff560499..a5d6e01ec9 100644
--- a/spec/mspec/lib/mspec/matchers/raise_error.rb
+++ b/spec/mspec/lib/mspec/matchers/raise_error.rb
@@ -2,7 +2,7 @@ require 'mspec/utils/deprecate'
class RaiseErrorMatcher
def initialize(exception, message, &block)
- @exception = Array(exception)
+ @exception = exception
@message = message
@block = block
end
@@ -19,7 +19,7 @@ class RaiseErrorMatcher
end
def matching_exception?(exc)
- return false unless @exception.any? {|exception_class| exception_class === exc}
+ return false unless @exception === exc
if @message then
case @message
when String
@@ -36,9 +36,6 @@ class RaiseErrorMatcher
end
def exception_class_and_message(exception_class, message)
- if Array === exception_class and exception_class.size == 1
- exception_class = exception_class[0]
- end
if message
"#{exception_class} (#{message})"
else
@@ -68,7 +65,7 @@ class RaiseErrorMatcher
def negative_failure_message
message = ["Expected to not get #{format_expected_exception}", ""]
- unless @exception.include?(@actual.class)
+ unless @actual.class == @exception
message[1] = "but got #{format_exception(@actual)}"
end
message