diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2013-03-21 16:42:37 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2013-03-21 16:42:37 -0700 |
| commit | a7391f58a0189474ef93ae89541fa34f6333e786 (patch) | |
| tree | 60f7161c3c45408cbb514c27b9a4f0faafe60ec3 /activerecord/lib | |
| parent | ecfdc842a58816540e7c96a913f95a0d94be7ca7 (diff) | |
| parent | 018fc5fc071d718f6fd1a0237996eeeec7d79e65 (diff) | |
| download | rails-a7391f58a0189474ef93ae89541fa34f6333e786.tar.gz rails-a7391f58a0189474ef93ae89541fa34f6333e786.tar.bz2 rails-a7391f58a0189474ef93ae89541fa34f6333e786.zip | |
Merge pull request #9861 from pivotalcommon/master
Allow fixture_path to be a Pathname
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 2958d08210..c26fc76515 100644 --- a/activerecord/lib/active_record/fixtures.rb +++ b/activerecord/lib/active_record/fixtures.rb @@ -752,7 +752,7 @@ module ActiveRecord def fixtures(*fixture_set_names) if fixture_set_names.first == :all fixture_set_names = Dir["#{fixture_path}/**/*.{yml}"] - fixture_set_names.map! { |f| f[(fixture_path.size + 1)..-5] } + fixture_set_names.map! { |f| f[(fixture_path.to_s.size + 1)..-5] } else fixture_set_names = fixture_set_names.flatten.map { |n| n.to_s } end |