diff options
| author | Jerome Dalbert <jerome.dalbert@gmail.com> | 2024-07-04 12:49:33 -0700 |
|---|---|---|
| committer | git <svn-admin@ruby-lang.org> | 2024-07-05 02:24:53 +0000 |
| commit | bbb4da78c7e35e41cc91af0791eb8f51c371d964 (patch) | |
| tree | 998952b7e9d49e98f55e97ec255065888fe5b00d /test | |
| parent | c480dec1ccf34b8452438811c5ef0f76cbb2a063 (diff) | |
[rubygems/rubygems] Use preferred add_dependency instead of add_runtime_dependency
https://github.com/rubygems/rubygems/commit/9a08043858
Diffstat (limited to 'test')
| -rw-r--r-- | test/rubygems/test_gem_commands_exec_command.rb | 12 | ||||
| -rw-r--r-- | test/rubygems/test_gem_commands_lock_command.rb | 4 | ||||
| -rw-r--r-- | test/rubygems/test_gem_request_set_gem_dependency_api.rb | 2 | ||||
| -rw-r--r-- | test/rubygems/test_gem_resolver.rb | 2 | ||||
| -rw-r--r-- | test/rubygems/test_gem_specification.rb | 14 | ||||
| -rw-r--r-- | test/rubygems/test_gem_uninstaller.rb | 2 |
6 files changed, 18 insertions, 18 deletions
diff --git a/test/rubygems/test_gem_commands_exec_command.rb b/test/rubygems/test_gem_commands_exec_command.rb index e52fe247a2..8d9c810d59 100644 --- a/test/rubygems/test_gem_commands_exec_command.rb +++ b/test/rubygems/test_gem_commands_exec_command.rb @@ -182,7 +182,7 @@ class TestGemCommandsExecCommand < Gem::TestCase fetcher.download "a", 2 do |s| s.executables = %w[a] s.files = %w[bin/a lib/a.rb] - s.add_runtime_dependency "with_platform" + s.add_dependency "with_platform" write_file File.join(*%W[gems #{s.original_name} bin a]) do |f| f << 'require "with_platform"' << "\n" @@ -222,7 +222,7 @@ class TestGemCommandsExecCommand < Gem::TestCase fetcher.download "a", 2 do |s| s.executables = %w[a] s.files = %w[bin/a lib/a.rb] - s.add_runtime_dependency "with_platform" + s.add_dependency "with_platform" s.platform = Gem::Platform.local.to_s write_file File.join(*%W[gems #{s.original_name} bin a]) do |f| @@ -234,7 +234,7 @@ class TestGemCommandsExecCommand < Gem::TestCase fetcher.download "a", 2 do |s| s.executables = %w[a] s.files = %w[bin/a lib/a.rb extconf.rb] - s.add_runtime_dependency "with_platform" + s.add_dependency "with_platform" write_file File.join(*%W[gems #{s.original_name} bin a]) do |f| f << 'require "with_platform"' << "\n" @@ -261,7 +261,7 @@ class TestGemCommandsExecCommand < Gem::TestCase fetcher.download "with_platform", 2 do |s| s.files = %w[lib/with_platform.rb] - s.add_runtime_dependency "sometimes_used" + s.add_dependency "sometimes_used" end fetcher.download "sometimes_used", 2 do |s| @@ -677,7 +677,7 @@ class TestGemCommandsExecCommand < Gem::TestCase fetcher.gem "a", 1 do |s| s.executables = %w[] s.files = %w[lib/a.rb] - s.add_runtime_dependency "b" + s.add_dependency "b" end fetcher.gem "b", 1 do |s| @@ -711,7 +711,7 @@ class TestGemCommandsExecCommand < Gem::TestCase fetcher.download "a", 2 do |s| s.executables = %w[a] s.files = %w[bin/a lib/a.rb] - s.add_runtime_dependency "b" + s.add_dependency "b" write_file File.join(*%W[gems #{s.original_name} bin a]) do |f| f << "Gem.ui.say #{s.original_name.dump}" diff --git a/test/rubygems/test_gem_commands_lock_command.rb b/test/rubygems/test_gem_commands_lock_command.rb index 6afe4f35c5..02a7103f89 100644 --- a/test/rubygems/test_gem_commands_lock_command.rb +++ b/test/rubygems/test_gem_commands_lock_command.rb @@ -9,11 +9,11 @@ class TestGemCommandsLockCommand < Gem::TestCase @a1 = quick_gem "a", "1" @b1 = quick_gem "b", "1" do |s| - s.add_runtime_dependency "a" + s.add_dependency "a" end @d1 = quick_gem "d", "1" do |s| - s.add_runtime_dependency "z" + s.add_dependency "z" end @cmd = Gem::Commands::LockCommand.new 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 af32005a16..4b5eaa38ed 100644 --- a/test/rubygems/test_gem_request_set_gem_dependency_api.rb +++ b/test/rubygems/test_gem_request_set_gem_dependency_api.rb @@ -44,7 +44,7 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase def test_gempspec_with_multiple_runtime_deps save_gemspec "foo", "1.0" do |s| - s.add_runtime_dependency "bar", ">= 1.6.0", "< 1.6.4" + s.add_dependency "bar", ">= 1.6.0", "< 1.6.4" end @gda.gemspec assert_equal %w[foo bar].sort, @set.dependencies.map(&:name).sort diff --git a/test/rubygems/test_gem_resolver.rb b/test/rubygems/test_gem_resolver.rb index b7dadda708..4990d5d2dd 100644 --- a/test/rubygems/test_gem_resolver.rb +++ b/test/rubygems/test_gem_resolver.rb @@ -571,7 +571,7 @@ class TestGemResolver < Gem::TestCase def test_raises_and_reports_an_implicit_request_properly a1 = util_spec "a", "1" do |s| - s.add_runtime_dependency "b", "= 2" + s.add_dependency "b", "= 2" end ad = make_dep "a", "= 1" diff --git a/test/rubygems/test_gem_specification.rb b/test/rubygems/test_gem_specification.rb index 34ebb377c6..8b17900e48 100644 --- a/test/rubygems/test_gem_specification.rb +++ b/test/rubygems/test_gem_specification.rb @@ -1833,7 +1833,7 @@ dependencies: [] end def test_for_cache - @a2.add_runtime_dependency "b", "1" + @a2.add_dependency "b", "1" @a2.dependencies.first.instance_variable_set :@type, nil @a2.required_rubygems_version = Gem::Requirement.new "> 0" @a2.test_files = %w[test/test_b.rb] @@ -2265,7 +2265,7 @@ dependencies: [] end def test_to_ruby - @a2.add_runtime_dependency "b", "1" + @a2.add_dependency "b", "1" @a2.dependencies.first.instance_variable_set :@type, nil @a2.required_rubygems_version = Gem::Requirement.new "> 0" @a2.require_paths << "other" @@ -2337,7 +2337,7 @@ end end def test_to_ruby_for_cache - @a2.add_runtime_dependency "b", "1" + @a2.add_dependency "b", "1" @a2.dependencies.first.instance_variable_set :@type, nil @a2.required_rubygems_version = Gem::Requirement.new "> 0" @a2.installed_by_version = Gem.rubygems_version @@ -2760,7 +2760,7 @@ duplicate dependency on c (>= 1.2.3, development), (~> 1.2) use: Dir.chdir @tempdir do @a1.version = "1.0.0.beta.1" - @a1.add_runtime_dependency "b", "~> 1.2.0.beta.1" + @a1.add_dependency "b", "~> 1.2.0.beta.1" use_ui @ui do @a1.validate @@ -2774,7 +2774,7 @@ duplicate dependency on c (>= 1.2.3, development), (~> 1.2) use: util_setup_validate Dir.chdir @tempdir do - @a1.add_runtime_dependency @a1.name, "1" + @a1.add_dependency @a1.name, "1" use_ui @ui do @a1.validate @@ -2807,7 +2807,7 @@ duplicate dependency on c (>= 1.2.3, development), (~> 1.2) use: Dir.chdir @tempdir do @a1.extensions = ["Rakefile"] - @a1.add_runtime_dependency "rake" + @a1.add_dependency "rake" File.write File.join(@tempdir, "Rakefile"), "" use_ui @ui do @@ -3077,7 +3077,7 @@ Please report a bug if this causes problems. def test_duplicate_runtime_dependency expected = "WARNING: duplicated b dependency [\"~> 3.0\", \"~> 3.0\"]\n" out, err = capture_output do - @a1.add_runtime_dependency "b", "~> 3.0", "~> 3.0" + @a1.add_dependency "b", "~> 3.0", "~> 3.0" end assert_empty out assert_equal(expected, err) diff --git a/test/rubygems/test_gem_uninstaller.rb b/test/rubygems/test_gem_uninstaller.rb index 794aaf1aec..92ea01a3bc 100644 --- a/test/rubygems/test_gem_uninstaller.rb +++ b/test/rubygems/test_gem_uninstaller.rb @@ -403,7 +403,7 @@ create_makefile '#{@spec.name}' def test_uninstall_not_ok quick_gem "z" do |s| - s.add_runtime_dependency @spec.name + s.add_dependency @spec.name end uninstaller = Gem::Uninstaller.new @spec.name |
