1 files changed, 11 insertions, 9 deletions
diff --git a/spec/ruby/core/basicobject/equal_spec.rb b/spec/ruby/core/basicobject/equal_spec.rb
index 3c1ad56d4a..c0f41dc0c0 100644
--- a/spec/ruby/core/basicobject/equal_spec.rb
+++ b/spec/ruby/core/basicobject/equal_spec.rb
@@ -3,7 +3,7 @@ require_relative '../../shared/kernel/equal'
 
 describe "BasicObject#equal?" do
   it "is a public instance method" do
-    BasicObject.should have_public_instance_method(:equal?)
+    BasicObject.public_instance_methods(false).should.include?(:equal?)
   end
 
   it_behaves_like :object_equal, :equal?
@@ -11,9 +11,11 @@ describe "BasicObject#equal?" do
   it "is unaffected by overriding __id__" do
     o1 = mock("object")
     o2 = mock("object")
-    def o1.__id__; 10; end
-    def o2.__id__; 10; end
-    o1.equal?(o2).should be_false
+    suppress_warning {
+      def o1.__id__; 10; end
+      def o2.__id__; 10; end
+    }
+    o1.equal?(o2).should == false
   end
 
   it "is unaffected by overriding object_id" do
@@ -21,7 +23,7 @@ describe "BasicObject#equal?" do
     o1.stub!(:object_id).and_return(10)
     o2 = mock("object")
     o2.stub!(:object_id).and_return(10)
-    o1.equal?(o2).should be_false
+    o1.equal?(o2).should == false
   end
 
   it "is unaffected by overriding ==" do
@@ -29,12 +31,12 @@ describe "BasicObject#equal?" do
     o1 = mock("object")
     o1.stub!(:==).and_return(true)
     o2 = mock("object")
-    o1.equal?(o2).should be_false
+    o1.equal?(o2).should == false
 
     # same objects, overriding == to return false
     o3 = mock("object")
     o3.stub!(:==).and_return(false)
-    o3.equal?(o3).should be_true
+    o3.equal?(o3).should == true
   end
 
   it "is unaffected by overriding eql?" do
@@ -42,11 +44,11 @@ describe "BasicObject#equal?" do
     o1 = mock("object")
     o1.stub!(:eql?).and_return(true)
     o2 = mock("object")
-    o1.equal?(o2).should be_false
+    o1.equal?(o2).should == false
 
     # same objects, overriding eql? to return false
     o3 = mock("object")
     o3.stub!(:eql?).and_return(false)
-    o3.equal?(o3).should be_true
+    o3.equal?(o3).should == true
   end
 end