10 files changed, 145 insertions, 235 deletions

diff --git a/spec/ruby/core/hash/shared/comparison.rb b/spec/ruby/core/hash/shared/comparison.rb
index bbb9bfd6ad..07564e4cec 100644
--- a/spec/ruby/core/hash/shared/comparison.rb
+++ b/spec/ruby/core/hash/shared/comparison.rb
@@ -1,8 +1,8 @@
 describe :hash_comparison, shared: true do
   it "raises a TypeError if the right operand is not a hash" do
-    lambda { { a: 1 }.send(@method, 1) }.should raise_error(TypeError)
-    lambda { { a: 1 }.send(@method, nil) }.should raise_error(TypeError)
-    lambda { { a: 1 }.send(@method, []) }.should raise_error(TypeError)
+    -> { { a: 1 }.send(@method, 1) }.should raise_error(TypeError)
+    -> { { a: 1 }.send(@method, nil) }.should raise_error(TypeError)
+    -> { { a: 1 }.send(@method, []) }.should raise_error(TypeError)
   end
 
   it "returns false if both hashes have the same keys but different values" do
diff --git a/spec/ruby/core/hash/shared/each.rb b/spec/ruby/core/hash/shared/each.rb
index d1f2e5f672..f9839ff58f 100644
--- a/spec/ruby/core/hash/shared/each.rb
+++ b/spec/ruby/core/hash/shared/each.rb
@@ -21,19 +21,39 @@ describe :hash_each, shared: true do
     ary.sort.should == ["a", "b", "c"]
   end
 
-  it "yields 2 values and not an Array of 2 elements when given a callable of arity 2" do
+  it "always yields an Array of 2 elements, even when given a callable of arity 2" do
     obj = Object.new
     def obj.foo(key, value)
-      ScratchPad << key << value
+    end
+
+    -> {
+      { "a" => 1 }.send(@method, &obj.method(:foo))
+    }.should raise_error(ArgumentError)
+
+    -> {
+      { "a" => 1 }.send(@method, &-> key, value { })
+    }.should raise_error(ArgumentError)
+  end
+
+  it "yields an Array of 2 elements when given a callable of arity 1" do
+    obj = Object.new
+    def obj.foo(key_value)
+      ScratchPad << key_value
     end
 
     ScratchPad.record([])
     { "a" => 1 }.send(@method, &obj.method(:foo))
-    ScratchPad.recorded.should == ["a", 1]
+    ScratchPad.recorded.should == [["a", 1]]
+  end
 
-    ScratchPad.record([])
-    { "a" => 1 }.send(@method, &-> key, value { ScratchPad << key << value })
-    ScratchPad.recorded.should == ["a", 1]
+  it "raises an error for a Hash when an arity enforcing callable of arity >2 is passed in" do
+    obj = Object.new
+    def obj.foo(key, value, extra)
+    end
+
+    -> {
+      { "a" => 1 }.send(@method, &obj.method(:foo))
+    }.should raise_error(ArgumentError)
   end
 
   it "uses the same order as keys() and values()" do
diff --git a/spec/ruby/core/hash/shared/eql.rb b/spec/ruby/core/hash/shared/eql.rb
index 1aed5f51fb..68db49f76d 100644
--- a/spec/ruby/core/hash/shared/eql.rb
+++ b/spec/ruby/core/hash/shared/eql.rb
@@ -118,7 +118,7 @@ describe :hash_eql_additional, shared: true do
     { 1.0 => "x" }.send(@method, { 1 => "x" }).should be_false
   end
 
-  it "returns true iff other Hash has the same number of keys and each key-value pair matches" do
+  it "returns true if and only if other Hash has the same number of keys and each key-value pair matches" do
     a = { a: 5 }
     b = {}
     a.send(@method, b).should be_false
@@ -155,12 +155,8 @@ describe :hash_eql_additional, shared: true do
       obj = mock('0')
       obj.should_receive(:hash).at_least(1).and_return(0)
 
-      # It's undefined whether the impl does a[0].eql?(a[1]) or
-      # a[1].eql?(a[0]) so we taint both.
       def obj.eql?(o)
         return true if self.equal?(o)
-        taint
-        o.taint
         false
       end
 
@@ -168,18 +164,12 @@ describe :hash_eql_additional, shared: true do
     end
 
     { a[0] => 1 }.send(@method, { a[1] => 1 }).should be_false
-    a[0].tainted?.should be_true
-    a[1].tainted?.should be_true
 
     a = Array.new(2) do
       obj = mock('0')
       obj.should_receive(:hash).at_least(1).and_return(0)
 
       def obj.eql?(o)
-        # It's undefined whether the impl does a[0].send(@method, a[1]) or
-        # a[1].send(@method, a[0]) so we taint both.
-        taint
-        o.taint
         true
       end
 
@@ -187,8 +177,6 @@ describe :hash_eql_additional, shared: true do
     end
 
     { a[0] => 1 }.send(@method, { a[1] => 1 }).should be_true
-    a[0].tainted?.should be_true
-    a[1].tainted?.should be_true
   end
 
   it "compares the values in self to values in other hash" do
diff --git a/spec/ruby/core/hash/shared/equal.rb b/spec/ruby/core/hash/shared/equal.rb
deleted file mode 100644
index 43606437fe..0000000000
--- a/spec/ruby/core/hash/shared/equal.rb
+++ /dev/null
@@ -1,90 +0,0 @@
-describe :hash_equal, shared: true do
-  it "does not compare values when keys don't match" do
-    value = mock('x')
-    value.should_not_receive(:==)
-    value.should_not_receive(:eql?)
-    { 1 => value }.send(@method, { 2 => value }).should be_false
-  end
-
-  it "returns false when the numbers of keys differ without comparing any elements" do
-    obj = mock('x')
-    h = { obj => obj }
-
-    obj.should_not_receive(:==)
-    obj.should_not_receive(:eql?)
-
-    {}.send(@method, h).should be_false
-    h.send(@method, {}).should be_false
-  end
-
-  it "first compares keys via hash" do
-    x = mock('x')
-    x.should_receive(:hash).and_return(0)
-    y = mock('y')
-    y.should_receive(:hash).and_return(0)
-
-    { x => 1 }.send(@method, { y => 1 }).should be_false
-  end
-
-  it "does not compare keys with different hash codes via eql?" do
-    x = mock('x')
-    y = mock('y')
-    x.should_not_receive(:eql?)
-    y.should_not_receive(:eql?)
-
-    x.should_receive(:hash).and_return(0)
-    y.should_receive(:hash).and_return(1)
-
-    def x.hash() 0 end
-    def y.hash() 1 end
-
-    { x => 1 }.send(@method, { y => 1 }).should be_false
-  end
-
-  it "computes equality for recursive hashes" do
-    h = {}
-    h[:a] = h
-    h.send(@method, h[:a]).should be_true
-    (h == h[:a]).should be_true
-  end
-
-  it "computes equality for complex recursive hashes" do
-    a, b = {}, {}
-    a.merge! self: a, other: b
-    b.merge! self: b, other: a
-    a.send(@method, b).should be_true # they both have the same structure!
-
-    c = {}
-    c.merge! other: c, self: c
-    c.send(@method, a).should be_true # subtle, but they both have the same structure!
-    a[:delta] = c[:delta] = a
-    c.send(@method, a).should be_false # not quite the same structure, as a[:other][:delta] = nil
-    c[:delta] = 42
-    c.send(@method, a).should be_false
-    a[:delta] = 42
-    c.send(@method, a).should be_false
-    b[:delta] = 42
-    c.send(@method, a).should be_true
-  end
-
-  it "computes equality for recursive hashes & arrays" do
-    x, y, z = [], [], []
-    a, b, c = {foo: x, bar: 42}, {foo: y, bar: 42}, {foo: z, bar: 42}
-    x << a
-    y << c
-    z << b
-    b.send(@method, c).should be_true # they clearly have the same structure!
-    y.send(@method, z).should be_true
-    a.send(@method, b).should be_true # subtle, but they both have the same structure!
-    x.send(@method, y).should be_true
-    y << x
-    y.send(@method, z).should be_false
-    z << x
-    y.send(@method, z).should be_true
-
-    a[:foo], a[:bar] = a[:bar], a[:foo]
-    a.send(@method, b).should be_false
-    b[:bar] = b[:foo]
-    b.send(@method, c).should be_false
-  end
-end
diff --git a/spec/ruby/core/hash/shared/index.rb b/spec/ruby/core/hash/shared/index.rb
index 4858ba85f5..7f6a186464 100644
--- a/spec/ruby/core/hash/shared/index.rb
+++ b/spec/ruby/core/hash/shared/index.rb
@@ -3,25 +3,35 @@ require_relative '../fixtures/classes'
 
 describe :hash_index, shared: true do
   it "returns the corresponding key for value" do
-    { 2 => 'a', 1 => 'b' }.send(@method, 'b').should == 1
+    suppress_warning do # for Hash#index
+      { 2 => 'a', 1 => 'b' }.send(@method, 'b').should == 1
+    end
   end
 
   it "returns nil if the value is not found" do
-    { a: -1, b: 3.14, c: 2.718 }.send(@method, 1).should be_nil
+    suppress_warning do # for Hash#index
+      { a: -1, b: 3.14, c: 2.718 }.send(@method, 1).should be_nil
+    end
   end
 
   it "doesn't return default value if the value is not found" do
-    Hash.new(5).send(@method, 5).should be_nil
+    suppress_warning do # for Hash#index
+      Hash.new(5).send(@method, 5).should be_nil
+    end
   end
 
   it "compares values using ==" do
-    { 1 => 0 }.send(@method, 0.0).should == 1
-    { 1 => 0.0 }.send(@method, 0).should == 1
+    suppress_warning do # for Hash#index
+      { 1 => 0 }.send(@method, 0.0).should == 1
+      { 1 => 0.0 }.send(@method, 0).should == 1
+    end
 
     needle = mock('needle')
     inhash = mock('inhash')
     inhash.should_receive(:==).with(needle).and_return(true)
 
-    { 1 => inhash }.send(@method, needle).should == 1
+    suppress_warning do # for Hash#index
+      { 1 => inhash }.send(@method, needle).should == 1
+    end
   end
 end
diff --git a/spec/ruby/core/hash/shared/replace.rb b/spec/ruby/core/hash/shared/replace.rb
deleted file mode 100644
index eb51130781..0000000000
--- a/spec/ruby/core/hash/shared/replace.rb
+++ /dev/null
@@ -1,51 +0,0 @@
-describe :hash_replace, shared: true do
-  it "replaces the contents of self with other" do
-    h = { a: 1, b: 2 }
-    h.send(@method, c: -1, d: -2).should equal(h)
-    h.should == { c: -1, d: -2 }
-  end
-
-  it "tries to convert the passed argument to a hash using #to_hash" do
-    obj = mock('{1=>2,3=>4}')
-    obj.should_receive(:to_hash).and_return({ 1 => 2, 3 => 4 })
-
-    h = {}
-    h.send(@method, obj)
-    h.should == { 1 => 2, 3 => 4 }
-  end
-
-  it "calls to_hash on hash subclasses" do
-    h = {}
-    h.send(@method, HashSpecs::ToHashHash[1 => 2])
-    h.should == { 1 => 2 }
-  end
-
-  it "does not transfer default values" do
-    hash_a = {}
-    hash_b = Hash.new(5)
-    hash_a.send(@method, hash_b)
-    hash_a.default.should == 5
-
-    hash_a = {}
-    hash_b = Hash.new { |h, k| k * 2 }
-    hash_a.send(@method, hash_b)
-    hash_a.default(5).should == 10
-
-    hash_a = Hash.new { |h, k| k * 5 }
-    hash_b = Hash.new(lambda { raise "Should not invoke lambda" })
-    hash_a.send(@method, hash_b)
-    hash_a.default.should == hash_b.default
-  end
-
-  it "raises a #{frozen_error_class} if called on a frozen instance that would not be modified" do
-    lambda do
-      HashSpecs.frozen_hash.send(@method, HashSpecs.frozen_hash)
-    end.should raise_error(frozen_error_class)
-  end
-
-  it "raises a #{frozen_error_class} if called on a frozen instance that is modified" do
-    lambda do
-      HashSpecs.frozen_hash.send(@method, HashSpecs.empty_frozen_hash)
-    end.should raise_error(frozen_error_class)
-  end
-end
diff --git a/spec/ruby/core/hash/shared/select.rb b/spec/ruby/core/hash/shared/select.rb
index cc1a54da25..fbeff07330 100644
--- a/spec/ruby/core/hash/shared/select.rb
+++ b/spec/ruby/core/hash/shared/select.rb
@@ -40,6 +40,27 @@ describe :hash_select, shared: true do
     @empty.send(@method).should be_an_instance_of(Enumerator)
   end
 
+  it "does not retain the default value" do
+    h = Hash.new(1)
+    h.send(@method) { true }.default.should be_nil
+    h[:a] = 1
+    h.send(@method) { true }.default.should be_nil
+  end
+
+  it "does not retain the default_proc" do
+    pr = proc { |h, k| h[k] = [] }
+    h = Hash.new(&pr)
+    h.send(@method) { true }.default_proc.should be_nil
+    h[:a] = 1
+    h.send(@method) { true }.default_proc.should be_nil
+  end
+
+  it "retains compare_by_identity flag" do
+    h = { a: 9, c: 4 }.compare_by_identity
+    h2 = h.send(@method) { |k, _| k == :a }
+    h2.compare_by_identity?.should == true
+  end
+
   it_should_behave_like :hash_iteration_no_block
 
   before :each do
@@ -74,12 +95,12 @@ describe :hash_select!, shared: true do
     { a: 1 }.send(@method) { |k,v| v <= 1 }.should == nil
   end
 
-  it "raises a #{frozen_error_class} if called on an empty frozen instance" do
-    lambda { HashSpecs.empty_frozen_hash.send(@method) { false } }.should raise_error(frozen_error_class)
+  it "raises a FrozenError if called on an empty frozen instance" do
+    -> { HashSpecs.empty_frozen_hash.send(@method) { false } }.should raise_error(FrozenError)
   end
 
-  it "raises a #{frozen_error_class} if called on a frozen instance that would not be modified" do
-    lambda { HashSpecs.frozen_hash.send(@method) { true } }.should raise_error(frozen_error_class)
+  it "raises a FrozenError if called on a frozen instance that would not be modified" do
+    -> { HashSpecs.frozen_hash.send(@method) { true } }.should raise_error(FrozenError)
   end
 
   it_should_behave_like :hash_iteration_no_block
diff --git a/spec/ruby/core/hash/shared/store.rb b/spec/ruby/core/hash/shared/store.rb
index de61ed1ad1..72a462a42f 100644
--- a/spec/ruby/core/hash/shared/store.rb
+++ b/spec/ruby/core/hash/shared/store.rb
@@ -9,7 +9,7 @@ describe :hash_store, shared: true do
 
   it "duplicates string keys using dup semantics" do
     # dup doesn't copy singleton methods
-    key = "foo"
+    key = +"foo"
     def key.reverse() "bar" end
     h = {}
     h.send(@method, key, 0)
@@ -36,7 +36,7 @@ describe :hash_store, shared: true do
     h[key].should == "foo"
   end
 
-  it " accepts keys with a Bignum hash" do
+  it " accepts keys with an Integer hash" do
     o = mock(hash: 1 << 100)
     h = {}
     h[o] = 1
@@ -44,13 +44,13 @@ describe :hash_store, shared: true do
   end
 
   it "duplicates and freezes string keys" do
-    key = "foo"
+    key = +"foo"
     h = {}
     h.send(@method, key, 0)
     key << "bar"
 
     h.should == { "foo" => 0 }
-    h.keys[0].frozen?.should == true
+    h.keys[0].should.frozen?
   end
 
   it "doesn't duplicate and freeze already frozen string keys" do
@@ -75,8 +75,8 @@ describe :hash_store, shared: true do
 
   it "keeps the existing String key in the hash if there is a matching one" do
     h = { "a" => 1, "b" => 2, "c" => 3, "d" => 4 }
-    key1 = "foo"
-    key2 = "foo"
+    key1 = "foo".dup
+    key2 = "foo".dup
     key1.should_not equal(key2)
     h[key1] = 41
     frozen_key = h.keys.last
@@ -86,13 +86,30 @@ describe :hash_store, shared: true do
     h.keys.last.should_not equal(key2)
   end
 
-  it "raises a #{frozen_error_class} if called on a frozen instance" do
-    lambda { HashSpecs.frozen_hash.send(@method, 1, 2) }.should raise_error(frozen_error_class)
+  it "raises a FrozenError if called on a frozen instance" do
+    -> { HashSpecs.frozen_hash.send(@method, 1, 2) }.should raise_error(FrozenError)
   end
 
   it "does not raise an exception if changing the value of an existing key during iteration" do
-      hash = {1 => 2, 3 => 4, 5 => 6}
-      hash.each { hash.send(@method, 1, :foo) }
-      hash.should == {1 => :foo, 3 => 4, 5 => 6}
+    hash = {1 => 2, 3 => 4, 5 => 6}
+    hash.each { hash.send(@method, 1, :foo) }
+    hash.should == {1 => :foo, 3 => 4, 5 => 6}
+  end
+
+  it "does not dispatch to hash for Boolean, Integer, Float, String, or Symbol" do
+    code = <<-EOC
+      load '#{fixture __FILE__, "name.rb"}'
+      hash = {}
+      [true, false, 1, 2.0, "hello", :ok].each do |value|
+        hash[value] = 42
+        raise "incorrect value" unless hash[value] == 42
+        hash[value] = 43
+        raise "incorrect value" unless hash[value] == 43
+      end
+      puts "OK"
+      puts hash.size
+    EOC
+    result = ruby_exe(code, args: "2>&1")
+    result.should == "OK\n6\n"
   end
 end
diff --git a/spec/ruby/core/hash/shared/to_s.rb b/spec/ruby/core/hash/shared/to_s.rb
index 88333e0f42..e116b8878b 100644
--- a/spec/ruby/core/hash/shared/to_s.rb
+++ b/spec/ruby/core/hash/shared/to_s.rb
@@ -2,17 +2,10 @@ require_relative '../../../spec_helper'
 require_relative '../fixtures/classes'
 
 describe :hash_to_s, shared: true do
-
   it "returns a string representation with same order as each()" do
     h = { a: [1, 2], b: -2, d: -6, nil => nil }
-
-    pairs = []
-    h.each do |key, value|
-      pairs << key.inspect + '=>' + value.inspect
-    end
-
-    str = '{' + pairs.join(', ') + '}'
-    h.send(@method).should == str
+    expected = ruby_version_is("3.4") ? "{a: [1, 2], b: -2, d: -6, nil => nil}" : "{:a=>[1, 2], :b=>-2, :d=>-6, nil=>nil}"
+    h.send(@method).should == expected
   end
 
   it "calls #inspect on keys and values" do
@@ -20,31 +13,31 @@ describe :hash_to_s, shared: true do
     val = mock('val')
     key.should_receive(:inspect).and_return('key')
     val.should_receive(:inspect).and_return('val')
-
-    { key => val }.send(@method).should == '{key=>val}'
+    expected = ruby_version_is("3.4") ? "{key => val}" : "{key=>val}"
+    { key => val }.send(@method).should == expected
   end
 
   it "does not call #to_s on a String returned from #inspect" do
-    str = "abc"
+    str = +"abc"
     str.should_not_receive(:to_s)
-
-    { a: str }.send(@method).should == '{:a=>"abc"}'
+    expected = ruby_version_is("3.4") ? '{a: "abc"}' : '{:a=>"abc"}'
+    { a: str }.send(@method).should == expected
   end
 
   it "calls #to_s on the object returned from #inspect if the Object isn't a String" do
     obj = mock("Hash#inspect/to_s calls #to_s")
     obj.should_receive(:inspect).and_return(obj)
     obj.should_receive(:to_s).and_return("abc")
-
-    { a: obj }.send(@method).should == "{:a=>abc}"
+    expected = ruby_version_is("3.4") ? "{a: abc}" : "{:a=>abc}"
+    { a: obj }.send(@method).should == expected
   end
 
   it "does not call #to_str on the object returned from #inspect when it is not a String" do
     obj = mock("Hash#inspect/to_s does not call #to_str")
     obj.should_receive(:inspect).and_return(obj)
     obj.should_not_receive(:to_str)
-
-    { a: obj }.send(@method).should =~ /^\{:a=>#<MockObject:0x[0-9a-f]+>\}$/
+    expected_pattern = ruby_version_is("3.4") ? /^\{a: #<MockObject:0x[0-9a-f]+>\}$/ : /^\{:a=>#<MockObject:0x[0-9a-f]+>\}$/
+    { a: obj }.send(@method).should =~ expected_pattern
   end
 
   it "does not call #to_str on the object returned from #to_s when it is not a String" do
@@ -52,8 +45,8 @@ describe :hash_to_s, shared: true do
     obj.should_receive(:inspect).and_return(obj)
     obj.should_receive(:to_s).and_return(obj)
     obj.should_not_receive(:to_str)
-
-    { a: obj }.send(@method).should =~ /^\{:a=>#<MockObject:0x[0-9a-f]+>\}$/
+    expected_pattern = ruby_version_is("3.4") ? /^\{a: #<MockObject:0x[0-9a-f]+>\}$/ : /^\{:a=>#<MockObject:0x[0-9a-f]+>\}$/
+    { a: obj }.send(@method).should =~ expected_pattern
   end
 
   it "does not swallow exceptions raised by #to_s" do
@@ -61,36 +54,40 @@ describe :hash_to_s, shared: true do
     obj.should_receive(:inspect).and_return(obj)
     obj.should_receive(:to_s).and_raise(Exception)
 
-    lambda { { a: obj }.send(@method) }.should raise_error(Exception)
+    -> { { a: obj }.send(@method) }.should raise_error(Exception)
   end
 
   it "handles hashes with recursive values" do
     x = {}
     x[0] = x
-    x.send(@method).should == '{0=>{...}}'
+    expected = ruby_version_is("3.4") ? '{0 => {...}}' : '{0=>{...}}'
+    x.send(@method).should == expected
 
     x = {}
     y = {}
     x[0] = y
     y[1] = x
-    x.send(@method).should == "{0=>{1=>{...}}}"
-    y.send(@method).should == "{1=>{0=>{...}}}"
+    expected_x = ruby_version_is("3.4") ? '{0 => {1 => {...}}}' : '{0=>{1=>{...}}}'
+    expected_y = ruby_version_is("3.4") ? '{1 => {0 => {...}}}' : '{1=>{0=>{...}}}'
+    x.send(@method).should == expected_x
+    y.send(@method).should == expected_y
   end
 
-  it "returns a tainted string if self is tainted and not empty" do
-    {}.taint.send(@method).tainted?.should be_false
-    { nil => nil }.taint.send(@method).tainted?.should be_true
+  it "does not raise if inspected result is not default external encoding" do
+    utf_16be = mock("utf_16be")
+    utf_16be.should_receive(:inspect).and_return(%<"utf_16be \u3042">.encode(Encoding::UTF_16BE))
+    expected = ruby_version_is("3.4") ? '{a: "utf_16be \u3042"}' : '{:a=>"utf_16be \u3042"}'
+    {a: utf_16be}.send(@method).should == expected
   end
 
-  it "returns an untrusted string if self is untrusted and not empty" do
-    {}.untrust.send(@method).untrusted?.should be_false
-    { nil => nil }.untrust.send(@method).untrusted?.should be_true
+  it "works for keys and values whose #inspect return a frozen String" do
+    expected = ruby_version_is("3.4") ? "{true => false}" : "{true=>false}"
+    { true => false }.to_s.should == expected
   end
 
-  it "does not raise if inspected result is not default external encoding" do
-    utf_16be = mock("utf_16be")
-    utf_16be.should_receive(:inspect).and_return(%<"utf_16be \u3042">.encode!(Encoding::UTF_16BE))
-
-    {a: utf_16be}.send(@method).should == '{:a=>"utf_16be \u3042"}'
+  ruby_version_is "3.4" do
+    it "adds quotes to symbol keys that are not valid symbol literals" do
+      { "needs-quotes": 1 }.send(@method).should == '{"needs-quotes": 1}'
+    end
   end
 end
diff --git a/spec/ruby/core/hash/shared/update.rb b/spec/ruby/core/hash/shared/update.rb
index e808add5c0..1b0eb809bf 100644
--- a/spec/ruby/core/hash/shared/update.rb
+++ b/spec/ruby/core/hash/shared/update.rb
@@ -34,10 +34,10 @@ describe :hash_update, shared: true do
     merge_bang_pairs.should == merge_pairs
   end
 
-  it "raises a #{frozen_error_class} on a frozen instance that is modified" do
-    lambda do
+  it "raises a FrozenError on a frozen instance that is modified" do
+    -> do
       HashSpecs.frozen_hash.send(@method, 1 => 2)
-    end.should raise_error(frozen_error_class)
+    end.should raise_error(FrozenError)
   end
 
   it "checks frozen status before coercing an object with #to_hash" do
@@ -47,14 +47,14 @@ describe :hash_update, shared: true do
     def obj.to_hash() raise Exception, "should not receive #to_hash" end
     obj.freeze
 
-    lambda { HashSpecs.frozen_hash.send(@method, obj) }.should raise_error(frozen_error_class)
+    -> { HashSpecs.frozen_hash.send(@method, obj) }.should raise_error(FrozenError)
   end
 
   # see redmine #1571
-  it "raises a #{frozen_error_class} on a frozen instance that would not be modified" do
-    lambda do
+  it "raises a FrozenError on a frozen instance that would not be modified" do
+    -> do
       HashSpecs.frozen_hash.send(@method, HashSpecs.empty_frozen_hash)
-    end.should raise_error(frozen_error_class)
+    end.should raise_error(FrozenError)
   end
 
   it "does not raise an exception if changing the value of an existing key during iteration" do
@@ -64,15 +64,13 @@ describe :hash_update, shared: true do
     hash.should == {1 => :foo, 3 => :bar, 5 => 6}
   end
 
-  ruby_version_is "2.6" do
-    it "accepts multiple hashes" do
-      result = { a: 1 }.send(@method, { b: 2 }, { c: 3 }, { d: 4 })
-      result.should == { a: 1, b: 2, c: 3, d: 4 }
-    end
+  it "accepts multiple hashes" do
+    result = { a: 1 }.send(@method, { b: 2 }, { c: 3 }, { d: 4 })
+    result.should == { a: 1, b: 2, c: 3, d: 4 }
+  end
 
-    it "accepts zero arguments" do
-      hash = { a: 1 }
-      hash.send(@method).should eql(hash)
-    end
+  it "accepts zero arguments" do
+    hash = { a: 1 }
+    hash.send(@method).should eql(hash)
   end
 end