From 86ac51c301e62abb4eb0962e04e587ba8298bf80 Mon Sep 17 00:00:00 2001 From: Benoit Daloze Date: Sun, 4 Aug 2019 14:39:55 +0200 Subject: [rubygems/rubygems] Use the standard RUBY_ENGINE_VERSION instead of JRUBY_VERSION * RUBY_ENGINE and RUBY_ENGINE_VERSION are defined on every modern Ruby. * There is no such constant as TRUFFLERUBY_VERSION or RBX_VERSION. https://github.com/rubygems/rubygems/commit/431d0aefdd --- test/rubygems/test_gem_request.rb | 8 ++-- .../test_gem_request_set_gem_dependency_api.rb | 43 ++++++++-------------- 2 files changed, 20 insertions(+), 31 deletions(-) (limited to 'test') diff --git a/test/rubygems/test_gem_request.rb b/test/rubygems/test_gem_request.rb index b9601b7c2c..2a756eaad7 100644 --- a/test/rubygems/test_gem_request.rb +++ b/test/rubygems/test_gem_request.rb @@ -261,7 +261,7 @@ class TestGemRequest < Gem::TestCase def test_user_agent_engine util_save_version - Object.send :remove_const, :RUBY_ENGINE if defined?(RUBY_ENGINE) + Object.send :remove_const, :RUBY_ENGINE Object.send :const_set, :RUBY_ENGINE, 'vroom' ua = make_request(@uri, nil, nil, nil).user_agent @@ -274,7 +274,7 @@ class TestGemRequest < Gem::TestCase def test_user_agent_engine_ruby util_save_version - Object.send :remove_const, :RUBY_ENGINE if defined?(RUBY_ENGINE) + Object.send :remove_const, :RUBY_ENGINE Object.send :const_set, :RUBY_ENGINE, 'ruby' ua = make_request(@uri, nil, nil, nil).user_agent @@ -460,7 +460,7 @@ ERROR: Certificate is an invalid CA certificate end def util_restore_version - Object.send :remove_const, :RUBY_ENGINE if defined?(RUBY_ENGINE) + Object.send :remove_const, :RUBY_ENGINE Object.send :const_set, :RUBY_ENGINE, @orig_RUBY_ENGINE if defined?(@orig_RUBY_ENGINE) @@ -473,7 +473,7 @@ ERROR: Certificate is an invalid CA certificate end def util_save_version - @orig_RUBY_ENGINE = RUBY_ENGINE if defined? RUBY_ENGINE + @orig_RUBY_ENGINE = RUBY_ENGINE @orig_RUBY_PATCHLEVEL = RUBY_PATCHLEVEL @orig_RUBY_REVISION = RUBY_REVISION if defined? RUBY_REVISION end diff --git a/test/rubygems/test_gem_request_set_gem_dependency_api.rb b/test/rubygems/test_gem_request_set_gem_dependency_api.rb index 959c28580f..f3d4c6fc72 100644 --- a/test/rubygems/test_gem_request_set_gem_dependency_api.rb +++ b/test/rubygems/test_gem_request_set_gem_dependency_api.rb @@ -20,35 +20,27 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase end def with_engine_version(name, version) - engine = RUBY_ENGINE if Object.const_defined? :RUBY_ENGINE - engine_version_const = "#{Gem.ruby_engine.upcase}_VERSION" - engine_version = Object.const_get engine_version_const + engine = RUBY_ENGINE + engine_version = RUBY_ENGINE_VERSION - Object.send :remove_const, :RUBY_ENGINE if engine - Object.send :remove_const, engine_version_const if name == 'ruby' and - Object.const_defined? engine_version_const + Object.send :remove_const, :RUBY_ENGINE + Object.send :remove_const, :RUBY_ENGINE_VERSION - new_engine_version_const = "#{name.upcase}_VERSION" - Object.const_set :RUBY_ENGINE, name if name - Object.const_set new_engine_version_const, version if version + Object.const_set :RUBY_ENGINE, name if name + Object.const_set :RUBY_ENGINE_VERSION, version if version Gem.instance_variable_set :@ruby_version, Gem::Version.new(version) begin yield ensure - Object.send :remove_const, :RUBY_ENGINE if name - Object.send :remove_const, new_engine_version_const if version + Object.send :remove_const, :RUBY_ENGINE if name + Object.send :remove_const, :RUBY_ENGINE_VERSION if version - Object.send :remove_const, engine_version_const if name == 'ruby' and - Object.const_defined? engine_version_const + Object.const_set :RUBY_ENGINE, engine + Object.const_set :RUBY_ENGINE_VERSION, engine_version - Object.const_set :RUBY_ENGINE, engine if engine - Object.const_set engine_version_const, engine_version unless - Object.const_defined? engine_version_const - - Gem.send :remove_instance_variable, :@ruby_version if - Gem.instance_variables.include? :@ruby_version + Gem.send :remove_instance_variable, :@ruby_version end end @@ -838,23 +830,20 @@ end def test_with_engine_version version = RUBY_VERSION - engine = Gem.ruby_engine - - engine_version_const = "#{Gem.ruby_engine.upcase}_VERSION" - engine_version = Object.const_get engine_version_const + engine = Gem.ruby_engine + engine_version = RUBY_ENGINE_VERSION with_engine_version 'other', '1.2.3' do assert_equal 'other', Gem.ruby_engine - assert_equal '1.2.3', OTHER_VERSION + assert_equal '1.2.3', RUBY_ENGINE_VERSION - assert_equal version, RUBY_VERSION if engine + assert_equal version, RUBY_VERSION end assert_equal version, RUBY_VERSION assert_equal engine, Gem.ruby_engine - assert_equal engine_version, Object.const_get(engine_version_const) if - engine + assert_equal engine_version, RUBY_ENGINE_VERSION if engine end end unless Gem.java_platform? -- cgit v1.2.3