mirror of
https://github.com/ruby/ruby.git
synced 2025-08-15 13:39:04 +02:00
parent
d6aa1714fe
commit
a763716a96
4 changed files with 6 additions and 6 deletions
|
@ -1002,7 +1002,7 @@ class Gem::Specification < Gem::BasicSpecification
|
||||||
def self.find_in_unresolved_tree(path)
|
def self.find_in_unresolved_tree(path)
|
||||||
unresolved_specs.each do |spec|
|
unresolved_specs.each do |spec|
|
||||||
spec.traverse do |_from_spec, _dep, to_spec, trail|
|
spec.traverse do |_from_spec, _dep, to_spec, trail|
|
||||||
if to_spec.has_conflicts? || to_spec.conficts_when_loaded_with?(trail)
|
if to_spec.has_conflicts? || to_spec.conflicts_when_loaded_with?(trail)
|
||||||
:next
|
:next
|
||||||
else
|
else
|
||||||
return trail.reverse if to_spec.contains_requirable_file? path
|
return trail.reverse if to_spec.contains_requirable_file? path
|
||||||
|
@ -1649,7 +1649,7 @@ class Gem::Specification < Gem::BasicSpecification
|
||||||
##
|
##
|
||||||
# return true if there will be conflict when spec if loaded together with the list of specs.
|
# return true if there will be conflict when spec if loaded together with the list of specs.
|
||||||
|
|
||||||
def conficts_when_loaded_with?(list_of_specs) # :nodoc:
|
def conflicts_when_loaded_with?(list_of_specs) # :nodoc:
|
||||||
result = list_of_specs.any? do |spec|
|
result = list_of_specs.any? do |spec|
|
||||||
spec.runtime_dependencies.any? {|dep| (dep.name == name) && !satisfies_requirement?(dep) }
|
spec.runtime_dependencies.any? {|dep| (dep.name == name) && !satisfies_requirement?(dep) }
|
||||||
end
|
end
|
||||||
|
|
|
@ -43,7 +43,7 @@ class TestGemCommandManager < Gem::TestCase
|
||||||
assert_kind_of Gem::Commands::SigninCommand, command
|
assert_kind_of Gem::Commands::SigninCommand, command
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_find_logout_alias_comamnd
|
def test_find_logout_alias_command
|
||||||
command = @command_manager.find_command "logout"
|
command = @command_manager.find_command "logout"
|
||||||
|
|
||||||
assert_kind_of Gem::Commands::SignoutCommand, command
|
assert_kind_of Gem::Commands::SignoutCommand, command
|
||||||
|
|
|
@ -1938,10 +1938,10 @@ end
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_pre_install_checks_malicious_platform_before_eval
|
def test_pre_install_checks_malicious_platform_before_eval
|
||||||
gem_with_ill_formated_platform = File.expand_path("packages/ill-formatted-platform-1.0.0.10.gem", __dir__)
|
gem_with_ill_formatted_platform = File.expand_path("packages/ill-formatted-platform-1.0.0.10.gem", __dir__)
|
||||||
|
|
||||||
installer = Gem::Installer.at(
|
installer = Gem::Installer.at(
|
||||||
gem_with_ill_formated_platform,
|
gem_with_ill_formatted_platform,
|
||||||
install_dir: @gemhome,
|
install_dir: @gemhome,
|
||||||
user_install: false,
|
user_install: false,
|
||||||
force: true
|
force: true
|
||||||
|
|
|
@ -17,7 +17,7 @@ class WebauthnListenerTest < Gem::TestCase
|
||||||
super
|
super
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_listener_thread_retreives_otp_code
|
def test_listener_thread_retrieves_otp_code
|
||||||
thread = Gem::GemcutterUtilities::WebauthnListener.listener_thread(Gem.host, @server)
|
thread = Gem::GemcutterUtilities::WebauthnListener.listener_thread(Gem.host, @server)
|
||||||
Gem::MockBrowser.get Gem::URI("http://localhost:#{@port}?code=xyz")
|
Gem::MockBrowser.get Gem::URI("http://localhost:#{@port}?code=xyz")
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue