Use COMPONENT_ROOT as app_root when present in test unit reporting.

kabelak · Jun 13, 2020 · 32aebc7 · 32aebc7
1 parent 00c2d3e
commit 32aebc7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/railties/lib/rails/test_unit/reporter.rb b/railties/lib/rails/test_unit/reporter.rb
@@ -82,6 +82,8 @@ def app_root
         @app_root ||=
           if defined?(ENGINE_ROOT)
             ENGINE_ROOT
+          elsif defined?(COMPONENT_ROOT)
+            COMPONENT_ROOT
           elsif Rails.respond_to?(:root)
             Rails.root
           end

diff --git a/tools/test.rb b/tools/test.rb
@@ -11,14 +11,6 @@
 require "active_support"
 require "active_support/test_case"
 
-class << Rails
-  # Necessary to get rerun-snippets working.
-  def root
-    @root ||= Pathname.new(COMPONENT_ROOT)
-  end
-  alias __root root
-end
-
 ActiveSupport::TestCase.extend Rails::LineFiltering
 Rails::TestUnitReporter.executable = "bin/test"