aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorAlexey Muranov <alexey.muranov@gmail.com>2012-05-09 13:32:58 +0200
committerAlexey Muranov <alexey.muranov@gmail.com>2012-05-10 00:40:26 +0200
commit981055540c8a1fc66669cfef29b437083e2fb7d6 (patch)
tree318a20c7c1d9c2adac866ac313fbd06133590d2f /activerecord
parentf02e7dc9ab4822ad2dfd85a0747a398ee3132cb3 (diff)
downloadrails-981055540c8a1fc66669cfef29b437083e2fb7d6.tar.gz
rails-981055540c8a1fc66669cfef29b437083e2fb7d6.tar.bz2
rails-981055540c8a1fc66669cfef29b437083e2fb7d6.zip
Remove deprecated use of ::instantiate_fixtures
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/lib/active_record/fixtures.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/activerecord/lib/active_record/fixtures.rb b/activerecord/lib/active_record/fixtures.rb
index 3316a84831..296639f35a 100644
--- a/activerecord/lib/active_record/fixtures.rb
+++ b/activerecord/lib/active_record/fixtures.rb
@@ -451,8 +451,8 @@ module ActiveRecord
end
def self.instantiate_all_loaded_fixtures(object, load_instances = true)
- all_loaded_fixtures.each do |table_name, fixtures|
- ActiveRecord::Fixtures.instantiate_fixtures(object, table_name, fixtures, load_instances)
+ all_loaded_fixtures.each_value do |fixture_set|
+ ActiveRecord::Fixtures.instantiate_fixtures(object, fixture_set, load_instances)
end
end
@@ -912,8 +912,8 @@ module ActiveRecord
ActiveRecord::Fixtures.instantiate_all_loaded_fixtures(self, load_instances?)
else
raise RuntimeError, 'Load fixtures before instantiating them.' if @loaded_fixtures.nil?
- @loaded_fixtures.each do |fixture_name, fixtures|
- ActiveRecord::Fixtures.instantiate_fixtures(self, fixture_name, fixtures, load_instances?)
+ @loaded_fixtures.each_value do |fixture_set|
+ ActiveRecord::Fixtures.instantiate_fixtures(self, fixture_set, load_instances?)
end
end
end