Skip to content

Commit 8674529

Browse files
author
Stanislav (Stas) Katkov
committed
Use defined UNDEFINED value instead of defining our own
1 parent e1ab316 commit 8674529

File tree

1 file changed

+4
-8
lines changed

1 file changed

+4
-8
lines changed

lib/rspec/rails/matchers/have_reported_error.rb

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@
33
module RSpec
44
module Rails
55
module Matchers
6-
# @api private
7-
# Sentinel value to distinguish between no argument passed vs explicitly passed nil.
8-
# This follows the same pattern as RSpec's raise_error matcher.
9-
UndefinedValue = Object.new.freeze
106
ErrorCollector = ActiveSupport::Testing::ErrorReporterAssertions::ErrorCollector
117

128
# Matcher class for `have_reported_error`. Should not be instantiated directly.
@@ -16,19 +12,19 @@ module Matchers
1612
# @api private
1713
# @see RSpec::Rails::Matchers#have_reported_error
1814
class HaveReportedError < RSpec::Rails::Matchers::BaseMatcher
19-
# Uses UndefinedValue as default to distinguish between no argument
15+
# Uses UNDEFINED as default to distinguish between no argument
2016
# passed vs explicitly passed nil.
2117
#
2218
# @param expected_error_or_message [Class, String, Regexp, nil]
2319
# Error class, message string, or message pattern
2420
# @param expected_message [String, Regexp, nil]
2521
# Expected message when first param is a class
26-
def initialize(expected_error_or_message = UndefinedValue, expected_message = nil)
22+
def initialize(expected_error_or_message = UNDEFINED, expected_message = nil)
2723
@attributes = {}
2824
@warn_about_nil_error = expected_error_or_message.nil?
2925

3026
case expected_error_or_message
31-
when UndefinedValue
27+
when UNDEFINED
3228
@expected_error = nil
3329
@expected_message = expected_message
3430
when String, Regexp
@@ -248,7 +244,7 @@ def warn_about_nil_error!
248244
#
249245
# @param expected_error_or_message [Class, String, Regexp, nil] the expected error class, message string, or message pattern
250246
# @param expected_message [String, Regexp, nil] the expected error message to match
251-
def have_reported_error(expected_error_or_message = UndefinedValue, expected_message = nil)
247+
def have_reported_error(expected_error_or_message = HaveReportedError::UNDEFINED, expected_message = nil)
252248
HaveReportedError.new(expected_error_or_message, expected_message)
253249
end
254250

0 commit comments

Comments
 (0)