Skip to content

Support datetime #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Support datetime #35

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e07a45b
cleaner support for comparing datetimes in json
sherin Aug 11, 2019
7925d1e
cleanup
sherin Aug 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions lib/rspec/json_expectations/json_traverser.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,12 @@ def match_size_of_collection(errors, expected, actual, prefix, options)
def handle_value(errors, expected, actual, negate=false, prefix=[])
return nil unless handled_by_simple_value?(expected)

actual_as_json = actual.class.method_defined?(:as_json) ? actual.as_json : actual
expected_as_json = expected.class.method_defined?(:as_json) ? expected.as_json : expected
if conditionally_negate(actual == expected, negate)
true
elsif conditionally_negate(actual_as_json == expected_as_json, negate)
true
else
errors[prefix.join("/")] = {
actual: actual,
Expand All @@ -95,7 +99,8 @@ def handle_value(errors, expected, actual, negate=false, prefix=[])
end

def handled_by_simple_value?(expected)
HANDLED_BY_SIMPLE_VALUE_HANDLER.any? { |type| type === expected }
HANDLED_BY_SIMPLE_VALUE_HANDLER.any? { |type| type === expected } ||
expected.class.method_defined?(:as_json)
end

def handle_regex(errors, expected, actual, negate=false, prefix=[])
Expand Down Expand Up @@ -129,10 +134,11 @@ def handle_rspec_matcher(errors, expected, actual, negate=false, prefix=[])
end

def handle_unsupported(expected)
unless SUPPORTED_VALUES.any? { |type| expected.is_a?(type) }
raise NotImplementedError,
"#{expected} expectation is not supported"
end
return nil if SUPPORTED_VALUES.any? { |type| expected.is_a?(type) }
return nil if handled_by_simple_value?(expected)

raise NotImplementedError,
"#{expected} expectation is not supported"
end

def has_key?(actual, key)
Expand Down