aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/testing/autorun.rb
diff options
context:
space:
mode:
Diffstat (limited to 'activesupport/lib/active_support/testing/autorun.rb')
-rw-r--r--activesupport/lib/active_support/testing/autorun.rb9
1 files changed, 8 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/testing/autorun.rb b/activesupport/lib/active_support/testing/autorun.rb
index 5aa5f46310..84c6b89340 100644
--- a/activesupport/lib/active_support/testing/autorun.rb
+++ b/activesupport/lib/active_support/testing/autorun.rb
@@ -2,4 +2,11 @@ gem 'minitest'
require 'minitest'
-Minitest.autorun
+if Minitest.respond_to?(:run_with_rails_extension)
+ unless Minitest.run_with_rails_extension
+ Minitest.run_with_autorun = true
+ Minitest.autorun
+ end
+else
+ Minitest.autorun
+end