1 files changed, 50 insertions, 25 deletions
diff --git a/spec/ruby/core/objectspace/define_finalizer_spec.rb b/spec/ruby/core/objectspace/define_finalizer_spec.rb
index effecc41d0..5441cb4a21 100644
--- a/spec/ruby/core/objectspace/define_finalizer_spec.rb
+++ b/spec/ruby/core/objectspace/define_finalizer_spec.rb
@@ -13,7 +13,7 @@ describe "ObjectSpace.define_finalizer" do
   it "raises an ArgumentError if the action does not respond to call" do
     -> {
       ObjectSpace.define_finalizer(Object.new, mock("ObjectSpace.define_finalizer no #call"))
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
   end
 
   it "accepts an object and a proc" do
@@ -42,7 +42,7 @@ describe "ObjectSpace.define_finalizer" do
   it "raises ArgumentError trying to define a finalizer on a non-reference" do
     -> {
       ObjectSpace.define_finalizer(:blah) { 1 }
-    }.should raise_error(ArgumentError)
+    }.should.raise(ArgumentError)
   end
 
   # see [ruby-core:24095]
@@ -57,7 +57,7 @@ describe "ObjectSpace.define_finalizer" do
       exit 0
     RUBY
 
-    ruby_exe(code, :args => "2>&1").should include("finalizer run\n")
+    ruby_exe(code, :args => "2>&1").should.include?("finalizer run\n")
   end
 
   it "warns if the finalizer has the object as the receiver" do
@@ -73,7 +73,7 @@ describe "ObjectSpace.define_finalizer" do
       exit 0
     RUBY
 
-    ruby_exe(code, :args => "2>&1").should include("warning: finalizer references object to be finalized\n")
+    ruby_exe(code, :args => "2>&1").should.include?("warning: finalizer references object to be finalized\n")
   end
 
   it "warns if the finalizer is a method bound to the receiver" do
@@ -90,7 +90,7 @@ describe "ObjectSpace.define_finalizer" do
       exit 0
     RUBY
 
-    ruby_exe(code, :args => "2>&1").should include("warning: finalizer references object to be finalized\n")
+    ruby_exe(code, :args => "2>&1").should.include?("warning: finalizer references object to be finalized\n")
   end
 
   it "warns if the finalizer was a block in the receiver" do
@@ -106,7 +106,7 @@ describe "ObjectSpace.define_finalizer" do
       exit 0
     RUBY
 
-    ruby_exe(code, :args => "2>&1").should include("warning: finalizer references object to be finalized\n")
+    ruby_exe(code, :args => "2>&1").should.include?("warning: finalizer references object to be finalized\n")
   end
 
   it "calls a finalizer at exit even if it is self-referencing" do
@@ -117,7 +117,7 @@ describe "ObjectSpace.define_finalizer" do
       exit 0
     RUBY
 
-    ruby_exe(code).should include("finalizer run\n")
+    ruby_exe(code).should.include?("finalizer run\n")
   end
 
   it "calls a finalizer at exit even if it is indirectly self-referencing" do
@@ -136,7 +136,7 @@ describe "ObjectSpace.define_finalizer" do
       exit 0
     RUBY
 
-    ruby_exe(code, :args => "2>&1").should include("finalizer run\n")
+    ruby_exe(code, :args => "2>&1").should.include?("finalizer run\n")
   end
 
   it "calls a finalizer defined in a finalizer running at exit" do
@@ -152,11 +152,11 @@ describe "ObjectSpace.define_finalizer" do
       exit 0
     RUBY
 
-    ruby_exe(code, :args => "2>&1").should include("finalizer 2 run\n")
+    ruby_exe(code, :args => "2>&1").should.include?("finalizer 2 run\n")
   end
 
   it "allows multiple finalizers with different 'callables' to be defined" do
-    code = <<-RUBY
+    code = <<-'RUBY'
       obj = Object.new
 
       ObjectSpace.define_finalizer(obj, Proc.new { STDOUT.write "finalized1\n" })
@@ -168,25 +168,50 @@ describe "ObjectSpace.define_finalizer" do
     ruby_exe(code).lines.sort.should == ["finalized1\n", "finalized2\n"]
   end
 
-  ruby_version_is "3.1" do
-    describe "when $VERBOSE is not nil" do
-      it "warns if an exception is raised in finalizer" do
-        code = <<-RUBY
-          ObjectSpace.define_finalizer(Object.new) { raise "finalizing" }
-        RUBY
+  it "defines same finalizer only once" do
+    code = <<~RUBY
+      obj = Object.new
+      p = proc { |id| print "ok" }
+      ObjectSpace.define_finalizer(obj, p.dup)
+      ObjectSpace.define_finalizer(obj, p.dup)
+    RUBY
 
-        ruby_exe(code, args: "2>&1").should include("warning: Exception in finalizer", "finalizing")
-      end
+    ruby_exe(code).should == "ok"
+  end
+
+  it "returns the defined finalizer" do
+    obj = Object.new
+    p = proc { |id| }
+    p2 = p.dup
+
+    ret = ObjectSpace.define_finalizer(obj, p)
+    ret.should == [0, p]
+    ret[1].should.equal?(p)
+
+    ret = ObjectSpace.define_finalizer(obj, p2)
+    ret.should == [0, p]
+    ret[1].should.equal?(p)
+  end
+
+  describe "when $VERBOSE is not nil" do
+    it "warns if an exception is raised in finalizer" do
+      code = <<-RUBY
+        ObjectSpace.define_finalizer(Object.new) { raise "finalizing" }
+      RUBY
+
+      out = ruby_exe(code, args: "2>&1")
+      out.should.include?("warning: Exception in finalizer")
+      out.should.include?("finalizing")
     end
+  end
 
-    describe "when $VERBOSE is nil" do
-      it "does not warn even if an exception is raised in finalizer" do
-        code = <<-RUBY
-          ObjectSpace.define_finalizer(Object.new) { raise "finalizing" }
-        RUBY
+  describe "when $VERBOSE is nil" do
+    it "does not warn even if an exception is raised in finalizer" do
+      code = <<-RUBY
+        ObjectSpace.define_finalizer(Object.new) { raise "finalizing" }
+      RUBY
 
-        ruby_exe(code, args: "2>&1", options: "-W0").should == ""
-      end
+      ruby_exe(code, args: "2>&1", options: "-W0").should == ""
     end
   end
 end