diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-11-29 21:35:30 -0200 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-12-10 17:05:00 -0300 |
commit | 660882bda42ffacc602758631c2a2e6ba09c1ee1 (patch) | |
tree | 92d871deb3b253e1b5030460e41ea59da46511af /activerecord/test/cases | |
parent | 09a8b146ef9e038d6036a21fb4f80e15f9ee969a (diff) | |
download | rails-660882bda42ffacc602758631c2a2e6ba09c1ee1.tar.gz rails-660882bda42ffacc602758631c2a2e6ba09c1ee1.tar.bz2 rails-660882bda42ffacc602758631c2a2e6ba09c1ee1.zip |
Make sure the tests pass in the case closer to described in #8195
Diffstat (limited to 'activerecord/test/cases')
-rw-r--r-- | activerecord/test/cases/base_test.rb | 12 | ||||
-rw-r--r-- | activerecord/test/cases/cache_key_test.rb | 18 |
2 files changed, 12 insertions, 18 deletions
diff --git a/activerecord/test/cases/base_test.rb b/activerecord/test/cases/base_test.rb index 8c89fb8b6e..4e0f8054c7 100644 --- a/activerecord/test/cases/base_test.rb +++ b/activerecord/test/cases/base_test.rb @@ -23,6 +23,8 @@ require 'models/edge' require 'models/joke' require 'models/bulb' require 'models/bird' +require 'models/car' +require 'models/bulb' require 'rexml/document' require 'active_support/core_ext/exception' require 'bcrypt' @@ -2154,6 +2156,16 @@ class BasicsTest < ActiveRecord::TestCase assert_equal "developers/#{dev.id}-#{dev.updated_at.utc.to_s(:nsec)}", dev.cache_key end + def test_cache_key_changes_when_child_touched + car = Car.create + Bulb.create(car: car) + + key = car.cache_key + car.bulb.touch + car.reload + assert_not_equal key, car.cache_key + end + def test_cache_key_format_for_existing_record_with_nil_updated_at dev = Developer.first dev.update_attribute(:updated_at, nil) diff --git a/activerecord/test/cases/cache_key_test.rb b/activerecord/test/cases/cache_key_test.rb deleted file mode 100644 index e52bbd3d30..0000000000 --- a/activerecord/test/cases/cache_key_test.rb +++ /dev/null @@ -1,18 +0,0 @@ -require "cases/helper" -require "models/invoice" -require "models/line_item" - -class CacheKeyTest < ActiveRecord::TestCase - def setup - @invoice = Invoice.create - LineItem.create(invoice: @invoice) - @invoice.reload - end - - def test_cache_key_changes_when_child_touched - key = @invoice.cache_key - @invoice.line_items[0].touch - @invoice.reload - assert_not_equal key, @invoice.cache_key - end -end |