Merge pull request #31411 from eugeneius/time_helpers_redefine_method

Prevent race condition when resetting time stubs
This commit is contained in:
Ryuta Kamizono 2017-12-12 16:23:31 +09:00 committed by GitHub
commit 38b2904f2c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -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 @@ def stubbing(object, method_name)
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