test/test_rhubarb.rb in rhubarb-0.4.0 vs test/test_rhubarb.rb in rhubarb-0.4.2

@@ -283,27 +283,27 @@
   end
 
   def test_instance_methods
     ["foo", "bar"].each do |prefix|
       ["#{prefix}", "#{prefix}="].each do |m|
-        assert TestClass.instance_methods.include?(m), "#{m} method not declared in TestClass"
+        assert TestClass.method_defined?(m), "#{m} method not declared in TestClass"
       end
     end
   end
 
   def test_instance_methods2
     ["fred", "barney"].each do |prefix|
       ["#{prefix}", "#{prefix}="].each do |m|
-        assert TestClass2.instance_methods.include?(m), "#{m} method not declared in TestClass2"
+        assert TestClass2.method_defined?(m), "#{m} method not declared in TestClass2"
       end
     end
   end
 
   def test_instance_methods_neg
     ["fred", "barney"].each do |prefix|
       ["#{prefix}", "#{prefix}="].each do |m|
-        bogus_include = TestClass.instance_methods.include? m
+        bogus_include = TestClass.method_defined? m
         assert(bogus_include == false, "#{m} method declared in TestClass; shouldn't be")
       end
     end
   end
   
@@ -343,11 +343,11 @@
   end
 
   def test_instance_methods_dont_include_class_methods
     ["foo", "bar"].each do |prefix|
       ["find_by_#{prefix}", "find_first_by_#{prefix}"].each do |m|
-        bogus_include = TestClass.instance_methods.include? m
+        bogus_include = TestClass.method_defined? m
         assert(bogus_include == false, "#{m} method declared in TestClass; shouldn't be")
       end
     end
   end
 
@@ -360,20 +360,20 @@
 
   def test_class_methods
     ["foo", "bar"].each do |prefix|
       ["find_by_#{prefix}", "find_first_by_#{prefix}"].each do |m|
         klass = class << TestClass; self end
-        assert klass.instance_methods.include?(m), "#{m} method not declared in TestClass' eigenclass"
+        assert klass.method_defined?(m), "#{m} method not declared in TestClass' eigenclass"
       end
     end
   end
   
   def test_class_methods2
     ["fred", "barney"].each do |prefix|
       ["find_by_#{prefix}", "find_first_by_#{prefix}"].each do |m|
         klass = class << TestClass2; self end
-        assert klass.instance_methods.include?(m), "#{m} method not declared in TestClass2's eigenclass"
+        assert klass.method_defined?(m), "#{m} method not declared in TestClass2's eigenclass"
       end
     end
   end
     
   def test_table_class_methods_neg
@@ -383,20 +383,20 @@
 
         klass.class_eval do
           include Rhubarb::Persisting
         end
 
-        bogus_include = klass.instance_methods.include?(m)
+        bogus_include = klass.method_defined?(m)
         assert(bogus_include == false, "#{m} method declared in eigenclass of class including Rhubarb::Persisting; shouldn't be")
       end
     end
   end
 
   def test_class_methods_neg
     ["fred", "barney"].each do |prefix|
       ["find_by_#{prefix}", "find_first_by_#{prefix}"].each do |m|
         klass = class << TestClass; self end
-        bogus_include = klass.instance_methods.include?(m)
+        bogus_include = klass.method_defined?(m)
         assert(bogus_include == false, "#{m} method declared in TestClass' eigenclass; shouldn't be")
       end
     end
   end