diff options
author | Sean Griffin <sean@seantheprogrammer.com> | 2016-06-10 22:12:06 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-06-10 22:12:06 -0400 |
commit | 1528c8c2aea0dec2199a4eec8f54ab2c2d58e57c (patch) | |
tree | b525dc0cc917673ec81a64c252fb3f727bd5495d /activesupport | |
parent | d2b08f2f6ae206106fd75de4337a4611f08d9fb6 (diff) | |
parent | 02a6452e2cac006285f55ce9b2fc54e0602332db (diff) | |
download | rails-1528c8c2aea0dec2199a4eec8f54ab2c2d58e57c.tar.gz rails-1528c8c2aea0dec2199a4eec8f54ab2c2d58e57c.tar.bz2 rails-1528c8c2aea0dec2199a4eec8f54ab2c2d58e57c.zip |
Merge pull request #25361 from maclover7/jm-rm-stuff
Remove `_run_class_setup`
Diffstat (limited to 'activesupport')
-rw-r--r-- | activesupport/lib/active_support/testing/isolation.rb | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/activesupport/lib/active_support/testing/isolation.rb b/activesupport/lib/active_support/testing/isolation.rb index edf8b30a0a..7dd03ce65d 100644 --- a/activesupport/lib/active_support/testing/isolation.rb +++ b/activesupport/lib/active_support/testing/isolation.rb @@ -13,17 +13,6 @@ module ActiveSupport !ENV["NO_FORK"] && Process.respond_to?(:fork) end - @@class_setup_mutex = Mutex.new - - def _run_class_setup # class setup method should only happen in parent - @@class_setup_mutex.synchronize do - unless defined?(@@ran_class_setup) || ENV['ISOLATION_TEST'] - self.class.setup if self.class.respond_to?(:setup) - @@ran_class_setup = true - end - end - end - def run serialized = run_in_isolation do super |