aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails
diff options
context:
space:
mode:
authorArthur Nogueira Neves <github@arthurnn.com>2016-09-23 23:28:37 -0400
committerGitHub <noreply@github.com>2016-09-23 23:28:37 -0400
commit0ce117fac3b9b0c58b3b6a091172d56754b56308 (patch)
treee13af2e21be281ebeb7a1a57286cc51a8336ae5e /railties/lib/rails
parent549ee51b771fa068a0c60896ea1f4d10747d50d2 (diff)
parent3f2e861da767565e334fc824b9dc252f1978833b (diff)
downloadrails-0ce117fac3b9b0c58b3b6a091172d56754b56308.tar.gz
rails-0ce117fac3b9b0c58b3b6a091172d56754b56308.tar.bz2
rails-0ce117fac3b9b0c58b3b6a091172d56754b56308.zip
Merge pull request #26515 from grosser/grosser/after_run
support minitest after_run
Diffstat (limited to 'railties/lib/rails')
-rw-r--r--railties/lib/rails/commands/test.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/railties/lib/rails/commands/test.rb b/railties/lib/rails/commands/test.rb
index 219c2fa4e0..03884a073a 100644
--- a/railties/lib/rails/commands/test.rb
+++ b/railties/lib/rails/commands/test.rb
@@ -1,9 +1,9 @@
require "rails/test_unit/minitest_plugin"
if defined?(ENGINE_ROOT)
- $: << File.expand_path("test", ENGINE_ROOT)
+ $LOAD_PATH << File.expand_path("test", ENGINE_ROOT)
else
- $: << File.expand_path("../../test", APP_PATH)
+ $LOAD_PATH << File.expand_path("../../test", APP_PATH)
end
-exit Minitest.run(ARGV)
+require "minitest/autorun"