diff options
author | Yves Senn <yves.senn@gmail.com> | 2015-12-10 08:40:23 +0100 |
---|---|---|
committer | Yves Senn <yves.senn@gmail.com> | 2015-12-10 08:40:23 +0100 |
commit | 3e5a1c2865f78236d4bc2e807b496267b99d8575 (patch) | |
tree | 66e99342a40795b2e5fd9a94b56ab44f549f2789 /railties/lib | |
parent | 11fbcf84ac29d6040be1b0988d22054342ed74d4 (diff) | |
parent | e4e42d0b346065f1fce6caaea669c3e4bc42dfc8 (diff) | |
download | rails-3e5a1c2865f78236d4bc2e807b496267b99d8575.tar.gz rails-3e5a1c2865f78236d4bc2e807b496267b99d8575.tar.bz2 rails-3e5a1c2865f78236d4bc2e807b496267b99d8575.zip |
Merge pull request #22546 from y-yagi/show_relative_path_in_test_runner
show relative path the rerun snippet of test runner in rails engine
Diffstat (limited to 'railties/lib')
-rw-r--r-- | railties/lib/rails/test_unit/reporter.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/railties/lib/rails/test_unit/reporter.rb b/railties/lib/rails/test_unit/reporter.rb index de4b002e55..00ea32d1b8 100644 --- a/railties/lib/rails/test_unit/reporter.rb +++ b/railties/lib/rails/test_unit/reporter.rb @@ -44,7 +44,7 @@ module Rails end def relative_path_for(file) - file.sub(/^#{Rails.root}\/?/, '') + file.sub(/^#{app_root}\/?/, '') end private @@ -66,5 +66,9 @@ module Rails "#{self.executable} #{relative_path_for(assertion_path)}" end + + def app_root + @app_root ||= defined?(ENGINE_ROOT) ? ENGINE_ROOT : Rails.root + end end end |