2 files changed, 46 insertions, 49 deletions
diff --git a/spec/ruby/core/basicobject/equal_spec.rb b/spec/ruby/core/basicobject/equal_spec.rb
index c0f41dc0c0..f27f0d7aca 100644
--- a/spec/ruby/core/basicobject/equal_spec.rb
+++ b/spec/ruby/core/basicobject/equal_spec.rb
@@ -1,54 +1,7 @@
 require_relative '../../spec_helper'
-require_relative '../../shared/kernel/equal'
 
 describe "BasicObject#equal?" do
-  it "is a public instance method" do
-    BasicObject.public_instance_methods(false).should.include?(:equal?)
-  end
-
-  it_behaves_like :object_equal, :equal?
-
-  it "is unaffected by overriding __id__" do
-    o1 = mock("object")
-    o2 = mock("object")
-    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
-    o1 = mock("object")
-    o1.stub!(:object_id).and_return(10)
-    o2 = mock("object")
-    o2.stub!(:object_id).and_return(10)
-    o1.equal?(o2).should == false
-  end
-
-  it "is unaffected by overriding ==" do
-    # different objects, overriding == to return true
-    o1 = mock("object")
-    o1.stub!(:==).and_return(true)
-    o2 = mock("object")
-    o1.equal?(o2).should == false
-
-    # same objects, overriding == to return false
-    o3 = mock("object")
-    o3.stub!(:==).and_return(false)
-    o3.equal?(o3).should == true
-  end
-
-  it "is unaffected by overriding eql?" do
-    # different objects, overriding eql? to return true
-    o1 = mock("object")
-    o1.stub!(:eql?).and_return(true)
-    o2 = mock("object")
-    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 == true
+  it "is an alias of BasicObject#==" do
+    BasicObject.instance_method(:equal?).should == BasicObject.instance_method(:==)
   end
 end
diff --git a/spec/ruby/core/basicobject/equal_value_spec.rb b/spec/ruby/core/basicobject/equal_value_spec.rb
index eb951a8305..15755a44a2 100644
--- a/spec/ruby/core/basicobject/equal_value_spec.rb
+++ b/spec/ruby/core/basicobject/equal_value_spec.rb
@@ -7,4 +7,48 @@ describe "BasicObject#==" do
   end
 
   it_behaves_like :object_equal, :==
+
+  it "is unaffected by overriding __id__" do
+    o1 = mock("object")
+    o2 = mock("object")
+    suppress_warning {
+      def o1.__id__; 10; end
+      def o2.__id__; 10; end
+    }
+    (o1 == o2).should == false
+  end
+
+  it "is unaffected by overriding object_id" do
+    o1 = mock("object")
+    o1.stub!(:object_id).and_return(10)
+    o2 = mock("object")
+    o2.stub!(:object_id).and_return(10)
+    (o1 == o2).should == false
+  end
+
+  it "is unaffected by overriding equal?" do
+    # different objects, overriding equal? to return true
+    o1 = mock("object")
+    o1.stub!(:equal?).and_return(true)
+    o2 = mock("object")
+    (o1 == o2).should == false
+
+    # same objects, overriding equal? to return false
+    o3 = mock("object")
+    o3.stub!(:equal?).and_return(false)
+    (o3 == o3).should == true
+  end
+
+  it "is unaffected by overriding eql?" do
+    # different objects, overriding eql? to return true
+    o1 = mock("object")
+    o1.stub!(:eql?).and_return(true)
+    o2 = mock("object")
+    (o1 == o2).should == false
+
+    # same objects, overriding eql? to return false
+    o3 = mock("object")
+    o3.stub!(:eql?).and_return(false)
+    (o3 == o3).should == true
+  end
 end