diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2015-01-11 19:23:03 -0200 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2015-01-11 19:23:03 -0200 |
| commit | 3adb05565c7de3ba9dd4117b8a3a631a0b238b8c (patch) | |
| tree | a3ecaccbb4b4f680d4936732358ac20a321dd716 | |
| parent | 186d443721e1b75717b33586fd899bc55c39a16f (diff) | |
| parent | 109721c4662ca60a388da34e016436c3798797f1 (diff) | |
| download | rails-3adb05565c7de3ba9dd4117b8a3a631a0b238b8c.tar.gz rails-3adb05565c7de3ba9dd4117b8a3a631a0b238b8c.tar.bz2 rails-3adb05565c7de3ba9dd4117b8a3a631a0b238b8c.zip | |
Merge pull request #18436 from deepj/fork-detection
Better fork detection in ActiveSupport::Testing::Isolation
| -rw-r--r-- | activesupport/lib/active_support/testing/isolation.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/testing/isolation.rb b/activesupport/lib/active_support/testing/isolation.rb index c46412550c..247df7423b 100644 --- a/activesupport/lib/active_support/testing/isolation.rb +++ b/activesupport/lib/active_support/testing/isolation.rb @@ -10,7 +10,7 @@ module ActiveSupport end def self.forking_env? - !ENV["NO_FORK"] && ((RbConfig::CONFIG['host_os'] !~ /mswin|mingw/) && (RUBY_PLATFORM !~ /java/)) + !ENV["NO_FORK"] && Process.respond_to?(:fork) end @@class_setup_mutex = Mutex.new |