diff options
author | Matthew Draper <matthew@trebex.net> | 2017-09-08 11:00:45 +0930 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-08 11:00:45 +0930 |
commit | e533ee758c7d3cef00da08034d8b8949b0ac493a (patch) | |
tree | 96c5043fbee7001443f5338ded2cba07030cab68 /railties/test/isolation | |
parent | dd7bd1e9c1de7668a9bdb671d00d4aec77001544 (diff) | |
parent | 39f3ab51e9d9c585dd65c09dcfe9a3ece4521c1f (diff) | |
download | rails-e533ee758c7d3cef00da08034d8b8949b0ac493a.tar.gz rails-e533ee758c7d3cef00da08034d8b8949b0ac493a.tar.bz2 rails-e533ee758c7d3cef00da08034d8b8949b0ac493a.zip |
Merge pull request #30536 from y-yagi/reorganize_secrets_test
Reorganize secrets test to use only `isolation/abstract_unit`
Diffstat (limited to 'railties/test/isolation')
-rw-r--r-- | railties/test/isolation/abstract_unit.rb | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/railties/test/isolation/abstract_unit.rb b/railties/test/isolation/abstract_unit.rb index a4c6fc4e68..b127a3b10b 100644 --- a/railties/test/isolation/abstract_unit.rb +++ b/railties/test/isolation/abstract_unit.rb @@ -243,11 +243,9 @@ module TestHelpers # stderr:: true to pass STDERR output straight to the "real" STDERR. # By default, the STDERR and STDOUT of the process will be # combined in the returned string. - # fork:: false to not use fork even when it's available. By default, - # when possible, the command is executed in a fork of the current - # process, avoiding the need to load core Rails libraries anew. - def rails(*args, allow_failure: false, stderr: false, fork: true) + def rails(*args, allow_failure: false, stderr: false) args = args.flatten + fork = true command = "bin/rails #{Shellwords.join args}#{' 2>&1' unless stderr}" |