Fix NumericData.average test on 2.6.0-dev #34601
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Can you investigate why |
|
@kamipo Sure, that's what I'm doing right now. |
|
@kamipo This should be the commit that caused this issue. ruby/ruby@a0e438c#diff-6b866d482baf2bdfd8433893fb1f6d36R144 What's the right action to take right now? |
kamipo
reviewed
Dec 3, 2018
| @@ -58,7 +58,7 @@ def test_should_return_integer_average_if_db_returns_such | |||
| end | |||
|
|
|||
| def test_should_return_nil_as_average | |||
| assert_nil NumericData.average(:bank_balance) | |||
There was a problem hiding this comment.
This assertion actually would be failed without Ruby 2.6.0 if bigdecimal 1.4.0.pre.20181130a is used.
rails/activerecord/lib/active_record/relation/calculations.rb
Lines 400 to 405 in e7717ec
How about checking nil.respond_to?(:to_d)?
--- a/activerecord/test/cases/calculations_test.rb
+++ b/activerecord/test/cases/calculations_test.rb
@@ -57,8 +57,12 @@ def test_should_return_integer_average_if_db_returns_such
assert_equal 3, value
end
- def test_should_return_nil_as_average
- assert_nil NumericData.average(:bank_balance)
+ def test_should_return_nil_to_d_as_average
+ if nil.respond_to?(:to_d)
+ assert_equal BigDecimal(0), NumericData.average(:bank_balance)
+ else
+ assert_nil NumericData.average(:bank_balance)
+ end
end
def test_should_get_maximum_of_fieldThere was a problem hiding this comment.
Makes sense, Thanks for helping out 🙌
abdallahalsamman
force-pushed
the
34600-test_should_return_nil_as_average
branch
from
664c45a
to
89b4612
Compare
utilum
added a commit
to utilum/rails
that referenced
this pull request
Dec 4, 2018
This patch modifies XmlMini::Parsing["decimal"] to handle a string that contains an invalid number. Since [ruby/ruby@a0e438c#diff-6b866d482baf2bdfd8433893fb1f6d36R144](ruby/ruby@a0e438c#diff-6b866d482baf2bdfd8433893fb1f6d36R144) this case raises an `ArgumentError`. `String.to_f` returns 0.0 if there is not a valid number at the start of the argument, so current behavior is conserved. See https://travis-ci.org/rails/rails/jobs/463180341#L6264 Related: rails#34600, rails#34601
rafaelfranca
pushed a commit
that referenced
this pull request
Dec 4, 2018
…s_average Fix NumericData.average test on 2.6.0-dev
|
I think this should still return |
|
I'm on it @rafaelfranca |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #34600
Summary
NumericData.average was returning nil on ruby versions <= ruby 2.6.0dev (2018-12-03 trunk 66154)
Now it returns 0.0 instead of nil