diff options
author | Aaron Patterson <aaron.patterson@gmail.com> | 2018-09-26 12:35:12 -0700 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2018-09-26 12:35:12 -0700 |
commit | b42d246c5d020a46d5964d236eb7f0d857ef01e8 (patch) | |
tree | b4fb19def15c5033483ecebe25d4e762ee1a4dab /activesupport/test/cache/behaviors/cache_store_behavior.rb | |
parent | b50f7ae627a0962efbc1805b603f2d5baa6810d7 (diff) | |
parent | 6556898884d636c59baae008e42783b8d3e16440 (diff) | |
download | rails-b42d246c5d020a46d5964d236eb7f0d857ef01e8.tar.gz rails-b42d246c5d020a46d5964d236eb7f0d857ef01e8.tar.bz2 rails-b42d246c5d020a46d5964d236eb7f0d857ef01e8.zip |
Merge branch 'master' into eager-url-helpers
* master:
Remove force parent loading when counter cache child is created/destroyed
Raise an error when loading all fixtures from nil fixture_path
Revert "Remove `counter_cache_target` which is no longer called"
Update counter cache in memory if parent target is existed
If association is a hash-like object preloading fails
Use the same option for create database statements between Raketask and travis.rb
Fix "warning: shadowing outer local variable - config"
Remove `counter_cache_target` which is no longer called
Fix more offences
Change the empty block style to have space inside of the block
Fix a content_for test description
Stringify database configurations
Improve error message when assign wrong attributes to model
Diffstat (limited to 'activesupport/test/cache/behaviors/cache_store_behavior.rb')
-rw-r--r-- | activesupport/test/cache/behaviors/cache_store_behavior.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/test/cache/behaviors/cache_store_behavior.rb b/activesupport/test/cache/behaviors/cache_store_behavior.rb index f7c750c08e..30735eb0eb 100644 --- a/activesupport/test/cache/behaviors/cache_store_behavior.rb +++ b/activesupport/test/cache/behaviors/cache_store_behavior.rb @@ -424,7 +424,7 @@ module CacheStoreBehavior @events << ActiveSupport::Notifications::Event.new(*args) end assert @cache.write(key, "1", raw: true) - assert @cache.fetch(key) {} + assert @cache.fetch(key) { } assert_equal 1, @events.length assert_equal "cache_read.active_support", @events[0].name assert_equal :fetch, @events[0].payload[:super_operation] @@ -438,7 +438,7 @@ module CacheStoreBehavior ActiveSupport::Notifications.subscribe(/^cache_(.*)\.active_support$/) do |*args| @events << ActiveSupport::Notifications::Event.new(*args) end - assert_not @cache.fetch("bad_key") {} + assert_not @cache.fetch("bad_key") { } assert_equal 3, @events.length assert_equal "cache_read.active_support", @events[0].name assert_equal "cache_generate.active_support", @events[1].name |