Merge pull request #2641 from ruby/backport-multiple-skip-files

Allows the use of a path list as RBS_SKIP_TESTS

Author: soutaro

lib/rbs/collection.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'yaml'
+require 'fileutils'
 
 require_relative './cli/colored_io'
 require_relative './collection/sources'

test/test_skip.rb

@@ -15,15 +15,11 @@
 # ```
 #
 module TestSkip
-  env = ENV["RBS_SKIP_TESTS"]
-  SKIP_TESTS_FILE =
-    if env
-      Pathname(env)
-    end
+  SKIP_TESTS_FILES = ENV["RBS_SKIP_TESTS"]&.split(File::PATH_SEPARATOR)
 
   SKIP_TESTS =
-    if SKIP_TESTS_FILE
-      SKIP_TESTS_FILE.each_line.with_object({}) do |line, hash|
+    SKIP_TESTS_FILES&.each_with_object({}) do |file, hash|
+      File.foreach(file) do |line|
         line.chomp!
         line.gsub!(/#.*/, "")
         line.strip!
@@ -32,19 +28,20 @@ module TestSkip
 
         name, message = line.split(/\s+/, 2)
 
-        hash[name] = message
+        hash[name] = [file, message]
       end
     end
 
   if SKIP_TESTS
     def setup
       super
 
-      if SKIP_TESTS.key?(name) || SKIP_TESTS.key?(self.class.name)
-        if message = SKIP_TESTS[name] || SKIP_TESTS[self.class.name]
-          omit "Skip test by RBS_SKIP_TESTS(#{SKIP_TESTS_FILE}): #{message}"
+      file, message = SKIP_TESTS[name] || SKIP_TESTS[self.class.name]
+      if file
+        if message
+          omit "Skip test by RBS_SKIP_TESTS(#{file}): #{message}"
         else
-          omit "Skip test by RBS_SKIP_TESTS(#{SKIP_TESTS_FILE})"
+          omit "Skip test by RBS_SKIP_TESTS(#{file})"
         end
       end
     end
@@ -54,7 +51,7 @@ def teardown
       when passed?
         # nop
       else
-        puts "💡You can skip this test `#{name}` by adding the name to `#{SKIP_TESTS_FILE}`"
+        puts "💡You can skip this test `#{name}` by adding the name to `#{SKIP_TESTS_FILES.join('`, `')}`"
       end
 
       super