From 5b070116b066db30e053df976032233a6eefef49 Mon Sep 17 00:00:00 2001 From: Kasper Timm Hansen Date: Mon, 10 Jul 2017 22:11:01 +0200 Subject: [PATCH] Fix root not being defined on Travis. --- railties/lib/rails/test_unit/reporter.rb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/railties/lib/rails/test_unit/reporter.rb b/railties/lib/rails/test_unit/reporter.rb index fe11664d5e..662fc72ffc 100644 --- a/railties/lib/rails/test_unit/reporter.rb +++ b/railties/lib/rails/test_unit/reporter.rb @@ -72,7 +72,12 @@ def format_rerun_snippet(result) end def app_root - @app_root ||= defined?(ENGINE_ROOT) ? ENGINE_ROOT : Rails.root + @app_root ||= + if defined?(ENGINE_ROOT) + ENGINE_ROOT + elsif Rails.respond_to?(:root) + Rails.root + end end def colored_output? -- GitLab