diff options
| author | Rick Olson <technoweenie@gmail.com> | 2006-03-14 15:15:06 +0000 |
|---|---|---|
| committer | Rick Olson <technoweenie@gmail.com> | 2006-03-14 15:15:06 +0000 |
| commit | 4965a754d5c9bfde332398c653e003c749e62cf9 (patch) | |
| tree | 05745679cf3935cbc25831e340ab01f6fb830b2d /activerecord/lib/active_record | |
| parent | 796a43dead8ebf2fb9d28a25cb90e83c9baab4a0 (diff) | |
| download | rails-4965a754d5c9bfde332398c653e003c749e62cf9.tar.gz rails-4965a754d5c9bfde332398c653e003c749e62cf9.tar.bz2 rails-4965a754d5c9bfde332398c653e003c749e62cf9.zip | |
Catch FixtureClassNotFound when using instantiated fixtures on a fixture that has no ActiveRecord model [Rick Olson]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3866 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record')
| -rwxr-xr-x | activerecord/lib/active_record/fixtures.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/fixtures.rb b/activerecord/lib/active_record/fixtures.rb index 71a28f4712..0e5f992538 100755 --- a/activerecord/lib/active_record/fixtures.rb +++ b/activerecord/lib/active_record/fixtures.rb @@ -223,8 +223,10 @@ class Fixtures < YAML::Omap if load_instances ActiveRecord::Base.silence do fixtures.each do |name, fixture| - if model = fixture.find - object.instance_variable_set "@#{name}", model + begin + object.instance_variable_set "@#{name}", fixture.find + rescue FixtureClassNotFound + nil end end end |