diff options
| -rw-r--r-- | activerecord/lib/active_record/fixtures.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/activerecord/lib/active_record/fixtures.rb b/activerecord/lib/active_record/fixtures.rb index 16a30e3fdb..d8f88cf2be 100644 --- a/activerecord/lib/active_record/fixtures.rb +++ b/activerecord/lib/active_record/fixtures.rb @@ -478,7 +478,7 @@ module ActiveRecord connection, table_name, class_names[table_name.to_sym] || table_name.classify, - File.join(fixtures_directory, path)) + ::File.join(fixtures_directory, path)) end all_loaded_fixtures.update(fixtures_map) @@ -656,9 +656,9 @@ module ActiveRecord end def read_fixture_files - if File.file?(yaml_file_path) + if ::File.file?(yaml_file_path) read_yaml_fixture_files - elsif File.file?(csv_file_path) + elsif ::File.file?(csv_file_path) read_csv_fixture_files else raise FixturesFileNotFound, "Could not find #{yaml_file_path} or #{csv_file_path}" @@ -713,7 +713,7 @@ module ActiveRecord end def yaml_fixtures_key(path) - File.basename(@fixture_path).split(".").first + ::File.basename(@fixture_path).split(".").first end def parse_yaml_string(fixture_content) |