Merge pull request #1479 from ruby/backport

Backport to 3.2

Author: soutaro

core/fiber.rbs

@@ -86,7 +86,7 @@ class Fiber < Object
   #
   # See also Fiber::[]=.
   #
-  def self.[]: (Symbol | String) -> untyped
+  def self.[]: (Symbol) -> untyped
 
   # <!--
   #   rdoc-file=cont.c
@@ -99,7 +99,7 @@ class Fiber < Object
   #
   # See also Fiber::[].
   #
-  def self.[]=: [A] (Symbol | String, A) -> A
+  def self.[]=: [A] (Symbol, A) -> A
 
   # <!--
   #   rdoc-file=cont.c

lib/rbs/environment.rb

@@ -276,9 +276,9 @@ def constant_entry(type_name)
     end
 
     def normalize_type_name?(name)
-      if name.class?
-        normalize_module_name?(name)
-      else
+      return normalize_module_name?(name) if name.class?
+
+      type_name =
         unless name.namespace.empty?
           parent = name.namespace.to_type_name
           parent = normalize_module_name?(parent)
@@ -288,6 +288,9 @@ def normalize_type_name?(name)
         else
           name
         end
+
+      if type_name?(type_name)
+        type_name
       end
     end
 

test/rbs/cli_test.rb

@@ -400,6 +400,40 @@ def voice: [X] { () -> X } -> String
     end
   end
 
+  def test_undefined_interface
+    with_cli do |cli|
+      Dir.mktmpdir do |dir|
+        (Pathname(dir) + 'a.rbs').write(<<~RBS)
+        class Foo
+          def void: () -> _Void
+        end
+        RBS
+
+        error = assert_raises RBS::NoTypeFoundError do
+          cli.run(["-I", dir, "validate"])
+        end
+        assert_equal "_Void", error.type_name.to_s
+      end
+    end
+  end
+
+  def test_undefined_alias
+    with_cli do |cli|
+      Dir.mktmpdir do |dir|
+        (Pathname(dir) + 'a.rbs').write(<<~RBS)
+        class Foo
+          def void: () -> voida
+        end
+        RBS
+
+        error = assert_raises RBS::NoTypeFoundError do
+          cli.run(["-I", dir, "validate"])
+        end
+        assert_equal "voida", error.type_name.to_s
+      end
+    end
+  end
+
   def test_constant
     with_cli do |cli|
       cli.run(%w(constant Pathname))

test/stdlib/Fiber_test.rb

@@ -15,18 +15,6 @@ def test_aref
       "(Symbol) -> Integer",
       Fiber, :[], :key
     )
-
-    key = "string"
-
-    assert_send_type(
-      "(String, Integer) -> Integer",
-      Fiber, :[]=, key, 123
-    )
-
-    assert_send_type(
-      "(String) -> Integer",
-      Fiber, :[], key
-    )
   end
 
   def test_blocking?

test/stdlib/Kernel_test.rb

@@ -662,7 +662,7 @@ def (obj = BasicObject.new).inspect
   def test_pp
     pp
     pp 1
-    pp 'a', 2 
+    pp 'a', 2
 
     pp Object.new
   end
@@ -704,9 +704,6 @@ def o.divmod(i)
       [0.001, 0.001]
     end
     sleep o
-
-    omit_if(RUBY_VERSION < "3.3.0")
-    sleep nil
   end
 
   def test_syscall

test/stdlib/test_helper.rb

@@ -10,6 +10,17 @@ class Test::Unit::TestCase
   prepend TestSkip
 end
 
+class Test::Unit::TestCase
+  module Printer
+    def setup
+      STDERR.puts name
+      super
+    end
+  end
+
+  # prepend Printer
+end
+
 module Spy
   def self.wrap(object, method_name)
     spy = WrapSpy.new(object: object, method_name: method_name)
@@ -460,7 +471,7 @@ def initialize(*args)
   def to_ary
     @args
   end
-end 
+end
 
 class ToHash
   def initialize(hash = { 'hello' => 'world' })
@@ -578,6 +589,11 @@ def self.hook
               end
   end
 
+  # def setup
+  #   STDERR.puts name
+  #   super
+  # end
+
   def hook
     self.class.hook
   end
@@ -591,9 +607,11 @@ def setup
       null = StringIO.new
       @stdout, @stderr = $stdout, $stderr
       $stderr = $stdout = null
+      super
     end
 
     def teardown
+      super
       $stderr, $stdout = @stderr, @stdout
     end
   end

test/test_helper.rb

@@ -233,15 +233,22 @@ def assert_sampling_check(builder, sample_size, array)
     OptionParser.new do |opts|
       opts.on("--name NAME") do |name|
         name = name.gsub(/(\A\/)|(\/\Z)/, '')
+        klass_name, method_name = name.split("#", 2)
 
-        constant = (Object.const_get(name) rescue nil)
+        constant = ObjectSpace.each_object(Class).find do |klass|
+          if klass.name
+            klass.name == klass_name || klass.name.end_with?("::#{klass_name}")
+          end
+        end
 
         if constant
-          test_unit_args << "--testcase"
-          test_unit_args << name
-        else
-          test_unit_args << "--name"
-          test_unit_args << name
+          if method_name
+            test_unit_args << "--name"
+            test_unit_args << "#{constant.name}##{method_name}"
+          else
+            test_unit_args << "--testcase"
+            test_unit_args << constant.name
+          end
         end
       end
     end.order!(argv)

test/test_skip.rb

@@ -50,7 +50,10 @@ def setup
     end
 
     def teardown
-      unless current_result.passed?
+      case
+      when passed?
+        # nop
+      else
         puts "💡You can skip this test `#{name}` by adding the name to `#{SKIP_TESTS_FILE}`"
       end