diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2011-05-23 14:02:33 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2011-05-23 15:06:13 -0700 |
| commit | 5ec23b95ba7d5a00d20f6ec59f75c34a2ac73b5d (patch) | |
| tree | 4ecceb39d9bb87dc61e9b40035aef1264c879616 /activerecord/lib | |
| parent | 1716da07204193c8acf967e2d75a53a82e4c7c28 (diff) | |
| download | rails-5ec23b95ba7d5a00d20f6ec59f75c34a2ac73b5d.tar.gz rails-5ec23b95ba7d5a00d20f6ec59f75c34a2ac73b5d.tar.bz2 rails-5ec23b95ba7d5a00d20f6ec59f75c34a2ac73b5d.zip | |
fixing 1.8 support for new fixture tests
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/fixtures/file.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/fixtures/file.rb b/activerecord/lib/active_record/fixtures/file.rb index da07cf5da1..04f494db2c 100644 --- a/activerecord/lib/active_record/fixtures/file.rb +++ b/activerecord/lib/active_record/fixtures/file.rb @@ -43,7 +43,10 @@ module ActiveRecord # Validate our unmarshalled data. def validate(data) - raise Fixture::FormatError, 'fixture is not a hash' unless Hash === data + unless Hash === data || YAML::Omap === data + raise Fixture::FormatError, 'fixture is not a hash' + end + raise Fixture::FormatError unless data.all? { |name, row| Hash === row } data end |