diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-08-05 12:56:31 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-08-05 12:56:31 -0700 |
| commit | 5f8a7d1d4d867d87e74b378d357f8476f91e7852 (patch) | |
| tree | 07fda07a47eb75514508dd1d1703a0a429b3d42f /activerecord/lib/active_record/fixtures.rb | |
| parent | 773eca0e12af14cbd52f71fff9387e6abcfc4f1f (diff) | |
| parent | 0ec701d50bebf8ebd08015565ec771fb14357d8d (diff) | |
| download | rails-5f8a7d1d4d867d87e74b378d357f8476f91e7852.tar.gz rails-5f8a7d1d4d867d87e74b378d357f8476f91e7852.tar.bz2 rails-5f8a7d1d4d867d87e74b378d357f8476f91e7852.zip | |
Merge pull request #11765 from kassio/load-fixtures-from-linked-folder
Load fixtures from linked folder
Diffstat (limited to 'activerecord/lib/active_record/fixtures.rb')
| -rw-r--r-- | activerecord/lib/active_record/fixtures.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/fixtures.rb b/activerecord/lib/active_record/fixtures.rb index 7a5634f225..1e6b5c5d69 100644 --- a/activerecord/lib/active_record/fixtures.rb +++ b/activerecord/lib/active_record/fixtures.rb @@ -661,7 +661,7 @@ module ActiveRecord end def read_fixture_files - yaml_files = Dir["#{@fixture_path}/**/*.yml"].select { |f| + yaml_files = Dir["#{@fixture_path}/{**,*}/*.yml"].select { |f| ::File.file?(f) } + [yaml_file_path] @@ -752,7 +752,7 @@ module ActiveRecord def fixtures(*fixture_names) if fixture_names.first == :all - fixture_names = Dir["#{fixture_path}/**/*.{yml}"] + fixture_names = Dir["#{fixture_path}/{**,*}/*.{yml}"] fixture_names.map! { |f| f[(fixture_path.size + 1)..-5] } else fixture_names = fixture_names.flatten.map { |n| n.to_s } |