diff options
| author | Leonel Galán <leonel@getstealz.com> | 2017-06-16 15:09:15 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-16 15:09:15 -0400 |
| commit | 095036467e4e06e56452da94077500d428dd0eed (patch) | |
| tree | 3443e6779bf5a1d0f73f3c6ceb5f22cdee12e303 /railties/lib/rails/commands/test/test_command.rb | |
| parent | 0804e58e1e6a52190a950f863622102b6b21ccb8 (diff) | |
| parent | b55cf266f9ccadf49276de230a8b0c2076f05202 (diff) | |
| download | rails-095036467e4e06e56452da94077500d428dd0eed.tar.gz rails-095036467e4e06e56452da94077500d428dd0eed.tar.bz2 rails-095036467e4e06e56452da94077500d428dd0eed.zip | |
Merge branch 'master' into bug/filtered_parameters_class
Diffstat (limited to 'railties/lib/rails/commands/test/test_command.rb')
| -rw-r--r-- | railties/lib/rails/commands/test/test_command.rb | 2 |
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 65e16900ba..dce85cf12d 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 end def perform(*) - $LOAD_PATH << Rails::Command.root.join("test") + $LOAD_PATH << Rails::Command.root.join("test").to_s Minitest.run_via = :rails |