diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2012-01-03 15:22:03 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2012-01-03 15:22:10 -0700 |
| commit | 508493ca458f32517d34369cd93abc6592b29b83 (patch) | |
| tree | 451e90e6d319bd0841193199ed627e916057fa0a | |
| parent | 7985f64e25980369bcf66b326310743cd028dbea (diff) | |
| download | rails-508493ca458f32517d34369cd93abc6592b29b83.tar.gz rails-508493ca458f32517d34369cd93abc6592b29b83.tar.bz2 rails-508493ca458f32517d34369cd93abc6592b29b83.zip | |
setup_fixture_accessors should accept symbols for table names. Fixes an unintended (and untested) regression.
| -rw-r--r-- | activerecord/lib/active_record/fixtures.rb | 1 | ||||
| -rw-r--r-- | activerecord/test/cases/fixtures_test.rb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/fixtures.rb b/activerecord/lib/active_record/fixtures.rb index c59c00f424..860e7ea0e4 100644 --- a/activerecord/lib/active_record/fixtures.rb +++ b/activerecord/lib/active_record/fixtures.rb @@ -789,6 +789,7 @@ module ActiveRecord fixture_names = Array.wrap(fixture_names || fixture_table_names) methods = Module.new do fixture_names.each do |fixture_name| + fixture_name = fixture_name.to_s accessor_name = fixture_name.tr('/', '_').to_sym define_method(accessor_name) do |*fixtures| diff --git a/activerecord/test/cases/fixtures_test.rb b/activerecord/test/cases/fixtures_test.rb index 859bb7992b..0e83621c98 100644 --- a/activerecord/test/cases/fixtures_test.rb +++ b/activerecord/test/cases/fixtures_test.rb @@ -589,7 +589,7 @@ class FasterFixturesTest < ActiveRecord::TestCase load_extra_fixture('posts') assert ActiveRecord::Fixtures.fixture_is_cached?(ActiveRecord::Base.connection, 'posts') - self.class.setup_fixture_accessors('posts') + self.class.setup_fixture_accessors :posts assert_equal 'Welcome to the weblog', posts(:welcome).title end end |