From 081fb4973d229a6da829d1f6d1faacbc21169161 Mon Sep 17 00:00:00 2001
From: Thomas Sawyer <transfire@gmail.com>
Date: Mon, 28 Sep 2026 22:19:04 -0400
Subject: [PATCH] Use bundled Rubytest command for Facets tests

---
 CONTRIBUTING.md |  4 ++--
 Gemfile         |  2 +-
 Guardfile       |  4 ++--
 Rakefile        | 10 +++++-----
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 3a0692b98..17ed769a8 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -104,8 +104,8 @@ explanation if needed, including *when* and *why* the method could be useful.
 
 The test suite uses four tools:
 
-* **RubyTest** provides the test runner interface; `rubytest-cli` supplies the
-  `ruby-test` command used by the Rake tasks.
+* **RubyTest** provides the test runner interface and the `rubytest` command
+  used by the Rake tasks.
 * **Lemon** defines the `test_case`, `method`, and `test` structure of the unit
   tests.
 * **AE** provides assertions such as `.assert` and `expect`, used in both the
diff --git a/Gemfile b/Gemfile
index 2c7c8487a..f365bd265 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,7 +3,7 @@ source "https://rubygems.org"
 group :test do
   gem 'lemon'
   gem 'qed'
-  gem 'rubytest-cli'
+  gem 'rubytest', '>= 0.9'
   gem 'rake'
   gem 'simplecov'
   gem 'ostruct'  # no longer a default gem as of Ruby 3.5; needed by facets/ostruct tests
diff --git a/Guardfile b/Guardfile
index eb13e0456..6c63952de 100644
--- a/Guardfile
+++ b/Guardfile
@@ -29,12 +29,12 @@ module ::Guard
 
     def run_all
       puts 'Running all tests'
-      puts `ruby-test test`
+      puts `rubytest test`
     end
 
     def run_on_modifications(paths)
       puts "Running test for #{paths.join(' ')}"
-      puts `ruby-test #{paths.join(' ')}`
+      puts `rubytest #{paths.join(' ')}`
     end
   end
 end
diff --git a/Rakefile b/Rakefile
index 7d937c0f5..cd0ea9a2f 100644
--- a/Rakefile
+++ b/Rakefile
@@ -50,9 +50,9 @@ task "default" => "test"
 
 task "test" => "tmp" do
   if tests = ENV['TESTS']
-    sh "ruby-test #{test_flags} #{tests}"
+    sh "rubytest #{test_flags} #{tests}"
   else
-    sh "ruby-test #{test_flags} test/"
+    sh "rubytest #{test_flags} test/"
   end
 end
 
@@ -61,17 +61,17 @@ task "test:all" => "test"
 
 desc "run core unit tests"
 task "test:core" => "tmp" do
-  sh "ruby-test #{test_flags} -Ilib/core test/core"
+  sh "rubytest #{test_flags} -Ilib/core test/core"
 end
 
 desc "run standard unit tests"
 task "test:standard" => "tmp" do
-  sh "ruby-test #{test_flags} -Ilib/standard test/standard"
+  sh "rubytest #{test_flags} -Ilib/standard test/standard"
 end
 
 desc "run rails compatibility unit tests"
 task "test:rails" => "tmp" do
-  sh "ruby-test #{test_flags} -Ilib/core -Ilib/standard -Ilib/rails test/rails"
+  sh "rubytest #{test_flags} -Ilib/core -Ilib/standard -Ilib/rails test/rails"
 end
 
 desc "run all unit tests with ActiveSupport loaded"