mirror of
https://github.com/github/rails.git
synced 2026-04-26 03:00:59 -04:00
Fix #3737 AS::expand_cache_key generates wrong key in certain situations (part 2)
`nil` and `false` both expand to `""` (empty string), while `true` expands to `"true"`; `false` should expand to `"false"`
This commit is contained in:
@@ -84,7 +84,7 @@ module ActiveSupport
|
||||
case
|
||||
when key.respond_to?(:cache_key) then key.cache_key
|
||||
when key.is_a?(Array) then key.map { |element| expand_cache_key(element) }.to_param
|
||||
when key then key.to_param
|
||||
else key.to_param
|
||||
end.to_s
|
||||
|
||||
expanded_cache_key
|
||||
|
||||
@@ -42,7 +42,7 @@ class CacheKeyTest < ActiveSupport::TestCase
|
||||
end
|
||||
end
|
||||
|
||||
def test_respond_to_cache_key
|
||||
def test_expand_cache_key_respond_to_cache_key
|
||||
key = 'foo'
|
||||
def key.cache_key
|
||||
:foo_key
|
||||
@@ -50,7 +50,7 @@ class CacheKeyTest < ActiveSupport::TestCase
|
||||
assert_equal 'foo_key', ActiveSupport::Cache.expand_cache_key(key)
|
||||
end
|
||||
|
||||
def test_array_with_something_that_responds_to_cache_key
|
||||
def test_expand_cache_key_array_with_something_that_responds_to_cache_key
|
||||
key = 'foo'
|
||||
def key.cache_key
|
||||
:foo_key
|
||||
@@ -58,6 +58,17 @@ class CacheKeyTest < ActiveSupport::TestCase
|
||||
assert_equal 'foo_key', ActiveSupport::Cache.expand_cache_key([key])
|
||||
end
|
||||
|
||||
def test_expand_cache_key_of_nil
|
||||
assert_equal '', ActiveSupport::Cache.expand_cache_key(nil)
|
||||
end
|
||||
|
||||
def test_expand_cache_key_of_false
|
||||
assert_equal 'false', ActiveSupport::Cache.expand_cache_key(false)
|
||||
end
|
||||
|
||||
def test_expand_cache_key_of_true
|
||||
assert_equal 'true', ActiveSupport::Cache.expand_cache_key(true)
|
||||
end
|
||||
end
|
||||
|
||||
class CacheStoreSettingTest < ActiveSupport::TestCase
|
||||
|
||||
Reference in New Issue
Block a user