From eec932704f3336294a08957b03e4ec1b18198bf1 Mon Sep 17 00:00:00 2001 From: Yves Senn Date: Mon, 8 Jun 2015 14:51:47 +0200 Subject: inline test runner check into `as/testing/autorun.rb`. This makes it possible to easily get the runner working with existing setups that rely on `active_support/testing/autorun.rb`. --- railties/lib/rails/test_help.rb | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'railties/lib/rails/test_help.rb') 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! -- cgit v1.2.3