Errno::ENOENT error makes more sense when a file cannot be found

This commit is contained in:
Aaron Patterson 2011-12-10 15:32:14 -08:00
parent 4beaa9b839
commit d09b67cfc0
2 changed files with 1 additions and 11 deletions

View File

@ -22,8 +22,6 @@ else
end
end
class FixturesFileNotFound < StandardError; end
module ActiveRecord
# \Fixtures are a way of organizing data that you want to test against; in short, sample data.
#
@ -644,14 +642,6 @@ module ActiveRecord
end
def read_fixture_files
if ::File.file?(yaml_file_path)
read_yaml_fixture_files
else
raise FixturesFileNotFound, "Could not find #{yaml_file_path}"
end
end
def read_yaml_fixture_files
yaml_files = Dir["#{@fixture_path}/**/*.yml"].select { |f|
::File.file?(f)
} + [yaml_file_path]

View File

@ -179,7 +179,7 @@ class FixturesTest < ActiveRecord::TestCase
#sanity check to make sure that this file never exists
assert Dir[nonexistent_fixture_path+"*"].empty?
assert_raise(FixturesFileNotFound) do
assert_raise(Errno::ENOENT) do
ActiveRecord::Fixtures.new( Account.connection, "companies", 'Company', nonexistent_fixture_path)
end
end