Merge pull request #27206 from kirs/fix-testing-isolation-2

Fix arguments passing in testing isolation

1 files changed, 8 insertions, 7 deletions

diff --git a/activesupport/lib/active_support/testing/isolation.rb b/activesupport/lib/active_support/testing/isolation.rb
index 404efe50bf..14edd13a8f 100644
--- a/activesupport/lib/active_support/testing/isolation.rb
+++ b/activesupport/lib/active_support/testing/isolation.rb
@@ -2,7 +2,6 @@ module ActiveSupport
   module Testing
     module Isolation
       require "thread"
-      require "shellwords"
 
       def self.included(klass) #:nodoc:
         klass.class_eval do
@@ -79,13 +78,15 @@ module ActiveSupport
                 "ISOLATION_OUTPUT" => tmpfile.path
               }
 
-              load_paths = $-I.map { |p| "-I\"#{File.expand_path(p)}\"" }.join(" ")
-              orig_args = ORIG_ARGV.join(" ")
-              test_opts = "-n#{self.class.name}##{Shellwords.escape(self.name)}"
-              command = "#{Gem.ruby} #{load_paths} #{$0} '#{orig_args}' #{test_opts}"
+              test_opts = "-n#{self.class.name}##{self.name}"
 
-              # IO.popen lets us pass env in a cross-platform way
-              child = IO.popen(env, command)
+              load_path_args = []
+              $-I.each do |p|
+                load_path_args << "-I"
+                load_path_args << File.expand_path(p)
+              end
+
+              child = IO.popen([env, Gem.ruby, *load_path_args, $0, *ORIG_ARGV, test_opts])
 
               begin
                 Process.wait(child.pid)