[ruby/psych] Don't hardcode expected alias names

b9ab19094f

test/psych/test_array.rb

@@ -57,17 +57,20 @@ module Psych
       assert_cycle(@list)
     end
 
+    def test_recursive_array
+      @list << @list
+
+      loaded = Psych.load(Psych.dump(@list), aliases: true)
+
+      assert_same loaded, loaded.last
+    end
+
     def test_recursive_array_uses_alias
       @list << @list
 
-      expected = <<~eoyaml
+      assert_raise(BadAlias) do
-        --- &1
+        Psych.load(Psych.dump(@list), aliases: false)
-        - :a: b
+      end
-        - foo
-        - *1
-      eoyaml
-
-      assert_equal expected, Psych.dump(@list)
     end
 
     def test_cycle

test/psych/test_hash.rb

@@ -112,16 +112,22 @@ eoyml
       assert_equal({"foo"=>{"hello"=>"world"}, "bar"=>{"hello"=>"world"}}, hash)
     end
 
+    def test_recursive_hash
+      h = { }
+      h["recursive_reference"] = h
+
+      loaded = Psych.load(Psych.dump(h), aliases: true)
+
+      assert_same loaded, loaded.fetch("recursive_reference")
+    end
+
     def test_recursive_hash_uses_alias
       h = { }
       h["recursive_reference"] = h
 
-      expected = <<~eoyaml
+      assert_raise(BadAlias) do
-        --- &1
+        Psych.load(Psych.dump(h), aliases: false)
-        recursive_reference: *1
+      end
-      eoyaml
-
-      assert_equal(expected, Psych.dump(h))
     end
 
     def test_key_deduplication

test/psych/test_object.rb

@@ -36,22 +36,19 @@ module Psych
     def test_cyclic_references
       foo = Foo.new(nil)
       foo.parent = foo
-      loaded = Psych.unsafe_load Psych.dump foo
+      loaded = Psych.load(Psych.dump(foo), permitted_classes: [Foo], aliases: true)
 
       assert_instance_of(Foo, loaded)
-      assert_equal loaded, loaded.parent
+      assert_same loaded, loaded.parent
     end
 
     def test_cyclic_reference_uses_alias
       foo = Foo.new(nil)
       foo.parent = foo
 
-      expected = <<~eoyaml
+      assert_raise(BadAlias) do
-        --- &1 !ruby/object:Psych::Foo
+        Psych.load(Psych.dump(foo), permitted_classes: [Foo], aliases: false)
-        parent: *1
+      end
-      eoyaml
-
-      assert_equal expected, Psych.dump(foo)
     end
   end
 end