aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
authorAkira Matsuda + Koichi Sasada <ronnie@dio.jp>2013-01-29 20:19:46 +0900
committerAkira Matsuda <ronnie@dio.jp>2013-01-29 20:46:09 +0900
commiteba172fb76ee46d9d801a5f3e56af7b777c9a13e (patch)
treef5ac5eee4288ae28789b1c80f54a8b58bae7d67b /activesupport
parent29000a7dbd9c6650b240f7f244901e55c3ac8ad2 (diff)
downloadrails-eba172fb76ee46d9d801a5f3e56af7b777c9a13e.tar.gz
rails-eba172fb76ee46d9d801a5f3e56af7b777c9a13e.tar.bz2
rails-eba172fb76ee46d9d801a5f3e56af7b777c9a13e.zip
'minitest/parallel_each' might not always be available
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/lib/active_support/testing/isolation.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/testing/isolation.rb b/activesupport/lib/active_support/testing/isolation.rb
index cc96f158b5..dca91e8b75 100644
--- a/activesupport/lib/active_support/testing/isolation.rb
+++ b/activesupport/lib/active_support/testing/isolation.rb
@@ -1,5 +1,8 @@
require 'rbconfig'
-require 'minitest/parallel_each'
+begin
+ require 'minitest/parallel_each'
+rescue LoadError
+end
module ActiveSupport
module Testing