diff options
author | Matthew Draper <matthew@trebex.net> | 2016-11-25 15:57:07 +1030 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-11-25 15:57:07 +1030 |
commit | 96a2c96ec3616737d2a8eeced57198206ceb9b14 (patch) | |
tree | 05723d6440940976656aec8843935be0f645a99d | |
parent | fed3d32ebca06c0f1f88301238ff362c9562816a (diff) | |
parent | d99b3848bb83e147674465a82af1c2dfcc27b9cc (diff) | |
download | rails-96a2c96ec3616737d2a8eeced57198206ceb9b14.tar.gz rails-96a2c96ec3616737d2a8eeced57198206ceb9b14.tar.bz2 rails-96a2c96ec3616737d2a8eeced57198206ceb9b14.zip |
Merge pull request #27174 from kamipo/fix_require_dependency_message_format
Fix `require_dependency` message format
-rw-r--r-- | actionview/test/actionpack/abstract/helper_test.rb | 2 | ||||
-rw-r--r-- | activesupport/lib/active_support/dependencies.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/actionview/test/actionpack/abstract/helper_test.rb b/actionview/test/actionpack/abstract/helper_test.rb index 5a2f0839e5..83237518d7 100644 --- a/actionview/test/actionpack/abstract/helper_test.rb +++ b/actionview/test/actionpack/abstract/helper_test.rb @@ -109,7 +109,7 @@ module AbstractController class InvalidHelpersTest < ActiveSupport::TestCase def test_controller_raise_error_about_real_require_problem e = assert_raise(LoadError) { AbstractInvalidHelpers.helper(:invalid_require) } - assert_equal "No such file to load -- very_invalid_file_name", e.message + assert_equal "No such file to load -- very_invalid_file_name.rb", e.message end def test_controller_raise_error_about_missing_helper diff --git a/activesupport/lib/active_support/dependencies.rb b/activesupport/lib/active_support/dependencies.rb index 0146401abe..e125b657f2 100644 --- a/activesupport/lib/active_support/dependencies.rb +++ b/activesupport/lib/active_support/dependencies.rb @@ -242,7 +242,7 @@ module ActiveSupport #:nodoc: # resolution deterministic for constants with the same relative name in # different namespaces whose evaluation would depend on load order # otherwise. - def require_dependency(file_name, message = "No such file to load -- %s") + def require_dependency(file_name, message = "No such file to load -- %s.rb") file_name = file_name.to_path if file_name.respond_to?(:to_path) unless file_name.is_a?(String) raise ArgumentError, "the file name must either be a String or implement #to_path -- you passed #{file_name.inspect}" |