diff options
| author | Yves Senn <yves.senn@gmail.com> | 2015-06-12 17:19:47 +0200 |
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2015-06-12 17:19:47 +0200 |
| commit | 1d43458c148f9532a81b92ee3a247da4f1c0b7ad (patch) | |
| tree | 27b14f89d7f0bb7e655c21e1961fbd20e1dc0afd /activesupport/lib | |
| parent | 98cacae101e73b24cc4fd11fb8e1daf3fdc6de45 (diff) | |
| parent | 9946788775437513c3489b7d7b2b01fcda62d5fb (diff) | |
| download | rails-1d43458c148f9532a81b92ee3a247da4f1c0b7ad.tar.gz rails-1d43458c148f9532a81b92ee3a247da4f1c0b7ad.tar.bz2 rails-1d43458c148f9532a81b92ee3a247da4f1c0b7ad.zip | |
Merge pull request #20480 from senny/test_runner
use our own runner for Rails framework components `bin/test`
Diffstat (limited to 'activesupport/lib')
| -rw-r--r-- | activesupport/lib/active_support/testing/autorun.rb | 9 |
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 |