1 files changed, 12 insertions, 16 deletions
diff --git a/spec/ruby/core/enumerator/initialize_spec.rb b/spec/ruby/core/enumerator/initialize_spec.rb
index 58f8a5e865..9929494b5a 100644
--- a/spec/ruby/core/enumerator/initialize_spec.rb
+++ b/spec/ruby/core/enumerator/initialize_spec.rb
@@ -1,6 +1,6 @@
 # -*- encoding: us-ascii -*-
 
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 
 describe "Enumerator#initialize" do
   before :each do
@@ -8,15 +8,11 @@ describe "Enumerator#initialize" do
   end
 
   it "is a private method" do
-    Enumerator.should have_private_instance_method(:initialize, false)
-  end
-
-  it "returns self when given an object" do
-    @uninitialized.send(:initialize, Object.new).should equal(@uninitialized)
+    Enumerator.private_instance_methods(false).should.include?(:initialize)
   end
 
   it "returns self when given a block" do
-    @uninitialized.send(:initialize) {}.should equal(@uninitialized)
+    @uninitialized.send(:initialize) {}.should.equal?(@uninitialized)
   end
 
   # Maybe spec should be broken up?
@@ -25,37 +21,37 @@ describe "Enumerator#initialize" do
       r = yielder.yield 3
       yielder << r << 2 << 1
     end
-    @uninitialized.should be_an_instance_of(Enumerator)
+    @uninitialized.should.instance_of?(Enumerator)
     r = []
     @uninitialized.each{|x| r << x; x * 2}
     r.should == [3, 6, 2, 1]
   end
 
   it "sets size to nil if size is not given" do
-    @uninitialized.send(:initialize) {}.size.should be_nil
+    @uninitialized.send(:initialize) {}.size.should == nil
   end
 
   it "sets size to nil if the given size is nil" do
-    @uninitialized.send(:initialize, nil) {}.size.should be_nil
+    @uninitialized.send(:initialize, nil) {}.size.should == nil
   end
 
   it "sets size to the given size if the given size is Float::INFINITY" do
-    @uninitialized.send(:initialize, Float::INFINITY) {}.size.should equal(Float::INFINITY)
+    @uninitialized.send(:initialize, Float::INFINITY) {}.size.should.equal?(Float::INFINITY)
   end
 
-  it "sets size to the given size if the given size is a Fixnum" do
+  it "sets size to the given size if the given size is an Integer" do
     @uninitialized.send(:initialize, 100) {}.size.should == 100
   end
 
   it "sets size to the given size if the given size is a Proc" do
-    @uninitialized.send(:initialize, lambda { 200 }) {}.size.should == 200
+    @uninitialized.send(:initialize, -> { 200 }) {}.size.should == 200
   end
 
   describe "on frozen instance" do
-    it "raises a RuntimeError" do
-      lambda {
+    it "raises a FrozenError" do
+      -> {
         @uninitialized.freeze.send(:initialize) {}
-      }.should raise_error(RuntimeError)
+      }.should.raise(FrozenError)
     end
   end
 end