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

1 files changed, 1 insertions, 1 deletions

diff --git a/activestorage/test/service/shared_service_tests.rb b/activestorage/test/service/shared_service_tests.rb
index 8a8d639af7..ca2490f2bc 100644
--- a/activestorage/test/service/shared_service_tests.rb
+++ b/activestorage/test/service/shared_service_tests.rb
@@ -77,7 +77,7 @@ module ActiveStorage::Service::SharedServiceTests
 
     test "downloading a nonexistent file in chunks" do
       assert_raises(ActiveStorage::FileNotFoundError) do
-        @service.download(SecureRandom.base58(24)) {}
+        @service.download(SecureRandom.base58(24)) { }
       end
     end