1 files changed, 20 insertions, 11 deletions
diff --git a/spec/ruby/core/method/unbind_spec.rb b/spec/ruby/core/method/unbind_spec.rb
index 3d36c6d675..994c3a8879 100644
--- a/spec/ruby/core/method/unbind_spec.rb
+++ b/spec/ruby/core/method/unbind_spec.rb
@@ -11,23 +11,32 @@ describe "Method#unbind" do
   end
 
   it "returns an UnboundMethod" do
-    @normal_um.should be_kind_of(UnboundMethod)
+    @normal_um.should.is_a?(UnboundMethod)
   end
 
-  it "returns a String containing 'UnboundMethod'" do
-    @string.should =~ /\bUnboundMethod\b/
-  end
+  describe "#inspect" do
+    it "returns a String containing 'UnboundMethod'" do
+      @string.should =~ /\bUnboundMethod\b/
+    end
 
-  it "returns a String containing the method name" do
-    @string.should =~ /\#bar/
-  end
+    it "returns a String containing the method name" do
+      @string.should =~ /\#bar/
+    end
+
+    it "returns a String containing the Module the method is defined in" do
+      @string.should =~ /MethodSpecs::MyMod/
+    end
 
-  it "returns a String containing the Module the method is defined in" do
-    @string.should =~ /MethodSpecs::MyMod/
+    it "returns a String containing the Module the method is referenced from" do
+      @string.should =~ /MethodSpecs::MyMod/
+    end
   end
 
-  it "returns a String containing the Module the method is referenced from" do
-    @string.should =~ /MethodSpecs::MySub/
+  it "keeps the origin singleton class if there is one" do
+    obj = Object.new
+    def obj.foo
+    end
+    obj.method(:foo).unbind.inspect.should.start_with?("#<UnboundMethod: #{obj.singleton_class}#foo")
   end
 
   specify "rebinding UnboundMethod to Method's obj produces exactly equivalent Methods" do