From 00c5342d96a3677c0a6a2bb8316c76182f5bdfdd Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Tue, 3 Jan 2012 14:54:29 -0800 Subject: use File.basename to get the filename minus .yml --- activerecord/lib/active_record/fixtures.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/activerecord/lib/active_record/fixtures.rb b/activerecord/lib/active_record/fixtures.rb index 860e7ea0e4..c85d54f28b 100644 --- a/activerecord/lib/active_record/fixtures.rb +++ b/activerecord/lib/active_record/fixtures.rb @@ -754,8 +754,9 @@ module ActiveRecord def fixtures(*fixture_names) if fixture_names.first == :all - fixture_names = Dir["#{fixture_path}/**/*.{yml}"] - fixture_names.map! { |f| f[(fixture_path.size + 1)..-5] } + fixture_names = Dir["#{fixture_path}/**/*.yml"].map { |f| + File.basename f, '.yml' + } else fixture_names = fixture_names.flatten.map { |n| n.to_s } end -- cgit v1.2.3