diff options
| author | Eugene Kenny <elkenny@gmail.com> | 2017-12-12 06:31:45 +0000 |
|---|---|---|
| committer | Eugene Kenny <elkenny@gmail.com> | 2017-12-12 06:31:45 +0000 |
| commit | 6122d2bfdf09fb4a3e70d619556ef471be274169 (patch) | |
| tree | 39020caebc9533f709b646b778ba712d122be008 /activesupport | |
| parent | c5462d1f27f7d43624e188008b0062d1d25369aa (diff) | |
| download | rails-6122d2bfdf09fb4a3e70d619556ef471be274169.tar.gz rails-6122d2bfdf09fb4a3e70d619556ef471be274169.tar.bz2 rails-6122d2bfdf09fb4a3e70d619556ef471be274169.zip | |
Prevent race condition when resetting time stubs
If the current thread is preempted after the stub has been removed but
before the original method has been restored, then the other thread will
get a `NoMethodError` when it tries to call the method.
Using `silence_redefinition_of_method` instead of `undef_method` ensures
that either the stub or the original method is always in place.
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/lib/active_support/testing/time_helpers.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/testing/time_helpers.rb b/activesupport/lib/active_support/testing/time_helpers.rb index 8c620e7f8c..998a51a34c 100644 --- a/activesupport/lib/active_support/testing/time_helpers.rb +++ b/activesupport/lib/active_support/testing/time_helpers.rb @@ -1,5 +1,6 @@ # frozen_string_literal: true +require "active_support/core_ext/module/redefine_method" require "active_support/core_ext/string/strip" # for strip_heredoc require "active_support/core_ext/time/calculations" require "concurrent/map" @@ -43,7 +44,7 @@ module ActiveSupport def unstub_object(stub) singleton_class = stub.object.singleton_class - singleton_class.send :undef_method, stub.method_name + singleton_class.send :silence_redefinition_of_method, stub.method_name singleton_class.send :alias_method, stub.method_name, stub.original_method singleton_class.send :undef_method, stub.original_method end |