diff options
| author | Kasper Timm Hansen <kaspth@gmail.com> | 2017-02-20 22:20:14 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-20 22:20:14 +0100 |
| commit | ff326e745614593530ee64b67ac21bf14e3d41b3 (patch) | |
| tree | 8974d1f3a6fd4edde32865e9b37f30056e826c40 /activesupport | |
| parent | 507c9970ab2d9e8296d605bc94843e2aa62aa5fd (diff) | |
| parent | f38a660a60ecc5e2f0e0f91e07a18344598cff5e (diff) | |
| download | rails-ff326e745614593530ee64b67ac21bf14e3d41b3.tar.gz rails-ff326e745614593530ee64b67ac21bf14e3d41b3.tar.bz2 rails-ff326e745614593530ee64b67ac21bf14e3d41b3.zip | |
Merge pull request #27941 from y-yagi/prevent_multiple_values_being_set_to_run_via
Prevent multiple values being set to `run_via`
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 |