aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2008-11-08 22:49:00 -0500
committerJeremy Kemper <jeremy@bitsweat.net>2008-11-08 22:49:00 -0500
commit1df0a07f060291397dcbc8dd39e3abd3ad915a78 (patch)
treee9ed898f2e9c716e3a8e17f689af5c947d3d083a /activerecord
parentd87d3f76d547df7c956fe4fab324cad9396477ae (diff)
downloadrails-1df0a07f060291397dcbc8dd39e3abd3ad915a78.tar.gz
rails-1df0a07f060291397dcbc8dd39e3abd3ad915a78.tar.bz2
rails-1df0a07f060291397dcbc8dd39e3abd3ad915a78.zip
lazy-initialize already loaded fixtures map
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/lib/active_record/fixtures.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/fixtures.rb b/activerecord/lib/active_record/fixtures.rb
index 24aabf0359..a09f58fc23 100644
--- a/activerecord/lib/active_record/fixtures.rb
+++ b/activerecord/lib/active_record/fixtures.rb
@@ -832,7 +832,6 @@ module ActiveRecord
self.use_instantiated_fixtures = true
self.pre_loaded_fixtures = false
- @@already_loaded_fixtures = {}
self.fixture_class_names = {}
end
@@ -940,6 +939,7 @@ module ActiveRecord
# Load fixtures for every test.
else
Fixtures.reset_cache
+ @@already_loaded_fixtures ||= {}
@@already_loaded_fixtures[self.class] = nil
load_fixtures
end