Skip to content

Commit 9d54d0f

Browse files
hsbtclaude
andcommitted
Update test helpers for YAMLSerializer
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
1 parent 895c879 commit 9d54d0f

3 files changed

Lines changed: 12 additions & 10 deletions

File tree

test/rubygems/helper.rb

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -738,11 +738,7 @@ def write_dummy_extconf(gem_name)
738738
# Load a YAML string, the psych 3 way
739739

740740
def load_yaml(yaml)
741-
if Psych.respond_to?(:unsafe_load)
742-
Psych.unsafe_load(yaml)
743-
else
744-
Psych.load(yaml)
745-
end
741+
Gem::SafeYAML.safe_load(yaml)
746742
end
747743

748744
##

test/rubygems/test_gem_commands_owner_command.rb

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,6 @@ def test_show_owners
5555
end
5656

5757
def test_show_owners_dont_load_objects
58-
pend "testing a psych-only API" unless defined?(::Psych::DisallowedClass)
59-
6058
response = <<EOF
6159
---
6260
- email: !ruby/object:Object {}
@@ -70,7 +68,7 @@ def test_show_owners_dont_load_objects
7068

7169
@stub_fetcher.data["#{Gem.host}/api/v1/gems/freewill/owners.yaml"] = HTTPResponseFactory.create(body: response, code: 200, msg: "OK")
7270

73-
assert_raise Psych::DisallowedClass do
71+
assert_raise ArgumentError do
7472
use_ui @ui do
7573
@cmd.show_owners("freewill")
7674
end

test/rubygems/test_gem_package.rb

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -909,7 +909,11 @@ def test_verify_checksum_bad
909909
}
910910
tar.add_file "checksums.yaml.gz", 0o444 do |io|
911911
Zlib::GzipWriter.wrap io do |gz_io|
912-
gz_io.write Psych.dump bogus_checksums
912+
if Gem.use_psych?
913+
gz_io.write Psych.dump(bogus_checksums)
914+
else
915+
gz_io.write Gem::YAMLSerializer.dump(bogus_checksums)
916+
end
913917
end
914918
end
915919
end
@@ -955,7 +959,11 @@ def test_verify_checksum_missing
955959

956960
tar.add_file "checksums.yaml.gz", 0o444 do |io|
957961
Zlib::GzipWriter.wrap io do |gz_io|
958-
gz_io.write Psych.dump checksums
962+
if Gem.use_psych?
963+
gz_io.write Psych.dump(checksums)
964+
else
965+
gz_io.write Gem::YAMLSerializer.dump(checksums)
966+
end
959967
end
960968
end
961969

0 commit comments

Comments
 (0)