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/evented_file_update_checker_test.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/evented_file_update_checker_test.rb')
| -rw-r--r-- | activesupport/test/evented_file_update_checker_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/test/evented_file_update_checker_test.rb b/activesupport/test/evented_file_update_checker_test.rb index d3af0dbef3..a557608986 100644 --- a/activesupport/test/evented_file_update_checker_test.rb +++ b/activesupport/test/evented_file_update_checker_test.rb @@ -38,7 +38,7 @@ class EventedFileUpdateCheckerTest < ActiveSupport::TestCase FileUtils.touch(tmpfiles) - checker = new_checker(tmpfiles) {} + checker = new_checker(tmpfiles) { } assert_not_predicate checker, :updated? # Pipes used for flow control across fork. |