1 files changed, 65 insertions, 45 deletions
diff --git a/spec/ruby/core/hash/compact_spec.rb b/spec/ruby/core/hash/compact_spec.rb
index d9ef8a2987..de83dabed3 100644
--- a/spec/ruby/core/hash/compact_spec.rb
+++ b/spec/ruby/core/hash/compact_spec.rb
@@ -1,61 +1,81 @@
-require File.expand_path('../../../spec_helper', __FILE__)
-require File.expand_path('../fixtures/classes', __FILE__)
+require_relative '../../spec_helper'
+require_relative 'fixtures/classes'
 
-ruby_version_is "2.4" do
-  describe "Hash#compact" do
-    before :each do
-      @hash = { truthy: true, false: false, nil: nil, nil => true }
-      @initial_pairs = @hash.dup
-      @compact = { truthy: true, false: false, nil => true }
-    end
+describe "Hash#compact" do
+  before :each do
+    @hash = { truthy: true, false: false, nil: nil, nil => true }
+    @initial_pairs = @hash.dup
+    @compact = { truthy: true, false: false, nil => true }
+  end
 
-    it "returns new object that rejects pair has nil value" do
-      ret = @hash.compact
-      ret.should_not equal(@hash)
-      ret.should == @compact
-    end
+  it "returns new object that rejects pair has nil value" do
+    ret = @hash.compact
+    ret.should_not.equal?(@hash)
+    ret.should == @compact
+  end
 
-    it "keeps own pairs" do
-      @hash.compact
-      @hash.should == @initial_pairs
-    end
+  it "keeps own pairs" do
+    @hash.compact
+    @hash.should == @initial_pairs
   end
 
-  describe "Hash#compact!" do
-    before :each do
-      @hash = { truthy: true, false: false, nil: nil, nil => true }
-      @initial_pairs = @hash.dup
-      @compact = { truthy: true, false: false, nil => true }
-    end
+  it "retains the default value" do
+    hash = Hash.new(1)
+    hash.compact.default.should == 1
+    hash[:a] = 1
+    hash.compact.default.should == 1
+  end
 
-    it "returns self" do
-      @hash.compact!.should equal(@hash)
-    end
+  it "retains the default_proc" do
+    pr = proc { |h, k| h[k] = [] }
+    hash = Hash.new(&pr)
+    hash.compact.default_proc.should == pr
+    hash[:a] = 1
+    hash.compact.default_proc.should == pr
+  end
 
-    it "rejects own pair has nil value" do
+  it "retains compare_by_identity flag" do
+    hash = {}.compare_by_identity
+    hash.compact.compare_by_identity?.should == true
+    hash[:a] = 1
+    hash.compact.compare_by_identity?.should == true
+  end
+end
+
+describe "Hash#compact!" do
+  before :each do
+    @hash = { truthy: true, false: false, nil: nil, nil => true }
+    @initial_pairs = @hash.dup
+    @compact = { truthy: true, false: false, nil => true }
+  end
+
+  it "returns self" do
+    @hash.compact!.should.equal?(@hash)
+  end
+
+  it "rejects own pair has nil value" do
+    @hash.compact!
+    @hash.should == @compact
+  end
+
+  context "when each pair does not have nil value" do
+    before :each do
       @hash.compact!
-      @hash.should == @compact
     end
 
-    context "when each pair does not have nil value" do
-      before :each do
-        @hash.compact!
-      end
-
-      it "returns nil" do
-        @hash.compact!.should be_nil
-      end
+    it "returns nil" do
+      @hash.compact!.should == nil
     end
+  end
 
-    describe "on frozen instance" do
-      before :each do
-        @hash.freeze
-      end
+  describe "on frozen instance" do
+    before :each do
+      @hash.freeze
+    end
 
-      it "keeps pairs and raises a RuntimeError" do
-        ->{ @hash.compact! }.should raise_error(RuntimeError)
-        @hash.should == @initial_pairs
-      end
+    it "keeps pairs and raises a FrozenError" do
+      ->{ @hash.compact! }.should.raise(FrozenError)
+      @hash.should == @initial_pairs
     end
   end
 end