Permalink
Browse files

Merge pull request #10795 from atambo/master

Don't blindly call blame_file! on exceptions in ActiveSupport::Dependes::Loadable
  • Loading branch information...
2 parents f5e133e + a548792 commit cbfcd9ddf1c964829307a8ce4b483c50252898a7 @steveklabnik steveklabnik committed Jun 10, 2013
@@ -1,3 +1,8 @@
+* Fix `ActiveSupport::Dependencies::Loadable#load_dependency` calling
+ `#blame_file!` on Exceptions that do not have the Blamable mixin
+
+ *Andrew Kreiling*
+
* Override `Time.at` to support the passing of Time-like values when called with a single argument.
*Andrew White*
@@ -213,7 +213,7 @@ def load_dependency(file)
yield
end
rescue Exception => exception # errors from loading file
- exception.blame_file! file
+ exception.blame_file! file if exception.respond_to? :blame_file!
raise
end
@@ -0,0 +1,5 @@
+exception = Exception.new('I am not blamable!')
+class << exception
+ undef_method(:blame_file!)
+end
+raise exception
@@ -76,6 +76,14 @@ def test_dependency_which_raises_exception_isnt_added_to_loaded_set
end
end
+ def test_dependency_which_raises_doesnt_blindly_call_blame_file!
+ with_loading do
+ filename = 'dependencies/raises_exception_without_blame_file'
+
+ assert_raises(Exception) { require_dependency filename }
+ end
+ end
+
def test_warnings_should_be_enabled_on_first_load
with_loading 'dependencies' do
old_warnings, ActiveSupport::Dependencies.warnings_on_first_load = ActiveSupport::Dependencies.warnings_on_first_load, true

0 comments on commit cbfcd9d

Please sign in to comment.