1 files changed, 55 insertions, 6 deletions
diff --git a/spec/ruby/core/module/method_defined_spec.rb b/spec/ruby/core/module/method_defined_spec.rb
index d6206fa57e..e6b4c7b817 100644
--- a/spec/ruby/core/module/method_defined_spec.rb
+++ b/spec/ruby/core/module/method_defined_spec.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 "Module#method_defined?" do
   it "returns true if a public or private method with the given name is defined in self, self's ancestors or one of self's included modules" do
@@ -27,17 +27,17 @@ describe "Module#method_defined?" do
   it "does not search Object or Kernel when called on a module" do
     m = Module.new
 
-    m.method_defined?(:module_specs_public_method_on_kernel).should be_false
+    m.method_defined?(:module_specs_public_method_on_kernel).should == false
   end
 
-  it "raises a TypeError when the given object is not a string/symbol/fixnum" do
+  it "raises a TypeError when the given object is not a string/symbol" do
     c = Class.new
     o = mock('123')
 
-    lambda { c.method_defined?(o) }.should raise_error(TypeError)
+    -> { c.method_defined?(o) }.should.raise(TypeError)
 
     o.should_receive(:to_str).and_return(123)
-    lambda { c.method_defined?(o) }.should raise_error(TypeError)
+    -> { c.method_defined?(o) }.should.raise(TypeError)
   end
 
   it "converts the given name to a string using to_str" do
@@ -46,4 +46,53 @@ describe "Module#method_defined?" do
 
     c.method_defined?(o).should == true
   end
+
+  # works as method_defined?(method_name)
+  describe "when passed true as a second optional argument" do
+    it "performs a lookup in ancestors" do
+      ModuleSpecs::Child.method_defined?(:public_child, true).should == true
+      ModuleSpecs::Child.method_defined?(:protected_child, true).should == true
+      ModuleSpecs::Child.method_defined?(:accessor_method, true).should == true
+      ModuleSpecs::Child.method_defined?(:private_child, true).should == false
+
+      # Defined in Parent
+      ModuleSpecs::Child.method_defined?(:public_parent, true).should == true
+      ModuleSpecs::Child.method_defined?(:protected_parent, true).should == true
+      ModuleSpecs::Child.method_defined?(:private_parent, true).should == false
+
+      # Defined in Module
+      ModuleSpecs::Child.method_defined?(:public_module, true).should == true
+      ModuleSpecs::Child.method_defined?(:protected_module, true).should == true
+      ModuleSpecs::Child.method_defined?(:private_module, true).should == false
+
+      # Defined in SuperModule
+      ModuleSpecs::Child.method_defined?(:public_super_module, true).should == true
+      ModuleSpecs::Child.method_defined?(:protected_super_module, true).should == true
+      ModuleSpecs::Child.method_defined?(:private_super_module, true).should == false
+    end
+  end
+
+  describe "when passed false as a second optional argument" do
+    it "checks only the class itself" do
+      ModuleSpecs::Child.method_defined?(:public_child, false).should == true
+      ModuleSpecs::Child.method_defined?(:protected_child, false).should == true
+      ModuleSpecs::Child.method_defined?(:accessor_method, false).should == true
+      ModuleSpecs::Child.method_defined?(:private_child, false).should == false
+
+      # Defined in Parent
+      ModuleSpecs::Child.method_defined?(:public_parent, false).should == false
+      ModuleSpecs::Child.method_defined?(:protected_parent, false).should == false
+      ModuleSpecs::Child.method_defined?(:private_parent, false).should == false
+
+      # Defined in Module
+      ModuleSpecs::Child.method_defined?(:public_module, false).should == false
+      ModuleSpecs::Child.method_defined?(:protected_module, false).should == false
+      ModuleSpecs::Child.method_defined?(:private_module, false).should == false
+
+      # Defined in SuperModule
+      ModuleSpecs::Child.method_defined?(:public_super_module, false).should == false
+      ModuleSpecs::Child.method_defined?(:protected_super_module, false).should == false
+      ModuleSpecs::Child.method_defined?(:private_super_module, false).should == false
+    end
+  end
 end