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 /railties/lib/rails | |
| 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 'railties/lib/rails')
| -rw-r--r-- | railties/lib/rails/test_help.rb | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/railties/lib/rails/test_help.rb b/railties/lib/rails/test_help.rb index 3b444b0932..828039dc43 100644 --- a/railties/lib/rails/test_help.rb +++ b/railties/lib/rails/test_help.rb @@ -9,10 +9,7 @@ require 'action_controller/test_case' require 'action_dispatch/testing/integration' require 'rails/generators/test_case' -unless Minitest.run_with_rails_extension - Minitest.run_with_autorun = true - require 'active_support/testing/autorun' -end +require 'active_support/testing/autorun' if defined?(ActiveRecord::Base) ActiveRecord::Migration.maintain_test_schema! |