Expand test directory command resolution with requires

Author: vinistock

lib/ruby_lsp/listeners/test_style.rb

@@ -31,7 +31,12 @@ def resolve_test_commands(items)
             next unless path
 
             if tags.include?("test_dir")
-              full_files << "#{path}/**/*" if children.empty?
+              if children.empty?
+                full_files.concat(Dir.glob(
+                  "#{path}/**/{*_test,test_*}.rb",
+                  File::Constants::FNM_EXTGLOB | File::Constants::FNM_PATHNAME,
+                ))
+              end
             elsif tags.include?("test_file")
               full_files << path if children.empty?
             elsif tags.include?("test_group")
@@ -67,7 +72,10 @@ def resolve_test_commands(items)
             end
           end
 
-          commands << "#{BASE_COMMAND} -Itest #{full_files.join(" ")}" unless full_files.empty?
+          unless full_files.empty?
+            commands << "#{BASE_COMMAND} -Itest -e \"ARGV.each { |f| require f }\" #{full_files.join(" ")}"
+          end
+
           commands
         end
 

test/requests/resolve_test_commands_test.rb

@@ -212,7 +212,7 @@ def test_resolve_test_command_entire_files
         result = server.pop_response.response
         assert_equal(
           [
-            "bundle exec ruby -Itest /test/server_test.rb /test/store_test.rb",
+            "bundle exec ruby -Itest -e \"ARGV.each { |f| require f }\" /test/server_test.rb /test/store_test.rb",
           ],
           result[:commands],
         )
@@ -221,6 +221,7 @@ def test_resolve_test_command_entire_files
 
     def test_resolve_test_command_entire_directories
       with_server do |server|
+        Dir.stubs(:glob).returns(["/other/test/fake_test.rb", "/other/test/fake_test2.rb"])
         server.process_message({
           id: 1,
           method: "rubyLsp/resolveTestCommands",
@@ -254,7 +255,8 @@ def test_resolve_test_command_entire_directories
         result = server.pop_response.response
         assert_equal(
           [
-            "bundle exec ruby -Itest /other/test/**/* /test/server_test.rb /test/store_test.rb",
+            "bundle exec ruby -Itest -e \"ARGV.each { |f| require f }\" /other/test/fake_test.rb " \
+              "/other/test/fake_test2.rb /test/server_test.rb /test/store_test.rb",
           ],
           result[:commands],
         )
@@ -535,6 +537,7 @@ def test_resolve_test_command_nested_test_groups
 
     def test_resolve_test_command_mix_of_directories_and_examples
       with_server do |server|
+        Dir.stubs(:glob).returns(["/test/unit/fake_test.rb", "/test/unit/fake_test2.rb"])
         server.process_message({
           id: 1,
           method: "rubyLsp/resolveTestCommands",
@@ -566,7 +569,7 @@ def test_resolve_test_command_mix_of_directories_and_examples
         assert_equal(
           [
             "bundle exec ruby -Itest /test/server_test.rb --name \"/^ServerTest#test_server$/\"",
-            "bundle exec ruby -Itest /test/unit/**/*",
+            "bundle exec ruby -Itest -e \"ARGV.each { |f| require f }\" /test/unit/fake_test.rb /test/unit/fake_test2.rb",
           ],
           result[:commands],
         )
@@ -1031,6 +1034,7 @@ def test_resolve_test_command_nested_test_groups
 
     def test_resolve_test_command_mix_of_directories_and_examples
       with_server do |server|
+        Dir.stubs(:glob).returns(["/test/unit/fake_test.rb", "/test/unit/fake_test2.rb"])
         server.process_message({
           id: 1,
           method: "rubyLsp/resolveTestCommands",
@@ -1062,7 +1066,8 @@ def test_resolve_test_command_mix_of_directories_and_examples
         assert_equal(
           [
             "bundle exec ruby -Itest /test/server_test.rb --testcase \"/^ServerTest$/\" --name \"/test_server$/\"",
-            "bundle exec ruby -Itest /test/unit/**/*",
+            "bundle exec ruby -Itest -e \"ARGV.each { |f| require f }\" /test/unit/fake_test.rb " \
+              "/test/unit/fake_test2.rb",
           ],
           result[:commands],
         )