aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
authorAkira Matsuda <ronnie@dio.jp>2013-01-02 10:02:14 +0900
committerAkira Matsuda <ronnie@dio.jp>2013-01-04 16:46:22 +0900
commit370bfda55ff11e289a8ff2464f4a6284e1f0977a (patch)
tree4f18441ace4d45ae71a618422920dd4b9d08691a /activesupport
parentbb38df89bfbfc37913babe2edf6ad73b0dc80358 (diff)
downloadrails-370bfda55ff11e289a8ff2464f4a6284e1f0977a.tar.gz
rails-370bfda55ff11e289a8ff2464f4a6284e1f0977a.tar.bz2
rails-370bfda55ff11e289a8ff2464f4a6284e1f0977a.zip
replace use of MissingSourceFile with LoadError
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/test/core_ext/load_error_test.rb17
-rw-r--r--activesupport/test/dependencies_test.rb4
2 files changed, 3 insertions, 18 deletions
diff --git a/activesupport/test/core_ext/load_error_test.rb b/activesupport/test/core_ext/load_error_test.rb
index 31863d0aca..66c39b143c 100644
--- a/activesupport/test/core_ext/load_error_test.rb
+++ b/activesupport/test/core_ext/load_error_test.rb
@@ -1,21 +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
-end
-
class TestLoadError < ActiveSupport::TestCase
def test_with_require
assert_raise(LoadError) { require 'no_this_file_don\'t_exist' }
@@ -29,4 +14,4 @@ class TestLoadError < ActiveSupport::TestCase
assert_equal 'nor/this/one.rb', e.path
end
end
-end \ No newline at end of file
+end
diff --git a/activesupport/test/dependencies_test.rb b/activesupport/test/dependencies_test.rb
index 9d913c27b0..3996fed928 100644
--- a/activesupport/test/dependencies_test.rb
+++ b/activesupport/test/dependencies_test.rb
@@ -53,7 +53,7 @@ class DependenciesTest < ActiveSupport::TestCase
end
def test_missing_dependency_raises_missing_source_file
- assert_raise(MissingSourceFile) { require_dependency("missing_service") }
+ assert_raise(LoadError) { require_dependency("missing_service") }
end
def test_dependency_which_raises_exception_isnt_added_to_loaded_set
@@ -576,7 +576,7 @@ class DependenciesTest < ActiveSupport::TestCase
def test_nested_load_error_isnt_rescued
with_loading 'dependencies' do
- assert_raise(MissingSourceFile) do
+ assert_raise(LoadError) do
RequiresNonexistent1
end
end