diff options
Diffstat (limited to 'activesupport')
-rw-r--r-- | activesupport/test/caching_test.rb | 14 | ||||
-rw-r--r-- | activesupport/test/callbacks_test.rb | 2 |
2 files changed, 15 insertions, 1 deletions
diff --git a/activesupport/test/caching_test.rb b/activesupport/test/caching_test.rb index febf0eeeff..9f76f4c90b 100644 --- a/activesupport/test/caching_test.rb +++ b/activesupport/test/caching_test.rb @@ -3,6 +3,20 @@ require 'abstract_unit' require 'active_support/cache' class CacheKeyTest < ActiveSupport::TestCase + def test_entry_legacy_optional_ivars + legacy = Class.new(ActiveSupport::Cache::Entry) do + def initialize(value, options = {}) + @value = value + @expires_in = nil + @created_at = nil + super + end + end + + entry = legacy.new 'foo' + assert_equal 'foo', entry.value + end + def test_expand_cache_key assert_equal '1/2/true', ActiveSupport::Cache.expand_cache_key([1, '2', true]) assert_equal 'name/1/2/true', ActiveSupport::Cache.expand_cache_key([1, '2', true], :name) diff --git a/activesupport/test/callbacks_test.rb b/activesupport/test/callbacks_test.rb index b7c3b130c3..8810302f40 100644 --- a/activesupport/test/callbacks_test.rb +++ b/activesupport/test/callbacks_test.rb @@ -120,7 +120,7 @@ module CallbacksTest end class Child < ParentController - skip_callback :dispatch, :before, :log, :if => proc {|c| c.action_name == :update} + skip_callback :dispatch, :before, :log, :if => proc {|c| c.action_name == :update} skip_callback :dispatch, :after, :log2 end |