diff options
| author | yuuji.yaginuma <yuuji.yaginuma@gmail.com> | 2016-09-11 21:43:03 +0900 |
|---|---|---|
| committer | yuuji.yaginuma <yuuji.yaginuma@gmail.com> | 2016-09-12 08:14:10 +0900 |
| commit | 1b128f89748c7cf12481684e473f7c884993055f (patch) | |
| tree | a84b9c6f75aa71228265478d26e08a6e8be0a2f9 /activerecord/lib | |
| parent | 7c3cc0902cfe00a0565c02c02d008c1ea75937ea (diff) | |
| download | rails-1b128f89748c7cf12481684e473f7c884993055f.tar.gz rails-1b128f89748c7cf12481684e473f7c884993055f.tar.bz2 rails-1b128f89748c7cf12481684e473f7c884993055f.zip | |
remove duplicated fixture set names
If using namespaced fixtures, get following Ruby warning.
```
activerecord/lib/active_record/fixtures.rb:922: warning: method redefined; discarding old admin_foos
activerecord/lib/active_record/fixtures.rb:922: warning: previous definition of admin_foos was here
```
This is happening because of the multiple set the same path when setting the
fixture name. Fix to remove the duplicate path.
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/fixtures.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/fixtures.rb b/activerecord/lib/active_record/fixtures.rb index 40a9aa2783..8b47fbdbe4 100644 --- a/activerecord/lib/active_record/fixtures.rb +++ b/activerecord/lib/active_record/fixtures.rb @@ -902,7 +902,7 @@ module ActiveRecord def fixtures(*fixture_set_names) if fixture_set_names.first == :all - fixture_set_names = Dir["#{fixture_path}/{**,*}/*.{yml}"] + fixture_set_names = Dir["#{fixture_path}/{**,*}/*.{yml}"].uniq fixture_set_names.map! { |f| f[(fixture_path.to_s.size + 1)..-5] } else fixture_set_names = fixture_set_names.flatten.map(&:to_s) |