1 files changed, 63 insertions, 61 deletions
diff --git a/spec/ruby/core/hash/to_proc_spec.rb b/spec/ruby/core/hash/to_proc_spec.rb
index b486d188b7..bc4756600d 100644
--- a/spec/ruby/core/hash/to_proc_spec.rb
+++ b/spec/ruby/core/hash/to_proc_spec.rb
@@ -1,89 +1,91 @@
-require File.expand_path('../../../spec_helper', __FILE__)
-require File.expand_path('../fixtures/classes', __FILE__)
+require_relative '../../spec_helper'
+require_relative 'fixtures/classes'
+
+describe "Hash#to_proc" do
+  before :each do
+    @key = Object.new
+    @value = Object.new
+    @hash = { @key => @value }
+    @default = Object.new
+    @unstored = Object.new
+  end
+
+  it "returns an instance of Proc" do
+    @hash.to_proc.should.instance_of? Proc
+  end
 
-ruby_version_is "2.3" do
-  describe "Hash#to_proc" do
+  describe "the returned proc" do
     before :each do
-      @key = Object.new
-      @value = Object.new
-      @hash = { @key => @value }
-      @default = Object.new
-      @unstored = Object.new
+      @proc = @hash.to_proc
     end
 
-    it "returns an instance of Proc" do
-      @hash.to_proc.should be_an_instance_of Proc
+    it "is a lambda" do
+      @proc.should.lambda?
     end
 
-    describe "the returned proc" do
-      before :each do
-        @proc = @hash.to_proc
-      end
+    it "has an arity of 1" do
+      @proc.arity.should == 1
+    end
 
-      it "is not a lambda" do
-        @proc.lambda?.should == false
-      end
+    it "raises ArgumentError if not passed exactly one argument" do
+      -> {
+        @proc.call
+      }.should.raise(ArgumentError)
 
-      it "raises ArgumentError if not passed exactly one argument" do
-        lambda {
-          @proc.call
-        }.should raise_error(ArgumentError)
+      -> {
+        @proc.call 1, 2
+      }.should.raise(ArgumentError)
+    end
 
-        lambda {
-          @proc.call 1, 2
-        }.should raise_error(ArgumentError)
+    context "with a stored key" do
+      it "returns the paired value" do
+        @proc.call(@key).should.equal?(@value)
       end
+    end
 
-      context "with a stored key" do
-        it "returns the paired value" do
-          @proc.call(@key).should equal(@value)
-        end
+    context "passed as a block" do
+      it "retrieves the hash's values" do
+        [@key].map(&@proc)[0].should.equal?(@value)
       end
 
-      context "passed as a block" do
-        it "retrieves the hash's values" do
-          [@key].map(&@proc)[0].should equal(@value)
-        end
-
-        context "to instance_exec" do
-          it "always retrieves the original hash's values" do
-            hash = {foo: 1, bar: 2}
-            proc = hash.to_proc
+      context "to instance_exec" do
+        it "always retrieves the original hash's values" do
+          hash = {foo: 1, bar: 2}
+          proc = hash.to_proc
 
-            hash.instance_exec(:foo, &proc).should == 1
+          hash.instance_exec(:foo, &proc).should == 1
 
-            hash2 = {quux: 1}
-            hash2.instance_exec(:foo, &proc).should == 1
-          end
+          hash2 = {quux: 1}
+          hash2.instance_exec(:foo, &proc).should == 1
         end
       end
+    end
 
-      context "with no stored key" do
-        it "returns nil" do
-          @proc.call(@unstored).should be_nil
-        end
-
-        context "when the hash has a default value" do
-          before :each do
-            @hash.default = @default
-          end
+    context "with no stored key" do
+      it "returns nil" do
+        @proc.call(@unstored).should == nil
+      end
 
-          it "returns the default value" do
-            @proc.call(@unstored).should equal(@default)
-          end
+      context "when the hash has a default value" do
+        before :each do
+          @hash.default = @default
         end
 
-        context "when the hash has a default proc" do
-          it "returns an evaluated value from the default proc" do
-            @hash.default_proc = -> hash, called_with { [hash.keys, called_with] }
-            @proc.call(@unstored).should == [[@key], @unstored]
-          end
+        it "returns the default value" do
+          @proc.call(@unstored).should.equal?(@default)
         end
       end
 
-      it "raises an ArgumentError when calling #call on the Proc with no arguments" do
-        lambda { @hash.to_proc.call }.should raise_error(ArgumentError)
+      context "when the hash has a default proc" do
+        it "returns an evaluated value from the default proc" do
+          @hash.default_proc = -> hash, called_with { [hash.keys, called_with] }
+          @proc.call(@unstored).should == [[@key], @unstored]
+        end
       end
     end
+
+    it "raises an ArgumentError when calling #call on the Proc with no arguments" do
+      -> { @hash.to_proc.call }.should.raise(ArgumentError)
+    end
   end
 end