diff options
| author | yuuji.yaginuma <yuuji.yaginuma@gmail.com> | 2017-02-08 18:24:50 +0900 |
|---|---|---|
| committer | yuuji.yaginuma <yuuji.yaginuma@gmail.com> | 2017-02-18 09:49:57 +0900 |
| commit | f38a660a60ecc5e2f0e0f91e07a18344598cff5e (patch) | |
| tree | a4f5d33200bef6c1f5c6e964aed054c02c19381a /activesupport | |
| parent | 25c6f4c947450c75c5a43ded19d7b6ca8b7c95b6 (diff) | |
| download | rails-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 'activesupport')
| -rw-r--r-- | activesupport/lib/active_support/testing/autorun.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/testing/autorun.rb b/activesupport/lib/active_support/testing/autorun.rb index 3108e3e549..a18788f38e 100644 --- a/activesupport/lib/active_support/testing/autorun.rb +++ b/activesupport/lib/active_support/testing/autorun.rb @@ -2,8 +2,8 @@ gem "minitest" require "minitest" -if Minitest.respond_to?(:run_via) && !Minitest.run_via[:rails] - Minitest.run_via[:ruby] = true +if Minitest.respond_to?(:run_via) && !Minitest.run_via.set? + Minitest.run_via = :ruby end Minitest.autorun |