1 files changed, 27 insertions, 23 deletions
diff --git a/spec/ruby/core/env/shared/update.rb b/spec/ruby/core/env/shared/update.rb
index 129a56544c..112cc2505d 100644
--- a/spec/ruby/core/env/shared/update.rb
+++ b/spec/ruby/core/env/shared/update.rb
@@ -10,13 +10,19 @@ describe :env_update, shared: true do
   end
 
   it "adds the parameter hash to ENV, returning ENV" do
-    ENV.send(@method, "foo" => "0", "bar" => "1").should equal(ENV)
+    ENV.send(@method, "foo" => "0", "bar" => "1").should.equal?(ENV)
     ENV["foo"].should == "0"
     ENV["bar"].should == "1"
   end
 
+  it "adds the multiple parameter hashes to ENV, returning ENV" do
+    ENV.send(@method, {"foo" => "multi1"}, {"bar" => "multi2"}).should.equal?(ENV)
+    ENV["foo"].should == "multi1"
+    ENV["bar"].should == "multi2"
+  end
+
   it "returns ENV when no block given" do
-    ENV.send(@method, {"foo" => "0", "bar" => "1"}).should equal(ENV)
+    ENV.send(@method, {"foo" => "0", "bar" => "1"}).should.equal?(ENV)
   end
 
   it "yields key, the old value and the new value when replacing an entry" do
@@ -39,43 +45,41 @@ describe :env_update, shared: true do
     ENV["bar"].should == "5"
   end
 
-  ruby_version_is "2.7" do
-    # BUG: https://bugs.ruby-lang.org/issues/16192
-    it "does not evaluate the block when the name is new" do
-      ENV.delete("bar")
-      ENV.send @method, {"foo" => "0"}
-      ENV.send(@method, "bar" => "1") { |key, old, new| fail "Should not get here" }
-      ENV["bar"].should == "1"
-    end
+  # BUG: https://bugs.ruby-lang.org/issues/16192
+  it "does not evaluate the block when the name is new" do
+    ENV.delete("bar")
+    ENV.send @method, {"foo" => "0"}
+    ENV.send(@method, "bar" => "1") { |key, old, new| fail "Should not get here" }
+    ENV["bar"].should == "1"
+  end
 
-    # BUG: https://bugs.ruby-lang.org/issues/16192
-    it "does not use the block's return value as the value when the name is new" do
-      ENV.delete("bar")
-      ENV.send @method, {"foo" => "0"}
-      ENV.send(@method, "bar" => "1") { |key, old, new| "Should not use this value" }
-      ENV["foo"].should == "0"
-      ENV["bar"].should == "1"
-    end
+  # BUG: https://bugs.ruby-lang.org/issues/16192
+  it "does not use the block's return value as the value when the name is new" do
+    ENV.delete("bar")
+    ENV.send @method, {"foo" => "0"}
+    ENV.send(@method, "bar" => "1") { |key, old, new| "Should not use this value" }
+    ENV["foo"].should == "0"
+    ENV["bar"].should == "1"
   end
 
   it "returns ENV when block given" do
-    ENV.send(@method, {"foo" => "0", "bar" => "1"}){}.should equal(ENV)
+    ENV.send(@method, {"foo" => "0", "bar" => "1"}){}.should.equal?(ENV)
   end
 
   it "raises TypeError when a name is not coercible to String" do
-    -> { ENV.send @method, Object.new => "0" }.should raise_error(TypeError, "no implicit conversion of Object into String")
+    -> { ENV.send @method, Object.new => "0" }.should.raise(TypeError, "no implicit conversion of Object into String")
   end
 
   it "raises TypeError when a value is not coercible to String" do
-    -> { ENV.send @method, "foo" => Object.new }.should raise_error(TypeError, "no implicit conversion of Object into String")
+    -> { ENV.send @method, "foo" => Object.new }.should.raise(TypeError, "no implicit conversion of Object into String")
   end
 
   it "raises Errno::EINVAL when a name contains the '=' character" do
-    -> { ENV.send(@method, "foo=" => "bar") }.should raise_error(Errno::EINVAL)
+    -> { ENV.send(@method, "foo=" => "bar") }.should.raise(Errno::EINVAL)
   end
 
   it "raises Errno::EINVAL when a name is an empty string" do
-    -> { ENV.send(@method, "" => "bar") }.should raise_error(Errno::EINVAL)
+    -> { ENV.send(@method, "" => "bar") }.should.raise(Errno::EINVAL)
   end
 
   it "updates good data preceding an error" do