diff options
| author | Sean Griffin <sean@seantheprogrammer.com> | 2015-10-20 14:20:32 -0600 |
|---|---|---|
| committer | Sean Griffin <sean@seantheprogrammer.com> | 2015-10-20 14:20:32 -0600 |
| commit | 8b64aba17bbb7bc6af6f0aafb874904147f373bf (patch) | |
| tree | 046a807b6ad660e25424d8dbf608e834e86be6db /activerecord/test/cases/integration_test.rb | |
| parent | cbcdecd2c55fca9613722779231de2d8dd67ad02 (diff) | |
| parent | 86d2924a115c2604e4facdf285a7b764938fae0f (diff) | |
| download | rails-8b64aba17bbb7bc6af6f0aafb874904147f373bf.tar.gz rails-8b64aba17bbb7bc6af6f0aafb874904147f373bf.tar.bz2 rails-8b64aba17bbb7bc6af6f0aafb874904147f373bf.zip | |
Merge pull request #21883 from tarzan/cache-key-too-precise
Fix precision on cache_key
Diffstat (limited to 'activerecord/test/cases/integration_test.rb')
| -rw-r--r-- | activerecord/test/cases/integration_test.rb | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/activerecord/test/cases/integration_test.rb b/activerecord/test/cases/integration_test.rb index 9169207b0a..08a186ae07 100644 --- a/activerecord/test/cases/integration_test.rb +++ b/activerecord/test/cases/integration_test.rb @@ -81,7 +81,7 @@ class IntegrationTest < ActiveRecord::TestCase def test_cache_key_format_for_existing_record_with_updated_at dev = Developer.first - assert_equal "developers/#{dev.id}-#{dev.updated_at.utc.to_s(:nsec)}", dev.cache_key + assert_equal "developers/#{dev.id}-#{dev.updated_at.utc.to_s(:usec)}", dev.cache_key end def test_cache_key_format_for_existing_record_with_updated_at_and_custom_cache_timestamp_format @@ -111,19 +111,19 @@ class IntegrationTest < ActiveRecord::TestCase def test_cache_key_for_updated_on dev = Developer.first dev.updated_at = nil - assert_equal "developers/#{dev.id}-#{dev.updated_on.utc.to_s(:nsec)}", dev.cache_key + assert_equal "developers/#{dev.id}-#{dev.updated_on.utc.to_s(:usec)}", dev.cache_key end def test_cache_key_for_newer_updated_at dev = Developer.first dev.updated_at += 3600 - assert_equal "developers/#{dev.id}-#{dev.updated_at.utc.to_s(:nsec)}", dev.cache_key + assert_equal "developers/#{dev.id}-#{dev.updated_at.utc.to_s(:usec)}", dev.cache_key end def test_cache_key_for_newer_updated_on dev = Developer.first dev.updated_on += 3600 - assert_equal "developers/#{dev.id}-#{dev.updated_on.utc.to_s(:nsec)}", dev.cache_key + assert_equal "developers/#{dev.id}-#{dev.updated_on.utc.to_s(:usec)}", dev.cache_key end def test_cache_key_format_is_precise_enough @@ -134,8 +134,16 @@ class IntegrationTest < ActiveRecord::TestCase assert_not_equal key, dev.cache_key end + def test_cache_key_format_is_not_too_precise + skip("Subsecond precision is not supported") unless subsecond_precision_supported? + dev = Developer.first + dev.touch + key = dev.cache_key + assert_equal key, dev.reload.cache_key + end + def test_named_timestamps_for_cache_key owner = owners(:blackbeard) - assert_equal "owners/#{owner.id}-#{owner.happy_at.utc.to_s(:nsec)}", owner.cache_key(:updated_at, :happy_at) + assert_equal "owners/#{owner.id}-#{owner.happy_at.utc.to_s(:usec)}", owner.cache_key(:updated_at, :happy_at) end end |