Fix if_ruby guards

Author: soutaro

test/stdlib/IO_test.rb

@@ -422,24 +422,22 @@ class IOWaitTest < Test::Unit::TestCase
   testing "::IO"
 
   def test_readyp
-    if_ruby31 do
-      # This method returns true|false in Ruby 2.7, nil|IO in 3.0, and true|false in 3.1.
+    # This method returns true|false in Ruby 2.7, nil|IO in 3.0, and true|false in 3.1.
 
-      IO.pipe.tap do |r, w|
-        assert_send_type(
-          "() -> untyped",
-          r, :ready?
-        )
-      end
+    IO.pipe.tap do |r, w|
+      assert_send_type(
+        "() -> untyped",
+        r, :ready?
+      )
+    end
 
-      IO.pipe.tap do |r, w|
-        w.write("hello")
+    IO.pipe.tap do |r, w|
+      w.write("hello")
 
-        assert_send_type(
-          "() -> untyped",
-          r, :ready?
-        )
-      end
+      assert_send_type(
+        "() -> untyped",
+        r, :ready?
+      )
     end
   end
 
@@ -491,7 +489,7 @@ def test_nread
   end
 
   def test_wait
-    if_ruby "3.0.0"..."3.2.0" do
+    if_ruby "3.0.0"..."3.2.0", skip: false do
       IO.pipe.tap do |r, w|
         w.write("hello")
 

test/stdlib/Range_test.rb

@@ -96,7 +96,7 @@ def test_min
 
   def test_percent
     (1..10).%(2)
-    if_ruby(..."3.4.0") do
+    if_ruby(..."3.4.0", skip: false) do
       ('A'...'Z').%(2) { |s| s.downcase }
     end
   end
@@ -110,7 +110,7 @@ def test_size
   def test_step
     (1..10).step
     (1..10).step(2)
-    if_ruby(..."3.4.0") do
+    if_ruby(..."3.4.0", skip: false) do
       ('A'...'Z').step { |s| s.downcase }
       ('A'...'Z').step(2) { |s| s.downcase }
     end

test/stdlib/test_helper.rb

@@ -23,7 +23,7 @@ def setup
 end
 
 module VersionHelper
-  def if_ruby(range)
+  def if_ruby(range, skip: true)
     r = Range.new(
       range.begin&.yield_self {|b| Gem::Version.new(b) },
       range.end&.yield_self {|e| Gem::Version.new(e) },
@@ -33,27 +33,17 @@ def if_ruby(range)
     if r === Gem::Version.new(RUBY_VERSION)
       yield
     else
-      notify "Skipping test: #{r} !== #{RUBY_VERSION}"
+      if skip
+        notify "Skipping test: #{r} !== #{RUBY_VERSION}"
+      end
     end
   end
-
-  def if_ruby3(&block)
-    if_ruby("3.0.0"..."4.0.0", &block)
-  end
-
-  def if_ruby30(&block)
-    if_ruby("3.0.0"..."3.1.0", &block)
-  end
-
-  def if_ruby31(&block)
-    if_ruby("3.1.0"..."3.2.0", &block)
-  end
 end
 
 module WithStdlibAliases
   def with_timeout(seconds: 1, nanoseconds: 0)
     unless block_given?
-      return RBS::UnitTest::Convertibles::WithAliases::WithEnum.new(
+      return RBS::UnitTest::WithAliases::WithEnum.new(
         to_enum(__method__, seconds: seconds, nanoseconds: nanoseconds)
       )
     end