From 519467babcce795193877ab4f8eefb23200e664f Mon Sep 17 00:00:00 2001 From: Kasper Timm Hansen Date: Mon, 10 Jul 2017 22:11:01 +0200 Subject: Fix root not being defined on Travis. --- railties/lib/rails/test_unit/reporter.rb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'railties/lib/rails/test_unit/reporter.rb') diff --git a/railties/lib/rails/test_unit/reporter.rb b/railties/lib/rails/test_unit/reporter.rb index 1cc27f7b6c..ab28034d27 100644 --- a/railties/lib/rails/test_unit/reporter.rb +++ b/railties/lib/rails/test_unit/reporter.rb @@ -71,7 +71,12 @@ module Rails 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? -- cgit v1.2.3