aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEileen M. Uchitelle <eileencodes@users.noreply.github.com>2018-05-04 11:28:54 -0400
committerGitHub <noreply@github.com>2018-05-04 11:28:54 -0400
commit99e4bb735d955318a7503c404d83c3314350ba20 (patch)
treeaf429e3b3ca126d5cc2c2eac1b6baee5733d8eaa
parentbd53f35e250b9e1559e5e971af0e2699d718c0f0 (diff)
parentbfddb67197bf0b5c6ec17e2a35ece9190bec8bac (diff)
downloadrails-99e4bb735d955318a7503c404d83c3314350ba20.tar.gz
rails-99e4bb735d955318a7503c404d83c3314350ba20.tar.bz2
rails-99e4bb735d955318a7503c404d83c3314350ba20.zip
Merge pull request #32809 from gmcgibbon/fix_load_error_is_missing_nil_path
Fix #29632 - nil #path leads to NoMethodError in LoadError#is_missing?
-rw-r--r--activesupport/lib/active_support/core_ext/load_error.rb2
-rw-r--r--activesupport/test/core_ext/load_error_test.rb7
2 files changed, 8 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/core_ext/load_error.rb b/activesupport/lib/active_support/core_ext/load_error.rb
index 750f858fcc..6b0dcab905 100644
--- a/activesupport/lib/active_support/core_ext/load_error.rb
+++ b/activesupport/lib/active_support/core_ext/load_error.rb
@@ -4,6 +4,6 @@ class LoadError
# Returns true if the given path name (except perhaps for the ".rb"
# extension) is the missing file which caused the exception to be raised.
def is_missing?(location)
- location.sub(/\.rb$/, "".freeze) == path.sub(/\.rb$/, "".freeze)
+ location.sub(/\.rb$/, "".freeze) == path.to_s.sub(/\.rb$/, "".freeze)
end
end
diff --git a/activesupport/test/core_ext/load_error_test.rb b/activesupport/test/core_ext/load_error_test.rb
index 41b11d0c33..126aa51cb4 100644
--- a/activesupport/test/core_ext/load_error_test.rb
+++ b/activesupport/test/core_ext/load_error_test.rb
@@ -7,13 +7,20 @@ class TestLoadError < ActiveSupport::TestCase
def test_with_require
assert_raise(LoadError) { require "no_this_file_don't_exist" }
end
+
def test_with_load
assert_raise(LoadError) { load "nor_does_this_one" }
end
+
def test_path
begin load "nor/this/one.rb"
rescue LoadError => e
assert_equal "nor/this/one.rb", e.path
end
end
+
+ def test_is_missing_with_nil_path
+ error = LoadError.new(nil)
+ assert_nothing_raised { error.is_missing?("anything") }
+ end
end