1 files changed, 13 insertions, 5 deletions
diff --git a/spec/ruby/core/unboundmethod/shared/to_s.rb b/spec/ruby/core/unboundmethod/shared/to_s.rb
index 07ba0903e2..848c1eba2e 100644
--- a/spec/ruby/core/unboundmethod/shared/to_s.rb
+++ b/spec/ruby/core/unboundmethod/shared/to_s.rb
@@ -1,5 +1,5 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
-require File.expand_path('../../fixtures/classes', __FILE__)
+require_relative '../../../spec_helper'
+require_relative '../fixtures/classes'
 
 describe :unboundmethod_to_s, shared: true do
   before :each do
@@ -8,8 +8,8 @@ describe :unboundmethod_to_s, shared: true do
   end
 
   it "returns a String" do
-    @from_module.send(@method).should be_kind_of(String)
-    @from_method.send(@method).should be_kind_of(String)
+    @from_module.send(@method).should.is_a?(String)
+    @from_method.send(@method).should.is_a?(String)
   end
 
   it "the String reflects that this is an UnboundMethod object" do
@@ -20,6 +20,14 @@ describe :unboundmethod_to_s, shared: true do
   it "the String shows the method name, Module defined in and Module extracted from" do
     @from_module.send(@method).should =~ /\bfrom_mod\b/
     @from_module.send(@method).should =~ /\bUnboundMethodSpecs::Mod\b/
-    @from_method.send(@method).should =~ /\bUnboundMethodSpecs::Methods\b/
+  end
+
+  it "returns a String including all details" do
+    @from_module.send(@method).should.start_with? "#<UnboundMethod: UnboundMethodSpecs::Mod#from_mod"
+    @from_method.send(@method).should.start_with? "#<UnboundMethod: UnboundMethodSpecs::Mod#from_mod"
+  end
+
+  it "does not show the defining module if it is the same as the origin" do
+    UnboundMethodSpecs::A.instance_method(:baz).send(@method).should.start_with? "#<UnboundMethod: UnboundMethodSpecs::A#baz"
   end
 end