File tree Expand file tree Collapse file tree 2 files changed +14
-3
lines changed Expand file tree Collapse file tree 2 files changed +14
-3
lines changed Original file line number Diff line number Diff line change @@ -84,7 +84,7 @@ def self.expand_cache_key(key, namespace = nil)
84
84
case
85
85
when key . respond_to? ( :cache_key ) then key . cache_key
86
86
when key . is_a? ( Array ) then key . map { |element | expand_cache_key ( element ) } . to_param
87
- when key then key . to_param
87
+ else key . to_param
88
88
end . to_s
89
89
90
90
expanded_cache_key
Original file line number Diff line number Diff line change @@ -42,22 +42,33 @@ def test_expand_cache_key_rails_cache_id_should_win_over_rails_app_version
42
42
end
43
43
end
44
44
45
- def test_respond_to_cache_key
45
+ def test_expand_cache_key_respond_to_cache_key
46
46
key = 'foo'
47
47
def key . cache_key
48
48
:foo_key
49
49
end
50
50
assert_equal 'foo_key' , ActiveSupport ::Cache . expand_cache_key ( key )
51
51
end
52
52
53
- def test_array_with_something_that_responds_to_cache_key
53
+ def test_expand_cache_key_array_with_something_that_responds_to_cache_key
54
54
key = 'foo'
55
55
def key . cache_key
56
56
:foo_key
57
57
end
58
58
assert_equal 'foo_key' , ActiveSupport ::Cache . expand_cache_key ( [ key ] )
59
59
end
60
60
61
+ def test_expand_cache_key_of_nil
62
+ assert_equal '' , ActiveSupport ::Cache . expand_cache_key ( nil )
63
+ end
64
+
65
+ def test_expand_cache_key_of_false
66
+ assert_equal 'false' , ActiveSupport ::Cache . expand_cache_key ( false )
67
+ end
68
+
69
+ def test_expand_cache_key_of_true
70
+ assert_equal 'true' , ActiveSupport ::Cache . expand_cache_key ( true )
71
+ end
61
72
end
62
73
63
74
class CacheStoreSettingTest < ActiveSupport ::TestCase
You can’t perform that action at this time.
0 commit comments