aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/commands/test
diff options
context:
space:
mode:
authoryuuji.yaginuma <yuuji.yaginuma@gmail.com>2017-02-08 18:24:50 +0900
committeryuuji.yaginuma <yuuji.yaginuma@gmail.com>2017-02-18 09:49:57 +0900
commitf38a660a60ecc5e2f0e0f91e07a18344598cff5e (patch)
treea4f5d33200bef6c1f5c6e964aed054c02c19381a /railties/lib/rails/commands/test
parent25c6f4c947450c75c5a43ded19d7b6ca8b7c95b6 (diff)
downloadrails-f38a660a60ecc5e2f0e0f91e07a18344598cff5e.tar.gz
rails-f38a660a60ecc5e2f0e0f91e07a18344598cff5e.tar.bz2
rails-f38a660a60ecc5e2f0e0f91e07a18344598cff5e.zip
Prevent multiple values being set to `run_via`
When executing the test via rake, since `rake` is set for `run_via`, `ruby` should not be set. Related 2cb6c27310452da11b93d729c3b760ce988106e1
Diffstat (limited to 'railties/lib/rails/commands/test')
-rw-r--r--railties/lib/rails/commands/test/test_command.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/commands/test/test_command.rb b/railties/lib/rails/commands/test/test_command.rb
index 7bf8f61137..629fb5b425 100644
--- a/railties/lib/rails/commands/test/test_command.rb
+++ b/railties/lib/rails/commands/test/test_command.rb
@@ -11,7 +11,7 @@ module Rails
def perform(*)
$LOAD_PATH << Rails::Command.root.join("test")
- Minitest.run_via[:rails] = true
+ Minitest.run_via = :rails
require "active_support/testing/autorun"
end