aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2016-07-11 14:31:24 -0300
committerGitHub <noreply@github.com>2016-07-11 14:31:24 -0300
commitf3cd032a2c88b990984e325082c231ea7e7dbca2 (patch)
treeba114bfbea7488c195cb9f1b400f6319b963b7ee
parent968b59af872efe4fd562bea377765967dadea958 (diff)
parentb10b7917e6449343e55958d1176d36d7ad04a46e (diff)
downloadrails-f3cd032a2c88b990984e325082c231ea7e7dbca2.tar.gz
rails-f3cd032a2c88b990984e325082c231ea7e7dbca2.tar.bz2
rails-f3cd032a2c88b990984e325082c231ea7e7dbca2.zip
Merge pull request #25782 from kamipo/fix_test_failure
Fix Active Record test failure
-rw-r--r--activerecord/test/cases/calculations_test.rb5
1 files changed, 2 insertions, 3 deletions
diff --git a/activerecord/test/cases/calculations_test.rb b/activerecord/test/cases/calculations_test.rb
index 06c2f10dc6..6acfec0621 100644
--- a/activerecord/test/cases/calculations_test.rb
+++ b/activerecord/test/cases/calculations_test.rb
@@ -26,7 +26,7 @@ class NumericData < ActiveRecord::Base
end
class CalculationsTest < ActiveRecord::TestCase
- fixtures :companies, :accounts, :topics, :speedometers, :minivans
+ fixtures :companies, :accounts, :topics, :speedometers, :minivans, :books
def test_should_sum_field
assert_equal 318, Account.sum(:credit_limit)
@@ -796,7 +796,6 @@ class CalculationsTest < ActiveRecord::TestCase
end
def test_group_by_attribute_with_custom_type
- Book.create!(status: :published)
- assert_equal({ "published" => 1 }, Book.group(:status).count)
+ assert_equal({ "proposed" => 2, "published" => 2 }, Book.group(:status).count)
end
end