diff options
| author | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2019-07-24 13:24:18 +0900 |
|---|---|---|
| committer | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2019-07-24 18:15:47 +0800 |
| commit | 99680f81e832506792cf32d830d09954acd220fc (patch) | |
| tree | 3b86d0f0d30c0176e28dcda2affcf2bbe29c2c07 | |
| parent | 3a227b99e78927cdd53e4c1b6b1e5f1af004ca41 (diff) | |
[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.
https://github.com/rubygems/rubygems/commit/e18e7c81b4
| -rw-r--r-- | lib/rubygems/test_case.rb | 2 | ||||
| -rw-r--r-- | test/rubygems/test_gem.rb | 2 | ||||
| -rw-r--r-- | test/rubygems/test_gem_command_manager.rb | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/lib/rubygems/test_case.rb b/lib/rubygems/test_case.rb index b466e7a4e0..a8cc5d0060 100644 --- a/lib/rubygems/test_case.rb +++ b/lib/rubygems/test_case.rb @@ -232,8 +232,6 @@ class Gem::TestCase < (defined?(Minitest::Test) ? Minitest::Test : MiniTest::Uni 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 index c90ad2d41a..a08a86d284 100644 --- 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 index 6ada96f1c1..73bfd207c6 100644 --- a/test/rubygems/test_gem_command_manager.rb +++ b/test/rubygems/test_gem_command_manager.rb @@ -4,6 +4,8 @@ require 'rubygems/command_manager' class TestGemCommandManager < Gem::TestCase + @@project_dir = File.expand_path('../../..', __FILE__).untaint + def setup super |