diff options
| -rw-r--r-- | lib/rubygems/specification.rb | 4 | ||||
| -rw-r--r-- | test/rubygems/test_gem_command_manager.rb | 2 | ||||
| -rw-r--r-- | test/rubygems/test_gem_installer.rb | 4 | ||||
| -rw-r--r-- | test/rubygems/test_webauthn_listener.rb | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/lib/rubygems/specification.rb b/lib/rubygems/specification.rb index 0b905a7ea7..68ebbf8bc3 100644 --- a/lib/rubygems/specification.rb +++ b/lib/rubygems/specification.rb @@ -1002,7 +1002,7 @@ class Gem::Specification < Gem::BasicSpecification def self.find_in_unresolved_tree(path) unresolved_specs.each do |spec| 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 else 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. - 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| spec.runtime_dependencies.any? {|dep| (dep.name == name) && !satisfies_requirement?(dep) } end diff --git a/test/rubygems/test_gem_command_manager.rb b/test/rubygems/test_gem_command_manager.rb index f3848e498d..e1c3512b6f 100644 --- a/test/rubygems/test_gem_command_manager.rb +++ b/test/rubygems/test_gem_command_manager.rb @@ -43,7 +43,7 @@ class TestGemCommandManager < Gem::TestCase assert_kind_of Gem::Commands::SigninCommand, command end - def test_find_logout_alias_comamnd + def test_find_logout_alias_command command = @command_manager.find_command "logout" assert_kind_of Gem::Commands::SignoutCommand, command diff --git a/test/rubygems/test_gem_installer.rb b/test/rubygems/test_gem_installer.rb index 993cd7e998..dfa8df283c 100644 --- a/test/rubygems/test_gem_installer.rb +++ b/test/rubygems/test_gem_installer.rb @@ -1938,10 +1938,10 @@ end end 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( - gem_with_ill_formated_platform, + gem_with_ill_formatted_platform, install_dir: @gemhome, user_install: false, force: true diff --git a/test/rubygems/test_webauthn_listener.rb b/test/rubygems/test_webauthn_listener.rb index 08edabceb2..ded4128928 100644 --- a/test/rubygems/test_webauthn_listener.rb +++ b/test/rubygems/test_webauthn_listener.rb @@ -17,7 +17,7 @@ class WebauthnListenerTest < Gem::TestCase super end - def test_listener_thread_retreives_otp_code + def test_listener_thread_retrieves_otp_code thread = Gem::GemcutterUtilities::WebauthnListener.listener_thread(Gem.host, @server) Gem::MockBrowser.get Gem::URI("http://localhost:#{@port}?code=xyz") |