diff options
author | Matthew Draper <matthew@trebex.net> | 2016-10-03 17:41:47 +1030 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-10-03 17:41:47 +1030 |
commit | e1fdfa820ffa6c5cd27b6d34a01d3f072fb15ff6 (patch) | |
tree | d94a7f656da51e38a657a8ebea8ef9a3656605ac /activerecord/test | |
parent | a92fa726003880f5d28367459ddaf134c44b1697 (diff) | |
parent | bd60e54021eee93a50d020b11cc42e92cdff4d4b (diff) | |
download | rails-e1fdfa820ffa6c5cd27b6d34a01d3f072fb15ff6.tar.gz rails-e1fdfa820ffa6c5cd27b6d34a01d3f072fb15ff6.tar.bz2 rails-e1fdfa820ffa6c5cd27b6d34a01d3f072fb15ff6.zip |
Merge pull request #26425 from prathamesh-sonpatki/fix-nil-issue
Fix issue with `cache_key` when the named timestamp column has value nil
Diffstat (limited to 'activerecord/test')
-rw-r--r-- | activerecord/test/cases/integration_test.rb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/activerecord/test/cases/integration_test.rb b/activerecord/test/cases/integration_test.rb index 766917b196..00457965d7 100644 --- a/activerecord/test/cases/integration_test.rb +++ b/activerecord/test/cases/integration_test.rb @@ -172,4 +172,10 @@ class IntegrationTest < ActiveRecord::TestCase owner = owners(:blackbeard) assert_equal "owners/#{owner.id}-#{owner.happy_at.utc.to_s(:usec)}", owner.cache_key(:updated_at, :happy_at) end + + def test_cache_key_when_named_timestamp_is_nil + owner = owners(:blackbeard) + owner.happy_at = nil + assert_equal "owners/#{owner.id}", owner.cache_key(:happy_at) + end end |