1 files changed, 42 insertions, 13 deletions
diff --git a/spec/ruby/core/method/shared/to_s.rb b/spec/ruby/core/method/shared/to_s.rb
index 7666322936..bfb58e6896 100644
--- a/spec/ruby/core/method/shared/to_s.rb
+++ b/spec/ruby/core/method/shared/to_s.rb
@@ -4,16 +4,16 @@ require_relative '../fixtures/classes'
 describe :method_to_s, shared: true do
   before :each do
     @m = MethodSpecs::MySub.new.method :bar
-    @string = @m.send(@method).sub(/0x\w+/, '0xXXXXXX')
+    @string = @m.send(@method)
   end
 
   it "returns a String" do
-    @m.send(@method).should be_kind_of(String)
+    @m.send(@method).should.is_a?(String)
   end
 
   it "returns a String for methods defined with attr_accessor" do
     m = MethodSpecs::Methods.new.method :attr
-    m.send(@method).should be_kind_of(String)
+    m.send(@method).should.is_a?(String)
   end
 
   it "returns a String containing 'Method'" do
@@ -24,6 +24,19 @@ describe :method_to_s, shared: true do
     @string.should =~ /\#bar/
   end
 
+  it "returns a String containing method arguments" do
+    obj = MethodSpecs::Methods.new
+    obj.method(:zero).send(@method).should.include?("()")
+    obj.method(:one_req).send(@method).should.include?("(a)")
+    obj.method(:one_req_named).send(@method).should.include?("(a:)")
+    obj.method(:zero_with_block).send(@method).should.include?("(&blk)")
+    obj.method(:one_opt).send(@method).should.include?("(a=...)")
+    obj.method(:one_opt_named).send(@method).should.include?("(a: ...)")
+    obj.method(:zero_with_splat).send(@method).should.include?("(*a)")
+    obj.method(:zero_with_double_splat).send(@method).should.include?("(**a)")
+    obj.method(:one_req_one_opt_with_splat_and_block).send(@method).should.include?("(a, b=..., *c, &blk)")
+  end
+
   it "returns a String containing the Module the method is defined in" do
     @string.should =~ /MethodSpecs::MyMod/
   end
@@ -32,21 +45,37 @@ describe :method_to_s, shared: true do
     @string.should =~ /MethodSpecs::MySub/
   end
 
-  ruby_version_is '2.8' do
-    it "returns a String containing the Module containing the method if object has a singleton class but method is not defined in the singleton class" do
-      obj = MethodSpecs::MySub.new
-      obj.singleton_class
-      @m = obj.method(:bar)
-      @string = @m.send(@method).sub(/0x\w+/, '0xXXXXXX')
-      @string.should =~ /\A#<Method: MethodSpecs::MySub\(MethodSpecs::MyMod\)#bar\(\) /
-    end
+  it "returns a String including all details" do
+    @string.should.start_with? "#<Method: MethodSpecs::MySub(MethodSpecs::MyMod)#bar"
+  end
+
+  it "does not show the defining module if it is the same as the receiver class" do
+    MethodSpecs::A.new.method(:baz).send(@method).should.start_with? "#<Method: MethodSpecs::A#baz"
+  end
+
+  it "returns a String containing the Module containing the method if object has a singleton class but method is not defined in the singleton class" do
+    obj = MethodSpecs::MySub.new
+    obj.singleton_class
+    @m = obj.method(:bar)
+    @string = @m.send(@method)
+    @string.should.start_with? "#<Method: MethodSpecs::MySub(MethodSpecs::MyMod)#bar"
+
+    c = MethodSpecs::MySub.dup
+    m = Module.new{def bar; end}
+    c.extend(m)
+    @string = c.method(:bar).send(@method)
+    @string.should.start_with? "#<Method: #<Class:#{c.inspect}>(#{m.inspect})#bar"
   end
 
   it "returns a String containing the singleton class if method is defined in the singleton class" do
     obj = MethodSpecs::MySub.new
     def obj.bar; end
     @m = obj.method(:bar)
-    @string = @m.send(@method).sub(/0x\w+/, '0xXXXXXX')
-    @string.should =~ /\A#<Method: #<MethodSpecs::MySub:0xXXXXXX>\.bar/
+    @string = @m.send(@method).sub(/0x\h+/, '0xXXXXXX')
+    @string.should.start_with? "#<Method: #<MethodSpecs::MySub:0xXXXXXX>.bar"
+  end
+
+  it "shows the metaclass and the owner for a Module instance method retrieved from a class" do
+    String.method(:include).inspect.should.start_with?("#<Method: #<Class:String>(Module)#include")
   end
 end