1 files changed, 16 insertions, 8 deletions
diff --git a/spec/ruby/core/unboundmethod/bind_spec.rb b/spec/ruby/core/unboundmethod/bind_spec.rb
index 03aaa22e74..087994ff57 100644
--- a/spec/ruby/core/unboundmethod/bind_spec.rb
+++ b/spec/ruby/core/unboundmethod/bind_spec.rb
@@ -7,18 +7,20 @@ describe "UnboundMethod#bind" do
     @parent_um = UnboundMethodSpecs::Parent.new.method(:foo).unbind
     @child1_um = UnboundMethodSpecs::Child1.new.method(:foo).unbind
     @child2_um = UnboundMethodSpecs::Child2.new.method(:foo).unbind
+    @normal_um_super = UnboundMethodSpecs::Mod.instance_method(:foo_super)
+    @parent_um_super = UnboundMethodSpecs::Parent.new.method(:foo_super).unbind
   end
 
   it "raises TypeError if object is not kind_of? the Module the method defined in" do
-    -> { @normal_um.bind(UnboundMethodSpecs::B.new) }.should raise_error(TypeError)
+    -> { @normal_um.bind(UnboundMethodSpecs::B.new) }.should.raise(TypeError)
   end
 
   it "returns Method for any object that is kind_of? the Module method was extracted from" do
-    @normal_um.bind(UnboundMethodSpecs::Methods.new).should be_kind_of(Method)
+    @normal_um.bind(UnboundMethodSpecs::Methods.new).should.is_a?(Method)
   end
 
   it "returns Method on any object when UnboundMethod is unbound from a module" do
-    UnboundMethodSpecs::Mod.instance_method(:from_mod).bind(Object.new).should be_kind_of(Method)
+    UnboundMethodSpecs::Mod.instance_method(:from_mod).bind(Object.new).should.is_a?(Method)
   end
 
   it "the returned Method is equal to the one directly returned by obj.method" do
@@ -27,9 +29,9 @@ describe "UnboundMethod#bind" do
   end
 
   it "returns Method for any object kind_of? the Module the method is defined in" do
-    @parent_um.bind(UnboundMethodSpecs::Child1.new).should be_kind_of(Method)
-    @child1_um.bind(UnboundMethodSpecs::Parent.new).should be_kind_of(Method)
-    @child2_um.bind(UnboundMethodSpecs::Child1.new).should be_kind_of(Method)
+    @parent_um.bind(UnboundMethodSpecs::Child1.new).should.is_a?(Method)
+    @child1_um.bind(UnboundMethodSpecs::Parent.new).should.is_a?(Method)
+    @child2_um.bind(UnboundMethodSpecs::Child1.new).should.is_a?(Method)
   end
 
   it "allows binding a Kernel method retrieved from Object on BasicObject" do
@@ -43,7 +45,7 @@ describe "UnboundMethod#bind" do
 
   it "binds a Parent's class method to any Child's class methods" do
     m = UnboundMethodSpecs::Parent.method(:class_method).unbind.bind(UnboundMethodSpecs::Child1)
-    m.should be_an_instance_of(Method)
+    m.should.instance_of?(Method)
     m.call.should == "I am UnboundMethodSpecs::Child1"
   end
 
@@ -56,6 +58,12 @@ describe "UnboundMethod#bind" do
       end
     end
     um = p.method(:singleton_method).unbind
-    ->{ um.bind(other) }.should raise_error(TypeError)
+    ->{ um.bind(other) }.should.raise(TypeError)
+  end
+
+  it "allows calling super for module methods bound to hierarchies that do not already have that module" do
+    p = UnboundMethodSpecs::Parent.new
+
+    @normal_um_super.bind(p).call.should == true
   end
 end