5 files changed, 35 insertions, 149 deletions
diff --git a/spec/ruby/core/method/shared/aliased_inspect.rb b/spec/ruby/core/method/shared/aliased_inspect.rb
new file mode 100644
index 0000000000..2a622c2f97
--- /dev/null
+++ b/spec/ruby/core/method/shared/aliased_inspect.rb
@@ -0,0 +1,31 @@
+describe :method_to_s_aliased, shared: true do
+  # @object converts a bound Method to either a Method (identity) or an
+  # UnboundMethod (-> meth { meth.unbind }), so these expectations cover both
+  # Method#to_s/#inspect and UnboundMethod#to_s/#inspect.
+
+  it "shows the original name in parentheses for an aliased method" do
+    klass = Class.new do
+      def original_method; end
+      alias_method :renamed_method, :original_method
+    end
+    @object.call(klass.new.method(:renamed_method)).send(@method).should.include? '#renamed_method(original_method)'
+  end
+
+  it "shows the source UnboundMethod's name in parentheses for a define_method'd method" do
+    klass = Class.new { define_method(:renamed_is_a?, ::Kernel.instance_method(:is_a?)) }
+    @object.call(klass.new.method(:renamed_is_a?)).send(@method).should.include? '#renamed_is_a?(is_a?)'
+  end
+
+  it "does not annotate a directly looked-up Kernel method with a shared internal name" do
+    @object.call(Object.new.method(:is_a?)).send(@method).should_not.include? '(kind_of?)'
+    @object.call(Object.new.method(:kind_of?)).send(@method).should_not.include? '(is_a?)'
+  end
+
+  it "shows the source name when aliasing a define_method'd Kernel method" do
+    klass = Class.new do
+      define_method(:my_is_a?, ::Kernel.instance_method(:is_a?))
+      alias_method :renamed_is_a?, :my_is_a?
+    end
+    @object.call(klass.new.method(:renamed_is_a?)).send(@method).should.include? '#renamed_is_a?(is_a?)'
+  end
+end
diff --git a/spec/ruby/core/method/shared/call.rb b/spec/ruby/core/method/shared/call.rb
deleted file mode 100644
index f26e373695..0000000000
--- a/spec/ruby/core/method/shared/call.rb
+++ /dev/null
@@ -1,51 +0,0 @@
-describe :method_call, shared: true do
-  it "invokes the method with the specified arguments, returning the method's return value" do
-    m = 12.method("+")
-    m.send(@method, 3).should == 15
-    m.send(@method, 20).should == 32
-
-    m = MethodSpecs::Methods.new.method(:attr=)
-    m.send(@method, 42).should == 42
-  end
-
-  it "raises an ArgumentError when given incorrect number of arguments" do
-    -> {
-      MethodSpecs::Methods.new.method(:two_req).send(@method, 1, 2, 3)
-    }.should raise_error(ArgumentError)
-    -> {
-      MethodSpecs::Methods.new.method(:two_req).send(@method, 1)
-    }.should raise_error(ArgumentError)
-  end
-
-  describe "for a Method generated by respond_to_missing?" do
-    it "invokes method_missing with the specified arguments and returns the result" do
-      @m = MethodSpecs::Methods.new
-      meth = @m.method(:handled_via_method_missing)
-      meth.send(@method, :argument).should == [:argument]
-    end
-
-    it "invokes method_missing with the method name and the specified arguments" do
-      @m = MethodSpecs::Methods.new
-      meth = @m.method(:handled_via_method_missing)
-
-      @m.should_receive(:method_missing).with(:handled_via_method_missing, :argument)
-      meth.send(@method, :argument)
-    end
-
-    it "invokes method_missing dynamically" do
-      @m = MethodSpecs::Methods.new
-      meth = @m.method(:handled_via_method_missing)
-
-      def @m.method_missing(*); :changed; end
-      meth.send(@method, :argument).should == :changed
-    end
-
-    it "does not call the original method name even if it now exists" do
-      @m = MethodSpecs::Methods.new
-      meth = @m.method(:handled_via_method_missing)
-
-      def @m.handled_via_method_missing(*); :not_called; end
-      meth.send(@method, :argument).should == [:argument]
-    end
-  end
-end
diff --git a/spec/ruby/core/method/shared/dup.rb b/spec/ruby/core/method/shared/dup.rb
index 1a10b90689..eee790890a 100644
--- a/spec/ruby/core/method/shared/dup.rb
+++ b/spec/ruby/core/method/shared/dup.rb
@@ -4,7 +4,7 @@ describe :method_dup, shared: true do
     b = a.send(@method)
 
     a.should == b
-    a.should_not equal(b)
+    a.should_not.equal?(b)
   end
 
   ruby_version_is "3.4" do
@@ -16,7 +16,7 @@ describe :method_dup, shared: true do
     end
 
     it "copies the finalizer" do
-      code = <<-RUBY
+      code = <<-'RUBY'
         obj = Object.new.method(:method)
 
         ObjectSpace.define_finalizer(obj, Proc.new { STDOUT.write "finalized\n" })
diff --git a/spec/ruby/core/method/shared/eql.rb b/spec/ruby/core/method/shared/eql.rb
deleted file mode 100644
index 5c720cbac1..0000000000
--- a/spec/ruby/core/method/shared/eql.rb
+++ /dev/null
@@ -1,94 +0,0 @@
-require_relative '../../../spec_helper'
-require_relative '../fixtures/classes'
-
-describe :method_equal, shared: true do
-  before :each do
-    @m = MethodSpecs::Methods.new
-    @m_foo = @m.method(:foo)
-    @m2 = MethodSpecs::Methods.new
-    @a = MethodSpecs::A.new
-  end
-
-  it "returns true if methods are the same" do
-    m2 = @m.method(:foo)
-
-    @m_foo.send(@method, @m_foo).should be_true
-    @m_foo.send(@method, m2).should be_true
-  end
-
-  it "returns true on aliased methods" do
-    m_bar = @m.method(:bar)
-
-    m_bar.send(@method, @m_foo).should be_true
-  end
-
-  it "returns true if the two core methods are aliases" do
-    s = "hello"
-    a = s.method(:size)
-    b = s.method(:length)
-    a.send(@method, b).should be_true
-  end
-
-  it "returns false on a method which is neither aliased nor the same method" do
-    m2 = @m.method(:zero)
-
-    @m_foo.send(@method, m2).should be_false
-  end
-
-  it "returns false for a method which is not bound to the same object" do
-    m2_foo = @m2.method(:foo)
-    a_baz = @a.method(:baz)
-
-    @m_foo.send(@method, m2_foo).should be_false
-    @m_foo.send(@method, a_baz).should be_false
-  end
-
-  it "returns false if the two methods are bound to the same object but were defined independently" do
-    m2 = @m.method(:same_as_foo)
-    @m_foo.send(@method, m2).should be_false
-  end
-
-  it "returns true if a method was defined using the other one" do
-    MethodSpecs::Methods.send :define_method, :defined_foo, MethodSpecs::Methods.instance_method(:foo)
-    m2 = @m.method(:defined_foo)
-    @m_foo.send(@method, m2).should be_true
-  end
-
-  it "returns false if comparing a method defined via define_method and def" do
-    defn = @m.method(:zero)
-    defined = @m.method(:zero_defined_method)
-
-    defn.send(@method, defined).should be_false
-    defined.send(@method, defn).should be_false
-  end
-
-  describe 'missing methods' do
-    it "returns true for the same method missing" do
-      miss1 = @m.method(:handled_via_method_missing)
-      miss1bis = @m.method(:handled_via_method_missing)
-      miss2 = @m.method(:also_handled)
-
-      miss1.send(@method, miss1bis).should be_true
-      miss1.send(@method, miss2).should be_false
-    end
-
-    it 'calls respond_to_missing? with true to include private methods' do
-      @m.should_receive(:respond_to_missing?).with(:some_missing_method, true).and_return(true)
-      @m.method(:some_missing_method)
-    end
-  end
-
-  it "returns false if the two methods are bound to different objects, have the same names, and identical bodies" do
-    a = MethodSpecs::Eql.instance_method(:same_body)
-    b = MethodSpecs::Eql2.instance_method(:same_body)
-    a.send(@method, b).should be_false
-  end
-
-  it "returns false if the argument is not a Method object" do
-    String.instance_method(:size).send(@method, 7).should be_false
-  end
-
-  it "returns false if the argument is an unbound version of self" do
-    method(:load).send(@method, method(:load).unbind).should be_false
-  end
-end
diff --git a/spec/ruby/core/method/shared/to_s.rb b/spec/ruby/core/method/shared/to_s.rb
index b2d27d370f..bfb58e6896 100644
--- a/spec/ruby/core/method/shared/to_s.rb
+++ b/spec/ruby/core/method/shared/to_s.rb
@@ -8,12 +8,12 @@ describe :method_to_s, shared: true do
   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