From 4e04ec4adb4bae4e880a73a6f9ce1851d444b058 Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Wed, 2 Jan 2008 09:11:39 +0000 Subject: Ruby 1.9 compat: fix two failing tests since String#each has been removed. Closes #10655. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8524 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- activerecord/lib/active_record/fixtures.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'activerecord/lib') diff --git a/activerecord/lib/active_record/fixtures.rb b/activerecord/lib/active_record/fixtures.rb index 611365669d..ffbce97295 100755 --- a/activerecord/lib/active_record/fixtures.rb +++ b/activerecord/lib/active_record/fixtures.rb @@ -704,7 +704,8 @@ class Fixtures < (RUBY_VERSION < '1.9' ? YAML::Omap : Hash) end yaml_value.each do |fixture| - fixture.each do |name, data| + raise Fixture::FormatError, "Bad data for #{@class_name} fixture named #{fixture}" unless fixture.respond_to?(:each) + fixture.each do |name, data| unless data raise Fixture::FormatError, "Bad data for #{@class_name} fixture named #{name} (nil)" end @@ -877,6 +878,7 @@ module Test #:nodoc: end def self.setup_fixture_accessors(table_names = nil) + table_names = [table_names] if table_names && !table_names.respond_to?(:each) (table_names || fixture_table_names).each do |table_name| table_name = table_name.to_s.tr('.', '_') -- cgit v1.2.3