[rubygems/rubygems] Resolve @@project_dir from test file paths

`Dir.pwd` may differ from the source path. Test directories and files should be resolved from test file paths. rubygems/rubygems@e18e7c81b4
ruby · Jul 24, 2019 · 99680f8 · 99680f8
1 parent 3a227b9
commit 99680f8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/lib/rubygems/test_case.rb b/lib/rubygems/test_case.rb
@@ -232,8 +232,6 @@ def assert_contains_make_command(target, output, msg = nil)
   undef_method :default_test if instance_methods.include? 'default_test' or
                                 instance_methods.include? :default_test
 
-  @@project_dir = Dir.pwd.untaint unless defined?(@@project_dir)
-
   ##
   # #setup prepares a sandboxed location to install gems.  All installs are
   # directed to a temporary directory.  All install plugins are removed.

diff --git a/test/rubygems/test_gem.rb b/test/rubygems/test_gem.rb
@@ -17,6 +17,8 @@ class TestGem < Gem::TestCase
 
   PLUGINS_LOADED = [] # rubocop:disable Style/MutableConstant
 
+  @@project_dir = File.expand_path('../../..', __FILE__).untaint
+
   def setup
     super
 

diff --git a/test/rubygems/test_gem_command_manager.rb b/test/rubygems/test_gem_command_manager.rb
@@ -4,6 +4,8 @@
 
 class TestGemCommandManager < Gem::TestCase
 
+  @@project_dir = File.expand_path('../../..', __FILE__).untaint
+
   def setup
     super