5 files changed, 22 insertions, 34 deletions
diff --git a/spec/ruby/library/rbconfig/rbconfig_spec.rb b/spec/ruby/library/rbconfig/rbconfig_spec.rb
index b9a4588bf0..4195128a05 100644
--- a/spec/ruby/library/rbconfig/rbconfig_spec.rb
+++ b/spec/ruby/library/rbconfig/rbconfig_spec.rb
@@ -4,8 +4,8 @@ require 'rbconfig'
 describe 'RbConfig::CONFIG' do
   it 'values are all strings' do
     RbConfig::CONFIG.each do |k, v|
-      k.should be_kind_of String
-      v.should be_kind_of String
+      k.should.is_a? String
+      v.should.is_a? String
     end
   end
 
@@ -32,7 +32,7 @@ describe 'RbConfig::CONFIG' do
 
     it "['sitelibdir'] is set and is part of $LOAD_PATH" do
       sitelibdir = RbConfig::CONFIG['sitelibdir']
-      sitelibdir.should be_kind_of String
+      sitelibdir.should.is_a? String
       $LOAD_PATH.map{|path| File.realpath(path) rescue path }.should.include? sitelibdir
     end
   end
@@ -80,7 +80,7 @@ describe 'RbConfig::CONFIG' do
       ar = RbConfig::CONFIG.fetch('AR')
       out = `#{ar} --version`
       $?.should.success?
-      out.should_not be_empty
+      out.should_not.empty?
     end
 
     it "['STRIP'] exists and can be executed" do
diff --git a/spec/ruby/library/rbconfig/sizeof/limits_spec.rb b/spec/ruby/library/rbconfig/sizeof/limits_spec.rb
index 776099da27..08b1185965 100644
--- a/spec/ruby/library/rbconfig/sizeof/limits_spec.rb
+++ b/spec/ruby/library/rbconfig/sizeof/limits_spec.rb
@@ -3,13 +3,13 @@ require 'rbconfig/sizeof'
 
 describe "RbConfig::LIMITS" do
   it "is a Hash" do
-    RbConfig::LIMITS.should be_kind_of(Hash)
+    RbConfig::LIMITS.should.is_a?(Hash)
   end
 
   it "has string keys and numeric values" do
     RbConfig::LIMITS.each do |key, value|
-      key.should be_kind_of String
-      value.should be_kind_of Numeric
+      key.should.is_a? String
+      value.should.is_a? Numeric
     end
   end
 
diff --git a/spec/ruby/library/rbconfig/sizeof/sizeof_spec.rb b/spec/ruby/library/rbconfig/sizeof/sizeof_spec.rb
index f2582dc4fd..b74dae5166 100644
--- a/spec/ruby/library/rbconfig/sizeof/sizeof_spec.rb
+++ b/spec/ruby/library/rbconfig/sizeof/sizeof_spec.rb
@@ -3,13 +3,13 @@ require 'rbconfig/sizeof'
 
 describe "RbConfig::SIZEOF" do
   it "is a Hash" do
-    RbConfig::SIZEOF.should be_kind_of(Hash)
+    RbConfig::SIZEOF.should.is_a?(Hash)
   end
 
   it "has string keys and integer values" do
     RbConfig::SIZEOF.each do |key, value|
-      key.should be_kind_of String
-      value.should be_kind_of Integer
+      key.should.is_a? String
+      value.should.is_a? Integer
     end
   end
 
diff --git a/spec/ruby/library/rbconfig/unicode_emoji_version_spec.rb b/spec/ruby/library/rbconfig/unicode_emoji_version_spec.rb
index 3dc9900127..521a750bf7 100644
--- a/spec/ruby/library/rbconfig/unicode_emoji_version_spec.rb
+++ b/spec/ruby/library/rbconfig/unicode_emoji_version_spec.rb
@@ -2,22 +2,16 @@ require_relative '../../spec_helper'
 require 'rbconfig'
 
 describe "RbConfig::CONFIG['UNICODE_EMOJI_VERSION']" do
-  ruby_version_is ""..."3.1" do
-    it "is 12.1" do
-      RbConfig::CONFIG['UNICODE_EMOJI_VERSION'].should == "12.1"
-    end
-  end
-
-  ruby_version_is "3.1"..."3.2" do
-    it "is 13.1" do
-      RbConfig::CONFIG['UNICODE_EMOJI_VERSION'].should == "13.1"
+  ruby_version_is ""..."3.4" do
+    it "is 15.0" do
+      RbConfig::CONFIG['UNICODE_EMOJI_VERSION'].should == "15.0"
     end
   end
 
   # Caution: ruby_version_is means is_or_later
-  ruby_version_is "3.2" do
-    it "is 15.0" do
-      RbConfig::CONFIG['UNICODE_EMOJI_VERSION'].should == "15.0"
+  ruby_version_is "4.0" do
+    it "is 17.0" do
+      RbConfig::CONFIG['UNICODE_EMOJI_VERSION'].should == "17.0"
     end
   end
 end
diff --git a/spec/ruby/library/rbconfig/unicode_version_spec.rb b/spec/ruby/library/rbconfig/unicode_version_spec.rb
index 458f13bf03..5cdde74f79 100644
--- a/spec/ruby/library/rbconfig/unicode_version_spec.rb
+++ b/spec/ruby/library/rbconfig/unicode_version_spec.rb
@@ -2,22 +2,16 @@ require_relative '../../spec_helper'
 require 'rbconfig'
 
 describe "RbConfig::CONFIG['UNICODE_VERSION']" do
-  ruby_version_is ""..."3.1" do
-    it "is 12.1.0" do
-      RbConfig::CONFIG['UNICODE_VERSION'].should == "12.1.0"
-    end
-  end
-
-  ruby_version_is "3.1"..."3.2" do
-    it "is 13.0.0" do
-      RbConfig::CONFIG['UNICODE_VERSION'].should == "13.0.0"
+  ruby_version_is ""..."3.4" do
+    it "is 15.0.0" do
+      RbConfig::CONFIG['UNICODE_VERSION'].should == "15.0.0"
     end
   end
 
   # Caution: ruby_version_is means is_or_later
-  ruby_version_is "3.2" do
-    it "is 15.0.0" do
-      RbConfig::CONFIG['UNICODE_VERSION'].should == "15.0.0"
+  ruby_version_is "4.0" do
+    it "is 17.0.0" do
+      RbConfig::CONFIG['UNICODE_VERSION'].should == "17.0.0"
     end
   end
 end