diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-01-02 19:19:59 -0300 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-01-02 19:19:59 -0300 |
commit | 48deeab90acd9f8f609fa461205a793c52f11ed2 (patch) | |
tree | e8b4287dcc718617bf53cc78c6d7cd0074624799 /activesupport/test/core_ext/load_error_test.rb | |
parent | 9b366b95f9aeb50388af6d247944ed63751b570a (diff) | |
parent | 370bfda55ff11e289a8ff2464f4a6284e1f0977a (diff) | |
download | rails-48deeab90acd9f8f609fa461205a793c52f11ed2.tar.gz rails-48deeab90acd9f8f609fa461205a793c52f11ed2.tar.bz2 rails-48deeab90acd9f8f609fa461205a793c52f11ed2.zip |
Merge pull request #8740 from amatsuda/missing_source_file
replace use of MissingSourceFile with LoadError
Conflicts:
activesupport/test/core_ext/load_error_test.rb
Diffstat (limited to 'activesupport/test/core_ext/load_error_test.rb')
-rw-r--r-- | activesupport/test/core_ext/load_error_test.rb | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/activesupport/test/core_ext/load_error_test.rb b/activesupport/test/core_ext/load_error_test.rb index 5f804c749b..66c39b143c 100644 --- a/activesupport/test/core_ext/load_error_test.rb +++ b/activesupport/test/core_ext/load_error_test.rb @@ -1,30 +1,6 @@ require 'abstract_unit' require 'active_support/core_ext/load_error' -class TestMissingSourceFile < ActiveSupport::TestCase - def test_with_require - assert_raise(MissingSourceFile) { require 'no_this_file_don\'t_exist' } - end - def test_with_load - assert_raise(MissingSourceFile) { load 'nor_does_this_one' } - end - def test_path - begin load 'nor/this/one.rb' - rescue MissingSourceFile => e - assert_equal 'nor/this/one.rb', e.path - end - end - - def test_is_missing - begin load 'nor_does_this_one' - rescue MissingSourceFile => e - assert e.is_missing?('nor_does_this_one') - assert e.is_missing?('nor_does_this_one.rb') - assert_not e.is_missing?('some_other_file') - end - end -end - class TestLoadError < ActiveSupport::TestCase def test_with_require assert_raise(LoadError) { require 'no_this_file_don\'t_exist' } |