diff options
| author | Ryuta Kamizono <kamipo@gmail.com> | 2018-12-03 20:41:13 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-03 20:41:13 +0900 |
| commit | 41e468a0518a45d017bfe74b4be12afd1d07e04c (patch) | |
| tree | 55d802af92547d75207334a8aa16276954fda6b0 /activerecord | |
| parent | df76eaa4f1619dfbc024235f444c602eb6d6775a (diff) | |
| parent | 89b4612ffc97e6648f5cf807906ae210e05acdda (diff) | |
| download | rails-41e468a0518a45d017bfe74b4be12afd1d07e04c.tar.gz rails-41e468a0518a45d017bfe74b4be12afd1d07e04c.tar.bz2 rails-41e468a0518a45d017bfe74b4be12afd1d07e04c.zip | |
Merge pull request #34601 from evexoio/34600-test_should_return_nil_as_average
Fix NumericData.average test on 2.6.0-dev
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/test/cases/calculations_test.rb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/activerecord/test/cases/calculations_test.rb b/activerecord/test/cases/calculations_test.rb index 97bce90c8b..4cb0dc66ed 100644 --- a/activerecord/test/cases/calculations_test.rb +++ b/activerecord/test/cases/calculations_test.rb @@ -57,8 +57,12 @@ class CalculationsTest < ActiveRecord::TestCase 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_field |